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-12-18 16:56:22 +08:00
parent 4388fb151e
commit 7fc7d273fd
10 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
View File

@@ -1094,7 +1094,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
//烘箱行架
if (linkDevice.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) {
ovenGantryManipulatorDeviceDriver = (OvenGantryManipulatorDeviceDriver) linkDevice.getDeviceDriver();
if ((manipulatorAgvStationDeviceDriver.getAction() == 6 && ovenGantryManipulatorDeviceDriver.getMode() != 3)) {
if ((manipulatorAgvStationDeviceDriver.getAction() == 6 )) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(this.getDeviceCode())

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java
View File

@@ -256,7 +256,12 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
JSONObject jo = JSON.parseObject(str);
if (jo.getInteger("status") == 200) {
List list = new ArrayList();
Map<String, Object> map1 = new HashMap<>();
map1.put("code", "to_command");
map1.put("value", 7);
list.add(map1);
this.writing(list);
requireSucess = true;
return;
}

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/ItemProtocol.java
View File

@@ -111,6 +111,7 @@ public class ItemProtocol {
return this.getOpcFloatValue(item_to_temperature);
} ;
Boolean isonline;
Boolean isError = false;

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

@@ -953,10 +953,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (StrUtil.isNotEmpty(taskDto.getOven_time())) {
//下发烘箱时间
int time = Integer.parseInt(taskDto.getOven_time());
int hours = time / 60; // 整数小时
int minutes = time % 60 ; // 剩余分钟
map.put("to_time_house", String.valueOf(hours));
map.put("to_time_min", String.valueOf(minutes));
map.put("to_time_house", time);
hongXiangConveyorDeviceDriver.writing(map);
}
int mode = hongXiangConveyorDeviceDriver.getMode();
@@ -1109,7 +1106,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map.put("walk_y", this.walk_y);
map.put("isOnline", this.getIsonline());
map.put("requireActionSucess", requireActionSucess);
map.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
// map.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
map.put("isError", this.getIserror());
map.put("message", message);
map.put("feedMessage", feedMessage);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/roll_up_roller_manipulator/RollUpRollerManipulatorDeviceDriver.java
View File

@@ -224,7 +224,7 @@ public class RollUpRollerManipulatorDeviceDriver extends AbstractOpcDeviceDriver
if (error2 == 2) {
errorDispose(PointErrorTypeEnum.IN.getCode());
} else {
// errorDispose(PointErrorTypeEnum.OUT.getCode());
errorDispose(PointErrorTypeEnum.OUT.getCode());
}
}

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -830,8 +830,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("countdown_min", hongXiangConveyorDeviceDriver.getCountdown_min());
jo.put("countdown_sec", hongXiangConveyorDeviceDriver.getCountdown_sec());
//温度需要除以10
jo.put("temperature", hongXiangConveyorDeviceDriver.getTo_temperature() / 10);
jo.put("now_temperature", hongXiangConveyorDeviceDriver.getTemperature() / 10);
jo.put("temperature", Math.round(hongXiangConveyorDeviceDriver.getTo_temperature() / 10));
jo.put("now_temperature", Math.round(hongXiangConveyorDeviceDriver.getTemperature() / 10));
jo.put("door", hongXiangConveyorDeviceDriver.getDoor());
jo.put("finish", hongXiangConveyorDeviceDriver.getFinish());
jo.put("task", hongXiangConveyorDeviceDriver.getTask());