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/qm/service/impl/QmCheckitemServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/impl/QmCheckitemServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/impl/QmCheckitemServiceImpl.java
index a8299aa..8ff9004 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/impl/QmCheckitemServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/impl/QmCheckitemServiceImpl.java
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.Map;
import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.HashMap; // 瀵煎叆 HashMap
/**
* 瑙勭▼妫�楠岄」鐩甋ervice涓氬姟灞傚鐞�
@@ -85,6 +87,28 @@
return roots;
}
+ @Override
+ public List<Map<String, String>> getRid(String stdCode) { // 淇敼杩斿洖绫诲瀷
+ if (StringUtils.isBlank(stdCode)) {
+ return new ArrayList<>();
+ }
+ LambdaQueryWrapper<QmCheckitem> lqw = Wrappers.lambdaQuery();
+ lqw.select(QmCheckitem::getId, QmCheckitem::getItemName);
+ lqw.eq(QmCheckitem::getStdCode, stdCode);
+ lqw.eq(QmCheckitem::getIsmix, 1L);
+ lqw.eq(QmCheckitem::getEnable, 1L);
+ lqw.ne(QmCheckitem::getDel, 1L);
+ List<QmCheckitem> list = baseMapper.selectList(lqw);
+ return list.stream()
+ .map(item -> {
+ Map<String, String> map = new HashMap<>();
+ map.put("value", item.getId());
+ map.put("label", item.getItemName());
+ return map;
+ })
+ .collect(Collectors.toList());
+ }
+
private List<QmCheckitemVo> selectTreeNodes(String stdCode, String rid) {
if (StringUtils.isBlank(stdCode)) {
return new ArrayList<>();
--
Gitblit v1.9.3