diff --git a/Admin.Core.Api/Admin.Core.Api.xml b/Admin.Core.Api/Admin.Core.Api.xml index 5521fdc..445da1c 100644 --- a/Admin.Core.Api/Admin.Core.Api.xml +++ b/Admin.Core.Api/Admin.Core.Api.xml @@ -329,11 +329,12 @@ 构造函数 - + 根据拉缸条码查询物料 缸条码 + 地磅名称:1号地磅|2号地磅 diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 83aca08..022bb2c 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -4099,7 +4099,7 @@ - 计划序号,我拿来传给PLC作为了唯一值 + 计划序号,传给PLC作为了唯一值 @@ -4222,6 +4222,16 @@ 地磅名称 + + + 是否有固含 + + + + + 固含率 + + 待执行物料 @@ -4342,6 +4352,16 @@ 待执行物料是否执行过 + + + 是否有固含 1:有;0:无 + + + + + 固含率 + + 反应釜计划号 diff --git a/Admin.Core.Model/ViewModels/VerifyView.cs b/Admin.Core.Model/ViewModels/VerifyView.cs index e3da5c9..4e95e65 100644 --- a/Admin.Core.Model/ViewModels/VerifyView.cs +++ b/Admin.Core.Model/ViewModels/VerifyView.cs @@ -28,7 +28,7 @@ namespace Admin.Core.Model.ViewModels /// public int Real_Num { get; set; } /// - /// 计划序号,我拿来传给PLC作为了唯一值 + /// 计划序号,传给PLC作为了唯一值 /// public int Plan_Serial { get; set; } /// diff --git a/Admin.Core.Model/ViewModels/WaitePlanView.cs b/Admin.Core.Model/ViewModels/WaitePlanView.cs index 787a203..e9c74b6 100644 --- a/Admin.Core.Model/ViewModels/WaitePlanView.cs +++ b/Admin.Core.Model/ViewModels/WaitePlanView.cs @@ -106,6 +106,10 @@ namespace Admin.Core.Model.ViewModels /// /// 是否有固含 1:有;0:无 /// - public int IsRate { get; set; } + public bool IsRate { get; set; } + /// + /// 固含率 + /// + public double Rate { get; set; } } } diff --git a/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs b/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs index e7722c7..bc61134 100644 --- a/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs +++ b/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs @@ -18,9 +18,9 @@ namespace Admin.Core.Repository public async Task> 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[] { diff --git a/Admin.Core.Service/Service_New/SolventServices.cs b/Admin.Core.Service/Service_New/SolventServices.cs index 58530f9..74abe28 100644 --- a/Admin.Core.Service/Service_New/SolventServices.cs +++ b/Admin.Core.Service/Service_New/SolventServices.cs @@ -45,7 +45,7 @@ namespace Admin.Core.Service /// /// //扫描拉缸(容器)条码后验证成功,执行PLC 启动 /// - /// y验证成功后传递过来相关数据 + /// 验证成功后传递过来相关数据 /// 是否执行成功! public async Task 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,