From 9ea7e2fb231db817d16c1c5158ba9adb6dba73c7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 13 五月 2025 14:26:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
index 666cd4c..340bb78 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -4,11 +4,13 @@
<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"/>
<id column="start_cell" property="startCell"/>
- <id column="enc_cell" property="endCell"/>
+ <id column="end_cell" property="endCell"/>
<id column="task_state" property="taskState"/>
<id column="create_time" property="createTime"/>
<id column="update_time" property="updateTime"/>
@@ -27,8 +29,5 @@
current_cell = #{task.currentCell},
start_cell = #{task.startCell},
end_cell = #{task.endCell}
- <if test="task.taskState == 0">
- ,task_state = #{task.taskState}
- </if>
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0