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/api/service/impl/MobileServiceImpl.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index ef30804..602607c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -539,6 +539,27 @@
                 .eq(Fields::getStatus, 1).orderByAsc(Fields::getId));
     }
 
+    @Override
+    public R getPdaPalletConfig() {
+        Map<String, Object> data = new HashMap<>(2);
+        data.put("pdaPakinAsnRequired", isPdaPakinAsnRequired());
+        return R.ok(data);
+    }
+
+    /** PDA 缁勭洏鏄惁寮哄埗浼� WMS 鍗曞彿锛堟棤閰嶇疆鎴栫己鐪佹椂鎸� true锛� */
+    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;
+    }
+
     /**
      * @param
      * @return
@@ -557,6 +578,9 @@
                 asnCode = null;
             }
         }
+        if (isPdaPakinAsnRequired() && Cools.isEmpty(asnCode)) {
+            return R.error("璇峰厛鎵弿WMS鍗曞彿");
+        }
         String crushNo = params.get("fieldsIndex");
         String batch = params.get("batch");
 //        String barcode = params.get("barcode");

--
Gitblit v1.9.1