From 62ce3f6eb9d104400c67e6e3ea60453eafa36069 Mon Sep 17 00:00:00 2001 From: SoulStar Date: Tue, 11 Feb 2025 15:37:48 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=BB=93=E6=9D=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8E=A5=E5=8F=A3=E6=94=B9=E7=BB=91PlanID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Business/WarehouseController.cs | 14 +++++++------- Admin.Core.Api/appsettings.json | 4 ++-- .../IService_New/IHw_BarrelServices.cs | 4 ++-- .../IService_New/ILR_weighServices.cs | 4 ++-- .../Service_New/Hw_BarrelServices.cs | 6 +++--- Admin.Core.Service/Service_New/LR_weighServices.cs | 14 +++++--------- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Admin.Core.Api/Controllers/Business/WarehouseController.cs b/Admin.Core.Api/Controllers/Business/WarehouseController.cs index 52d18da..3fa0b72 100644 --- a/Admin.Core.Api/Controllers/Business/WarehouseController.cs +++ b/Admin.Core.Api/Controllers/Business/WarehouseController.cs @@ -306,23 +306,23 @@ namespace Admin.Core.Api.Controllers.Business int weightResult = 0; MessageModel> messageModel = new MessageModel>(); - string materialName = _hw_BarrelService.GetMaterialNameByBarrelID(barrelBarcode.Trim()); - if (string.IsNullOrEmpty(materialName)) + string planID = _hw_BarrelService.GetPlanIDByBarrelID(barrelBarcode.Trim()); + if (string.IsNullOrEmpty(planID)) { weightResult = 1; - //return Failed>("查询不到罐号对应的物料ID!"); + //return Failed>("查询不到罐号对应的PlanID!"); } - if (materialName == "-1") + if (planID == "-1") { weightResult = 2; //return Failed>("查询不到罐号!"); } - List wlist = _lr_weighService.GetRecentWeightList(materialName); - List list = new List(); + List wlist = _lr_weighService.GetRecentWeightList(planID); if (wlist.Count == 0 || wlist == null) { weightResult = 3; } + List list = new List(); foreach (LR_weigh weigh in wlist) { LR_weigh_BatchCode record = new LR_weigh_BatchCode(); @@ -363,7 +363,7 @@ namespace Admin.Core.Api.Controllers.Business if (weightResult == 0) WeightString = "称量信息查询成功"; if (weightResult == 1) - WeightString = "查询不到罐号对应的物料ID!"; + WeightString = "查询不到罐号对应的PlanID!"; if (weightResult == 2) WeightString = "查询不到罐号!"; if (weightResult == 3) diff --git a/Admin.Core.Api/appsettings.json b/Admin.Core.Api/appsettings.json index ef156fb..4a31ff3 100644 --- a/Admin.Core.Api/appsettings.json +++ b/Admin.Core.Api/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "AllowedHosts": "*", "Logging": { "LogLevel": { @@ -162,7 +162,7 @@ { "Id": 1, "EquipName": "小料PLC", - "IP": "192.168.10.130", + "IP": "192.168.10.100", "Port": 102 }, { diff --git a/Admin.Core.IService/IService_New/IHw_BarrelServices.cs b/Admin.Core.IService/IService_New/IHw_BarrelServices.cs index 133160e..dbd10e0 100644 --- a/Admin.Core.IService/IService_New/IHw_BarrelServices.cs +++ b/Admin.Core.IService/IService_New/IHw_BarrelServices.cs @@ -13,10 +13,10 @@ namespace Admin.Core.IService.IService_New public interface IHw_BarrelServices : IBaseServices { /// - /// 根据罐号获取料罐ID + /// 根据罐号获取PlanID /// /// /// - string GetMaterialNameByBarrelID(string barrelBarcode); + string GetPlanIDByBarrelID(string barrelBarcode); } } diff --git a/Admin.Core.IService/IService_New/ILR_weighServices.cs b/Admin.Core.IService/IService_New/ILR_weighServices.cs index 45c8f18..05c2e01 100644 --- a/Admin.Core.IService/IService_New/ILR_weighServices.cs +++ b/Admin.Core.IService/IService_New/ILR_weighServices.cs @@ -10,9 +10,9 @@ namespace Admin.Core.IService public interface ILR_weighServices :IBaseServices { /// - /// 通过物料名称获取最近一次的称量列表 + /// 通过PlanID称获取最近一次的称量列表 /// /// - List GetRecentWeightList(string MaterialName); + List GetRecentWeightList(string PlanID); } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/Hw_BarrelServices.cs b/Admin.Core.Service/Service_New/Hw_BarrelServices.cs index 3512b1d..8835383 100644 --- a/Admin.Core.Service/Service_New/Hw_BarrelServices.cs +++ b/Admin.Core.Service/Service_New/Hw_BarrelServices.cs @@ -22,12 +22,12 @@ namespace Admin.Core.Service.Service_New base.BaseDal = dal; } - public string GetMaterialNameByBarrelID(string barrelBarcode) + public string GetPlanIDByBarrelID(string barrelBarcode) { try { - string materialName = _dal.Query(x => x.BarCode == barrelBarcode).FirstOrDefault().MaterialName; - return materialName; + string planId = _dal.Query(x => x.BarCode == barrelBarcode).FirstOrDefault().PlanId; + return planId; } catch(Exception ex) { diff --git a/Admin.Core.Service/Service_New/LR_weighServices.cs b/Admin.Core.Service/Service_New/LR_weighServices.cs index 2ec4b18..6853a8b 100644 --- a/Admin.Core.Service/Service_New/LR_weighServices.cs +++ b/Admin.Core.Service/Service_New/LR_weighServices.cs @@ -17,18 +17,14 @@ namespace Admin.Core.Service base.BaseDal = dal; } - public List GetRecentWeightList(string MaterialName) + public List GetRecentWeightList(string planID) { try { - List list = _dal.Query(x => x.Material_Name == MaterialName).ToList(); - if (list == null && list.Count == 0) - { - return new List(); - } - int maxMainID = list.Max(x => x.MainId); - List groupList = list.Where(x => x.MainId == maxMainID).ToList(); - return groupList; + List list = _dal.Query(x => x.Plan_ID == planID).ToList(); + //int maxMainID = list.Max(x => x.MainId); + //List groupList = list.Where(x => x.MainId == maxMainID).ToList(); + return list; } catch {