From 781a5198032d701e8bb1ddb8377b26ef7566e8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sat, 23 Aug 2025 13:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E9=81=93=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Service/mes/mm/MmInventoryReportService.cs           | 1 +
 ZR.Service/mes/mm/MmOutboundReportService.cs            | 1 +
 ZR.Service/mes/qc/backend/QcBackEndService.cs           | 6 +++---
 ZR.Service/mes/wms/WMentryWarehousing_productService.cs | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ZR.Service/mes/mm/MmInventoryReportService.cs b/ZR.Service/mes/mm/MmInventoryReportService.cs
index 19a416cf..d9589e8a 100644
--- a/ZR.Service/mes/mm/MmInventoryReportService.cs
+++ b/ZR.Service/mes/mm/MmInventoryReportService.cs
@@ -61,6 +61,7 @@ namespace ZR.Service.mes.mm
                         new
                         {
                             gr.Partnumber,
+                            gr.Code,
                             m.ProductName,
                             m.Color,
                             m.Specification,
diff --git a/ZR.Service/mes/mm/MmOutboundReportService.cs b/ZR.Service/mes/mm/MmOutboundReportService.cs
index f4e4ecbd..8ae6fdce 100644
--- a/ZR.Service/mes/mm/MmOutboundReportService.cs
+++ b/ZR.Service/mes/mm/MmOutboundReportService.cs
@@ -60,6 +60,7 @@ namespace ZR.Service.mes.mm
                         new
                         {
                             gr.Partnumber,
+                            gr.Code,
                             m.ProductName,
                             m.Color,
                             m.Specification,
diff --git a/ZR.Service/mes/qc/backend/QcBackEndService.cs b/ZR.Service/mes/qc/backend/QcBackEndService.cs
index d0d58d56..2a6ecafa 100644
--- a/ZR.Service/mes/qc/backend/QcBackEndService.cs
+++ b/ZR.Service/mes/qc/backend/QcBackEndService.cs
@@ -1152,7 +1152,7 @@ namespace ZR.Service.Business
             int isAgain = specialPrintType == 1 ? 1 : 0;
 
             string newLabelCode =
-                $"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{workOrder}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Team={newLabelScran.Team}^IsFull={isFull}^IsAgain={isAgain}";
+                $"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{workOrder}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Tm={newLabelScran.Team}^Fu={isFull}^Ag={isAgain}";
 
             string newPackageCode = $"BOX:PGW{workOrder}{newLabelScran.Team}1";
 
@@ -1589,10 +1589,10 @@ namespace ZR.Service.Business
                 .Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelSort > 0)
                 .Count();
 
-            // 重新打印计数（LabelType=1且LabelCode包含IsAgain=1），合并查询条件
+            // 重新打印计数（LabelType=1且LabelCode包含IsAgain(Ag)=1），合并查询条件
             result.RePrintCount = Context
                 .Queryable<QcBackendRecordLabelPrint>()
-                .Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelCode.Contains("IsAgain=1"))
+                .Where(it => it.WorkOrder == workOrder && it.LabelType == 1 && it.LabelCode.Contains("Ag=1"))
                 .Count();
 
             // 零头箱打印计数（LabelType=1且未装满），合并查询条件
diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
index 9b56c76a..3ff9e94d 100644
--- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
+++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
@@ -454,7 +454,7 @@ namespace ZR.Service.mes.wms
                     isStrict = false;
                 }
                 //20250610 后道标签并且是满箱的可跳过检查
-                /*if (resultionPackage.originalCode.Contains("LabelBy=HD") && resultionPackage.originalCode.Contains("IsFull=1"))
+                /*if (resultionPackage.originalCode.Contains("LabelBy=HD") && resultionPackage.originalCode.Contains("Fu=1"))
                 {
                     isStrict = false;
                 }*/