From 65bc307f3bc8583b1e6a92fe263e9a5f1ae2b93f Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Wed, 8 Nov 2023 21:35:16 +0800 Subject: [PATCH] . --- Admin.Core.Api/Admin.Core.Model.xml | 4 ++-- Admin.Core.Api/Controllers/Business/MaterialController.cs | 2 ++ Admin.Core.Api/appsettings.Development.json | 2 +- Admin.Core.IService/IService_New/Ixl_materialServices.cs | 7 +++++++ Admin.Core.Model/ViewModels/VerifyView.cs | 2 +- Admin.Core.Model/ViewModels/WaitePlanView.cs | 2 +- Admin.Core.PlcServer/Impl/SiemensPlc.cs | 2 +- Admin.Core.Repository/Repository_New/Hw_weighRepository.cs | 2 +- Admin.Core.Service/Service_New/xl_materialServices.cs | 1 + 9 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 022bb2c..d48ef20 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -4222,7 +4222,7 @@ 地磅名称 - + 是否有固含 @@ -4352,7 +4352,7 @@ 待执行物料是否执行过 - + 是否有固含 1:有；0:无 diff --git a/Admin.Core.Api/Controllers/Business/MaterialController.cs b/Admin.Core.Api/Controllers/Business/MaterialController.cs index 8e9bf8f..35e0b11 100644 --- a/Admin.Core.Api/Controllers/Business/MaterialController.cs +++ b/Admin.Core.Api/Controllers/Business/MaterialController.cs @@ -111,6 +111,8 @@ namespace Admin.Core.Api #endregion #region 执行PLC + /// + ///执行PLC /// /// 料仓排序Bin_Serial /// 匹配状态：条码匹配写“1”，不匹配时写“2” diff --git a/Admin.Core.Api/appsettings.Development.json b/Admin.Core.Api/appsettings.Development.json index b196aa1..ec3f4f9 100644 --- a/Admin.Core.Api/appsettings.Development.json +++ b/Admin.Core.Api/appsettings.Development.json @@ -167,7 +167,7 @@ { "Id": 1, "EquipName": "小料PLC", - "IP": "127.0.0.1", + "IP": "192.168.10.100", "Port": 102 }, { diff --git a/Admin.Core.IService/IService_New/Ixl_materialServices.cs b/Admin.Core.IService/IService_New/Ixl_materialServices.cs index e4f3a6a..344f8fb 100644 --- a/Admin.Core.IService/IService_New/Ixl_materialServices.cs +++ b/Admin.Core.IService/IService_New/Ixl_materialServices.cs @@ -12,6 +12,13 @@ namespace Admin.Core.IService public interface Ixl_materialServices :IBaseServices { Task GetByMaterialCode(string code); + /// + /// 执行类型防差错 + /// + /// 料仓号 + /// 状态 + /// 物料编码 + /// 物料重量 Task> ExecPlcState(int binSerial, int state,string materialCode,decimal weight); /// /// 绑定料桶信息 diff --git a/Admin.Core.Model/ViewModels/VerifyView.cs b/Admin.Core.Model/ViewModels/VerifyView.cs index 4e95e65..5512946 100644 --- a/Admin.Core.Model/ViewModels/VerifyView.cs +++ b/Admin.Core.Model/ViewModels/VerifyView.cs @@ -130,7 +130,7 @@ namespace Admin.Core.Model.ViewModels /// /// 是否有固含 /// - public bool IsRate { get; set; } + public bool Exist { get; set; } /// /// 固含率 /// diff --git a/Admin.Core.Model/ViewModels/WaitePlanView.cs b/Admin.Core.Model/ViewModels/WaitePlanView.cs index e9c74b6..b6a4f63 100644 --- a/Admin.Core.Model/ViewModels/WaitePlanView.cs +++ b/Admin.Core.Model/ViewModels/WaitePlanView.cs @@ -106,7 +106,7 @@ namespace Admin.Core.Model.ViewModels /// /// 是否有固含 1:有；0:无 /// - public bool IsRate { get; set; } + public bool Exist { get; set; } /// /// 固含率 /// diff --git a/Admin.Core.PlcServer/Impl/SiemensPlc.cs b/Admin.Core.PlcServer/Impl/SiemensPlc.cs index f7bb3d3..e75c5c4 100644 --- a/Admin.Core.PlcServer/Impl/SiemensPlc.cs +++ b/Admin.Core.PlcServer/Impl/SiemensPlc.cs @@ -75,7 +75,7 @@ namespace Admin.Core.PlcServer /// public bool Connect(string iP, int port) { - //siemensS7Net.IpAddress = iP;//正式环境开启 + siemensS7Net.IpAddress = iP;//正式环境开启 siemensS7Net.Port = port; try { diff --git a/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs b/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs index bc61134..96e4446 100644 --- a/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs +++ b/Admin.Core.Repository/Repository_New/Hw_weighRepository.cs @@ -18,7 +18,7 @@ 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(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 + hw.Plan_ID MaterialPlan,ISNULL(w.IsRate,0) as Exist 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 and p.Plan_Id=@Plan_Id ORDER BY w.Weight_Id"; diff --git a/Admin.Core.Service/Service_New/xl_materialServices.cs b/Admin.Core.Service/Service_New/xl_materialServices.cs index 900542b..f6538e4 100644 --- a/Admin.Core.Service/Service_New/xl_materialServices.cs +++ b/Admin.Core.Service/Service_New/xl_materialServices.cs @@ -54,6 +54,7 @@ namespace Admin.Core.Service public async Task> ExecPlcState(int binSerial, int state, string materialCode, decimal weight) { MessageModel mesage=new MessageModel(); + log.Info(materialCode + "|" + weight); string station = string.Empty; try {