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;