From 20b72a000801cf006bfe1f487baabc110594832f Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期日, 05 四月 2026 17:55:42 +0800
Subject: [PATCH] 重量
---
src/main/java/com/zy/asrs/controller/OpenController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 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 4547421..4f2b253 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 = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -459,6 +461,7 @@
validComb.add(mesToCombParam);
}
for (MesToCombParam mesToCombParam : validComb) {
+ mesToCombParam.setBoxType1("ERP");
openService.mesToComb(mesToCombParam);
}
// TODO:寰呮祴璇�
@@ -474,10 +477,11 @@
*/
@PostMapping("/outOrder")
- public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
+ request.setAttribute("cache", params);
Set<String> orderIds = new LinkedHashSet<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
@@ -485,6 +489,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));
@@ -515,14 +551,19 @@
}
validOutOrders.add(outTaskParam);
}
+ for (OutTaskParam outTaskParam : validOutOrders) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + outTaskParam.getPalletId() + "瀵瑰簲鐨勫簱浣�");
+ }
+ }
for (OutTaskParam outTaskParam : validOutOrders) {
- R r = openService.outOrder(outTaskParam);
+ R r = openService.outOrder(outTaskParam,validOutOrders.size());
if (!r.get("code").equals(200)){
return r;
}
}
-
if(errorOutOrders.size() > 0) {
return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩�").add(errorOutOrders);
}
--
Gitblit v1.9.1