From ccd7d95206d8bfd6e4cab542e12fd1b7c59e2f27 Mon Sep 17 00:00:00 2001
From: zgw <13623675548@163.com>
Date: Thu, 18 Dec 2025 16:38:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=20product=5Fid=E5=92=8C=20?=
 =?UTF-8?q?product=5Fname=20=E5=AD=97=E6=AE=B5=202.=E7=A9=BF=E6=A2=AD?=
 =?UTF-8?q?=E8=BD=A6=E7=BA=BF=E7=A8=8B=E6=B3=A8=E5=85=A5=E5=9B=9E=E4=BC=A0?=
 =?UTF-8?q?=E8=A1=A8server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/job/domain/MydoJob.java    |  8 ++++++
 .../com/ruoyi/schedule/ScheduleThread.java    |  5 ++++
 .../scheduleTask/srgv/BaseSRgvThread.java     |  3 ++-
 .../resources/mapper/job/MydoJobMapper.xml    | 25 ++++++++++++++-----
 4 files changed, 34 insertions(+), 7 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 2364923..3d9942e 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
@@ -91,4 +91,12 @@ public class MydoJob extends BaseEntity
     private String inOut;
 
     private String theFloor;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
index 0386f0a..dba4b09 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
@@ -71,6 +71,11 @@ public class ScheduleThread {
         plcReadInit();
         //调度初始化
         scheduleInit();
+
+        startAllThread();
+
+        startAllThread2();
+
         log.info("调度服务执行成功");
     }
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
index 1a080f3..8d40756 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
@@ -84,6 +84,7 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
         wcsSrgvMapService = SpringUtils.getBean(IWcsSrgvMapService.class);
         roadCacheService = SpringUtils.getBean(RoadCacheService.class);
         deviceSrgvService = SpringUtils.getBean(DeviceSrgvServiceImpl.class);
+        jobCallBackService=SpringUtils.getBean(JobCallBackServiceImpl.class);
     }
 
     @Override
@@ -242,7 +243,7 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
         resQueue(deviceSrgv);
 
 //        小车完成队列
-        completeCarTask(deviceSrgv);
+//        completeCarTask(deviceSrgv);
 
         //小车发送任务
         sendTask(deviceSrgv);
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index ce19c80..f215d31 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -23,13 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="faultFlag"    column="fault_flag"    />
         <result property="theFloor"    column="the_floor"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
     </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,the_floor 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,the_floor,product_id,product_name 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,the_floor 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,the_floor,product_id,product_name from mydo_job_wcs_finish
     </sql>
 
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
@@ -51,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
             <if test="theFloor != null  and theFloor != ''"> and the_floor = #{theFloor}</if>
-
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
         </where>
     </select>
 
@@ -82,7 +85,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,the_floor 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,the_floor,product_id,product_name from mydo_job_wcs
         where exit_id in
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}
@@ -113,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="faultFlag != null">fault_flag,</if>
             <if test="theFloor != null">the_floor,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null">#{jobId},</if>
@@ -133,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="faultFlag != null">#{faultFlag},</if>
             <if test="theFloor != null">#{theFloor},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
          </trim>
     </insert>
     <insert id="insertHistory">
@@ -160,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
             <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
         </trim>
         where job_id = #{jobId}
     </update>
@@ -197,10 +206,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
              <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
              <if test="theFloor != null  and theFloor != ''"> and the_floor = #{theFloor}</if>
+             <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
         </where>
     </select>
     <select id="selectMydoJobByEntranceList"  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,the_floor 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,the_floor,product_id,product_name from mydo_job_wcs
         where entrance_id in
         <foreach item="item" index="index" collection="entranceList" separator="," open="(" close=")">
             #{item}
@@ -227,10 +238,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
             <if test="theFloor != null  and theFloor != ''"> and the_floor = #{theFloor}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</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,the_floor 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,the_floor,product_id,product_name from mydo_job_wcs
         where exit_id in
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}