From d4a06fc08b6e6e215bbf1771d204c3b7d773bc29 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 09 十月 2025 14:51:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index f59fda8..d400c63 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -164,36 +164,16 @@
from hollow_glass_relation_info
where flow_card_id = #{flowCardId}
</select>
- <select id="queryProductNameByFlowCardId" resultType="com.mes.hollow.entity.dto.OrderDetailsDTO">
- select t.product_name, t1.customer_name
- from sd.order_detail t
- inner join sd.order t1 on t.order_id = t1.order_id
- where (t.order_id, t.order_number) = (
- select min(order_id) as order_id, min(order_number) as order_number
- from pp.flow_card
- where process_id = #{flowCardId}
- <if test="productName != null and productName != ''">
- and t.product_name like concat('%', #{productName}, '%')
- </if>
- <if test="customerName != null and customerName != ''">
- and t1.customer_name like concat('%', #{customerName}, '%')
- </if>
- )
- limit 1
- </select>
<update id="clearDirtyFlowCardData">
- update hollow_glass_relation_info
- set glass_id = null,
- tempering_layout_id = null,
- tempering_feed_sequence = null,
- engineer_id = null,
- state = 0
+ update tempering_glass_relation_info
+ set shelf_order = 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
+ and shelf_order not in (
+ select shelf_order
+ from vertical_sheet_cage_details
where flow_card_id = #{flowCardId}
and layer = #{layer}
and state in (100, 102, 103, 104)
--
Gitblit v1.8.0