From 21092d29c1c0cd1003bb32bf91fddae265a8baea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 20 十一月 2024 08:41:11 +0800
Subject: [PATCH] 1、卧理单条磨边线对接完成，另一条线等待IP确认 2、大理片笼提交部分代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
index b532cfa..8c76445 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -4,6 +4,8 @@
<resultMap id="baseMap" type="com.mes.opctask.entity.EdgStorageDeviceTask">
<id column="task_running" property="taskRunning"/>
+ <id column="glass_id" property="glassId"/>
+ <id column="in_place" property="inPlace"/>
<id column="glass_id_in" property="glassIdIn"/>
<id column="glass_id_out" property="glassIdOut"/>
<id column="current_cell" property="currentCell"/>
@@ -12,10 +14,6 @@
<id column="task_state" property="taskState"/>
<id column="create_time" property="createTime"/>
<id column="update_time" property="updateTime"/>
- <id column="width" property="width"/>
- <id column="height" property="height"/>
- <id column="thickness" property="thickness"/>
- <id column="film_remove" property="filmRemove"/>
</resultMap>
<select id="queryTaskMessage" resultMap="baseMap">
@@ -30,11 +28,7 @@
glass_id_out = #{task.glassIdOut},
current_cell = #{task.currentCell},
start_cell = #{task.startCell},
- end_cell = #{task.endCell},
- width = #{task.width},
- height = #{task.height},
- thickness = #{task.thickness},
- film_remove = #{task.filmRemove}
+ end_cell = #{task.endCell}
<if test="task.taskState == 0">
,task_state = #{task.taskState}
</if>
--
Gitblit v1.8.0