From 47ff2ca09bfd8d506ff309701dd3dcc9e30de8ea Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 4 Jan 2023 14:52:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=9D=A1=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/admin/controller/inout/WareHouseController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index a26cede1..ae760e65 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -758,10 +758,10 @@ public class WareHouseController {
                     int count = invProductDetailService.vailStockCount(code, addOrderRequest.getLocStorageCode(), addOrderRequest.getInvWarehouseCode(), null);
                     if (count <= 0) {
                         return ResultVOUtils.error(500, "当前库存不足,不允许0库存出库");
-                    } else {
+                    } else if (StrUtil.isNotBlank(addOrderRequest.getOrderId())){
                         //查询此单据已扫描的条码数量
                         WarehouseEntity warehouse = codesTempService.findByUnique(addOrderRequest.getOrderId(), addOrderRequest.getCode());
-                        if (null != warehouse && warehouse.getCount() > count) {
+                        if (null != warehouse && warehouse.getCount() >= count) {
                             return ResultVOUtils.error(500, "当前库存不足,不允许0库存出库");
                         }
                     }