From ef3366e30b4664c04ba0ddca39f125f4aeadde09 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 24 Sep 2025 11:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=A5=BC=E5=85=A5=E5=BA=93=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/api/service/IApiService.java    |  2 +
 .../api/service/impl/ApiServiceImpl.java      |  5 +++
 .../ssj/floor1/Floor1BothWayInSsjThread.java  | 39 ++++++++++++-------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
index e6c77fe7..35b91867 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
@@ -158,4 +158,6 @@ public interface IApiService
      * 入库请求生成作业
      */
     public AjaxResult createInMydoJob(Map<String, Object> param);
+
+    public AjaxResult requestEnterByEnterIdAndTrayCode();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
index a98322ec..09ec94ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
@@ -395,4 +395,9 @@ public class ApiServiceImpl implements IApiService {
             return AjaxResult.error();
         }
     }
+
+    @Override
+    public AjaxResult requestEnterByEnterIdAndTrayCode() {
+        return null;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
index f04b7740..2861667c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
@@ -10,6 +10,7 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRespons
 import com.ruoyi.api.service.IApiService;
 import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.domain.SendData;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.job.domain.MydoJob;
@@ -154,22 +155,30 @@ public class Floor1BothWayInSsjThread implements Runnable {
                 }
             } else {
                 if (StrUtil.isNotEmpty(ssj.getTrayCode())) {
-                    SendData qx = new SendData(Tools.INT, 1);
-                    SendData rwh = new SendData(Tools.DINT, ssj.getTaskNo());
-                    byte[] bytes = Tools.sendData(qx, rwh);
-                    int i = 0;
-                    //下发去向 和任务号
-                    switch (ssj.getDeviceCode()) {
-                        case "L2005":
-                            i = PlcSsjRead.WriteToSSJ("DB501.20", bytes);
+                    //根据托盘码请求入库作业
+                    AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode();
+                    if (result.isSuccess()) {
+                        MydoJob inJob = (MydoJob) result.get("data");
+                        mydoJobService.insertMydoJob(inJob);
+                        SendData qx = new SendData(Tools.INT, 1);
+                        SendData rwh = new SendData(Tools.DINT, inJob.getTaskNo());
+                        byte[] bytes = Tools.sendData(qx, rwh);
+                        int i = 0;
+                        //下发去向 和任务号
+                        switch (ssj.getDeviceCode()) {
+                            case "L2005":
+                                i = PlcSsjRead.WriteToSSJ("DB501.20", bytes);
 
-                            break;
-                        case "L2012":
-                            i = PlcSsjRead.WriteToSSJ("DB501.30", bytes);
-                            break;
-                    }
-                    if (i == 1) {
-                        log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode());
+                                break;
+                            case "L2012":
+                                i = PlcSsjRead.WriteToSSJ("DB501.30", bytes);
+                                break;
+                        }
+                        if (i == 1) {
+                            log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode());
+                        }
+                    }else {
+                        log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode());
                     }
                 } else {
                     //回退