From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
index d9b1ce4..92e73a1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
@@ -6,24 +6,26 @@
<select id="queryFreeDeviceByUsed" resultType="java.lang.Integer">
SELECT T.DEVICE_ID
FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
+ LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 8, 9)) T1
ON T.SLOT = T1.SLOT
WHERE T.MAX_THICKNESS >= #{thickness}
AND T.ENABLE_STATE = 1
GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
+ ORDER BY T.MAX_THICKNESS,
+ COUNT(DISTINCT T1.ENGINEER_ID), COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
COUNT(DISTINCT T1.SLOT)
</select>
- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">
- SELECT T.DEVICE_ID
- FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
- ON T.SLOT = T1.SLOT
- WHERE T.MAX_THICKNESS >= #{thickness}
- AND T.ENABLE_STATE = 1
- GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC
- </select>
+ <!-- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">-->
+ <!-- SELECT T.DEVICE_ID-->
+ <!-- FROM BIG_STORAGE_CAGE T-->
+ <!-- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 8, 9)) T1-->
+ <!-- ON T.SLOT = T1.SLOT-->
+ <!-- WHERE T.MAX_THICKNESS >= #{thickness}-->
+ <!-- AND T.ENABLE_STATE = 1-->
+ <!-- GROUP BY T.DEVICE_ID-->
+ <!-- ORDER BY COUNT(DISTINCT T1.ENGINEER_ID)-->
+ <!-- COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),-->
+ <!-- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC-->
+ <!-- </select>-->
</mapper>
--
Gitblit v1.8.0