From eb21b7a8c4800754533e124860fd486a57732fd1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 17 十二月 2024 10:30:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
index 059ec28..50f680e 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"/>
@@ -16,19 +18,16 @@
 
     <select id="queryTaskMessage" resultMap="baseMap">
         select *
-        from #{tableName}
+        from ${tableName}
         limit 1
     </select>
 
     <update id="updateTaskMessage">
-        UPDATE #{tableName}
-        SET task_running = #{taskRunning},
-        glass_id_out = #{glassIdOut},
-        current_cell = #{currentCell},
-        start_cell = #{startCell},
-        enc_cell = #{endCell},
-        <if test="taskState == 0">
-            task_state = #{taskState},
-        </if>
+        UPDATE ${tableName}
+        SET task_running = #{task.taskRunning},
+        glass_id_out = #{task.glassIdOut},
+        current_cell = #{task.currentCell},
+        start_cell = #{task.startCell},
+        end_cell = #{task.endCell}
     </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0