diff --git a/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueHandlingUnitDto.java b/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueHandlingUnitDto.java
index ef3cdfab..cb68d0f9 100644
--- a/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueHandlingUnitDto.java
+++ b/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueHandlingUnitDto.java
@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 @Data
 public class AutoIssueHandlingUnitDto {
     private String handlingUnitId;
+    /*用于打印的（保持传参变量统一）就是标签号*/
     private String labelCode;
     private String partNo;
     private String locationId;
diff --git a/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueShopOrderDto.java b/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueShopOrderDto.java
index 53a1623c..bfe0db4a 100644
--- a/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueShopOrderDto.java
+++ b/src/main/java/com/gaotao/modules/production/entity/dto/AutoIssueShopOrderDto.java
@@ -8,6 +8,7 @@ import java.util.List;
 public class AutoIssueShopOrderDto {
     private String site;
     private String shopOrderNo;
+    /*发料那拷来的参数，是用于防orderno空备选参数*/
     private String workOrderNo;
     private String releaseNo;
     private String sequenceNo;
diff --git a/src/main/java/com/gaotao/modules/production/entity/dto/DirectUnissueDto.java b/src/main/java/com/gaotao/modules/production/entity/dto/DirectUnissueDto.java
index e5371b3e..0426ff77 100644
--- a/src/main/java/com/gaotao/modules/production/entity/dto/DirectUnissueDto.java
+++ b/src/main/java/com/gaotao/modules/production/entity/dto/DirectUnissueDto.java
@@ -15,6 +15,7 @@ public class DirectUnissueDto {
     private String workOrderNo; // 工单号
     @NotNull(message = "componentPartNo is not null")
     private String componentPartNo;//物料号
+    private String componentPartDesc;//物料描述
     private String operatorName; // 操作员
     private String remark; // 备注
     private int itemNo; // 物料行号
diff --git a/src/main/java/com/gaotao/modules/production/entity/dto/WorkOrderMaterialDto.java b/src/main/java/com/gaotao/modules/production/entity/dto/WorkOrderMaterialDto.java
index a7d3683e..7465dd64 100644
--- a/src/main/java/com/gaotao/modules/production/entity/dto/WorkOrderMaterialDto.java
+++ b/src/main/java/com/gaotao/modules/production/entity/dto/WorkOrderMaterialDto.java
@@ -8,6 +8,8 @@ import java.math.BigDecimal;
 public class WorkOrderMaterialDto {
     private String partNo;
     private String partDesc;
+    /** 与partNo同义，兼容前端新标签传参 - rqrq */
+    private String componentPartNo;
     private BigDecimal requiredQty; // 需求数量
     private BigDecimal issuedQty; // 已发数量
     private BigDecimal remainQty; // 剩余数量
diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java
index ca72cd26..f7ae87d9 100644
--- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java
@@ -193,8 +193,18 @@ public class ProductionReturnServiceImpl implements ProductionReturnService {
                 CreateHuRequestReturnIssueDto huRequest = new CreateHuRequestReturnIssueDto();
                 huRequest.setSite(returnDto.getSite());
                 huRequest.setLocationId(material.getLocationId());
-                huRequest.setPartNo(returnDto.getComponentPartNo());
-                huRequest.setPartDesc(returnDto.getComponentPartNo());
+                // 料号优先取物料行，其次主单componentPartNo - rqrq
+                String partNo = StringUtils.isNotBlank(material.getPartNo())
+                        ? material.getPartNo()
+                        : (StringUtils.isNotBlank(material.getComponentPartNo())
+                        ? material.getComponentPartNo()
+                        : returnDto.getComponentPartNo());
+                // 描述优先取物料行partDesc，其次主单componentPartDesc，避免误写料号 - rqrq
+                String partDesc = StringUtils.isNotBlank(material.getPartDesc())
+                        ? material.getPartDesc()
+                        : returnDto.getComponentPartDesc();
+                huRequest.setPartNo(partNo);
+                huRequest.setPartDesc(StringUtils.isNotBlank(partDesc) ? partDesc : partNo);
                 huRequest.setBatchNo(returnDto.getBatchNo());
                 huRequest.setWdr(material.getWdrNo());
                 huRequest.setHeight(material.getHeight());
@@ -405,8 +415,18 @@ public class ProductionReturnServiceImpl implements ProductionReturnService {
                 CreateHuRequestReturnIssueDto huRequest = new CreateHuRequestReturnIssueDto();
                 huRequest.setSite(returnDto.getSite());
                 huRequest.setLocationId(material.getLocationId());
-                huRequest.setPartNo(returnDto.getComponentPartNo());
-                huRequest.setPartDesc(returnDto.getComponentPartNo());
+                // 料号优先取物料行，其次主单componentPartNo - rqrq
+                String partNo = StringUtils.isNotBlank(material.getPartNo())
+                        ? material.getPartNo()
+                        : (StringUtils.isNotBlank(material.getComponentPartNo())
+                        ? material.getComponentPartNo()
+                        : returnDto.getComponentPartNo());
+                // 描述优先取物料行partDesc，其次主单componentPartDesc，避免误写料号 - rqrq
+                String partDesc = StringUtils.isNotBlank(material.getPartDesc())
+                        ? material.getPartDesc()
+                        : returnDto.getComponentPartDesc();
+                huRequest.setPartNo(partNo);
+                huRequest.setPartDesc(StringUtils.isNotBlank(partDesc) ? partDesc : partNo);
                 huRequest.setBatchNo(returnDto.getBatchNo());
                 huRequest.setWdr(material.getWdrNo());
                 huRequest.setHeight(material.getHeight());