From 223d5f536fcb045311105a0c92a29ee688183a15 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 23 四月 2026 22:01:08 +0800
Subject: [PATCH] 出库订单托数更新
---
src/main/java/com/zy/asrs/controller/OpenController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 83f03bd..f20724b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -528,6 +528,7 @@
*/
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
+ int count = params.size();
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
@@ -645,7 +646,7 @@
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- return openService.outOrderBatch(linesByBatchSeq);
+ return openService.outOrderBatch(linesByBatchSeq,count);
}
/**
@@ -981,20 +982,21 @@
String supp = "";
//璇ヨ鍗曠疮璁″叆鍑哄簱浠舵暟
Integer ioType = wrkMast.getIoType();
+ Integer suppCount = 0;
+ Integer sum = 0;
if (ioType != null && ioType < 100) {
supp = String.valueOf(resolveInboundSupp(wrkMast));
}else {
- List<WrkMast> orderNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()));
- List<WrkMastLog> userNo = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", wrkMast.getUserNo()).eq("wrk_sts",15L));
- if (userNo != null && userNo.size() > 0) {
- count = userNo.size()+1;
+ String[] split = wrkDetls.get(0).getSupp().split("/");
+ if (split != null && split.length > 0) {
+ sum = Integer.valueOf(split[split.length - 1]);
+ }else {
+ sum = Integer.valueOf(wrkDetls.get(0).getSupp());
}
- if (orderNo != null && orderNo.size() > 0) {
- count=orderNo.size()+count;
- }
- supp = count + "";
+ List<WrkMast> userNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()).in("wrk_sts",11,12,21,22,25));
+ suppCount = sum - userNo.size()+1;
}
- map.put("supp", supp);
+ map.put("supp", suppCount + "/" + sum);
//鑰楁椂
Long costTime = resolveCostTime(wrkMast);
--
Gitblit v1.9.1