From f01ebd5c94d854e2a63b23d9be2c0dd9e0aaf4bd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 22 十月 2024 08:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
index d1a6d99..56c2e88 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
@@ -4,13 +4,14 @@
<resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
<result column="device_id" property="deviceId"/>
- <result column="slot" property="slotId"/>
+ <result column="slot" property="slot"/>
<result column="pattern_width" property="patternWidth"/>
<result column="pattern_height" property="patternHeight"/>
<result column="pattern_thickness" property="patternThickness"/>
<result column="films_id" property="filmsId"/>
<result column="create_time" property="createTime"/>
<result column="remain_quantity" property="remainQuantity"/>
+ <result column="enable_state" property="state"/>
</resultMap>
@@ -22,10 +23,11 @@
T1.PATTERN_THICKNESS,
T1.FILMS_ID,
T1.CREATE_TIME,
- T1.REMAIN_QUANTITY
+ T1.REMAIN_QUANTITY,
+ T.ENABLE_STATE
FROM RAW_GLASS_STORAGE_STATION T
LEFT JOIN RAW_GLASS_STORAGE_DETAILS T1 ON T.DEVICE_ID = T1.DEVICE_ID
- AND T.SLOT = T1.SLOT_ID
+ AND T.SLOT = T1.SLOT
AND T1.STATE = 100
</select>
</mapper>
--
Gitblit v1.8.0