From ede9c8a903707967af94e4db1ae4eb6022402a49 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Mon, 12 May 2025 10:23:16 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=94=9F=E7=AE=94=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=BE=E7=BD=AE=E5=B0=8F=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java | 2 +- .../java/org/nl/system/service/quartz/task/AutoCreateInst.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index e8280494e..1985f010f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -310,7 +310,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic && StrUtil.equals("true", manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("ignore_pickup_check").toString())) { byte[] dataSJG = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); TwoNDCSocketConnectionAutoRun.write(dataSJG); - Thread.sleep(3000); + Thread.sleep(5000); try { manipulatorAgvStationDeviceDriver.writing(2); } catch (Exception e) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 8c4388a08..63a66b4eb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -184,6 +184,7 @@ public class AutoCreateInst { }else { instdto.setAgv_inst_type("2"); } + instdto.setCarno("1"); } else if (StrUtil.equals(task_type, "3")) { instdto.setAgv_inst_type("2"); }else if (StrUtil.equals(task_type, "2")) {