From 4c48a4a1f3251f63c6e9943b3059f0a022b45a40 Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Sat, 8 Mar 2025 20:39:23 +0800
Subject: [PATCH] 1

---
 .../src/main/resources/mapper/app/AppTaskMapper.xml    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
index 5fb48aa7..d11846dc 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
@@ -26,10 +26,11 @@
         <result property="locationId"    column="location_id"    />
         <result property="ckType"    column="ck_type"    />
         <result property="stockId"    column="stock_id"    />
+        <result property="orderId"    column="order_id"    />
     </resultMap>
 
     <sql id="selectAppTaskVo">
-        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task, remark,plc_id,location_id,ck_type,stock_id from app_task
+        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task, remark,plc_id,location_id,ck_type,stock_id,order_id from app_task
     </sql>
 
     <select id="selectAppTaskList" parameterType="AppTask" resultMap="AppTaskResult">
@@ -51,6 +52,7 @@
             <if test="plcId != null  and plcId != ''"> and plc_id = #{plcId}</if>
             <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
             <if test="ckType != null  and ckType != ''"> and ck_type = #{ckType}</if>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
         </where>
     </select>
 
@@ -81,6 +83,7 @@
             <if test="locationId != null">location_id,</if>
             <if test="ckType != null">ck_type,</if>
             <if test="stockId != null">stock_id,</if>
+            <if test="orderId != null">order_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -102,6 +105,7 @@
             <if test="locationId != null">#{locationId},</if>
             <if test="ckType != null">#{ckType},</if>
             <if test="stockId != null">#{stockId},</if>
+            <if test="orderId != null">#{stockId},</if>
         </trim>
     </insert>
 
@@ -129,6 +133,7 @@
                 <if test="appTask.locationId != null">location_id,</if>
                 <if test="appTask.ckType != null">ck_type,</if>
                 <if test="appTask.stockId != null">stock_id,</if>
+                <if test="appTask.orderId != null">order_id,</if>
             </trim>
             )
             values
@@ -152,6 +157,7 @@
                 <if test="appTask.remark != null">#{appTask.remark},</if>
                 <if test="appTask.ckType != null">#{appTask.ckType},</if>
                 <if test="appTask.stockId != null">#{appTask.stockId},</if>
+                <if test="appTask.orderId != null">#{appTask.orderId},</if>
             </trim>
             )
         </foreach>
@@ -179,6 +185,7 @@
             <if test="locationId != null">location_id = #{locationId},</if>
             <if test="ckType != null">ck_type = #{ckType},</if>
             <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
         </trim>
         where task_id = #{taskId}
     </update>
@@ -205,6 +212,7 @@
                 <if test="appTask.locationId != null">location_id = #{appTask.locationId},</if>
                 <if test="appTask.ckType != null">ck_type = #{appTask.ckType},</if>
                 <if test="appTask.stockId != null">stock_id = #{appTask.stockId},</if>
+                <if test="appTask.orderId != null">order_id = #{appTask.orderId},</if>
             </trim>
             where task_id = #{appTask.taskId}
         </foreach>