.

Admin.Core.Api/Admin.Core.Api.xml

@@ -329,11 +329,12 @@
             构造函数
             </summary>
         </member>
-        <member name="M:Admin.Core.Api.SolventController.GetByCylinderInfo(System.String)">
+        <member name="M:Admin.Core.Api.SolventController.GetByCylinderInfo(System.String,System.String)">
             <summary>
             根据拉缸条码查询物料
             </summary>
             <param name="code">缸条码</param>
+            <param name="weighbridge">地磅名称：1号地磅|2号地磅</param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Api.SolventController.ExecPlcState(Admin.Core.Model.ViewModels.VerifyView)">

Admin.Core.Api/Admin.Core.Model.xml

@@ -4099,7 +4099,7 @@
         </member>
         <member name="P:Admin.Core.Model.ViewModels.VerifyView.Plan_Serial">
             <summary>
-            计划序号，我拿来传给PLC作为了唯一值
+            计划序号，传给PLC作为了唯一值
             </summary>
         </member>
         <member name="P:Admin.Core.Model.ViewModels.VerifyView.Plan_Date">
@@ -4222,6 +4222,16 @@
             地磅名称
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.ViewModels.VerifyView.IsRate">
+            <summary>
+            是否有固含
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.VerifyView.Rate">
+            <summary>
+            固含率
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.ViewModels.WaitePlanView">
             <summary>
             待执行物料
@@ -4342,6 +4352,16 @@
             待执行物料是否执行过
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.ViewModels.WaitePlanView.IsRate">
+            <summary>
+            是否有固含 1:有；0:无
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ViewModels.WaitePlanView.Rate">
+            <summary>
+            固含率
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.ViewModels.WarehousePlanView">
             <summary>
             反应釜计划号

Admin.Core.Model/ViewModels/VerifyView.cs

@@ -28,7 +28,7 @@ namespace Admin.Core.Model.ViewModels
         /// </summary>
         public int Real_Num { get; set; }
         /// <summary>
-        /// 计划序号，我拿来传给PLC作为了唯一值
+        /// 计划序号，传给PLC作为了唯一值
         /// </summary>
         public int Plan_Serial { get; set; }
         /// <summary>

Admin.Core.Model/ViewModels/WaitePlanView.cs

@@ -106,6 +106,10 @@ namespace Admin.Core.Model.ViewModels
         /// <summary>
         /// 是否有固含 1:有；0:无
         /// </summary>
-        public int IsRate { get; set; }
+        public bool IsRate { get; set; }
+        /// <summary>
+        /// 固含率
+        /// </summary>
+        public double Rate { get; set; }
     }
 }

Admin.Core.Repository/Repository_New/Hw_weighRepository.cs

@@ -18,9 +18,9 @@ namespace Admin.Core.Repository
         public async Task<List<WaitePlanView>> GetWaiteMaterial(string planId)
         {
             string sql = @"select  w.Weight_Id MID,p.Plan_Id,p.Plan_Num,p.Real_Num,p.Plan_Serial,p.Plan_State,p.Plan_Date,p.Plan_StateText,r.ID as RecipeID,r.Recipe_Serial,r.Recipe_Name,r.Version,r.Recipe_Verify,r.Total_Weight,r.Total_Error,m.ID  as MaterialID,m.Material_name,m.Material_code,w.Set_Weight,w.Set_Error,
-																			  hw.Plan_ID MaterialPlan,ISNULL(r.IsRate,0) as IsRate  from RT_plan  p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID  
+																			  hw.Plan_ID MaterialPlan,ISNULL(w.IsRate,0) as IsRate  from RT_plan  p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID  
 																				left join Pmt_material m on w.Material_ID=m.ID 
-																				left join Hw_weigh  hw on hw.Material_ID=m.ID   and p.Real_Num=hw.Dosing_ID where p.Plan_State=3    ORDER BY w.Weight_Id";
+																				left join Hw_weigh  hw on hw.Material_ID=m.ID   and p.Real_Num=hw.Dosing_ID where p.Plan_State=3  and p.Plan_Id=@Plan_Id  ORDER BY w.Weight_Id";
 
             SugarParameter[] parameters = new SugarParameter[]
           {

Admin.Core.Service/Service_New/SolventServices.cs

@@ -45,7 +45,7 @@ namespace Admin.Core.Service
         /// <summary>
         ///  //扫描拉缸（容器）条码后验证成功，执行PLC 启动
         /// </summary>
-        /// <param name="view">y验证成功后传递过来相关数据</param>
+        /// <param name="view">验证成功后传递过来相关数据</param>
         /// <returns>是否执行成功!</returns>
         public async Task<bool> ExecPlcState(VerifyView view)
         {
@@ -57,9 +57,10 @@ namespace Admin.Core.Service
                     if (view.Weighbridge == "1号地磅")
                     {
                         bool matCode = plcList.plc.WriteInt16("DB110.DBW400.0", "1");//执行启动
-                        bool writeDouble  = plcList.plc.Writedouble("DB110.DBW401.0", view.Rate);//传入固率
+                        
                         if (matCode)
                         {
+                            plcList.plc.Writedouble("DB110.DBW443.0", view.Rate);//传入固率
                             Hw_SolventErrorPreventionReport report = new Hw_SolventErrorPreventionReport()
                             {
                                 PlanId = view.Plan_Id,
@@ -118,8 +119,10 @@ namespace Admin.Core.Service
                     else if (view.Weighbridge == "2号地磅")
                     {
                         bool matCode = plcList.plc.WriteInt16("DB111.DBW400.0", "1");//执行启动
+                       
                         if (matCode)
                         {
+                            plcList.plc.Writedouble("DB111.DBW443.0", view.Rate);//传入固率
                             Hw_SolventErrorPreventionReport report = new Hw_SolventErrorPreventionReport()
                             {
                                 PlanId = view.Plan_Id,