From 9bc0cbf6209555659782501fdca0b8427f30d9cf Mon Sep 17 00:00:00 2001
From: lsymicc <e003914@163.com>
Date: Thu, 9 Apr 2026 14:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BF=AE=E6=94=B9=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

---
 .../scheduleTask/ssj/PortConvThread.java      | 65 +++++++++++--------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
index 43fe1a4..71ac7f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
@@ -100,14 +100,14 @@ public class PortConvThread implements Runnable {
 
     public void inDispatch(DeviceSsj inSsjDevice) {
         // 测试数据
-        inSsjDevice.setInOrOut(1);
-        inSsjDevice.setTrayCode("T888888");
-        inSsjDevice.setTaskNo(85012);
-        inSsjDevice.setKx(0);
-        inSsjDevice.setDw(1);
+//        inSsjDevice.setInOrOut(1);
+//        inSsjDevice.setTrayCode("T888888");
+//        inSsjDevice.setTaskNo(85012);
+//        inSsjDevice.setKx(0);
+//        inSsjDevice.setDw(1);
 //        inSsjDevice.setHeight("1");
 //        inSsjDevice.setWeight("100");
-        inSsjDevice.setException(0);
+//        inSsjDevice.setException(0);
 //        inSsjDevice.setRkqq(1);
 
         switch (inSsjDevice.getInOrOut()) {
@@ -124,31 +124,10 @@ public class PortConvThread implements Runnable {
                     requestMydoJob(inSsjDevice);
 
                 }
-
                 break;
             //---------------------------出库模式---------------------------
             case 2:
-                //出库到位
-                if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) {
-                    //查询该出库任务
-                    MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(inSsjDevice.getTaskNo()));
-                    if (mydoJob != null && Integer.parseInt(mydoJob.getInOrOut()) > 20) {
-                        log.info("【出库到位】设备:{}，位置:{}，任务号:{}，出库到位", "输送线:", inSsjDevice.getDeviceCode(), mydoJob.getTaskNo());
-                        mydoJobService.insertHistory(mydoJob.getJobId());
-                        mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
-                        JobCallBack jobCallBack = new JobCallBack();
-                        jobCallBack.setType("2");
-                        jobCallBack.setMydojobId(mydoJob.getJobId());
-                        jobCallBack.setStatus("0");
-                        jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo()));
-                        jobCallBack.setCreateTime(new Date());
-                        jobCallBack.setTaskTypeCode("");//todo ???
-                        jobCallBack.setReqCode(UUID.randomUUID().toString().replace("-", ""));
-                        jobCallBack.setTaskCode(mydoJob.getWmsTaskNo());
-//                        jobCallBack.setSpare1("0");
-                        jobCallBackService.insertJobCallBack(jobCallBack);
-                    }
-                }
+                finishStockoutMydoJob(inSsjDevice);
                 break;
 
         }
@@ -251,6 +230,8 @@ public class PortConvThread implements Runnable {
         return m.find() ? m.group(1) : null;
     }
 
+
+
     /**
      * 请求wms获取wcs任务参数
      * @param inSsjDevice
@@ -400,4 +381,32 @@ public class PortConvThread implements Runnable {
         }
     }
 
+    /**
+     * 输送机出库到位 - 任务出库完成
+     * @param inSsjDevice
+     */
+    private void finishStockoutMydoJob(DeviceSsj inSsjDevice){
+//出库到位
+        if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) {
+            //查询该出库任务
+            MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(inSsjDevice.getTaskNo()));
+            if (mydoJob != null && Integer.parseInt(mydoJob.getInOrOut()) > 20) {
+                log.info("【出库到位】设备:{}，位置:{}，任务号:{}，出库到位", "输送线:", inSsjDevice.getDeviceCode(), mydoJob.getTaskNo());
+                mydoJobService.insertHistory(mydoJob.getJobId());
+                mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
+                JobCallBack jobCallBack = new JobCallBack();
+                jobCallBack.setType("2");
+                jobCallBack.setMydojobId(mydoJob.getJobId());
+                jobCallBack.setStatus("0");
+                jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo()));
+                jobCallBack.setCreateTime(new Date());
+                jobCallBack.setTaskTypeCode("");//todo ???
+                jobCallBack.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+                jobCallBack.setTaskCode(mydoJob.getWmsTaskNo());
+//                        jobCallBack.setSpare1("0");
+                jobCallBackService.insertJobCallBack(jobCallBack);
+            }
+        }
+    }
+
 }