weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

扣除oms库存问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-29 19:55:06 +08:00
parent bf612be0b2
commit e8b5cb4084
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java
+9 -1
View File
@@ -457,11 +457,19 @@ public class InventoryAdjustmentRecordDomainService {
//InventoryAdjustmentRecordDO inventoryAdjustmentRecord = new InventoryAdjustmentRecordDO(); //InventoryAdjustmentRecordDO inventoryAdjustmentRecord = new InventoryAdjustmentRecordDO();
try { try {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
Long materialInventoryId = inventoryAdjustmentRecordDO.getMaterialInventoryId();
MaterialInventory materialInventory = materialInventoryService.getById(materialInventoryId);
BigDecimal adjustQuantity = inventoryAdjustmentRecordDO.getAdjustQuantity(); BigDecimal adjustQuantity = inventoryAdjustmentRecordDO.getAdjustQuantity();
MaterialInventoryParamDO materialInventoryParamDO = new MaterialInventoryParamDO(); MaterialInventoryParamDO materialInventoryParamDO = new MaterialInventoryParamDO();
materialInventoryParamDO.setMaterialInventoryId(inventoryAdjustmentRecordDO.getMaterialInventoryId()); materialInventoryParamDO.setMaterialInventoryId(materialInventoryId);
materialInventoryParamDO.setQuantity(adjustQuantity); materialInventoryParamDO.setQuantity(adjustQuantity);
materialInventoryParamDO.setType("7"); 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.kctzjl(materialInventoryParamDO,"库存冻结",loginUser);
materialInventoryService.xgkc(materialInventoryParamDO); materialInventoryService.xgkc(materialInventoryParamDO);
MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+18
View File
@@ -585,6 +585,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
materialInventoryParamDO.setRelateNo(relateNo); materialInventoryParamDO.setRelateNo(relateNo);
materialInventoryParamDO.setBatchNumber(outMaterialDetail.getBatchNumber()); materialInventoryParamDO.setBatchNumber(outMaterialDetail.getBatchNumber());
materialInventoryParamDO.setLotNumber(outMaterialDetail.getLotNo()); materialInventoryParamDO.setLotNumber(outMaterialDetail.getLotNo());
materialInventoryParamDO.setProductionDate(materialInventory.getProductionDate());
materialInventoryParamDO.setExpiryDate(materialInventory.getExpiryDate());
materialInventoryParamDO.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
materialInventoryParamDO.setWarehouseId(materialInventory.getWarehouseId());
materialInventoryParamDO.setLotNumber(materialInventory.getLotNumber());
materialInventoryParamDO.setBatchNumber(materialInventory.getBatchNumber());
materialInventoryParamDO.setInOrderNumber(outMaterialDetail.getInOrderNumber()); materialInventoryParamDO.setInOrderNumber(outMaterialDetail.getInOrderNumber());
materialInventoryService.kctzjl(materialInventoryParamDO,"分配库存",loginUser); materialInventoryService.kctzjl(materialInventoryParamDO,"分配库存",loginUser);
materialInventoryService.xgkc(materialInventoryParamDO); materialInventoryService.xgkc(materialInventoryParamDO);
@@ -973,6 +979,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
materialInventoryParamDO.setMaterialInventoryId(materialInventoryId); materialInventoryParamDO.setMaterialInventoryId(materialInventoryId);
materialInventoryParamDO.setQuantity(allocationQuantity); materialInventoryParamDO.setQuantity(allocationQuantity);
materialInventoryParamDO.setType("3"); materialInventoryParamDO.setType("3");
materialInventoryParamDO.setProductionDate(materialInventoryPO.getProductionDate());
materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
materialInventoryParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
materialInventoryParamDO.setLotNumber(materialInventoryPO.getLotNumber());
materialInventoryParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
String cancelRelateNo = outMaterialDetail.getUniqueId() != null String cancelRelateNo = outMaterialDetail.getUniqueId() != null
? outOrderNumber + "#" + outMaterialDetail.getUniqueId() ? outOrderNumber + "#" + outMaterialDetail.getUniqueId()
: outOrderNumber; : outOrderNumber;
@@ -1076,6 +1088,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
String cancelRelateNoCh = outMaterialDetail.getUniqueId() != null String cancelRelateNoCh = outMaterialDetail.getUniqueId() != null
? outOrderNumber + "#" + outMaterialDetail.getUniqueId() ? outOrderNumber + "#" + outMaterialDetail.getUniqueId()
: outOrderNumber; : outOrderNumber;
materialInventoryParamDO.setProductionDate(materialInventoryPO.getProductionDate());
materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
materialInventoryParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
materialInventoryParamDO.setLotNumber(materialInventoryPO.getLotNumber());
materialInventoryParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
materialInventoryParamDO.setRelateNo(cancelRelateNoCh); materialInventoryParamDO.setRelateNo(cancelRelateNoCh);
materialInventoryService.kctzjl(materialInventoryParamDO,"取消分配",loginUser); materialInventoryService.kctzjl(materialInventoryParamDO,"取消分配",loginUser);
materialInventoryService.xgkc(materialInventoryParamDO); materialInventoryService.xgkc(materialInventoryParamDO);
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+6
View File
@@ -1332,6 +1332,12 @@ public class StockShelfOrderDomainService {
materialInventoryService.xgkc(inventoryParamDO); materialInventoryService.xgkc(inventoryParamDO);
MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO); BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO);
materialInventoryOmsParamDO.setProductionDate(materialInventoryPO.getProductionDate());
materialInventoryOmsParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
materialInventoryOmsParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
materialInventoryOmsParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
materialInventoryOmsParamDO.setLotNumber(materialInventoryPO.getLotNumber());
materialInventoryOmsParamDO.setBatchNumber(materialInventoryPO.getBatchNumber());
materialInventoryOmsParamDO.setKctzType("入库"); materialInventoryOmsParamDO.setKctzType("入库");
materialInventoryOmsParamDO.setLoginUser(loginUser); materialInventoryOmsParamDO.setLoginUser(loginUser);
materialInventoryOmsParamDO.setMaterialInventoryId(null); materialInventoryOmsParamDO.setMaterialInventoryId(null);