From 1f1397b1161dab1d8ed393f7ffb2db54f466ae1c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 9 Jun 2026 16:40:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(mill):=20=E4=BF=AE=E5=A4=8D=E6=8D=A2?=
 =?UTF-8?q?=E8=BE=8A=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正了MesRollChangeMapper.xml中的查询条件，添加del_flag = 0过滤已删除记录
- 修改了排序规则，从change_id改为change_time优先排序，确保获取最新的换辊记录
- 注释掉了服务层中统计信息的相关代码，避免不必要的数据加载和计算
- 确保查询能够返回正确的最新换辊记录，提高数据准确性
---
 .../mill/service/impl/MesRollChangeServiceImpl.java  | 12 ++++++------
 .../resources/mapper/mill/MesRollChangeMapper.xml    |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MesRollChangeServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MesRollChangeServiceImpl.java
index 49a5bb0c..e182e0c4 100644
--- a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MesRollChangeServiceImpl.java
+++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MesRollChangeServiceImpl.java
@@ -149,12 +149,12 @@ public class MesRollChangeServiceImpl implements IMesRollChangeService
                 if (rec != null) {
                     cell.put("rollNo", getRollNoByPos(rec, posType));
                     cell.put("onlineTime", rec.getChangeTime());
-                    Map<String, Object> stats = mesRollChangeMapper.selectCoilStats(rec.getChangeTime(), null);
-                    MesRollChangeVo tmp = new MesRollChangeVo();
-                    fillStatsToVo(tmp, stats);
-                    cell.put("workLength",  tmp.getWorkLength());
-                    cell.put("coilCount",   tmp.getCoilCount());
-                    cell.put("totalWeight", tmp.getTotalWeight());
+//                    Map<String, Object> stats = mesRollChangeMapper.selectCoilStats(rec.getChangeTime(), null);
+//                    MesRollChangeVo tmp = new MesRollChangeVo();
+//                    fillStatsToVo(tmp, stats);
+//                    cell.put("workLength",  tmp.getWorkLength());
+//                    cell.put("coilCount",   tmp.getCoilCount());
+//                    cell.put("totalWeight", tmp.getTotalWeight());
                 }
                 byStand.put(standNo, cell);
             }
diff --git a/ruoyi-mill/src/main/resources/mapper/mill/MesRollChangeMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/MesRollChangeMapper.xml
index f9cf7bcd..3c0169e2 100644
--- a/ruoyi-mill/src/main/resources/mapper/mill/MesRollChangeMapper.xml
+++ b/ruoyi-mill/src/main/resources/mapper/mill/MesRollChangeMapper.xml
@@ -168,15 +168,14 @@
     <!-- 查询指定机架+辊位的最新换辊记录 -->
     <select id="selectLatestByStandAndPosition" resultMap="MesRollChangeResult">
         <include refid="selectMesRollChangeVo"/>
-        FROM mes_roll_change
-        WHERE line_id = #{lineId} AND stand_no = #{standNo}
+        WHERE line_id = #{lineId} AND stand_no = #{standNo} AND del_flag = 0
           AND (
                 (#{posType} = 'upperWr'  AND upper_wr_no  IS NOT NULL)
                 OR (#{posType} = 'lowerWr'  AND lower_wr_no  IS NOT NULL)
                 OR (#{posType} = 'upperBr'  AND upper_br_no  IS NOT NULL)
                 OR (#{posType} = 'lowerBr'  AND lower_br_no  IS NOT NULL)
               )
-        ORDER BY change_id DESC
+        ORDER BY change_time DESC, change_id DESC
         LIMIT 1
     </select>