From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml | 12 +++++++-----
1 files changed, 7 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..0d655b2 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -132,17 +132,19 @@
<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