From b8d6301e4a1a073bd4ec4c0239b1a2b530140354 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 29 Oct 2025 13:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=86=E5=9E=9B=E6=9C=BA=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java
index 53be582a..b103b068 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java
@@ -110,6 +110,7 @@ public class Ddj1Thread implements Runnable {
             if (ddjDeviceExecutionQueue != null) {
                 //修改队列执行阶段
                 ddjDeviceExecutionQueue.setRwzt(ddj.getJdbz());
+                ddjDeviceExecutionQueue.setSpare1("1");
                 ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
             }
         }
@@ -122,13 +123,16 @@ public class Ddj1Thread implements Runnable {
             //判断堆垛机上任务是否已重分，若未重分，则调用接口，请求重分货位
             Long rwh = ddj.getRwh();
             MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
-            if ("0".equals(mydoJob.getFaultFlag())){
+            DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
+            if ("0".equals(mydoJob.getFaultFlag()) && "1".equals(ddjDeviceExecutionQueue.getSpare1())) {
                 mydoJob.setStatus("1");
                 mydoJobService.updateMydoJob(mydoJob);
                 AjaxResult ajaxResult = apiService.reAssign(new JobParam(rwh.toString(), null, null));
                 if (ajaxResult.isSuccess()){
                     mydoJob.setFaultFlag("2");
                     mydoJobService.updateMydoJob(mydoJob);
+                    ddjDeviceExecutionQueue.setSpare1("0");
+                    ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
                 }
             }
         }
@@ -184,11 +188,11 @@ public class Ddj1Thread implements Runnable {
             Long rwh = ddj.getRwh();
             //对堆垛机执行队列中无已下发队列
             DdjDeviceExecutionQueue ddjDeviceExecutionQueueParam = new DdjDeviceExecutionQueue();
-            ddjDeviceExecutionQueueParam.setDdjxf("1");
+            ddjDeviceExecutionQueueParam.setDdjxf("0");
             ddjDeviceExecutionQueueParam.setDevId(ddj.getId());
             List<DdjDeviceExecutionQueue> ddjDeviceExecutionQueues = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueList(ddjDeviceExecutionQueueParam);
             //取堆垛机队列中，生成时间最早的执行队列下发
-            if (CollUtil.isEmpty(ddjDeviceExecutionQueues)) {
+            if (CollUtil.isNotEmpty(ddjDeviceExecutionQueues)) {
                 DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueues.get(0);
                 if (ddjDeviceExecutionQueue == null) {
                     return;