From 6d2d0f3068860ae9be4587c9988f3b7ba6e03ff5 Mon Sep 17 00:00:00 2001
From: ysj09 <ysj091001@163.com>
Date: Mon, 2 Feb 2026 09:34:51 +0800
Subject: [PATCH] =?UTF-8?q?2.2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java   | 5 +++--
 .../src/main/resources/mapper/job/MydoJobFinishMapper.xml    | 4 ++--
 ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml  | 5 +++--
 ruoyi-ui/src/utils/request.js                                | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 66068bb..f801eb1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -499,11 +499,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
         String msg = "";
         StringBuilder builder = new StringBuilder();
         for (String stockId : stockIds) {
-            map.put("v_stock_id", stockId);
+            BasStock basStock = basStockService.selectBasStockByStockId(stockId);
+            map.put("v_tray_code", basStock.getTrayCode());
             map.put("v_exit_id", exitId);
             mydoJobMapper.pointOut(map);
             msg = map.get("v_resultmsg").toString();
-            builder.append("库存编号：" + stockId + "，分配结果：" + msg + "<br/>");
+            builder.append("托盘：" + basStock.getTrayCode() + "，分配结果：" + msg + "<br/>");
         }
         iToWcsService.pushOutMydoJob();
         if (!StrUtil.isEmpty(builder)) {
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index b799378..f35a52a 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -145,10 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(25,26)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(28)</if>
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
             <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
             order by mj.create_time desc
         </where>
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index bb9cba5..f9b62ef 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
         left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
         left join mydo_job_detail mjd on mj.job_id = mjd.job_id
+
         <where>
             <if test="jobId != null  and jobId != ''"> and mj.job_id = #{jobId}</if>
             <if test="status != null  and status != ''"> and mj.status = #{status}</if>
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 </if>
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 </if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
             <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
         </where>
         order by mj.create_time desc
@@ -223,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_point_out(
-        #{v_stock_id,jdbcType=VARCHAR,mode=IN},
+        #{v_tray_code,jdbcType=VARCHAR,mode=IN},
         #{v_exit_id,jdbcType=VARCHAR,mode=IN},
         #{v_result,mode=OUT,jdbcType=INTEGER},
         #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index a6dc790..35eafbd 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 30000
 })
 
 // request拦截器