root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:分切添加满轴位

Browse Source
This commit is contained in:
ls
2024-10-24 13:58:23 +08:00
parent 8c066d751f
commit 2b00aa9ea1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -954,8 +954,8 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (StrUtil.isNotEmpty(taskDto.getOven_time())) { if (StrUtil.isNotEmpty(taskDto.getOven_time())) {
//下发烘箱时间 //下发烘箱时间
int time = Integer.parseInt(taskDto.getOven_time()); int time = Integer.parseInt(taskDto.getOven_time());
int hours = (time % (60 * 60 * 24)) / (60 * 60); int hours = (time / (60 * 60)); // 整数小时
int minutes = (time % (60 * 60)) / 60; int minutes = (time % (60 * 60)) / 60; // 剩余分钟
map.put("to_time_house", String.valueOf(hours)); map.put("to_time_house", String.valueOf(hours));
map.put("to_time_min", String.valueOf(minutes)); map.put("to_time_min", String.valueOf(minutes));
hongXiangConveyorDeviceDriver.writing(map); hongXiangConveyorDeviceDriver.writing(map);

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java
View File

@@ -78,7 +78,7 @@ public class SlitterUpAGVTask extends AbstractTask {
// 四点任务 // 四点任务
task.setPoint_code1(deviceCode); task.setPoint_code1(deviceCode);
task.setPoint_code2(cutPoint.getFull_point_code()); 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()); task.setPoint_code4(sjgPoint.getPoint_code());
} }
// 创建任务 // 创建任务