From 134e97dcb6f70b03ad2f010f1dfb8a3a35581e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 7 May 2024 15:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E5=85=A5=E5=BA=93=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/WMentryWarehousing_productService.cs  | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
index 88bac97d..0c2f7962 100644
--- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
+++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
@@ -281,15 +281,29 @@ namespace ZR.Service.mes.wms
                 }
                 if (isStrict && wmInfo.Remark != "临时")
                 {
-                    //1.2  判断是否检验合格 入库检验
+                    // 3. 提取流水号
                     string package_no = resultionPackage.PatchCode.Split("_")[1];
-                   var inspect= Context.Queryable<WmFgentryInspect>()
+
+                    // 3.1 isStrict = TRUE  时判断是否是满箱标签
+                    WmPackingrecord recourd = Context.Queryable<WmPackingrecord>()
+                        .Where(it => it.WorkOrderNum == resultionPackage.WorkoderID)
+                        // .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())
+                        .Where(it => it.BFilled == true)
+                        .First();
+                    if (recourd == null)
+                    {
+                        return "该标签不为满箱标签！请入临时仓库！";
+                    }
+                    //3.2 GP12检测
+                    var inspect = Context.Queryable<WmFgentryInspect>()
                           .Where(it => it.Workorder == resultionPackage.WorkoderID)
                           .Where(it => it.Packcode.EndsWith(package_no))
                           .OrderByDescending(it=>it.CreatedTime)
                           .First();
                     // XXX 添加校验，如果是编号为4号的打印机打出来的就跳过GP12，满箱与测试标签校验
-                    if (inspect.Machine != "4")
+                    if (recourd.Machine != "4")
                     {
                         // 其余不变
                         if (inspect == null)
@@ -305,19 +319,7 @@ namespace ZR.Service.mes.wms
                             return "该箱号GP12  未检验，不得入库";
                         }
                     }
-                    // 3.isStrict = TRUE时判断是否是满箱标签
-                    string packingCode = resultionPackage.PatchCode.Split('_')[1];
-                    bool isExist = Context.Queryable<WmPackingrecord>()
-                        .Where(it => it.WorkOrderNum == resultionPackage.WorkoderID)
-                        // .Where(it => it.PackingCode.EndsWith(packingCode))
-                        // .Where(it => packingCode == int.Parse(it.PackingCode.Substring(7)).ToString())
-                        .Where(it => packingCode == int.Parse( SqlFunc.Right(it.PackingCode,5)).ToString())
-                        .Where(it => it.BFilled == true)
-                        .Any();
-                    if (!isExist)
-                    {
-                        return "该标签不为满箱标签！请入临时仓库！";
-                    }
+                    
                     // 4.isStrict = TRUE时判断能否追溯
                     string flow = resultionPackage.PatchCode.Split('_')[1];
                     int flow_num = 0;