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/OptimizeProjectMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
index decf51f..0c7707c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
@@ -14,10 +14,10 @@
     </resultMap>
 
     <select id="saveProject" parameterType="com.mes.pp.entity.request.OptimizeRequest" resultMap="sequenceMap">
-        select a.project_no, b.glass_type, a.width, a.height, b.glass_thickness, a.heat_layout_sort, 0 as state
+        select a.project_no, 1 as glass_type, a.width, a.height, REGEXP_REPLACE(b.glass_thickness, '\\D', '')as glass_thickness, a.heat_layout_sort, 0 as state
         from optimize_detail a
                  left join optimize_project b on a.project_no = b.project_no
-        where a.project_no = #{projectNo,jdbcType=VARCHAR}
+        where a.project_no = #{projectNo}
     </select>
 
 

--
Gitblit v1.8.0