From 9320540f7b6735d065fe3428484d5d47765dc160 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 30 十月 2025 12:54:41 +0800
Subject: [PATCH] gwms申请入库时判断卷号/箱号是否存在

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 77b3e03..bb4b011 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1254,6 +1254,43 @@
                     if (zpalletCount2 > 0) {
                         throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
                     }
+
+                    // 鍗峰彿
+                    HashMap<String, Object> yy = new HashMap<>();
+                    // 绠卞彿
+                    HashMap<String, Object> zz = new HashMap<>();
+                    List<GwmsGenerateInventoryDto.Rolls> rolls = obj.getRolls();
+                    for(GwmsGenerateInventoryDto.Rolls roll :rolls) {
+                        barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("model", roll.getRollNo()));
+                        if (barcodeCount2 > 0) {
+                            throw new CoolException("鍗峰彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + roll.getRollNo());
+                        }
+                        zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("model", roll.getRollNo()));
+                        if (zpalletCount2 > 0) {
+                            throw new CoolException("鍗峰彿宸插瓨鍦ㄥ簱瀛橈細" + roll.getRollNo());
+                        }
+
+                        barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("unit", roll.getBoxNo()));
+                        if (barcodeCount2 > 0) {
+                            throw new CoolException("绠卞彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + roll.getBoxNo());
+                        }
+                        zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("unit", roll.getBoxNo()));
+                        if (zpalletCount2 > 0) {
+                            throw new CoolException("绠卞彿宸插瓨鍦ㄥ簱瀛橈細" + roll.getBoxNo());
+                        }
+
+                        if (yy.get(roll.getRollNo()) != null) {
+                            throw new CoolException("鏄庣粏涓瓨鍦�2鏉$浉鍚岀殑鍗峰彿锛�" + roll.getRollNo());
+                        } else {
+                            yy.put(roll.getRollNo(), roll.getRollNo());
+                        }
+
+                        if (zz.get(roll.getBoxNo()) != null) {
+                            throw new CoolException("鏄庣粏涓瓨鍦�2鏉$浉鍚岀殑绠卞彿锛�" + roll.getBoxNo());
+                        } else {
+                            zz.put(roll.getBoxNo(), roll.getBoxNo());
+                        }
+                    }
                     if (xx.get(obj.getPackageGroupNo()) != null) {
                         throw new CoolException("鏄庣粏涓瓨鍦�2鏉$浉鍚岀殑鍖呰缁勫彿锛�" + obj.getPackageGroupNo());
                     } else {

--
Gitblit v1.9.1