收货lot编码

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

@@ -171,6 +171,11 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
     @Excel(name = "批次号")
     private String batchNumber;
 
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    @TableField("lot_no")
+    private String lotNo;
+
     @ApiModelProperty("物料状态编码")
     @Excel(name = "物料状态编码")
     private String materialStatusCode;

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java

@@ -668,6 +668,9 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
         if (StringUtils.isBlank(receiptMaterialDetailPO.getBatchNumber()) && StringUtils.isNotBlank(inMaterialDetail.getBatchNumber())) {
             receiptMaterialDetailPO.setBatchNumber(inMaterialDetail.getBatchNumber());
         }
+        if (StringUtils.isBlank(receiptMaterialDetailPO.getLotNo()) && StringUtils.isNotBlank(inMaterialDetail.getLotNo())) {
+            receiptMaterialDetailPO.setLotNo(inMaterialDetail.getLotNo());
+        }
         
         // 如果materialMoreDetailList为空，直接返回
         if (CollectionUtils.isEmpty(materialMoreDetailList)) {

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

@@ -182,6 +182,10 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "批次号")
     private String batchNumber;
 
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
+
     @ApiModelProperty("物料状态编码")
     @Excel(name = "物料状态编码")
     private String materialStatusCode;

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

@@ -186,6 +186,10 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "批次号")
     private String batchNumber;
 
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
+
     @ApiModelProperty("物料状态编码")
     @Excel(name = "物料状态编码")
     private String materialStatusCode;

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

@@ -181,6 +181,10 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "批次号")
     private String batchNumber;
 
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
+
     @ApiModelProperty("物料状态编码")
     @Excel(name = "物料状态编码")
     private String materialStatusCode;