From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
index e31d1e7..d0b6752 100644
--- a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
@@ -49,10 +49,19 @@
*/
public DtOverviewVo overview(String areaId) {
+ if (areaId != null) {
+ areaId = areaId.trim();
+ if (areaId.isEmpty()) {
+ areaId = null;
+ }
+ }
+
List<Double> dbOverview = digitalTwinMapper.overview(areaId);
if (dbOverview != null && !dbOverview.isEmpty()){
+ int total = (int)Math.round(dbOverview.get(0));
+ total = Math.min(total, 40000);
DtOverviewVo dtOverviewVo = DtOverviewVo.builder()
- .totalLoc((int)Math.round(dbOverview.get(0)))
+ .totalLoc(total)
.useLoc((int)Math.round(dbOverview.get(1)))
.remainingStock((int)Math.round(dbOverview.get(2)))
.todayWarehousing((int)Math.round(dbOverview.get(3)))
@@ -189,7 +198,7 @@
return dtInAndOutBoundVos;
}
/**
- * 杩戞湡杩戞湡鍛嗘粸鍝佷俊鎭紝榛樿瓒呰繃30澶╀负鍛嗘粸鍝�
+ * 杩戞湡杩戞湡鍛嗘粸鍝佷俊鎭紝榛樿瓒呰繃14澶╀负鍛嗘粸鍝�
*
* @param areaId
* @param overDayNum
@@ -200,7 +209,7 @@
*/
public List<DtDetainMatVo> recentDetainMat(String areaId, Integer overDayNum, Integer pageIndex, Integer pageSize, String condition) {
- overDayNum = overDayNum == null ? 30 : overDayNum;
+ overDayNum = overDayNum == null ? 14 : overDayNum;
pageIndex = pageIndex == null ? 1 : pageIndex;
pageSize = pageSize == null ? 1000000 : pageSize;
--
Gitblit v1.9.1