From 91ea5339a5ee8976cc2a9f773e09e8cd5f844ef4 Mon Sep 17 00:00:00 2001 From: zj Date: Thu, 8 Jan 2026 08:53:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssj/floor2/Floor2InOutSsjThread.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java index c6f7860..f868fe4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.List; import static com.ruoyi.common.TaskStatusCode.*; +import static com.ruoyi.common.utils.Threads.sleep; import static com.ruoyi.schedule.plcRead.ssj.PlcSsjRead.writeToSsj; import static com.ruoyi.schedule.plcRead.ssj.PlcSsjRead.writeToSsjQH; @@ -103,16 +104,16 @@ public class Floor2InOutSsjThread implements Runnable { //不允许放货 等着 if (!agvQueues.isEmpty() && inSsjDevice.getAllowPut() == 0 && "L1001".equals(inSsjDevice.getDeviceCode())) { //下发输送线切换导向 DB未知 - int i = writeToSsjQH("DB802.106", Integer.parseInt(agvQueues.get(0).getCtnrType())); + int i = writeToSsjQH("DB802.106", Integer.parseInt(agvQueues.get(0).getCtnrCode())); if (i == 1) { - log.info("输送机{}下发切换导向{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getCtnrType()); + log.info("输送机{}下发切换导向{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getCtnrCode()); } } if (!agvQueues.isEmpty() && inSsjDevice.getAllowPut() == 0 && "L1003".equals(inSsjDevice.getDeviceCode())) { //下发输送线切换导向 DB未知 - int i = writeToSsjQH("DB802.118", Integer.parseInt(agvQueues.get(0).getCtnrType())); + int i = writeToSsjQH("DB802.118", Integer.parseInt(agvQueues.get(0).getCtnrCode())); if (i == 1) { - log.info("输送机{}下发切换导向{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getCtnrType()); + log.info("输送机{}下发切换导向{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getCtnrCode()); } } @@ -137,15 +138,16 @@ public class Floor2InOutSsjThread implements Runnable { if (!agvQueues.isEmpty()) { //解绑AGV容器 apiService.deleteAgvTray(agvQueues.get(0)); + sleep(10000); if("L1001".equals(inSsjDevice.getDeviceCode())) { - int i = writeToSsj("DB802.100", agvQueues.get(0).getWmsTaskNo(), 2,Integer.parseInt(agvQueues.get(0).getCtnrType())); + int i = writeToSsj("DB802.100", agvQueues.get(0).getWmsTaskNo(), 2,Integer.parseInt(agvQueues.get(0).getCtnrCode())); if (i == 1) { log.info("输送机{}AGV放货完成下发任务号{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getWmsTaskNo()); } } if("L1003".equals(inSsjDevice.getDeviceCode())) { - int i = writeToSsj("DB802.112", agvQueues.get(0).getWmsTaskNo(), 2,Integer.parseInt(agvQueues.get(0).getCtnrType())); + int i = writeToSsj("DB802.112", agvQueues.get(0).getWmsTaskNo(), 2,Integer.parseInt(agvQueues.get(0).getCtnrCode())); if (i == 1) { log.info("输送机{}AGV放货完成下发任务号{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getWmsTaskNo()); @@ -172,7 +174,7 @@ public class Floor2InOutSsjThread implements Runnable { if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) { MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(inSsjDevice.getTaskNo())); - if (mydoJob != null) { + if (mydoJob != null && Integer.parseInt(mydoJob.getInOrOut()) > 20) { log.info("设备：{} 位置：{} 任务号：{} 出库到位", "输送线", inSsjDevice.getDeviceCode(), mydoJob.getTaskNo()); mydoJobService.insertHistory(mydoJob.getJobId()); mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());