diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index f2026315..cc6012b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -759,9 +759,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS } oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); - Integer oldAvailableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - oldWarehouseInventoryInquiry.setFixedAvailableStockNum(oldAvailableStockNum - sharedAvailableStockNum); //固定可用库存 - int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); if (updateResult <= 0){ throw new BusinessException("更新库存查询记录失败!"); @@ -799,17 +796,16 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS } oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); -// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); -// oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量 - Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 - if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ - sharedAvailableStockNum = storageNum; +// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); + + Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 + if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ + fixedAvailableStockNum = storageNum; }else { - sharedAvailableStockNum += storageNum; + fixedAvailableStockNum += storageNum; } - oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); - Integer oldAvailableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - oldWarehouseInventoryInquiry.setFixedAvailableStockNum(oldAvailableStockNum - sharedAvailableStockNum); //固定可用库存 + oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); + int updateResult = warehouseInventoryInquiryService.insertWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); if (updateResult <= 0) {