From 8d2398cb9d27e216d94fe0d7252339b8e0f4779c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 29 九月 2025 08:59:31 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 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 59f0af9..f26f4b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -134,14 +134,19 @@
                 //鏍¢獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
                 MatBarcode matBarcode = new MatBarcode();
                 MatBarcode mb = matBarcodeService.selectbyMatnr(detlDto.getMatnr());
-                if (mb != null && !mb.getZpallet().equals(param.getBarcode())) {
-                    throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
-                } else {
+                if (mb != null){
+                    if (!mb.getZpallet().equals(param.getBarcode())){
+                        throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
+                    }
+                }else {
                     matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
                     matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
                     matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
                     matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
                     matBarcode.setModel(mat.getModel());//鍨嬪彿
+                    if (!matBarcodeService.insert(matBarcode)) {
+                        throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
+                    }
                 }
                 WaitPakin waitPakin = new WaitPakin();
                 waitPakin.sync(mat);
@@ -160,9 +165,6 @@
                 waitPakin.setMemo(detlDto.getMemo());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-                }
-                if (!matBarcodeService.insert(matBarcode)) {
-                    throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
                 }
             }
             // 鍏宠仈缁勬墭
@@ -194,14 +196,19 @@
                 //鏍¢獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
                 MatBarcode matBarcode = new MatBarcode();
                 MatBarcode mb = matBarcodeService.selectbyMatnr(orderDetl.getMatnr());
-                if (mb != null && !mb.getZpallet().equals(param.getBarcode())) {
-                    throw new CoolException(orderDetl.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
-                } else {
+                if (mb != null){
+                    if (!mb.getZpallet().equals(param.getBarcode())){
+                        throw new CoolException(orderDetl.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
+                    }
+                }else {
                     matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
                     matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
                     matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
                     matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
                     matBarcode.setModel(mat.getModel());//鍨嬪彿
+                    if (!matBarcodeService.insert(matBarcode)) {
+                        throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
+                    }
                 }
                 WaitPakin waitPakin = new WaitPakin();
                 waitPakin.sync(mat);
@@ -224,9 +231,6 @@
                 waitPakin.setPacking(orderDetl.getPacking());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-                }
-                if (!matBarcodeService.insert(matBarcode)) {
-                    throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
                 }
             });
 

--
Gitblit v1.9.1