From 2b00aa9ea1d96b8be6a1d861966ec722977bab12 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Thu, 24 Oct 2024 13:58:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E5=88=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=BB=A1=E8=BD=B4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oven_manipulator/OvenGantryManipulatorDeviceDriver.java | 4 ++-- .../wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 78eec18e6..827aae606 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -954,8 +954,8 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (StrUtil.isNotEmpty(taskDto.getOven_time())) { //下发烘箱时间 int time = Integer.parseInt(taskDto.getOven_time()); - int hours = (time % (60 * 60 * 24)) / (60 * 60); - int minutes = (time % (60 * 60)) / 60; + int hours = (time / (60 * 60)); // 整数小时 + int minutes = (time % (60 * 60)) / 60; // 剩余分钟 map.put("to_time_house", String.valueOf(hours)); map.put("to_time_min", String.valueOf(minutes)); hongXiangConveyorDeviceDriver.writing(map); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java index c4812e328..35379ad9f 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java @@ -78,7 +78,7 @@ public class SlitterUpAGVTask extends AbstractTask { // 四点任务 task.setPoint_code1(deviceCode); task.setPoint_code2(cutPoint.getFull_point_code()); - task.setPoint_code3(cutPoint.getFull_point_code()); + task.setPoint_code3(cutPoint.getEmpty_point_code()); task.setPoint_code4(sjgPoint.getPoint_code()); } // 创建任务