From 7f21c67a593acef6c6df00672411b370c901e344 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 23 六月 2025 09:20:15 +0800
Subject: [PATCH] #盘点出库不需要待判

---
 src/main/java/com/zy/asrs/controller/OutController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 862bff4..c94302b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -221,11 +221,17 @@
                         .eq("model", paramLocDetl.getModel()));
 
                 if (one != null) {
-                    if (!"鍚堟牸".equals(one.getThreeCode())) {
-                        throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+                    // 鍒ゆ柇鏄惁涓虹洏鐐瑰崟锛坉ocType == 23锛夛紝濡傛灉涓嶆槸鍒欐牎楠屽悎鏍兼��
+                    Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+                    if ( order.getDocType() != 23) {
+                        if (!"鍚堟牸".equals(one.getThreeCode())) {
+                            throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+                        }
                     }
+
                     locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
                 }
+
             }
 
             if (!locDetlDtos.isEmpty()) {

--
Gitblit v1.9.1