From 7a8ce5a3760aa10a8109f9d34f13d19652975404 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 29 十二月 2024 20:06:56 +0800
Subject: [PATCH] 1、erp报工接口改造,ip改为配置

---
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
index 127a511..febd8e7 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
@@ -46,7 +46,7 @@
         real_flow_layer_count AS ( SELECT flow_card_id, layer, count(*) AS real_count FROM
         hollow_big_storage_cage_details t WHERE state = 100 GROUP BY flow_card_id, layer ),
         damage_flow_layer_count AS ( SELECT process_id AS flow_card_id, technology_number AS layer, count(*) as
-        damage_count FROM damage GROUP BY process_id, technology_number ),
+        damage_count FROM damage where type in(8,9) GROUP BY process_id, technology_number ),
         lack_flow_layer_count AS (
         SELECT
         t.flow_card_id,
@@ -197,4 +197,20 @@
             desc
         </if>
     </select>
+    <select id="queryHollowbigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
+        SELECT SLOT, COUNT(1) AS COUNT
+        FROM HOLLOW_BIG_STORAGE_CAGE_DETAILS
+        where state in (100, 102, 103, 104)
+        group by SLOT
+        ORDER BY SLOT
+    </select>
+    <select id="querySlotMaxSequence" resultType="com.mes.hollow.entity.HollowBigStorageCageDetails">
+        select max(sequence) as sequence, device_id, slot
+        from hollow_big_storage_cage_details
+        where (flow_card_id, total_layer, layer, virtual_slot) =
+              (#{flowCardId}, #{totalLayer}, #{layer}, #{virtualSlot})
+          and state in (0, 100, 102, 103, 104)
+        group by device_id, slot
+        order by sequence
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0