入库批次号赋值

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java

@@ -76,4 +76,12 @@ public class MaterialInventoryOmsParamDO extends BaseVOEntity {
 
     private LoginUser loginUser;
 
+
+    private String batchNo;
+
+    //生产日期
+    private Date productionDate;
+    //过期日期
+    private Date expiryDate;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java

@@ -477,14 +477,18 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
 //            materialInventory.setBatchRefNo(materialInventoryParamDO.getBatchRefNo());
 //            materialInventory.setSheetRefNo(materialInventoryParamDO.getSheetRefNo());
 //            materialInventory.setBoxPalletNo(materialInventoryParamDO.getBoxPalletNo());
-//            materialInventory.setProductionDate(materialInventoryParamDO.getProductionDate());
+            materialInventory.setProductionDate(materialInventoryParamDO.getProductionDate());
 //            materialInventory.setExtAttr1(materialInventoryParamDO.getExtAttr1());
 //            materialInventory.setExtAttr2(materialInventoryParamDO.getExtAttr2());
 //            materialInventory.setExtAttr3(materialInventoryParamDO.getExtAttr3());
 //            materialInventory.setExtAttr4(materialInventoryParamDO.getExtAttr4());
-//            materialInventory.setExpiryDate(materialInventoryParamDO.getExpiryDate());
+            materialInventory.setExpiryDate(materialInventoryParamDO.getExpiryDate());
 //            materialInventory.setInventoryDate(materialInventoryParamDO.getInventoryDate());
             materialInventory.setBatchNumber(materialInventoryParamDO.getBatchNumber());
+            String batchNo = materialInventoryParamDO.getBatchNo();
+            if (batchNo != null) {
+                materialInventory.setBatchNumber(batchNo);
+            }
             materialInventory.setUnit(materialBaseInfo.getUnitCode());
             materialInventory.setUnitName(materialBaseInfo.getUnitName());
             //创建人信息

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java

@@ -858,6 +858,9 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventory.setLotNumber(materialInventoryParamDO.getLotNumber());
             materialInventory.setBatchNumber((materialInventoryParamDO.getBatchNumber()));
             materialInventory.setInOrderNumber((materialInventoryParamDO.getInOrderNumber()));
+            if (materialInventoryParamDO.getBatchNo() != null) {
+                materialInventory.setBatchNumber(materialInventoryParamDO.getBatchNo());
+            }
             materialInventoryMapper.insert(materialInventory);
             materialInventoryParamDO.setMaterialInventoryId(materialInventory.getMaterialInventoryId());
         } else {

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java

@@ -105,4 +105,6 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
     /** 业务关联单号（出库单号、交接单对应单号等），用于库存调整记录 relate_no；可与入库单号区分 */
     private String relateNo;
 
+    private String batchNo;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java

@@ -373,4 +373,8 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
 
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java

@@ -370,4 +370,8 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java

@@ -364,4 +364,7 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java

@@ -374,4 +374,7 @@ public class ShelfMaterialDetail extends BaseVOEntity {
     @Excel(name = "抄码数量克重详情")
     @TableField("copy_details")
     private String copyDetails;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java

@@ -380,4 +380,7 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
     @ApiModelProperty("oms入库单详情id")
     @Excel(name = "oms入库单详情id")
     private String omsInMaterialDetail;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java

@@ -367,4 +367,7 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
     @ApiModelProperty("oms入库单详情id")
     @Excel(name = "oms入库单详情id")
     private String omsInMaterialDetail;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -222,6 +222,7 @@ public class StockReceiptOrderDomainService {
                 receiptMaterialDetail.setCreateBy(loginUser.getUserid());
                 receiptMaterialDetail.setCreateByName(userRealName);
                 receiptMaterialDetail.setCreateTime(new Date());
+                receiptMaterialDetail.setBatchNo(stockReceiptOrder.getBatchNo());
                 Date drinkDate = receiptMaterialDetail.getDrinkDate();
                 if (drinkDate != null) {
                     receiptMaterialDetail.setExpiryDate(receiptMaterialDetail.getDrinkDate());

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -1252,6 +1252,7 @@ public class StockShelfOrderDomainService {
                 inventoryParamDO.setSheetRefNo(shelfMaterialDetail.getSheetRefNo());
                 inventoryParamDO.setBatchRefNo(shelfMaterialDetail.getBatchRefNo());
                 inventoryParamDO.setBatchNumber(shelfMaterialDetail.getBatchNumber());
+                inventoryParamDO.setBatchNo(shelfMaterialDetail.getBatchNo());
 
                 inventoryParamDO.setCreateBy(loginUser.getUserid());
                 inventoryParamDO.setCreateByName(loginUser.getUsername());

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java

@@ -316,4 +316,8 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java

@@ -350,4 +350,7 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity {
     @ApiModelProperty("oms入库单详情id")
     @Excel(name = "oms入库单详情id")
     private String omsInMaterialDetail;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }