From 872dd98f359f6d6ff45dac82fe925a5abf4faa83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 21 四月 2026 10:47:09 +0800
Subject: [PATCH] 1.订单累计入库件数改成改站点入库所以总和。从早上8点开始计算
---
src/main/java/com/zy/asrs/controller/OpenController.java | 27 +++++++++++++++++----------
1 files changed, 17 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 b043207..1b25813 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -932,7 +932,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();
// 搴撲綅浣跨敤鐜�
@@ -979,20 +979,20 @@
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 + "";
+ Date endTime = new Date();
+ Date startTime = resolveBusinessDayStart(endTime);
+ Long inboundCount = wrkMastLogService.countInboundHistoryBySourceStaNo(startTime, endTime, resolveInboundStationNo(wrkMast));
+ supp = String.valueOf(inboundCount);
}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 + "";
}
@@ -1016,6 +1016,13 @@
return wrkMastLogService.sumCostTimeByWrkSts(startTime, endTime, wrkSts);
}
+ private Integer resolveInboundStationNo(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return null;
+ }
+ return wrkMast.getSourceStaNo() == null ? wrkMast.getStaNo() : wrkMast.getSourceStaNo();
+ }
+
private Date resolveBusinessDayStart(Date now) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(now);
--
Gitblit v1.9.1