From c907e77a7352697a89a87df26d15b48f944a42ed Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 2 Jan 2026 22:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=BC=80=E5=90=AF=E4=BA=86=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=BC=9A=E5=8E=BB=E6=A0=A1=E9=AA=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=BC=BA=E5=B0=91=E5=BA=93=E5=AD=98=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8E=BB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/service/DepotItemService.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
index 13360b97..d39611bf 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
@@ -648,8 +648,15 @@ public class DepotItemService {
                         thisRealNumber = depotItem.getOperNumber()==null?BigDecimal.ZERO:depotItem.getOperNumber();
                     }
                     if(!systemConfigService.getMinusStockFlag() && stock.compareTo(thisRealNumber)<0){
-                        throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
-                                String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG, stockMsg));
+                        //如果开启出入库管理，并且类型等于采购退货、销售，则跳过
+                        if(systemConfigService.getInOutManageFlag() &&
+                                (BusinessConstants.SUB_TYPE_PURCHASE_RETURN.equals(depotHead.getSubType())
+                                        ||BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType()))) {
+                            //跳过
+                        } else {
+                            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
+                                    String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG, stockMsg));
+                        }
                     }
                     //出库时处理序列号
                     if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {