From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息

---
 hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
index e859f86..e19a528 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
@@ -13,11 +13,10 @@
         <result column="state" property="state"/>
         <result column="group_number" property="groupNumber"/>
     </resultMap>
-    <select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
+    <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
         SET @prev_width := NULL;
         SET @prev_height := NULL;
         SET @counter := 0;
-
         SELECT t.*,
                @counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
                @prev_width := width,

--
Gitblit v1.8.0