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

更新

Browse Source
This commit is contained in:
gengby
2022-07-29 18:00:11 +08:00
parent 1b813598ff
commit 922973f09e
4 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -1046,6 +1046,13 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
}
} else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
int mode = standardInspectSiteDeviceDriver.getMode();
if (mode == 5){
standardInspectSiteDeviceDriver.setEmptyrequireSucess(false);
}
if (mode == 6){
standardInspectSiteDeviceDriver.setInrequireSucess(false);
}
standardInspectSiteDeviceDriver.setMaterial(material_type);
standardInspectSiteDeviceDriver.setBatch(batch);
device.setMaterial_type(material_type);

10
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -144,11 +144,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (mode != last_mode) {
if (mode == 5){
if (move != last_move){
if (move == 0){
this.setEmptyrequireSucess(false);
}
}
this.setEmptyrequireSucess(false);
}
if (mode == 6){
this.setInrequireSucess(false);
@@ -300,7 +296,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
case 5:
if (!emptyrequireSucess){
//mode = 5 并且工位上无货时申请空托盘
if (move == 0){
if (move == 0 && mode == 5){
this.execute_log.log("设备:" + devicecode + ",move:" + move);
this.apply_empty_require(container);
}
@@ -308,7 +304,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
break;
case 6:
if (!inrequireSucess){
if (move == 1){
if (move == 1 && mode == 6){
this.execute_log.log("设备:" + devicecode + ",move:" + move);
this.apply_in_require(container);
}

36
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -164,6 +164,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid);
StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
StandardOrdinarySiteDeviceDriver StandardOrdinarySiteDeviceDriver;
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
for (int i = 0; i < ja.size(); i++) {
JSONObject jo = (JSONObject) ja.get(i);
@@ -253,9 +254,42 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
}
}
if (nextdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver){
StandardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) nextdevice.getDeviceDriver();
int num = taskserver.querySameDestinationTask(next_device_code);
if (num != 0) {
continue;
}
TaskDto dto = new TaskDto();
String now = DateUtil.now();
dto.setTask_id(IdUtil.simpleUUID());
dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setStart_point_code(this.getDevice().getDevice_code());
dto.setCreate_time(now);
dto.setUpdate_time(now);
String taskcode = CodeUtil.getNewCode("TASK_NO");
dto.setTask_code("-" + taskcode);
dto.setTask_status("0");
dto.setPriority("101");
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setNext_point_code(next_device_code);
dto.setUpdate_time(now);
dto.setCreate_time(now);
//判断是否已经有该起点设备的任务,如果有就结束循环
try {
taskserver.create(dto);
flag = true;
break;
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (flag){
this.setIslock(true);
requireSucess = true;
branchProtocol = 0;
this.execute_log.log("设备:" + devicecode+ "", "", "对应路由设备，生成任务成功已锁定");

16
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -1128,6 +1128,22 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
agvService.markComplete(entity.getTask_code());
}
}
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (startDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startDevice.getDeviceDriver();
int mode = standardInspectSiteDeviceDriver.getMode();
if (mode == 6){
standardInspectSiteDeviceDriver.setInrequireSucess(false);
}
}
if (nextDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextDevice.getDeviceDriver();
int mode = standardInspectSiteDeviceDriver.getMode();
if (mode == 5){
standardInspectSiteDeviceDriver.setInrequireSucess(false);
}
}
JSONObject jo1 = new JSONObject();
jo1.put("device_code",entity.getStart_device_code());
jo1.put("islock", "0");