供应商生产日期和供应商批次号

src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java

@@ -117,6 +117,17 @@ public class ShopOrderInboundDto {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date ifsExpiryDate;
 
+    /**
+     * 供应商生产日期 (yyyy-MM-dd格式)
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date supplierManufactureDate;
+
+    /**
+     * 供应商批次号
+     */
+    private String supplierBatchNo;
+
     /**
      * 处理单元列表
      */

src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java

@@ -648,6 +648,9 @@ public class ProductionInboundServiceImpl implements ProductionInboundService {
             transDetailDto.setRemark("生产订单入库");
             transDetailDto.setEngChgLevel( dto.getEngChgLevel()!= null ? dto.getEngChgLevel() : "1");
             transDetailDto.setNeedHandlingUnit(dto.getHandlingUnitList() != null && !dto.getHandlingUnitList().isEmpty() ? "Y" : "N");
+            // 供应商字段需要透传到交易明细，便于后续追溯和与标签数据保持一致
+            transDetailDto.setSupplierManufactureDate(dto.getSupplierManufactureDate());
+            transDetailDto.setSupplierBatchNo(dto.getSupplierBatchNo());
 
             // 处理单元列表
             if (dto.getHandlingUnitList() != null && !dto.getHandlingUnitList().isEmpty()) {
@@ -838,6 +841,9 @@ public class ProductionInboundServiceImpl implements ProductionInboundService {
             handlingUnit.setUmId(dto.getUom());
             handlingUnit.setEngChgLevel(dto.getEngChgLevel()!= null ? dto.getEngChgLevel() : "1");
             handlingUnit.setExpiredDate(dto.getIfsExpiryDate()!=null ? dto.getIfsExpiryDate() : null);
+            // 将供应商生产信息落到新建HU，保证后续打印的新标签可直接带出该信息
+            handlingUnit.setSupplierManufactureDate(dto.getSupplierManufactureDate());
+            handlingUnit.setSupplierBatchNo(dto.getSupplierBatchNo());
             // 设置高度
             if (dto.getHeight() != null && dto.getHeight() > 0) {
                 handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight()));