diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index eab331ee..5453d7f7 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 = 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),