From 22a189d37bd7e27ef46ed7e3951202259bf14da0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 13 三月 2025 17:05:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
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