From 5cf1c8d3891a9d22ff4417128ad68e0bc8ab8758 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 03 七月 2025 13:23:41 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 cc8a208..aab373f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -387,9 +387,7 @@
                 //for (CombParam.CombMat elem : param.getCombMats()) {
                 CombParam.CombMat elem = combMats.get(i);
                 CodeDataParam codeDataParam = data.get(i);
-                if (!codeDataParam.getQuality().equals(order.getShipCode())) {
-                    throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
-                }
+
                 elem.setTemp1(codeDataParam.getQuality());
                 elem.setAnfme(codeDataParam.getQty());
                 //elem.setBatch(codeDataParam.getBatchNum());
@@ -403,6 +401,12 @@
                 if (Cools.isEmpty(orderDetl)) {
                     throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
                 }
+                if (Cools.isEmpty(codeDataParam.getQuality())){
+                    throw new CoolException("鏉$爜鏈繑鍥炶川閲忕姸鎬�");
+                }
+                if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
+                    throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
+                }
                 if (elem.getAnfme() > orderDetl.getEnableQty()) {
                     throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
                 }

--
Gitblit v1.9.1