From 5930bd171a59dd53b3b99dd621ff009aa5366aab Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Fri, 7 Mar 2025 11:12:34 +0800
Subject: [PATCH] 1

---
 .../resources/mapper/app/AppPmsOrderOutMapper.xml     | 11 +++++------
 .../src/main/resources/mapper/app/AppTaskMapper.xml   | 11 +++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
index 6db767cc..3dd30738 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
@@ -21,11 +21,11 @@
         <result property="orderStatus"    column="order_status"    />
         <result property="isLock"    column="is_lock"    />
         <result property="orderId"    column="order_id"    />
-        <result property="stockId"    column="stock_id"    />
+
     </resultMap>
 
     <sql id="selectAppPmsOrderOutVo">
-        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id,stock_id from app_pms_order_out
+        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id from app_pms_order_out
     </sql>
 
     <select id="selectAppPmsOrderOutList" parameterType="AppPmsOrderOut" resultMap="AppPmsOrderOutResult">
@@ -39,7 +39,6 @@
             <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
             <if test="isLock != null  and isLock != ''"> and is_lock = #{isLock}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
         </where>
     </select>
 
@@ -67,7 +66,7 @@
             <if test="orderStatus != null">order_status,</if>
             <if test="isLock != null">is_lock,</if>
             <if test="orderId != null">order_id,</if>
-            <if test="stockId != null">stock_id,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -86,7 +85,7 @@
             <if test="orderStatus != null">#{orderStatus},</if>
             <if test="isLock != null">#{isLock},</if>
             <if test="orderId != null">#{orderId},</if>
-            <if test="stockId != null">#{stockId},</if>
+
          </trim>
     </insert>
 
@@ -107,7 +106,7 @@
             <if test="stockNum != null">stock_num = #{stockNum},</if>
             <if test="isLock != null">is_lock = #{isLock},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="stockId != null">stock_id = #{stockId},</if>
+
         </trim>
         where record_id = #{recordId}
     </update>
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
index 0c981505..9362e5f1 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
@@ -25,10 +25,11 @@
         <result property="plcId"    column="plc_id"    />
         <result property="locationId"    column="location_id"    />
         <result property="ckType"    column="ck_type"    />
+        <result property="stockId"    column="stock_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 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 from app_task
     </sql>
 
     <select id="selectAppTaskList" parameterType="AppTask" resultMap="AppTaskResult">
@@ -43,7 +44,7 @@
             <if test="wcsTaskId != null  and wcsTaskId != ''"> and wcs_task_id = #{wcsTaskId}</if>
             <if test="finishTime != null "> and finish_time = #{finishTime}</if>
             <if test="goodsId != null  and goodsId != ''"> and goods_id = #{goodsId}</if>
-
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
             <if test="opUser != null  and opUser != ''"> and op_user = #{opUser}</if>
             <if test="preTask != null  and preTask != ''"> and pre_task = #{preTask}</if>
             <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
@@ -79,6 +80,7 @@
             <if test="remark != null">remark,</if>
             <if test="locationId != null">location_id,</if>
             <if test="ckType != null">ck_type,</if>
+            <if test="stockId != null">stock_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -99,6 +101,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="locationId != null">#{locationId},</if>
             <if test="ckType != null">#{ckType},</if>
+            <if test="stockId != null">#{stockId},</if>
         </trim>
     </insert>
 
@@ -125,6 +128,7 @@
                 <if test="appTask.remark != null">remark,</if>
                 <if test="appTask.locationId != null">location_id,</if>
                 <if test="appTask.ckType != null">ck_type,</if>
+                <if test="appTask.stockId != null">stock_id,</if>
             </trim>
             )
             values
@@ -147,6 +151,7 @@
                 <if test="appTask.preTask != null">#{appTask.preTask},</if>
                 <if test="appTask.remark != null">#{appTask.remark},</if>
                 <if test="appTask.ckType != null">#{appTask.ckType},</if>
+                <if test="appTask.stockId != null">#{appTask.stockId},</if>
             </trim>
             )
         </foreach>
@@ -173,6 +178,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="locationId != null">location_id = #{locationId},</if>
             <if test="ckType != null">ck_type = #{ckType},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
         </trim>
         where task_id = #{taskId}
     </update>
@@ -198,6 +204,7 @@
                 <if test="appTask.remark != null">remark = #{appTask.remark},</if>
                 <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>
             </trim>
             where task_id = #{appTask.taskId}
         </foreach>