From 9d1aa573bf114937dde7bd5fc3feffd28e6f11fa Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 13 Sep 2022 19:58:24 +0800 Subject: [PATCH] =?UTF-8?q?agv=E6=94=BE=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=86=99=E5=85=A5=E6=8C=87=E4=BB=A4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java | 2 +- .../lnsh/lnsh_station/LnshStationDeviceDriver.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 4892fdd..508db6d 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -598,7 +598,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() > 0) { inst.setExecute_device_code(address); inst.setExecute_status("4"); -// lnshStationDeviceDriver.writing(3); + lnshStationDeviceDriver.setInst(inst); is_feedback = true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index 2d1c865..6d49295 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -279,6 +279,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements //放货完成 case 4: writing(3); + this.writing(2,Integer.parseInt(inst.getInstruction_code())); return; } }