From 1c3f1147dd027759c3a955efcd7a60a76e5087f2 Mon Sep 17 00:00:00 2001 From: zj Date: Mon, 5 Jan 2026 21:20:59 +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 --- .../scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java | 2 -- .../scheduleTask/ssj/floor2/Floor2InOutSsjThread.java | 5 ----- .../scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java | 1 - .../schedule/scheduleTask/ssj/floor2/LineSsjThread.java | 4 ++-- 4 files changed, 2 insertions(+), 10 deletions(-) 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 c96fa5b1..9875beed 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 @@ -166,7 +166,6 @@ public class Floor1BothWayInSsjThread implements Runnable { //根据托盘码请求入库作业 HashMap paramMap = new HashMap<>(); paramMap.put("trayCode", ssj.getTrayCode()); - //paramMap.put("size", ssj.getTraySize()); paramMap.put("floor", "1"); paramMap.put("entranceId",ssj.getDeviceCode()); AjaxResult result = apiService.selectMydoJobByTrayCodeAndEntranceId(paramMap); @@ -225,7 +224,6 @@ public class Floor1BothWayInSsjThread implements Runnable { }else { //不存在扫不到托盘码的任务 HashMap paramMap = new HashMap<>(); -// paramMap.put("size", ssj.getTraySize()); paramMap.put("entranceId",ssj.getDeviceCode()); AjaxResult ajaxResult = apiService.selectMydoJobByNoTrayCode(paramMap); if (ajaxResult.isSuccess()) { 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 96840f94..c6f78600 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 @@ -227,7 +227,6 @@ public class Floor2InOutSsjThread implements Runnable { HashMap map = new HashMap<>(); map.put("trayCode",ssjDevice.getTrayCode()); map.put("entranceId",ssjDevice.getDeviceCode()); -// map.put("size", ssjDevice.getTraySize()); map.put("floor", "2"); AjaxResult ajaxResult = apiService.selectMydoJobByTrayCodeAndEntranceId(map); if(ajaxResult.isSuccess()){ @@ -251,10 +250,7 @@ public class Floor2InOutSsjThread implements Runnable { log.info(ssjDevice.getDeviceCode()+"输送机没取到作业下发输送线" ); } } - } - - } if(StrUtil.isBlank(ssjDevice.getTrayCode()) && ssjDevice.getRkqq()==1 && ssjDevice.getTaskNo()<1000){ @@ -263,7 +259,6 @@ public class Floor2InOutSsjThread implements Runnable { mydoJob1.setInOrOut("1"); mydoJob1.setEntranceId(ssjDevice.getDeviceCode()); // mydoJob1.setStatus("1"); - List mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob1); if(!mydoJobs.isEmpty()){ MydoJob mydoJob2 = mydoJobs.get(0); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java index dc66dce0..8a8b601b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java @@ -77,7 +77,6 @@ public class Floor2RoadWaySsjThread implements Runnable { } catch (RuntimeException e) { log.error(e.getMessage(),e); } - } break; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java index c5242375..034a3e0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java @@ -94,7 +94,7 @@ public class LineSsjThread implements Runnable { //如果到位，扫到条码，托盘大小，执行阶段卡控一下（下发输送机后改执行阶段） if (SsjDevice.getRkqq() == 1 && StrUtil.isNotBlank(SsjDevice.getTrayCode()) && SsjDevice.getTraySize() != 0 && SsjDevice.getTaskNo() < 1000) { - log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线到位", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); + //log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线到位", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); //查作业，入如果已经有了，直接下发输送线 MydoJob mydoJob = new MydoJob(); @@ -173,7 +173,7 @@ public class LineSsjThread implements Runnable { if (SsjDevice.getRkqq() == 1 && StrUtil.isBlank(SsjDevice.getTrayCode()) && SsjDevice.getTraySize() != 0 && SsjDevice.getTaskNo() < 1000) { - log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); + //log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); //查wcs有没作业，有下发给输送机任务号，覆盖任务号 MydoJob mydoJob = new MydoJob(); mydoJob.setInOrOut("1");