From 73f677ac03ebcf0f9d2e865dd60d3e4a6c2bc2c9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 23 四月 2026 13:53:01 +0800
Subject: [PATCH] 电视机出库订单托数显示
---
src/main/java/com/zy/asrs/controller/OpenController.java | 167 +++++++++++--------------------------------------------
1 files changed, 34 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4e1f501..b066e3a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -25,7 +25,6 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -38,6 +37,7 @@
private static final boolean auth = true;
private static final String sign_arm_order = "|s|LABEL_";
private static final String sign_arm_sku = "|sku|LABEL_";
+ private static final long MILLIS_PER_MINUTE = 60L * 1000L;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -50,8 +50,6 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -530,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("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
@@ -647,7 +646,7 @@
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- return openService.outOrderBatch(linesByBatchSeq);
+ return openService.outOrderBatch(linesByBatchSeq,count);
}
/**
@@ -935,7 +934,7 @@
// 鎬诲簱浣嶆暟
Integer total1 = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
- Integer total = total1>40000?40000:total1;
+ Integer total = total1>40000?6528:total1;
// 浣跨敤涓�
Integer used = locUseRate.getFqty() + locUseRate.getUqty();
// 搴撲綅浣跨敤鐜�
@@ -982,167 +981,69 @@
Integer count = 0;
String supp = "";
//璇ヨ鍗曠疮璁″叆鍑哄簱浠舵暟
- 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));
Integer ioType = wrkMast.getIoType();
if (ioType != null && ioType < 100) {
- if (orderNo != null && orderNo.size() > 0) {
- count = orderNo.size();
- }
- if (userNo != null && userNo.size() > 0) {
- count = userNo.size()+count+1;
- }
- supp = count + "";
+ 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;
+ }
+ if (orderNo != null && orderNo.size() > 0) {
+ count=orderNo.size()+count;
}
supp = count + "";
}
map.put("supp", supp);
//鑰楁椂
- String costTime = resolveCostTime(wrkMast, wrkDetls);
- map.put("costTime", costTime);
+ Long costTime = resolveCostTime(wrkMast);
+ map.put("costTime", String.valueOf(costTime));
return R.ok().add(map);
}
- private String resolveCostTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ Long resolveCostTime(WrkMast wrkMast) {
+ return resolveCostTime(wrkMast, new Date());
+ }
+
+ Long resolveCostTime(WrkMast wrkMast, Date now) {
if (wrkMast == null || wrkMast.getIoType() == null) {
- return "0";
+ return 0L;
}
-
- Date createTime;
if (wrkMast.getIoType() < 100) {
- createTime = resolveInboundTaskCreateTime(wrkMast, wrkDetls);
- } else {
- createTime = resolveTaskCreateTime(wrkMast);
- }
-
- if (createTime == null) {
- return "0";
- }
-
- long minutes = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - createTime.getTime());
- if (minutes < 0L) {
- minutes = 0L;
- }
- return String.valueOf(minutes);
- }
-
- private Date resolveInboundTaskCreateTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- if (wrkMast == null) {
- return null;
- }
-
- if (!Cools.isEmpty(wrkMast.getUserNo())) {
- Date userNoCreateTime = resolveUserNoCreateTime(wrkMast.getUserNo());
- if (userNoCreateTime != null) {
- return userNoCreateTime;
+ if (Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0L;
}
+ return minutesBetween(wrkMastService.firstInboundCreateTimeByTrainNo(wrkMast.getTrainNo()), resolveTaskCreateTime(wrkMast));
}
-
- String orderNo = resolveOrderNo(wrkMast, wrkDetls);
- if (Cools.isEmpty(orderNo)) {
- return null;
- }
- return resolveOrderCreateTime(orderNo);
+ return minutesBetween(resolveTaskCreateTime(wrkMast), now);
}
- private Date resolveUserNoCreateTime(String userNo) {
- if (Cools.isEmpty(userNo)) {
- return null;
+ int resolveInboundSupp(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getIoType() == null || wrkMast.getIoType() >= 100 || Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0;
}
- return minDate(
- minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", userNo))),
- minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", userNo)))
- );
- }
-
- private String resolveOrderNo(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- if (wrkMast != null && !Cools.isEmpty(wrkMast.getUserNo())) {
- return wrkMast.getUserNo();
- }
- if (Cools.isEmpty(wrkDetls)) {
- return null;
- }
- for (WrkDetl wrkDetl : wrkDetls) {
- if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getOrderNo())) {
- return wrkDetl.getOrderNo();
- }
- }
- return null;
- }
-
- private Date resolveOrderCreateTime(String orderNo) {
- if (Cools.isEmpty(orderNo)) {
- return null;
- }
-
- Date historyCreateTime = minDate(
- minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("order_no", orderNo)))
- );
- Date currentCreateTime = minDate(
- minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)))
- );
- return minDate(historyCreateTime, currentCreateTime);
- }
-
- private Date minDate(Date first, Date second) {
- if (first == null) {
- return second;
- }
- if (second == null) {
- return first;
- }
- return first.before(second) ? first : second;
+ return wrkMastService.finishedInboundPalletCountByTrainNo(wrkMast.getTrainNo());
}
private Date resolveTaskCreateTime(WrkMast wrkMast) {
if (wrkMast == null) {
return null;
}
- return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
+ return wrkMast.getAppeTime() == null ? wrkMast.getIoTime() : wrkMast.getAppeTime();
}
- private Date minCreateTime(List<?> list) {
- if (Cools.isEmpty(list)) {
- return null;
+ private Long minutesBetween(Date startTime, Date endTime) {
+ if (startTime == null || endTime == null) {
+ return 0L;
}
- Date min = null;
- for (Object item : list) {
- Date createTime = resolveCreateTime(item);
- if (createTime == null) {
- continue;
- }
- if (min == null || createTime.before(min)) {
- min = createTime;
- }
+ long diff = endTime.getTime() - startTime.getTime();
+ if (diff <= 0) {
+ return 0L;
}
- return min;
- }
-
- private Date resolveCreateTime(Object item) {
- if (item instanceof WrkMast) {
- WrkMast wrkMast = (WrkMast) item;
- return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
- }
- if (item instanceof WrkMastLog) {
- WrkMastLog wrkMastLog = (WrkMastLog) item;
- return minDate(minDate(wrkMastLog.getAppeTime(), wrkMastLog.getIoTime()), wrkMastLog.getModiTime());
- }
- if (item instanceof WrkDetl) {
- WrkDetl wrkDetl = (WrkDetl) item;
- return minDate(minDate(wrkDetl.getAppeTime(), wrkDetl.getIoTime()), wrkDetl.getModiTime());
- }
- if (item instanceof WrkDetlLog) {
- WrkDetlLog wrkDetlLog = (WrkDetlLog) item;
- return minDate(minDate(wrkDetlLog.getAppeTime(), wrkDetlLog.getIoTime()), wrkDetlLog.getModiTime());
- }
- return null;
+ return diff / MILLIS_PER_MINUTE;
}
}
--
Gitblit v1.9.1