From ac5aafccc214e7de489c01d48c494fdaf3be484f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 17 九月 2025 08:39:12 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 b3654de..3f81f37 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1227,7 +1227,7 @@
 
     @Override
     @Transactional
-    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
+    public synchronized R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
 
         if (Cools.isEmpty(param)) {
             throw new CoolException("璇锋眰鍙傛暟鏈夎锛�" + param);
@@ -1246,6 +1246,10 @@
                 HashMap<String, Object> xx = new HashMap<>();
                 List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
                 for (GwmsGenerateInventoryDto.MatList obj : matList) {
+                    int barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("brand", obj.getPackageGroupNo()));
+                    if (barcodeCount2 > 0) {
+                        throw new CoolException("鍖呰缁勫彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + obj.getPackageGroupNo());
+                    }
                     int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
                     if (zpalletCount2 > 0) {
                         throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
@@ -2391,6 +2395,8 @@
                 detl.setBrand(param.getPackageGroupNo());   // 鍖呰缁勫彿
                 detl.setModel(vn.getVolumeNumber());     // 鍗峰彿
                 orderDetlMapper.insert(detl);
+            } else {
+                throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
             }
         }
 
@@ -2399,7 +2405,7 @@
 
     @Override
     @Transactional
-    public R unqualifiedOrder(ReturnOrderConfirmParam param) {
+    public R unQualifiedOrder(ReturnOrderConfirmParam param) {
         if (Cools.isEmpty(param.getOrderNumber())) {
             param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
         }
@@ -2446,6 +2452,8 @@
                 detl.setBrand(param.getPackageGroupNo());   // 鍖呰缁勫彿
                 detl.setModel(vn.getVolumeNumber());     // 鍗峰彿
                 orderDetlMapper.insert(detl);
+            } else {
+                throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
             }
         }
 

--
Gitblit v1.9.1