制品收货申请导入赋值生产失效日期 任务创建库存事务 赋值生产失效日期

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestImportVO.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -53,4 +55,13 @@ public class ProductreceiptRequestImportVO {
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
+
+    @ExcelProperty("生产日期")
+    private LocalDateTime produceDate;
+
+    @ExcelProperty("过期日期")
+    private LocalDateTime expireDate;
+
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java

@@ -588,6 +588,9 @@ public class ProductionMainServiceImpl implements ProductionMainService {
                 productreceiptRequestDetailCreateReqVO.setBatch(today.format(formatter));
                 productreceiptRequestDetailCreateReqVO.setQty(productionDetailDO.getPlanQty());
                 productreceiptRequestDetailCreateReqVO.setUom(productionDetailDO.getUom());
+                // 计划创建制品收货 生产日期 失效日期 取计划开始结束日期
+                productreceiptRequestDetailCreateReqVO.setProduceDate(mainDO.getBeginTime());
+                productreceiptRequestDetailCreateReqVO.setExpireDate(mainDO.getEndTime());
                 subList.add(productreceiptRequestDetailCreateReqVO);
             }
             productreceiptRequestMainCreateReqVO.setSubList(subList);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java

@@ -369,6 +369,8 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe
                     transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                     transactionCreateReqVO.setWarehouseCode(productreceiptRecordMainDO.getToWarehouseCode());
                     transactionCreateReqVO.setLocationCode(DetailUpdateItem.getToLocationCode());
+                    transactionCreateReqVO.setProduceDate(productreceiptRecordDetailDO.getProduceDate());
+                    transactionCreateReqVO.setExpireDate(productreceiptRecordDetailDO.getExpireDate());
                     transactionCreateReqVOList.add(transactionCreateReqVO);
                 }
             });