From 40c8f926742ac885981e1791291b77b8fd662163 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 23 五月 2025 14:55:10 +0800
Subject: [PATCH] 1、编辑打包方式,避免生成的jar过大在升级过程耗费大量时间 将target下的config、lib和jar 统一放在同一目录下,修改服务启动命令 后续升级在不修改依赖、配置文件的情况下替换jar即可 涉及依赖、配置文件仅需在lib、config下新增/替换相关文件即可

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index 25ac2e8..981209f 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -129,20 +129,32 @@
         from hollow_glass_relation_info
         where flow_card_id = #{flowCardId}
     </select>
+    <select id="queryProductNameByFlowCardId" resultType="java.lang.String">
+        select product_name
+        from sd.order_detail
+        where (order_id, order_number) = (
+            select min(order_id) as order_id, min(order_number) as order_number
+            from pp.flow_card
+            where process_id = #{flowCardId}
+        )
+        limit 1
+    </select>
 
     <update id="clearDirtyFlowCardData">
         update hollow_glass_relation_info
-        set glass_id = null,
-            tempering_layout_id = null,
+        set glass_id                = null,
+            tempering_layout_id     = null,
             tempering_feed_sequence = null,
-            engineer_id = null,
-            state = 0
+            engineer_id             = null,
+            state                   = 0
         where flow_card_id = #{flowCardId}
           and layer = #{layer}
           and glass_id not in (
             select glass_id
             from hollow_big_storage_cage_details
-            where flow_card_id = #{flowCardId} and layer = #{layer} and state = 100
+            where flow_card_id = #{flowCardId}
+              and layer = #{layer}
+              and state in (100, 102, 103, 104)
         )
     </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0