Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

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 != "临时")
                 {

ZR.Service/mes/wms/WmOneTimeRecordService.cs

@@ -28,16 +28,12 @@ namespace ZR.Service.mes.wms
 		/// <returns></returns>
 		public PagedInfo<WmOneTimeRecordDto> GetList(WmOneTimeRecordQueryDto parm)
 		{
-			var predicate = Expressionable
+            var predicate = Expressionable
 				.Create<WmOneTimeRecord>()
 				.AndIF(
 					!string.IsNullOrEmpty(parm.Partnumber),
-					it => it.Partnumber.Contains(parm.Partnumber)
+					it => it.Partnumber == parm.Partnumber
-				)
+                )
-				.AndIF(
-					!string.IsNullOrEmpty(parm.BlankNum),
-					it => it.BlankNum.Contains(parm.BlankNum)
-				)
 				.AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark))
 				.AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
 				/*.AndIF(

ZR.Service/mes/wms/WmPolishRecordService.cs

@@ -32,7 +32,7 @@ namespace ZR.Service.mes.wms
                 .Create<WmPolishRecord>()
                 .AndIF(
                     !string.IsNullOrEmpty(parm.Partnumber),
-                    it => it.Partnumber.Contains(parm.Partnumber)
+                    it => it.Partnumber == parm.Partnumber
                 )
                 .AndIF(
                     !string.IsNullOrEmpty(parm.BlankNum),