From b61c2d7525bcbdf02db339c1b9865c6032412a8c Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 19 三月 2026 14:10:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index deba829..35c6fe2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -433,12 +433,13 @@
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
-// if (mesToCombParam.getPalletId().length() != 8) {
-// return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
-// }
+ if (Cools.isEmpty(mesToCombParam.getBizNo())) {
+ return R.error("bizNo涓嶈兘鐐虹┖");
+ }
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
// }
+
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
@@ -482,24 +483,24 @@
}
orderIds.add(outTaskParam.getOrderId());
}
- if (!orderIds.isEmpty()) {
- Set<String> existedOrderIds = new LinkedHashSet<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
- for (WrkMast wrkMast : wrkMasts) {
- if (!Cools.isEmpty(wrkMast.getUserNo())) {
- existedOrderIds.add(wrkMast.getUserNo());
- }
- }
- List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().in("user_no", orderIds));
- for (WrkMastLog wrkMastLog : wrkMastLogs) {
- if (!Cools.isEmpty(wrkMastLog.getUserNo())) {
- existedOrderIds.add(wrkMastLog.getUserNo());
- }
- }
- if (!existedOrderIds.isEmpty()) {
- return R.error("鍑哄簱鍗曞彿宸插瓨鍦ㄤ换鍔℃。鎴栦换鍔″巻鍙叉。锛�" + String.join("锛�", existedOrderIds));
- }
- }
+// if (!orderIds.isEmpty()) {
+// Set<String> existedOrderIds = new LinkedHashSet<>();
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
+// for (WrkMast wrkMast : wrkMasts) {
+// if (!Cools.isEmpty(wrkMast.getUserNo())) {
+// existedOrderIds.add(wrkMast.getUserNo());
+// }
+// }
+// List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().in("user_no", orderIds));
+// for (WrkMastLog wrkMastLog : wrkMastLogs) {
+// if (!Cools.isEmpty(wrkMastLog.getUserNo())) {
+// existedOrderIds.add(wrkMastLog.getUserNo());
+// }
+// }
+// if (!existedOrderIds.isEmpty()) {
+// return R.error("鍑哄簱鍗曞彿宸插瓨鍦ㄤ换鍔℃。鎴栦换鍔″巻鍙叉。锛�" + String.join("锛�", existedOrderIds));
+// }
+// }
List<OutTaskParam> errorOutOrders = Lists.newArrayList();
List<OutTaskParam> validOutOrders = Lists.newArrayList();
--
Gitblit v1.9.1