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

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-07-16 14:50:26 +08:00
parent bbfcb7bf94
commit 1ab6715791
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/agvDefination/ndc/AgvNdcOneDeviceDriver.java
View File

@@ -141,7 +141,7 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
// 二次分配处理 // 二次分配处理
data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
// 判断是否需要二次分配 // 判断是否需要二次分配
if ("A".equals(inst.getStart_device_code())) { if ("10".equals(inst.getStart_device_code())) {
// 向WMS申请新点位 // 向WMS申请新点位
JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getStart_device_code()); JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getStart_device_code());
if (response != null && response.getInteger("responseCode") == 0 if (response != null && response.getInteger("responseCode") == 0
@@ -169,6 +169,8 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
// 返回NDC更换新位置 // 返回NDC更换新位置
data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew")); data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew"));
} }
} else {
data = null;
} }
//(需要WCS反馈) //(需要WCS反馈)
} else if (phase == 0x03) { } else if (phase == 0x03) {
@@ -280,7 +282,7 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
// 二次分配处理 // 二次分配处理
data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
// 判断是否需要二次分配 // 判断是否需要二次分配
if ("A".equals(inst.getNext_device_code())) { if ("10".equals(inst.getNext_device_code())) {
// 向WMS申请新点位 // 向WMS申请新点位
JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getNext_device_code()); JSONObject response = acsToWmsService.taskRedirection(task.getTask_code(), inst.getNext_device_code());
if (response != null && response.getInteger("responseCode") == 0 if (response != null && response.getInteger("responseCode") == 0
@@ -306,6 +308,8 @@ public class AgvNdcOneDeviceDriver extends AbstractStandardDeviceDriver {
instructionService.update(inst); instructionService.update(inst);
// 返回NDC更换新位置 // 返回NDC更换新位置
data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew")); data = ndcAgvService.sendAgvOneModeInstDis(phase, index, response.getString("locationNew"));
} else {
data = null;
} }
} }
} else if (phase == 0x07) { } else if (phase == 0x07) {