From 885fab377d6209da4b3b2e04200321bbb9a42662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Wed, 17 Dec 2025 09:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=A1=A8=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/job/domain/MydoJob.java   |  2 ++
 .../scheduleTask/ssj/floor2/LineSsjThread.java    |  6 ++++--
 .../main/resources/mapper/job/MydoJobMapper.xml   | 15 +++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/domain/MydoJob.java
index a7125bca..a8950f98 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/domain/MydoJob.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/domain/MydoJob.java
@@ -94,5 +94,7 @@ public class MydoJob extends BaseEntity
 
     private String flag;
 
+    private String traySize;
+
     private List<String> epList;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
index d0cff6e2..0c1157cf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
@@ -131,6 +131,7 @@ public class LineSsjThread implements Runnable {
                     mydoJob2.setStatus("1");
                     mydoJob2.setExecutionPhase(TASK_EP_CREATE);
                     mydoJob2.setCreateTime(new Date());
+                    mydoJob2.setTraySize(Convert.toStr(SsjDevice.getTraySize()));
                     mydoJobService.insertMydoJob(mydoJob2);
                     int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1);
                     if (i == 1) {
@@ -186,6 +187,7 @@ public class LineSsjThread implements Runnable {
                     mydoJob2.setStatus("1");
                     mydoJob2.setExecutionPhase("0");
                     mydoJob2.setCreateTime(new Date());
+                    mydoJob2.setTraySize(Convert.toStr(SsjDevice.getTraySize()));
                     mydoJobService.insertMydoJob(mydoJob2);
                     int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1);
                     if (i == 1) {
@@ -251,7 +253,7 @@ public class LineSsjThread implements Runnable {
                             //todo 与agv对点
                             paramMap.put("startPoint", "G1005");
                             paramMap.put("endPoint", deviceCode);
-                            paramMap.put("traySize",String.valueOf(SsjDevice.getTraySize()));
+                            paramMap.put("traySize",mydoJob.getTraySize());
                             paramMap.put("wmsTaskNo", mydoJob.getTaskNo());
                             AjaxResult ajaxResult = apiService.receiveAgvMoveJob(paramMap);
                             if (ajaxResult.isSuccess()) {
@@ -293,7 +295,7 @@ public class LineSsjThread implements Runnable {
                 //todo 与agv对点
                 map.put("startPoint", "G1005");
                 map.put("endPoint", wcsPorts.get(0).getPortCode());
-                map.put("traySize",String.valueOf(SsjDevice.getTraySize()));
+//                map.put("traySize",String.valueOf(SsjDevice.getTraySize()));
 //                            map.put("wmsTaskNo", mydoJob.getTaskNo());
                 AjaxResult ajaxResult1 = apiService.receiveAgvMoveJob(map);
                 if(ajaxResult1.isSuccess()){
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 38ce8e6d..d8fae7ca 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -24,13 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="faultFlag"    column="fault_flag"    />
         <result property="flag"    column="flag"    />
         <result property="trayCode"    column="tray_code"    />
+        <result property="traySize"    column="tray_size"    />
     </resultMap>
 
     <sql id="selectMydoJobVo">
-        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code from mydo_job_wcs
+        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code,tray_size from mydo_job_wcs
     </sql>
     <sql id="selectMydoJobFinishVo">
-        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code from mydo_job_wcs_finish
+        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code,tray_size from mydo_job_wcs_finish
     </sql>
 
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null  and faultFlag != ''">and fault_flag = #{faultFlag}</if>
             <if test="flag != null  and flag != ''">and flag = #{flag}</if>
             <if test="trayCode != null  and trayCode != ''">and trayCode = #{tray_code}</if>
+            <if test="traySize != null  and traySize != ''">and traySize = #{tray_size}</if>
             <if test="epList != null and epList.size() > 0">
                 and entrance_id in
                 <foreach item="item" index="index" collection="epList" separator="," open="(" close=")">
@@ -91,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               )}
     </select>
     <select id="selectMydoJobByExitList" resultMap="MydoJobResult">
-        select TOP 1 job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code from mydo_job_wcs
+        select TOP 1 job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code,tray_size from mydo_job_wcs
         where exit_id in
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null">fault_flag,</if>
             <if test="flag != null">flag,</if>
             <if test="trayCode != null">tray_code,</if>
+            <if test="traySize != null">tray_size,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null">#{jobId},</if>
@@ -144,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null">#{faultFlag},</if>
             <if test="flag != null">#{flag},</if>
             <if test="trayCode != null">#{trayCode},</if>
+            <if test="traySize != null">#{traySize},</if>
 
          </trim>
     </insert>
@@ -173,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
             <if test="flag != null">flag = #{flag},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="traySize != null">tray_size = #{traySize},</if>
         </trim>
         where job_id = #{jobId}
     </update>
@@ -211,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
              <if test="flag != null  and flag != ''"> and flag = #{flag}</if>
              <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+             <if test="traySize != null  and traySize != ''"> and tray_size = #{traySize}</if>
         </where>
     </select>
     <select id="selectMydoJobByEntranceList"  resultMap="MydoJobResult">
@@ -242,10 +248,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
             <if test="flag != null  and flag != ''"> and flag = #{flag}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="traySize != null  and traySize != ''"> and tray_size = #{traySize}</if>
         </where>
     </select>
     <select id="selectRunningMydoJobByExitList" resultMap="MydoJobResult">
-        select TOP 1 job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag, from mydo_job_wcs
+        select TOP 1 job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_size,tray_code from mydo_job_wcs
         where exit_id in
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}