1.新增 product_id和 product_name 字段

2.穿梭车线程注入回传表server

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;
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java

@@ -71,6 +71,11 @@ public class ScheduleThread {
         plcReadInit();
         //调度初始化
         scheduleInit();
+
+        startAllThread();
+
+        startAllThread2();
+
         log.info("调度服务执行成功");
     }
     /**

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);