diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index c0abb625..7e14c5bb 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -27,11 +27,11 @@ public enum DriverTypeEnum { INSPECT_CONVEYOR_MONITOR(9, "standard_conveyor_monitor", "标准版-输送机-监控点", "conveyor"), - HAILIANG_PACKING(10, "hailiang_packing", "海亮包装项目-包装机", "conveyor"), + //HAILIANG_PACKING(10, "hailiang_packing", "海亮包装项目-包装机", "conveyor"), - HAILIANG_LABELING(11, "hailiang_labeling", "海亮包装项目-贴标机", "conveyor"), + //HAILIANG_LABELING(11, "hailiang_labeling", "海亮包装项目-贴标机", "conveyor"), - HAILIANG_COATING(12, "hailiang_coating", "海亮包装项目-裹膜机", "conveyor"), + //HAILIANG_COATING(12, "hailiang_coating", "海亮包装项目-裹膜机", "conveyor"), HAILIANG_SPECIAL_EMPTY_STATION(13, "hailiang_special_empty_station", "海亮专机空料点", "conveyor"), @@ -61,17 +61,17 @@ public enum DriverTypeEnum { HAILIANG_PACKER_STATION(26, "hailiang_packer_station", "海亮-包装机工位", "conveyor"), - HAILIANG_XJ_PLC_TEST(27, "hailiang_xj_plc_test", "海亮-信捷PLC", "conveyor"), + //HAILIANG_XJ_PLC_TEST(27, "hailiang_xj_plc_test", "海亮-信捷PLC", "conveyor"), - HAILIANG_SMART_PLC_TEST(28, "hailiang_smart_plc_test", "海亮-西门子SMART200PLC", "conveyor"), + //HAILIANG_SMART_PLC_TEST(28, "hailiang_smart_plc_test", "海亮-西门子SMART200PLC", "conveyor"), - HAILIANG_THREESTATION_SMART(29, "hailiang_threestation_smart", "海亮-三工位Smart200", "conveyor"), + //HAILIANG_THREESTATION_SMART(29, "hailiang_threestation_smart", "海亮-三工位Smart200", "conveyor"), - HAILIANG_FOLDINGDISC_SMART(30, "hailiang_foldingDisc_smart", "海亮-叠盘位Smart200", "conveyor"), + //HAILIANG_FOLDINGDISC_SMART(30, "hailiang_foldingDisc_smart", "海亮-叠盘位Smart200", "conveyor"), - HAILIANG_ELEVATOR_WIRING(31, "hailiang_elevator_wiring", "海亮-货梯对接线", "conveyor"), + //HAILIANG_ELEVATOR_WIRING(31, "hailiang_elevator_wiring", "海亮-货梯对接线", "conveyor"), - HAILIANG_PAINT_LINE(32, "hailiang_paint_line", "海亮-油漆线", "conveyor"), + //HAILIANG_PAINT_LINE(32, "hailiang_paint_line", "海亮-油漆线", "conveyor"), HAILIANG_STACKING_STATION(33, "hailiang_stacking_station", "海亮-包装线体", "conveyor"), diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 51b9310e..c99c16d4 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -247,6 +247,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial Device device = iterator.next(); if (StrUtil.equals(device.getDevice_code(), device_code)) { iterator.remove(); + break; } } @@ -255,7 +256,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial log.info("设备删除成功!"); if (deviceByCode != null) { - if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { + if (ObjectUtil.isNotEmpty(deviceByCode.getDeviceDriverDefination()) && StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'"); } else { @@ -1332,6 +1333,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial if (StrUtil.equals(storageCellDto.getStorage_code(), dto.getStorage_code())) { storageCells.remove(storageCellDto); storageCells.add(dto); + break; } } } @@ -1592,11 +1594,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial String datatype = jo.getString("extra_name"); //西门子200 if (!datatype.contains(".")) { - String[] split = datatype.split(""); - if (split[1].equals("W")) { - datatype = "Word"; - } else if (split[1].equals("D")) { + if (datatype.startsWith("VD")) { datatype = "DWord"; + } else if (datatype.startsWith("VW")) { + datatype = "Word"; + } else if (datatype.startsWith("V")) { + datatype = "Boolean"; } } else { datatype = "Boolean"; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java index 86b6c944..cd4ba444 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java @@ -140,7 +140,6 @@ public class StorageCellServiceImpl implements StorageCellService { JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.update(json); deviceService.updateDeviceCodeByAddress(dto); - } @Override diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 8c4dec32..79aad848 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -131,7 +131,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu .collect(Collectors.toList()); JSONObject jo = new JSONObject(); jo.put("content", instructionList); - jo.put("totalElements", instructionList.size()); + jo.put("totalElements", this.instructions.size()); return jo; } @@ -1092,6 +1092,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu .orElse(new CopyOnWriteArrayList<>()) .stream() .filter(i -> i.getLink_num().equals(link_no)) + .sorted((inst1, inst2) -> inst1.getInstruction_code().compareTo(inst2.getInstruction_code())) .collect(Collectors.toList()); } @@ -1326,9 +1327,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu if (putDevice != null) { if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) { throw new BadRequestException("缓存线已存在任务,稍后下发!"); - } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + } else if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) { //下发电气单出 to_task_type = "4"; } @@ -1341,12 +1342,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) { throw new BadRequestException("缓存线已存在任务,稍后下发!"); - } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) { //下发电气单入 to_task_type = "2"; - } else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { + } else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) { //下发电气双入 to_task_type = "3"; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 95e77367..c21b1461 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -118,7 +118,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A .collect(Collectors.toList()); JSONObject jo = new JSONObject(); jo.put("content", orderList); - jo.put("totalElements", orderList.size()); + jo.put("totalElements", this.order.size()); return jo; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index cd1da4c3..0ff9dab5 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -176,7 +176,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { .collect(Collectors.toList()); JSONObject jo = new JSONObject(); jo.put("content", taskList); - jo.put("totalElements", taskList.size()); + jo.put("totalElements", this.tasks.size()); return jo; } diff --git a/wcs/nladmin-ui/src/views/acs/instruction/index.vue b/wcs/nladmin-ui/src/views/acs/instruction/index.vue index b8dcac61..6b5060f0 100644 --- a/wcs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/wcs/nladmin-ui/src/views/acs/instruction/index.vue @@ -127,9 +127,9 @@ {{ dict.label.send_status[scope.row.send_status] }} - - - + + + - - - - + + + +