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/domain/vo/StoreSilkDetailVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkDetailVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkDetailVo.java
index f08f5b8..d312ac1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkDetailVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkDetailVo.java
@@ -49,7 +49,17 @@
private Date shiftEndTime;
/**
- * 璇ョ彮娆″唴璁＄畻鍑虹殑浜ч噺
+ * 璇ョ彮娆″唴璁＄畻鍑虹殑浜ч噺锛堜綔涓鸿褰曟椂姝ｆ暟琛ㄧず澧炲姞锛岃礋鏁拌〃绀哄墧闄わ級
*/
private Double output;
+
+ /**
+ * 鎿嶄綔绫诲瀷鎻忚堪锛堝 "鐝绱", "鎵ｉ櫎澶撮儴", "鎵ｉ櫎灏鹃儴"锛�
+ */
+ private String calcType;
+
+ /**
+ * 鍛戒腑鏁版嵁鐨勬椂闂寸偣锛堢敤浜庤拷婧暟鎹潵婧愶級
+ */
+ private Date hitTime;
}
--
Gitblit v1.9.3