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 | 12 +++++++++---
1 files changed, 9 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 14571f4..4f2b253 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -477,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())) {
@@ -506,7 +507,7 @@
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 + "銆嶅簭鍙蜂笉杩炵画");
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炶疮");
}
}
}
@@ -550,7 +551,6 @@
}
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) {
@@ -558,6 +558,12 @@
}
}
+ for (OutTaskParam outTaskParam : validOutOrders) {
+ 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