Browse Source

[fix]

修改生产订单的采购入库和请购单的采购入库生成\更新仓库库存查询的方法:可用库存,固定可用库存,共享可用库存按照分类分别计算加减
dev
liuxiaoxu 3 months ago
parent
commit
3f8f112dcf
  1. 18
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

18
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@ -759,9 +759,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
} }
oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum);
Integer oldAvailableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
oldWarehouseInventoryInquiry.setFixedAvailableStockNum(oldAvailableStockNum - sharedAvailableStockNum); //固定可用库存
int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
if (updateResult <= 0){ if (updateResult <= 0){
throw new BusinessException("更新库存查询记录失败!"); throw new BusinessException("更新库存查询记录失败!");
@ -800,16 +797,15 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum);
// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); // Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo);
// oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量
Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存
if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){
sharedAvailableStockNum = storageNum; fixedAvailableStockNum = storageNum;
}else { }else {
sharedAvailableStockNum += storageNum; fixedAvailableStockNum += storageNum;
} }
oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum);
Integer oldAvailableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
oldWarehouseInventoryInquiry.setFixedAvailableStockNum(oldAvailableStockNum - sharedAvailableStockNum); //固定可用库存
int updateResult = warehouseInventoryInquiryService.insertWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); int updateResult = warehouseInventoryInquiryService.insertWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
if (updateResult <= 0) { if (updateResult <= 0) {

Loading…
Cancel
Save