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

OPT：套件接口优化

Browse Source
This commit is contained in:
tuqiang
2026-02-28 13:32:30 +08:00
parent 0a2dfed98c
commit 738110ca9b
3 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
Object ext_system = device.getExtraValue().get("ext_system"); Object ext_system = device.getExtraValue().get("ext_system");
@@ -206,7 +206,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.error("请求wms取货失败参数:{}", response); log.error("请求wms取货失败参数:{}", response);
@@ -257,7 +257,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.error("请求焊接线失败，申请区货 错误信息{}", response); log.error("请求焊接线失败，申请区货 错误信息{}", response);
@@ -280,7 +280,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
} else { } else {
@@ -313,7 +313,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
Object ext_system = device.getExtraValue().get("ext_system"); Object ext_system = device.getExtraValue().get("ext_system");
@@ -341,7 +341,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.error("请求wms取货失败参数:{}", response); log.error("请求wms取货失败参数:{}", response);
@@ -385,7 +385,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.info("请求焊接线失败，申请取货完成 错误信息{}", response2); log.info("请求焊接线失败，申请取货完成 错误信息{}", response2);
@@ -415,7 +415,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
} }
@@ -442,7 +442,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
Object ext_system = device.getExtraValue().get("ext_system"); Object ext_system = device.getExtraValue().get("ext_system");
@@ -470,7 +470,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.error("请求wms请求放货失败参数:{}", response); log.error("请求wms请求放货失败参数:{}", response);
@@ -503,7 +503,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
log.error("请求焊接线放货失败，申请区货 错误信息{}", response); log.error("请求焊接线放货失败，申请区货 错误信息{}", response);
@@ -521,7 +521,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
} else { } else {
@@ -547,7 +547,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} else { } else {
Object ext_system = device.getExtraValue().get("ext_system"); Object ext_system = device.getExtraValue().get("ext_system");
@@ -575,7 +580,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} else { } else {
log.error("请求wms放货失败参数:{}", response); log.error("请求wms放货失败参数:{}", response);
@@ -618,7 +628,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} else { } else {
log.info("请求焊接线放货货完成失败 错误信息{}", response2); log.info("请求焊接线放货货完成失败 错误信息{}", response2);
@@ -650,7 +665,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} else { } else {
log.info("请求MES放货货完成失败 错误信息{}", responseCode); log.info("请求MES放货货完成失败 错误信息{}", responseCode);
@@ -870,6 +890,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
// B设置新任务 // B设置新任务
@Override @Override
public void setDeviceInnerParam(String taskId, String agvphase) { public void setDeviceInnerParam(String taskId, String agvphase) {
System.out.println("任务号:"+taskId+"-------"+agvphase);
synchronized (lock) { synchronized (lock) {
// 不允许设置和上次处理相同的taskId // 不允许设置和上次处理相同的taskId
if (taskId.equals(lastTakeInstCode)) { if (taskId.equals(lastTakeInstCode)) {
@@ -883,11 +904,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
} }
} }
// B设置新任务 // B设置新任务
public void resetInstTask() { public void resetInstTask(Integer agvphase) {
synchronized (lock) { synchronized (lock) {
// 设置新任务 // 设置新任务
// 处理完成，更新状态 // 处理完成，更新状态
this.lastTakeInstCode = reqTakeInstCode; if (Integer.valueOf(4).equals(agvphase)){
this.lastTakeInstCode = reqTakeInstCode;
}
this.reqTakeRequireSuccess = false; this.reqTakeRequireSuccess = false;
this.reqTakeInstCode = null; this.reqTakeInstCode = null;
this.agvphase = 0; this.agvphase = 0;

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

@@ -161,7 +161,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
if (agvphase == 2) { if (agvphase == 2) {
@@ -181,7 +181,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} else { } else {
//MES下发需要上报取货完成 //MES下发需要上报取货完成
@@ -204,7 +204,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
} }
@@ -224,7 +224,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); resetInstTask(agvphase);
} }
} }
if (agvphase == 4) { if (agvphase == 4) {
@@ -244,7 +244,12 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} else { } else {
//mes下发需要上报放货完成 //mes下发需要上报放货完成
@@ -284,7 +289,12 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
} else { } else {
resetInstTask(); try {
instructionService.finish(instruction.getInstruction_id());
} catch (Exception e) {
e.printStackTrace();
}
resetInstTask(agvphase);
} }
} }
} }
@@ -355,11 +365,13 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
} }
} }
// B设置新任务 // B设置新任务
public void resetInstTask() { public void resetInstTask(Integer agvphase) {
synchronized (lock) { synchronized (lock) {
// 设置新任务 // 设置新任务
// 处理完成，更新状态 // 处理完成，更新状态
this.lastTakeInstCode = reqTakeInstCode; if (Integer.valueOf(4).equals(agvphase)){
this.lastTakeInstCode = reqTakeInstCode;
}
this.reqTakeRequireSuccess = false; this.reqTakeRequireSuccess = false;
this.reqTakeInstCode = null; this.reqTakeInstCode = null;
this.agvphase = 0; this.agvphase = 0;

1
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java
View File

@@ -117,7 +117,6 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
} }
//taskPhase 任务完成 //taskPhase 任务完成
if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){ if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){
instructionService.finish(instruction.getInstruction_id());
resp.put("code", "200"); resp.put("code", "200");
resp.put("message", "完成任务成功"); resp.put("message", "完成任务成功");
log.info("---响应kit请求---"+resp.toString()); log.info("---响应kit请求---"+resp.toString());