From d07b83f5e818f838ce6b956e37aaf758fda58419 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 07 七月 2025 10:45:29 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java | 19 +++++++++++++++----
1 files changed, 15 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..b304cf3 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,10 @@
@OperationLog("娣诲姞瀹瑰櫒绠＄悊")
@PostMapping("/zpalletBarcode/save")
public R save(@RequestBody ZpalletBarcode zpalletBarcode) {
+ 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 +124,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 +145,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