From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
index 9f8d543..845fadb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
@@ -55,6 +55,13 @@
     @OperationLog("娣诲姞瀹瑰櫒绠$悊")
     @PostMapping("/zpalletBarcode/save")
     public R save(@RequestBody ZpalletBarcode zpalletBarcode) {
+        if (Objects.isNull(zpalletBarcode.getBarcode())) {
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>().eq(ZpalletBarcode::getBarcode, zpalletBarcode.getBarcode()));
+        if (!Objects.isNull(one)) {
+            return R.error("瀹瑰櫒宸插瓨鍦紝涓嶅彲閲嶅娣诲姞锛侊紒");
+        }
         if (!zpalletBarcodeService.save(zpalletBarcode)) {
             return R.error("娣诲姞澶辫触");
         }
@@ -120,16 +127,18 @@
                 pakinType = "ctu";
             }
         }
-        ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>().eq(ZpalletBarcode::getBarcode, barcode));
-        if (one != null) {
-            return R.error("鏉$爜璧峰鍊煎凡瀛樺湪");
-        }
+
         if (pakinType.equals("flat")) {
             int barcodeInt = Integer.parseInt(String.valueOf(barcode));
             for (int i = 0; i < Integer.parseInt(String.valueOf(num)); i++) {
                 ZpalletBarcode zpalletBarcode = new ZpalletBarcode();
                 String strBarcode = String.format("%08d", barcodeInt);
                 zpalletBarcode.setBarcode("PK" + strBarcode);
+                ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>()
+                        .eq(ZpalletBarcode::getBarcode, strBarcode));
+                if (one != null) {
+                    continue;
+                }
                 zpalletBarcodeService.save(zpalletBarcode);
                 barcodeInt += 1;
             }
@@ -139,6 +148,11 @@
                 ZpalletBarcode zpalletBarcode = new ZpalletBarcode();
                 String strBarcode = String.format("%08d", barcodeInt);
                 zpalletBarcode.setBarcode(strBarcode);
+                ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>()
+                        .eq(ZpalletBarcode::getBarcode, strBarcode));
+                if (one != null) {
+                    continue;
+                }
                 zpalletBarcodeService.save(zpalletBarcode);
                 barcodeInt += 1;
             }

--
Gitblit v1.9.1