From b97ab3e077df3665663eb3a5b0c23d54c83a5548 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期五, 31 五月 2024 12:02:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    9 ++++++++-
 1 files changed, 8 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 163d97b..b222e61 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -92,11 +92,18 @@
             throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
         }
 
+        //鍒ゆ柇鎵樼洏鏄惁宸茬粡鍦ㄥ伐浣滄。
+        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+                .eq("barcode", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄤ换鍔℃。涓�");
+        }
+
         //鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
         boolean hasContainerCode = false;
         int containerCodeCount = 0;//鏂欑鐮佹暟閲�
         for (CombParam.CombMat combMat : param.getCombMats()) {
-            if (combMat.getContainerCode() != null) {
+            if(!Cools.isEmpty(combMat.getContainerCode())){
+            //if (combMat.getContainerCode() != null) {
                 hasContainerCode = true;
                 containerCodeCount++;
                 continue;

--
Gitblit v1.9.1