diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java index 4a5c18caf..0ad56b3d4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java +++ b/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; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java index ad0e85a13..f4a85184f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/entity/ShiftMaterialDetail.java +++ b/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 shiftMoveMaterialQuantityList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java index 5337fde55..b1b4b7273 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java @@ -729,6 +729,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl children; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index d291bb1aa..af1fcd521 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/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());