From 1f07dab81f2ae7ead8f282d04dc2264cc9a2a9c6 Mon Sep 17 00:00:00 2001 From: jiaoliming Date: Fri, 1 Sep 2023 10:01:03 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=A3=85=E7=AE=B1=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiaoliming --- .../hailiang_ealing_machine/EalingMachineDeviceDriver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java index a0d8f1e8..110ad439 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java @@ -245,7 +245,11 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement JSONObject jo = new JSONObject(); jo.put("device_code", this.getDevice().getDevice_code()); jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("order", task); + jo.put("mode", mode == 1 ? "联机" : "单机"); jo.put("isOnline", this.itemProtocol.getIsonline()); + jo.put("isError", this.getIserror()); + jo.put("message", this.getMessage()); return jo; } @@ -259,8 +263,8 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement public void issuedOrderInfo(ProduceshiftorderDto dto) { EalingOrderDto ealingOrderDto = dto.getEalingOrderDto(); if (ObjectUtil.isNotEmpty(ealingOrderDto)) { + this.writing("to_clear", "1"); Map map = new LinkedHashMap<>(); - map.put("to_clear", "1"); map.put("to_order", ealingOrderDto.getOrder_code()); map.put("to_order_box_num", ealingOrderDto.getOrder_box_num()); map.put("to_order_bag_num", ealingOrderDto.getOrder_bag_num());