调整记录添加入库编号和lot编号

mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java

@@ -188,4 +188,12 @@ public class InventoryAdjustmentRecord extends BaseVOEntity {
     @Excel(name = "调整后面积")
     private BigDecimal adjustedArea;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java

@@ -260,6 +260,14 @@ public class ShiftMaterialDetail extends BaseVOEntity {
     @Excel(name = "面积")
     private BigDecimal area;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMoveMaterialQuantityPO> shiftMoveMaterialQuantityList;

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java

@@ -729,6 +729,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
 
 
         inventoryAdjustmentRecord.setAdjustAction("移位管理");
+        inventoryAdjustmentRecord.setInOrderNumber(shiftMaterialDetailDO.getInOrderNumber());
+        inventoryAdjustmentRecord.setLotNumber(shiftMaterialDetailDO.getLotNumber());
         inventoryAdjustmentRecord.setRelateNo(shiftMaterialDetailDO.getShiftNumber());
         inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" : materialInventory1.getMaterialStatusCode());
         inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory1.getMaterialStatusCode() == null ? "" :  materialInventory1.getMaterialStatusCode());

mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/todo/ShiftMaterialDetailDO.java

@@ -273,6 +273,14 @@ public class ShiftMaterialDetailDO extends BaseVOEntity {
     @ApiModelProperty("总面积(SQM)，PDA 表单区修改后回传")
     private BigDecimal totalArea;
 
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("LOT编号")
+    @Excel(name = "LOT编号")
+    private String LotNumber;
+
     @ApiModelProperty("移位详情")
     @TableField(exist = false)
     private List<ShiftMaterialDetailDO> children;

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

@@ -735,6 +735,8 @@ public class StockShelfOrderDomainService {
 
                 //库存调整记录
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber());
+                inventoryAdjustmentRecord.setLotNumber(shelfMaterialDetail.getLotNumber());
                 inventoryAdjustmentRecord.setAdjustAction("入库");
                 inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
                 inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
@@ -874,6 +876,8 @@ public class StockShelfOrderDomainService {
 
 
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
+                inventoryAdjustmentRecord.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber());
+                inventoryAdjustmentRecord.setLotNumber(shelfMaterialDetail.getLotNumber());
                 inventoryAdjustmentRecord.setAdjustAction("入库");
                 inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
                 inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());