diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index b43d9b9c0..15e8e2f1e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -752,8 +752,10 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { //如果是放货二次分配,取放货二次分配需要重新追加动作块 if (AgvActionTypeEnum.OUT_STOCK.getCode().equals(instructionDto.getAgv_action_type()) || AgvActionTypeEnum.IN_OUT_STOCK.getCode().equals(instructionDto.getAgv_action_type())) { Integer actionType = ActionTypeEnum.OUT_STOCK.getCode(); -// deviceCodeNow = applyXGAgvTask(task_code, actionType, instructionDto); +// deviceCodeNow = applyXGAgvTask(task_code, actionType, instructionDto); deviceCodeNow = "ZXQ_05"; + sendAddSequencesToNBAgv(instructionDto.getInstruction_code(), deviceCodeNow, instructionDto); + return agvWaitUtil.waitInPut(deviceCodeNow, instructionDto); } return agvWaitUtil.waitInPut(deviceCodeNow, instructionDto);