From a1f531ee3acc549aabfed8efb6c821e6f6209fa4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 26 十一月 2025 08:06:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index ede4780..7562426 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -582,10 +582,21 @@
         if (param.getBarcode().length() != 8) {
             throw new CoolException("鏉$爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
         }
-        if (param.getCombMats().size() > 1) {
+//        if (param.getCombMats().size() > 1) {
+//            throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+//        }
+        HashMap<String, Object> containMatnrMap = new HashMap<>();
+        for (CombParam.CombMat mat : param.getCombMats()) {
+            if(!containMatnrMap.containsKey(mat.getMatnr())) {
+                containMatnrMap.put(mat.getMatnr(), 1);
+            }
+        }
+
+        if (containMatnrMap.size() > 1) {
             throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
         }
 
+
         int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
         int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
         int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));

--
Gitblit v1.9.1