root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：装箱机

Browse Source 
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
This commit is contained in:
jiaoliming
2023-09-01 10:01:03 +08:00
parent 01fd8b0d19
commit 1f07dab81f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
View File

@@ -245,7 +245,11 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("device_code", this.getDevice().getDevice_code()); jo.put("device_code", this.getDevice().getDevice_code());
jo.put("device_name", this.getDevice().getDevice_name()); 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("isOnline", this.itemProtocol.getIsonline());
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());
return jo; return jo;
} }
@@ -259,8 +263,8 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement
public void issuedOrderInfo(ProduceshiftorderDto dto) { public void issuedOrderInfo(ProduceshiftorderDto dto) {
EalingOrderDto ealingOrderDto = dto.getEalingOrderDto(); EalingOrderDto ealingOrderDto = dto.getEalingOrderDto();
if (ObjectUtil.isNotEmpty(ealingOrderDto)) { if (ObjectUtil.isNotEmpty(ealingOrderDto)) {
this.writing("to_clear", "1");
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_clear", "1");
map.put("to_order", ealingOrderDto.getOrder_code()); map.put("to_order", ealingOrderDto.getOrder_code());
map.put("to_order_box_num", ealingOrderDto.getOrder_box_num()); map.put("to_order_box_num", ealingOrderDto.getOrder_box_num());
map.put("to_order_bag_num", ealingOrderDto.getOrder_bag_num()); map.put("to_order_bag_num", ealingOrderDto.getOrder_bag_num());