From ed512ac7448826a510a7e18ce53e9831999eeaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sun, 31 Aug 2025 11:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92nullbug=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E9=81=93=E6=A0=87=E7=AD=BE=E5=86=85=E5=B7=A5=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Service/mes/qc/backend/QcBackEndService.cs |  2 +-
 ZR.Service/mes/wms/WmOutOrderService.cs       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ZR.Service/mes/qc/backend/QcBackEndService.cs b/ZR.Service/mes/qc/backend/QcBackEndService.cs
index 1bbcc0cc..881aa94a 100644
--- a/ZR.Service/mes/qc/backend/QcBackEndService.cs
+++ b/ZR.Service/mes/qc/backend/QcBackEndService.cs
@@ -1156,7 +1156,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^Fu={isFull}^Ag={isAgain}";
+                $"Code=PGW{workOrder}^ItemNumber={newLabelScran.PartNumber}^Order=W{batchCode}^Qty={maxPackage}^LabelType=1^LabelBy=HD^Fu={isFull}^Ag={isAgain}";
 
             string newPackageCode = $"BOX:PGW{workOrder}{newLabelScran.Team}1";
 
diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index 486d4ff7..513caaa5 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/ZR.Service/mes/wms/WmOutOrderService.cs
@@ -1164,12 +1164,18 @@ namespace ZR.Service.mes.wms
                     item.MaterialCode,
                     item.BatchCode
                 );
-                item.Description = Context
+                var material = Context
                     .Queryable<WmMaterial>()
                     .Where(m => m.Partnumber == item.MaterialCode && m.Status == 1 && m.Type == 1)
-                    .Select(m => m.Description)
-                    .First()
-                    .ToString();
+                    .First();
+                if(material == null)
+                {
+                    item.Description = "无描述";
+                }
+                else
+                {
+                    item.Description = material.Description;
+                }
                 item.InventoryNumber = actualData.InventoryNumber;
                 item.ActualOutNumber = actualData.ActualOutNumber;
                 item.InventoryPackage = actualData.InventoryPackage;