From 7b18719395d285812986a6ec876e4c55359185f2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 16:59:06 +0800
Subject: [PATCH] 1、卧式理片推送数据与切割版图推送数据websocket分开
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index 15dcb15..ebda8bb 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -131,6 +131,15 @@
and state !=101
</where>
</update>
+ <update id="updateDeviceIdBySlot">
+ update big_storage_cage_details t inner join big_storage_cage t1 on t.slot = t1.slot
+ set t.device_id = t1.device_id
+ where t.slot in (
+ <foreach collection="list" item="item" separator=",">
+ #{item}
+ </foreach>
+ )
+ </update>
<select id="selectTemperingGlassCount" resultMap="temperingGlassCount">
with glass_info_temp as (
@@ -227,13 +236,18 @@
<select id="queryLackGlassInfo" resultMap="glassInfoLackDTO">
WITH glass_info_temp AS (SELECT *
FROM glass_info
- WHERE engineer_id = #{engineerId} AND tempering_layout_id = #{temperingLayoutId}),
+ WHERE engineer_id = #{engineerId}
+ AND tempering_layout_id = #{temperingLayoutId}),
big_details_temp AS (SELECT *
FROM big_storage_cage_details
- WHERE state = 100 AND engineer_id = #{engineerId} AND tempering_layout_id = #{temperingLayoutId}),
+ WHERE state = 100
+ AND engineer_id = #{engineerId}
+ AND tempering_layout_id = #{temperingLayoutId}),
damage_temp AS (SELECT *
FROM damage
- WHERE type IN (8, 9) AND engineer_id = #{engineerId} AND tempering_layout_id = #{temperingLayoutId}),
+ WHERE type IN (8, 9)
+ AND engineer_id = #{engineerId}
+ AND tempering_layout_id = #{temperingLayoutId}),
result_lack AS (SELECT t.*
FROM glass_info_temp t
LEFT JOIN big_details_temp t1 ON t.glass_id = t1.glass_id
--
Gitblit v1.8.0