From feebd19f66e0b20beb0dbfdd0c9c3b8edc384b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Fri, 13 Dec 2024 10:43:13 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A2=86=E6=96=99=E5=8D=95=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98service=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=9B=BA=E5=AE=9A>=E9=A2=86=E6=96=99=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=85=B1=E4=BA=AB=E5=BA=93=E5=AD=98=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E6=93=8D=E4=BD=9C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
index 21a96369..7213447b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
@@ -258,7 +258,6 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService
             }
             //固定可用库存数 > 领料数，
             if(fixedStockNum > pickNum){
-                sharedStockNum = sharedStockNum - pickNum;
                 fixedStockNum = fixedStockNum - pickNum;
                 pickDetail.setFixedStockAllocatedNum(pickNum);
                 pickDetail.setSharedStockAllocatedNum(0);
@@ -449,7 +448,7 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService
     }
 
 
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     //审批拒绝后更新领料单详情和库存信息
     @Override
     public int updateUnApprovedInfo(SysMakeorderPickVo sysMakeorderPickVo){