From 80f0da54c82972fed94161b14e9932507060dce8 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Sat, 27 Apr 2024 11:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs | 1 + ZR.Service/mes/wms/WmGoodsBatchSearchService.cs | 16 ++++++++-------- .../mes/wms/WmGoodsNowProductionService.cs | 12 ++++++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs b/ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs index 41f846a5..a8bdef58 100644 --- a/ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs +++ b/ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs @@ -59,6 +59,7 @@ namespace ZR.Model.MES.wms.Dto public string LocationCode { get; set; } public string Partnumber { get; set; } + public string Description { get; set; } public int? GoodsNumLogic { get; set; } diff --git a/ZR.Service/mes/wms/WmGoodsBatchSearchService.cs b/ZR.Service/mes/wms/WmGoodsBatchSearchService.cs index 02ce2fac..a0435c70 100644 --- a/ZR.Service/mes/wms/WmGoodsBatchSearchService.cs +++ b/ZR.Service/mes/wms/WmGoodsBatchSearchService.cs @@ -64,7 +64,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in result.Result) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber==item.Partnumber) .First(); if (material == null) { @@ -110,7 +110,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in list) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -165,7 +165,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in result.Result) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -211,7 +211,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in list) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -268,7 +268,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in result.Result) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -316,7 +316,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in list) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -371,7 +371,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in result.Result) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { @@ -416,7 +416,7 @@ namespace ZR.Service.Business foreach (WmGoodsBatchTableDto item in list) { WmMaterial material = Context.Queryable() - .Where(it => it.Partnumber.Contains(item.Partnumber)) + .Where(it => it.Partnumber == item.Partnumber) .First(); if (material == null) { diff --git a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs index ecb29d61..223b4c21 100644 --- a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs @@ -38,6 +38,18 @@ namespace ZR.Service.mes.wms .Where(predicate.ToExpression()) .ToPage(parm); + foreach (WmGoodsNowProductionDto item in response.Result) + { + WmMaterial material = Context.Queryable() + .Where(it => it.Partnumber==item.Partnumber) + .First(); + if (material == null) + { + item.Description = "此零件号不在物料清单内！"; + continue; + } + item.Description = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName; + } return response; }