fix: 1.储丝单柜卷包产量处理包装机换班后产量不清零导致重复计算问题（2026.04.04后数据新增dac_up_time生效） 2.前端请求超...

zhuguifei

6 天以前 fecaf0050852d71e42444e2216a8844474f0de29

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

@@ -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)))) {
                        // 先把统计结束时刻累计值加进来：current = 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)))) {
                        // 先把统计结束时刻累计值加进来：current = 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();

                                // 记录过程：扣除头部产量

 ruoyi-plus-soybean/packages/axios/src/options.ts

@@ -41,7 +41,7 @@
}

export function createAxiosConfig(config?: Partial<CreateAxiosDefaults>) {
  const TEN_SECONDS = 10 * 1000;
  const TEN_SECONDS = 20 * 1000;

  const axiosConfig: CreateAxiosDefaults = {
    timeout: TEN_SECONDS,