From 759deb6f34c55eacf8f2895cb2e6623f1c5b1729 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Thu, 27 Jun 2024 09:35:47 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=88=86=E9=85=8D=E9=A1=B6=E7=82=B9=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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);