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/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index c157460..e9fc32e 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -3,17 +3,22 @@
<mapper namespace="com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper">
<select id="listBySlotState" resultType="java.lang.Integer">
- select t.slot
- from raw_glass_storage_station t
- inner JOIN raw_glass_storage_details t1
- on t.slot = t1.slot and t.enable_state = 1
- and t.device_id in
- <foreach collection="leftingStation" item="item" open='(' close=')' separator=','>
- #{item}
- </foreach>
- and t1.state not in
+ SELECT
+ T.SLOT
+ FROM
+ RAW_GLASS_STORAGE_STATION T
+ LEFT JOIN RAW_GLASS_STORAGE_DETAILS AS T1 ON T.DEVICE_ID = T1.DEVICE_ID
+ AND T.SLOT = T1.SLOT
+ AND T1.STATE IN
<foreach collection="state" item="item" open='(' close=')' separator=','>
#{item}
</foreach>
+ WHERE
+ T.ENABLE_STATE = 1
+ AND T.DEVICE_ID IN
+ <foreach collection="leftingStation" item="item" open='(' close=')' separator=','>
+ #{item}
+ </foreach>
+ AND T1.SLOT IS NULL
</select>
</mapper>
--
Gitblit v1.8.0