From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/CommandInfoMapper.xml |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index 67e7bc6..e2158ff 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -6,21 +6,38 @@
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo">
         <id column="id" property="id" />
         <result column="wrk_no" property="wrkNo" />
-        <result column="wms_wrk_no" property="wmsWrkNo" />
+        <result column="task_no" property="taskNo" />
         <result column="command_status" property="commandStatus" />
         <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
         <result column="command_type" property="commandType" />
         <result column="device" property="device" />
         <result column="device_log" property="deviceLog" />
         <result column="command_desc" property="commandDesc" />
+        <result column="execute_time" property="executeTime" />
+        <result column="complete_time" property="completeTime" />
 
     </resultMap>
 
-    <select id="selectByWmsWrkNoAndWrkNo" resultMap="BaseResultMap">
+    <select id="selectByTaskNoAndWrkNo" resultMap="BaseResultMap">
         select * from wcs_command_info
         where wrk_no = #{wrkNo}
-        and wms_wrk_no = #{wmsWrkNo}
+        and task_no = #{taskNo}
+    </select>
+
+    <select id="selectByWrkNo" resultMap="BaseResultMap">
+        select * from wcs_command_info
+        where wrk_no = #{wrkNo}
+    </select>
+
+    <select id="selectByTaskNo" resultMap="BaseResultMap">
+        select * from wcs_command_info
+        where task_no = #{taskNo}
+    </select>
+
+    <select id="selectCompleteManualCommand" resultMap="BaseResultMap">
+        select * from wcs_command_info
+        where command_type = 2
+        and command_status = 3
     </select>
 
 </mapper>

--
Gitblit v1.9.1