From cdeeaabfa7aafeb95cc7a48f9b0c0d57176bf701 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Sat, 17 May 2025 10:25:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8E=E9=81=93=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/wms/WMentryWarehousing_productService.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index eab331ee..a89fd4a2 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -388,7 +388,12 @@ namespace ZR.Service.mes.wms .First(); if (wmInfo == null) { - return "库位参数异常"; + return "库位参数异常，库位不存在"; + } + //TODO 后道标签直接跳过检查 + if (resultionPackage.originalCode.Contains("LabelBy=HD")) + { + isStrict = true; } if (isStrict && wmInfo.Remark != "临时") { From 60dd44be8772ac6f37656d2c2ef4820a2d5acf3a Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Sat, 17 May 2025 13:23:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=9B=E5=85=89=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8C=E8=AE=B0=E5=BD=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E6=90=9C=E7=B4=A2=E6=8C=87=E5=AE=9A=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=85=A5=E5=BA=93=E6=9A=82=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=90=8E=E9=81=93=E6=A0=87=E7=AD=BE=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/wms/WMentryWarehousing_productService.cs | 2 +- ZR.Service/mes/wms/WmOneTimeRecordService.cs | 10 +++------- ZR.Service/mes/wms/WmPolishRecordService.cs | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index a89fd4a2..5453d7f7 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -393,7 +393,7 @@ namespace ZR.Service.mes.wms //TODO 后道标签直接跳过检查 if (resultionPackage.originalCode.Contains("LabelBy=HD")) { - isStrict = true; + isStrict = false; } if (isStrict && wmInfo.Remark != "临时") { diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs index e1ffbd98..4913f3a8 100644 --- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -28,16 +28,12 @@ namespace ZR.Service.mes.wms /// public PagedInfo GetList(WmOneTimeRecordQueryDto parm) { - var predicate = Expressionable + var predicate = Expressionable .Create() .AndIF( !string.IsNullOrEmpty(parm.Partnumber), - it => it.Partnumber.Contains(parm.Partnumber) - ) - .AndIF( - !string.IsNullOrEmpty(parm.BlankNum), - it => it.BlankNum.Contains(parm.BlankNum) - ) + it => it.Partnumber == parm.Partnumber + ) .AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark)) .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) /*.AndIF( diff --git a/ZR.Service/mes/wms/WmPolishRecordService.cs b/ZR.Service/mes/wms/WmPolishRecordService.cs index ad32c0de..a90106a1 100644 --- a/ZR.Service/mes/wms/WmPolishRecordService.cs +++ b/ZR.Service/mes/wms/WmPolishRecordService.cs @@ -32,7 +32,7 @@ namespace ZR.Service.mes.wms .Create() .AndIF( !string.IsNullOrEmpty(parm.Partnumber), - it => it.Partnumber.Contains(parm.Partnumber) + it => it.Partnumber == parm.Partnumber ) .AndIF( !string.IsNullOrEmpty(parm.BlankNum),