From 99b5e9a5b50b7092bbcb5ec0a24261a31716db2b Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期四, 27 六月 2024 20:49:56 +0800
Subject: [PATCH] logo修改，返回提示修改
---
src/main/java/com/zy/common/web/WcsController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0fd99f2..4f616dc 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -50,6 +50,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public R getLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -63,7 +64,7 @@
}
pltBarcodes = pltBarcodeService.selectList(new EntityWrapper<PltBarcode>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(pltBarcodes)) {
- return R.error("鏉＄爜鏁版嵁閿欒");
+ return R.error("鏉＄爜鏈粍鎵橈細" + param.getBarcode());
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
@@ -102,7 +103,7 @@
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto.toString(), param.getBarcode());
return R.ok().add(dto);
}
@@ -115,9 +116,16 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = pltBarcodes.stream().map(PltBarcode::getMatNo).distinct().collect(Collectors.toList());
+
+ // 鑾峰彇绫诲埆鏍囪瘑(1鍘熸潗鏂欙紝2鎴愬搧)
+ List<String> str5 = pltBarcodes.stream().map(PltBarcode::getStr5).distinct().collect(Collectors.toList());
+ if (str5.isEmpty() || str5.get(0) == null) {
+ throw new CoolException("鐗╂枡绫诲埆鑾峰彇澶辫触");
+ }
+
StartupDto dto;
if (devpNo == 304) {
- dto = commonService.getLocNoBy304(barcode);
+ dto = commonService.getLocNoBy304(str5.get(0));
} else {
dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
}
--
Gitblit v1.9.1