From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 十二月 2024 11:44:07 +0800
Subject: [PATCH] 1、大理片笼进出片任务新增限制:进片玻璃数大于可用格子时,不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制

---
 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