From 3f8f112dcf6168a2b4d2b022a585b508499204a1 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 6 Dec 2024 09:12:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=92=8C=E8=AF=B7=E8=B4=AD=E5=8D=95=E7=9A=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=9F=E6=88=90\=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95:=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BA=E5=AE=9A=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B1=E4=BA=AB=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=88=86=E7=B1=BB=E5=88=86=E5=88=AB=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=8A=A0=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseStorageOrderServiceImpl.java     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

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) {