diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java index f904600e2..9bccb9db7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java @@ -457,11 +457,19 @@ public class InventoryAdjustmentRecordDomainService { //InventoryAdjustmentRecordDO inventoryAdjustmentRecord = new InventoryAdjustmentRecordDO(); try { LoginUser loginUser = SecurityUtils.getLoginUser(); + Long materialInventoryId = inventoryAdjustmentRecordDO.getMaterialInventoryId(); + MaterialInventory materialInventory = materialInventoryService.getById(materialInventoryId); BigDecimal adjustQuantity = inventoryAdjustmentRecordDO.getAdjustQuantity(); MaterialInventoryParamDO materialInventoryParamDO = new MaterialInventoryParamDO(); - materialInventoryParamDO.setMaterialInventoryId(inventoryAdjustmentRecordDO.getMaterialInventoryId()); + materialInventoryParamDO.setMaterialInventoryId(materialInventoryId); materialInventoryParamDO.setQuantity(adjustQuantity); materialInventoryParamDO.setType("7"); + materialInventoryParamDO.setProductionDate(materialInventory.getProductionDate()); + materialInventoryParamDO.setExpiryDate(materialInventory.getExpiryDate()); + materialInventoryParamDO.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId()); + materialInventoryParamDO.setWarehouseId(materialInventory.getWarehouseId()); + materialInventoryParamDO.setLotNumber(materialInventory.getLotNumber()); + materialInventoryParamDO.setBatchNumber(materialInventory.getBatchNumber()); materialInventoryService.kctzjl(materialInventoryParamDO,"库存冻结",loginUser); materialInventoryService.xgkc(materialInventoryParamDO); MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 1ba0b4336..52af94400 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -585,6 +585,12 @@ public class OutMaterialDetailImpl extends ServiceImpl