From a3ad778fbddb123db352358d6385d2bf35ef57bc Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 9 Mar 2023 18:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard_autodoor/StandardAutodoorDeviceDriver.java | 2 +- .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 1 - .../nl/acs/instruction/service/impl/InstructionServiceImpl.java | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index ca4a03c45..d314b68ef 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -81,7 +81,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem } if(this.getClose() == 0){ open = "未知"; - } else if(this.getOpen() == 1){ + } else if(this.getClose() == 1){ open = "关到位"; } jo.put("device_name", this.getDevice().getDevice_name()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 4c42b5160..b4bc77895 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -774,7 +774,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { public Map updateTask(String whereJson) { JSONArray datas = JSONArray.parseArray(whereJson); log.info("updateTask--------------:输入参数" + datas.toString()); - JSONObject map = new JSONObject(); JSONArray errArr = new JSONArray(); if (datas.size() > 0) { for (int i = 0; i < datas.size(); i++) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index bb636cf0b..282143736 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -782,6 +782,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu public void finish(Instruction dto) { String now = DateUtil.now(); dto.setInstruction_status("2"); + dto.setUpdate_time(now); WQLObject wo = WQLObject.getWQLObject("acs_instruction"); JSONObject json = (JSONObject) JSONObject.toJSON(dto);