From 67ff3cb5330d5729497fa01ded04fd512f4b2381 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 4 Dec 2025 17:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87=E6=9C=BA=E8=B0=83=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/scheduleTask/tsj/TsjThread.java | 65 ------------------- 1 file changed, 65 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java index 58200f0..cc8967f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java @@ -90,13 +90,6 @@ public class TsjThread implements Runnable { finishSend(rwh); } - /* - * 2、四向车任务生成 2-工作 ,触发方式 2-自动,任务号大于999 - * - * */ - if (czfs == 2 && sbzt == 2 && jdbz == 4 && rwh > 999) { - createSRgvQueue(rwh); - } /* * 2、任务完成 * @@ -118,64 +111,6 @@ public class TsjThread implements Runnable { } - private void createSRgvQueue(Long rwh) { - WcsSrgvQueue sRgvQueueParam = new WcsSrgvQueue(); - sRgvQueueParam.setTaskNo(Convert.toStr(rwh)); - List wcsSrgvQueues = wcsSrgvQueueService.selectWcsSrgvQueueList(sRgvQueueParam); - if (CollUtil.isEmpty(wcsSrgvQueues)) { - return; - } - WcsSrgvQueue wcsSrgvQueue = wcsSrgvQueueService.insertHistory(Convert.toStr(rwh)); - //修改起点终点 - if (ObjUtil.isNotEmpty(wcsSrgvQueue)) { - wcsSrgvQueue.setCreateDate(DateUtil.formatDateTime(DateUtil.date())); - wcsSrgvQueue.setStartDate(null); - wcsSrgvQueue.setIssued("0"); - wcsSrgvQueue.setExecutionStatus("0"); - String startSite = ""; - String endSite = ""; - switch (wcsSrgvQueue.getDefault02()) { - case "1": - //入库 - //满车 - startSite = "tsj"; - endSite = wcsSrgvQueue.getCargoPlaceSite(); - break; - case "2": - //出库 - startSite = "tsj"; - endSite = wcsSrgvQueue.getCargoPlaceSite(); - break; - case "3": - //充电 - startSite = "tsj"; - endSite = wcsSrgvQueue.getCargoPlaceSite(); - break; - case "4": - //点到点 - switch (wcsSrgvQueue.getTaskType()) { - case "1": - startSite = "tsj"; - endSite = wcsSrgvQueue.getCargoPickSite(); - break; - case "2": - startSite = "tsj"; - endSite = wcsSrgvQueue.getCargoPlaceSite(); - break; - default: - log.info("任务类型错误"); - } - break; - } - - if (StrUtil.isNotEmpty(startSite) && StrUtil.isNotEmpty(endSite)){ - - wcsSrgvQueue.setStartSite(startSite); - wcsSrgvQueue.setEndSite(endSite); - wcsSrgvQueueService.updateWcsSrgvQueue(wcsSrgvQueue); - } - } - } /** * 创建进入提升机队列