From 1a0bdd8df58435ec37e9d8345e67cd092902b5e4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:27:18 +0800
Subject: [PATCH] 序号控制
---
src/main/java/com/zy/asrs/controller/OpenController.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ca3fb5e..14571f4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -57,6 +57,8 @@
private MatService matService;
@Autowired
+ private LocMastService locMastService;
+ @Autowired
private ReportQueryMapper reportQueryMapper;
// @PostMapping("/order/matSync/default/v1")
//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -486,6 +488,38 @@
}
orderIds.add(outTaskParam.getOrderId());
}
+
+ Map<String, List<OutTaskParam>> linesByOrder = new LinkedHashMap<>();
+ for (OutTaskParam outTaskParam : params) {
+ linesByOrder.computeIfAbsent(outTaskParam.getOrderId(), k -> new ArrayList<>()).add(outTaskParam);
+ }
+ for (Map.Entry<String, List<OutTaskParam>> entry : linesByOrder.entrySet()) {
+ String oid = entry.getKey();
+ List<OutTaskParam> lines = entry.getValue();
+ List<Integer> seqs = new ArrayList<>(lines.size());
+ for (OutTaskParam line : lines) {
+ if (line.getSeq() == null) {
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉鑳戒负绌�");
+ }
+ seqs.add(line.getSeq());
+ }
+ Collections.sort(seqs);
+ for (int i = 0; i < seqs.size(); i++) {
+ if (!String.valueOf(seqs.get(i)).equals(String.valueOf(i + 1))) {
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炵画");
+ }
+ }
+ }
+
+ Set<String> seenPallet = new LinkedHashSet<>();
+ for (OutTaskParam outTaskParam : params) {
+ String pid = outTaskParam.getPalletId();
+ String palletKey = pid == null ? "" : pid;
+ if (!seenPallet.add(palletKey)) {
+ return R.error("鎵樼洏鍙烽噸澶嶏細" + (Cools.isEmpty(pid) ? "锛堢┖锛�" : pid));
+ }
+ }
+
// if (!orderIds.isEmpty()) {
// Set<String> existedOrderIds = new LinkedHashSet<>();
// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
@@ -518,9 +552,9 @@
}
for (OutTaskParam outTaskParam : validOutOrders) {
- R r = openService.outOrder(outTaskParam,validOutOrders.size());
- if (!r.get("code").equals(200)){
- return r;
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + outTaskParam.getPalletId() + "瀵瑰簲鐨勫簱浣�");
}
}
--
Gitblit v1.9.1