From d8cbfdcac8292522dd3c39e5cafdf19a43d15a5d Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 11:21:08 +0800
Subject: [PATCH] 强制组托单号必填

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index b2bf8c8..c469ace 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -70,6 +70,13 @@
         if (StringUtils.isBlank(waitPakin.getBarcode())) {
             throw new CoolException("鍙傛暟閿欒锛氭枡绠辩爜涓虹┖锛侊紒");
         }
+        if (isPdaPakinAsnRequired()) {
+            for (PakinItem it : waitPakin.getItems()) {
+                if (StringUtils.isBlank(it.getAsnCode())) {
+                    throw new CoolException("璇峰厛鎵弿WMS鍗曞彿");
+                }
+            }
+        }
         WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                 .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
 
@@ -508,4 +515,17 @@
 
         return R.ok("Delete Success").add(pakinIds);
     }
+
+    private boolean isPdaPakinAsnRequired() {
+        Config c = configService.getOne(new LambdaQueryWrapper<Config>()
+                .eq(Config::getFlag, GlobalConfigCode.PDA_PAKIN_ASN_REQUIRED)
+                .eq(Config::getDeleted, 0)
+                .last("LIMIT 1"));
+        boolean required = true;
+        if (c != null && StringUtils.isNotBlank(c.getVal())) {
+            String v = c.getVal().trim();
+            required = Boolean.parseBoolean(v) || "1".equals(v);
+        }
+        return required;
+    }
 }

--
Gitblit v1.9.1