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

add qd

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-06-12 13:51:11 +08:00
parent a2caa4f214
commit 31936a81f5
445 changed files with 46275 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
View File

@@ -2043,13 +2043,5 @@ public class AgvServiceImpl implements AgvService {
}
return ret;
}
public static void main(String[] args) {
String address = "L1-01-01";
if (address.indexOf("-") > 0) {
String str = address.substring(address.indexOf("-"), address.length());
address = address.substring(0, address.indexOf("-"));
System.out.println(address);
}
}
}

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

@@ -305,7 +305,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
case 4:
this.cancle_require();
break;
case 5:
if (!emptyrequireSucess){
@@ -415,7 +415,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
server.dispose();
}
public void writing(int type, int command) {
@@ -462,16 +462,21 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
} else {
this.instruction_require_time = date;
List<TaskDto> taskList = taskserver.queryTaskByDeviceCode(this.devicecode);
if(taskList.size() != 0){
for(int i=0;i<taskList.size();i++){
TaskDto task = taskList.get(i);
Instruction inst = instructionService.findByTaskCodeFromCache(task.getTask_code());
if(ObjectUtil.isNotEmpty(inst)){
instructionService.cancel(inst.getInstruction_id());
try{
if(taskList.size() != 0){
for(int i=0;i<taskList.size();i++){
TaskDto task = taskList.get(i);
Instruction inst = instructionService.findByTaskCodeFromCache(task.getTask_code());
if(ObjectUtil.isNotEmpty(inst)){
instructionService.cancel(inst.getInstruction_id());
}
taskserver.cancel(task.getTask_id());
}
taskserver.cancel(task.getTask_id());
}
} catch (Exception e){
e.printStackTrace();
}
writing(4);
return true;
}
}
@@ -538,7 +543,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
String taskcode = CodeUtil.getNewCode("TASK_NO");
dto.setTask_code("-" + taskcode);
dto.setTask_status("0");
dto.setPriority("101");
dto.setPriority("1");
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setUpdate_time(now);
dto.setCreate_time(now);
@@ -565,6 +570,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
map.put("update_time", DateUtil.now());
runpointwo.update(map, "device_code = '" + next_device_code + "'");*/
flag = true;
writing(3);
break;
} catch (Exception e) {
this.execute_log.log("设备:" + devicecode+ "", "", "创建任务失败");

38
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -242,14 +242,16 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//检测站点
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if (standardInspectSiteDeviceDriver.getMove() != 0) {
inst.setExecute_status("1");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
log.info("AGV请求取货设备{}无货,无法反馈", device_code);
}
// if (standardInspectSiteDeviceDriver.getMove() != 0) {
// inst.setExecute_status("1");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// log.info("AGV请求取货设备{}无货,无法反馈", device_code);
// }
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//空盘堆叠站点
if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
@@ -342,14 +344,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if (standardInspectSiteDeviceDriver.getMove() == 0) {
inst.setExecute_status("5");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
log.info("AGV取货完成请求离开设备{}有货,无法反馈", device_code);
}
// if (standardInspectSiteDeviceDriver.getMove() == 0) {
// inst.setExecute_status("5");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// log.info("AGV取货完成请求离开设备{}有货,无法反馈", device_code);
// }
data = AgvService.sendAgvOneModeInst(phase, index, 0);
standardInspectSiteDeviceDriver.writing(2);
flag = true;
}
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
@@ -558,6 +563,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (standardInspectSiteDeviceDriver.getMove() != 0) {
inst.setExecute_status("6");
instructionService.update(inst);
standardInspectSiteDeviceDriver.writing(3);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {