From fecaf0050852d71e42444e2216a8844474f0de29 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 10 四月 2026 14:18:20 +0800
Subject: [PATCH] fix: 1.储丝单柜卷包产量处理包装机换班后产量不清零导致重复计算问题（2026.04.04后数据新增dac_up_time生效） 2.前端请求超时时间修改为20s
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java
index ba00d90..3ea1446 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java
@@ -376,7 +376,7 @@
.gt(RollerTimeData::getQty, 0)
.last("LIMIT 1");
RollerTimeData rData = rollerTimeDataService.selectOne(rlqw);
- if (rData != null) {
+ if (rData != null && (rData.getDacUpTime() == null || (!rData.getDacUpTime().before(stimDate) && !rData.getDacUpTime().after(etimDate)))) {
// 鍏堟妸缁熻缁撴潫鏃跺埢绱鍊煎姞杩涙潵锛歝urrent = Qty(calcEnd)
currentRollerOutput += rData.getQty();
@@ -410,7 +410,7 @@
.last("LIMIT 1");
RollerTimeData rBeginData = rollerTimeDataService.selectOne(beginRlqw);
- if (rBeginData != null) {
+ if (rBeginData != null && (rBeginData.getDacUpTime() == null || (!rBeginData.getDacUpTime().before(stimDate) && !rBeginData.getDacUpTime().after(etimDate)))) {
currentRollerOutput -= rBeginData.getQty();
// 璁板綍杩囩▼锛氭墸闄ゅご閮ㄤ骇閲�
@@ -458,7 +458,7 @@
.last("LIMIT 1");
PackerTimeData pData = packerTimeDataService.selectOne(plqw);
- if (pData != null) {
+ if (pData != null && (pData.getDacUpTime() == null || (!pData.getDacUpTime().before(stimDate) && !pData.getDacUpTime().after(etimDate)))) {
// 鍏堟妸缁熻缁撴潫鏃跺埢绱鍊煎姞杩涙潵锛歝urrent = Qty(calcEnd)
currentPackerOutput += pData.getQty();
@@ -492,7 +492,7 @@
.last("LIMIT 1");
PackerTimeData pBeginData = packerTimeDataService.selectOne(beginPlqw);
- if (pBeginData != null) {
+ if (pBeginData != null && (pBeginData.getDacUpTime() == null || (!pBeginData.getDacUpTime().before(stimDate) && !pBeginData.getDacUpTime().after(etimDate)))) {
currentPackerOutput -= pBeginData.getQty();
// 璁板綍杩囩▼锛氭墸闄ゅご閮ㄤ骇閲�
--
Gitblit v1.9.3