入库调整

ZR.Service/mes/wms/WMentryWarehousing_productService.cs

@@ -393,8 +393,9 @@ namespace ZR.Service.mes.wms
                 if (isStrict && wmInfo.Remark != "临时")
                 {
                     // 3. 提取流水号
-                    string package_no = resultionPackage.PatchCode.Split("_")[1];
-
+                    string patchCodePart = resultionPackage.PatchCode.Split("_")[1];
+                    // 直接在 int.TryParse 中处理转换，并在一行内完成默认值设置
+                    int package_no = int.TryParse(patchCodePart, out var temp) ? temp : -1;
                     // 3.1 isStrict = TRUE  时判断是否是满箱标签
                     WmPackingrecord recourd = Context
                         .Queryable<WmPackingrecord>()
@@ -402,7 +403,7 @@ namespace ZR.Service.mes.wms
                         // .Where(it => it.PackingCode.EndsWith(packingCode))
                         // .Where(it => packingCode == int.Parse(it.PackingCode.Substring(7)).ToString())
                         .Where(it =>
-                            package_no == int.Parse(SqlFunc.Right(it.PackingCode, 5)).ToString()
+                            package_no == int.Parse(SqlFunc.Right(it.PackingCode, 5))
                         )
                         .Where(it => it.BFilled == true)
                         .First();
@@ -414,7 +415,10 @@ namespace ZR.Service.mes.wms
                     var inspect = Context
                         .Queryable<WmFgentryInspect>()
                         .Where(it => it.Workorder == resultionPackage.WorkoderID)
-                        .Where(it => it.Packcode.EndsWith(package_no))
+                        .Where(it =>
+                            package_no == int.Parse(SqlFunc.Right(it.Packcode, 5))
+                        )
+                        //.Where(it => it.Packcode.EndsWith(package_no))
                         .OrderByDescending(it => it.CreatedTime)
                         .First();
                     // XXX 添加校验，如果是编号为4号的打印机打出来的就跳过GP12，满箱与测试标签校验