From 1451500dbf72e064b5cccb7af62702b8b873acb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 22 Feb 2023 17:30:28 +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 --- .../acs/agv/server/impl/AgvServiceImpl.java | 2 +- .../agv/server/impl/MagicAgvServiceImpl.java | 4 +- .../agv/server/impl/NDCAgvServiceImpl.java | 2 +- .../server/impl/XianGongAgvServiceImpl.java | 6 +- .../device/device_driver/DriverTypeEnum.java | 6 +- .../service/impl/DeviceServiceImpl.java | 2 +- .../modbus_autodoor/ItemProtocol.java | 69 +++ .../ModbusAutodoorDefination.java | 71 +++ .../ModbusAutodoorDeviceDriver.java | 163 ++++++ .../standard_autodoor/ItemProtocol.java | 2 +- .../StandardAutodoorDefination.java | 2 +- .../StandardAutodoorDeviceDriver.java | 2 +- .../modbus_inspect_site/ItemProtocol.java | 106 ++++ .../ModbusInspectSiteDefination.java | 74 +++ .../ModbusInspectSiteDeviceDriver.java | 455 ++++++++++++++++ .../standard_inspect_site/ItemProtocol.java | 2 +- .../StandardInspectSiteDefination.java | 2 +- .../StandardInspectSiteDeviceDriver.java | 2 +- .../LampThreecolorDeviceDriver.java | 2 +- .../StandardOrdinarySiteDeviceDriver.java | 2 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 2 +- .../service/impl/InstructionServiceImpl.java | 2 +- .../task/service/impl/TaskServiceImpl.java | 3 +- .../service/impl/StageServiceImpl.java | 4 +- .../modules/quartz/task/AutoCreateInst.java | 2 +- acs/qd/src/views/acs/device/config.vue | 4 +- .../acs/device/driver/modbus_autodoor.vue | 352 +++++++++++++ .../acs/device/driver/modbus_inspect_site.vue | 490 ++++++++++++++++++ .../org/nl/wms/pad/rest/PadController.java | 16 +- .../org/nl/wms/pad/service/PadService.java | 5 +- .../wms/pad/service/impl/PadServiceImpl.java | 13 +- .../src/main/java/org/nl/wms/pad/wql/PAD.wql | 12 +- .../org/nl/wms/sch/rest/PointController.java | 4 +- .../org/nl/wms/sch/service/PointService.java | 11 +- .../org/nl/wms/sch/service/dto/PointDto.java | 5 - .../sch/service/impl/PointServiceImpl.java | 194 ++++--- .../wms/sch/service/wql/QSCH_BASE_POINT.wql | 3 - .../java/org/nl/wms/sch/service/wql/sch.xls | Bin 178176 -> 214528 bytes .../java/org/nl/wms/sch/tasks/CallTask.java | 43 +- .../java/org/nl/wms/sch/tasks/SendTask.java | 32 +- .../java/org/nl/wms/sch/wql/SEND_TASK.wql | 28 +- .../src/test/java/org/nl/PointTest.java | 77 +-- lms/qd/src/views/wms/sch/point/index.vue | 49 +- 43 files changed, 2080 insertions(+), 247 deletions(-) create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ItemProtocol.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDefination.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDeviceDriver.java rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => autodoor}/standard_autodoor/ItemProtocol.java (96%) rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => autodoor}/standard_autodoor/StandardAutodoorDefination.java (97%) rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => autodoor}/standard_autodoor/StandardAutodoorDeviceDriver.java (98%) create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ItemProtocol.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDefination.java create mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDeviceDriver.java rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => inspect_site}/standard_inspect_site/ItemProtocol.java (97%) rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => inspect_site}/standard_inspect_site/StandardInspectSiteDefination.java (96%) rename acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/{ => inspect_site}/standard_inspect_site/StandardInspectSiteDeviceDriver.java (99%) create mode 100644 acs/qd/src/views/acs/device/driver/modbus_autodoor.vue create mode 100644 acs/qd/src/views/acs/device/driver/modbus_inspect_site.vue diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 03bfc86..281ae20 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -10,7 +10,7 @@ import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; 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 0dc6ee5..6bcf917 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 @@ -12,8 +12,8 @@ import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index 73860fa..a53f2e9 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -12,7 +12,7 @@ import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 5e45841..138c649 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -12,17 +12,15 @@ import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceType; -import org.nl.acs.task.service.TaskService; import org.nl.exception.BadRequestException; import org.slf4j.MDC; import org.springframework.stereotype.Service; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 2c10437..c84b7b1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -41,7 +41,11 @@ public enum DriverTypeEnum { TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"), - STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"); + STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"), + + MODBUS_AUTODOOR(36, "modbus_autodoor", "modbus-自动门", "autodoor"), + + MODBUS_INSPECT_SITE(37, "modbus_inspect_site", "modbus-检测站点", "station"); //驱动索引 private int index; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 5c7a4fe..7c56df5 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -22,7 +22,7 @@ import org.nl.acs.device_driver.ScannerDeviceDriver; import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver; import org.nl.acs.opc.Device; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ItemProtocol.java new file mode 100644 index 0000000..57852ee --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ItemProtocol.java @@ -0,0 +1,69 @@ +package org.nl.acs.device_driver.autodoor.modbus_autodoor; + +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +public class ItemProtocol { + public static String item_heartbeat = "heartbeat"; + public static String item_mode = "mode"; + public static String item_action = "action"; + public static String item_error = "error"; + public static String item_to_command = "to_command"; + + + private final ModbusAutodoorDeviceDriver driver; + + public ItemProtocol(ModbusAutodoorDeviceDriver driver) { + this.driver = driver; + } + + public int getHeartbeat() { + return this.getOpcIntegerValue(item_heartbeat); + } + + public int getMode() { + return this.getOpcIntegerValue(item_mode); + } + + public int getAction() { + return this.getOpcIntegerValue(item_action); + } + + public int getError() { + return this.getOpcIntegerValue(item_error); + } + + public int getToCommand() { + return this.getOpcIntegerValue(item_to_command); + } + + + public int getOpcIntegerValue(String protocol) { + Integer value = this.driver.getIntegeregerValue(protocol); + if (value != null) { + return value; + } + return 0; + } + + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(item_heartbeat, "心跳", "30002")); + list.add(new ItemDto(item_mode, "工作状态", "30004", Boolean.TRUE)); + list.add(new ItemDto(item_action, "动作信号", "30006")); + list.add(new ItemDto(item_error, "报警信号", "30008")); + return list; + } + + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(item_to_command, "作业命令", "40002", Boolean.TRUE)); + return list; + } + +} + diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDefination.java new file mode 100644 index 0000000..a7c5255 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDefination.java @@ -0,0 +1,71 @@ +package org.nl.acs.device_driver.autodoor.modbus_autodoor; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceType; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** + * 自动门驱动定义 + */ +@Service +public class ModbusAutodoorDefination implements OpcDeviceDriverDefination { + @Override + public String getDriverCode() { + return "modbus_autodoor"; + } + + @Override + public String getDriverName() { + return "modbus-自动门"; + } + + @Override + public String getDriverDescription() { + return "modbus-自动门"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return (new ModbusAutodoorDeviceDriver()).setDevice(device).setDriverDefination(this); + + } + + @Override + public Class getDeviceDriverType() { + return ModbusAutodoorDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList<>(); + types.add(DeviceType.conveyor); + return types; + } + + @Override + public List getReadableItemDtos() { + return getReadableItemDtos2(); + } + + public static List getReadableItemDtos2() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "30002")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "30004", Boolean.TRUE)); + list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "30006")); + list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "30008")); + return list; + } + + @Override + public List getWriteableItemDtos() { + return ItemProtocol.getWriteableItemDtos(); + } + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDeviceDriver.java new file mode 100644 index 0000000..66f708f --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDeviceDriver.java @@ -0,0 +1,163 @@ +package org.nl.acs.device_driver.autodoor.modbus_autodoor; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.opc.Device; +import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.task.service.TaskService; +import org.nl.utils.SpringContextHolder; +import org.openscada.opc.lib.da.Server; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 自动门驱动 + */ +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Data +@RequiredArgsConstructor +public class ModbusAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { + protected ItemProtocol itemProtocol = new ItemProtocol(this); + @Autowired + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); + @Autowired + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); + @Autowired + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); + @Autowired + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); + String container; + String container_type_desc; + String last_container_type_desc; + String last_container; + //放货准备锁 + String putReadyLock = null; + //有货标记 + protected boolean has_goods_tag = false; + String devicecode; + int mode = 0; + int action = 0; + int error = 0; + Boolean iserror = false; + + int move = 0; + int task = 0; + int last_action = 0; + int last_mode = 0; + int last_error = 0; + int last_move = 0; + int last_task = 0; + + boolean hasVehicle = false; + boolean isReady = false; + protected int instruction_num = 0; + protected int instruction_num_truth = 0; + protected boolean hasGoods = false; + boolean isFold = false; + private String assemble_check_tag; + private Boolean sampleMode0; + private Boolean sampleMode3; + private Integer sampleError; + private Boolean sampleOnline; + protected String displayMessage = null; + public int display_message_time_out = 30000; + public Date display_message_time; + protected String current_stage_instruction_message; + protected String last_stage_instruction_message; + Integer heartbeat_tag; + private Date instruction_require_time = new Date(); + private Date instruction_finished_time = new Date(); + + private int instruction_require_time_out; + boolean requireSucess = false; + + private int instruction_finished_time_out; + + int branchProtocol = 0; + + @Override + public Device getDevice() { + return this.device; + } + + + @Override + public void execute() { + + mode = this.itemProtocol.getMode(); + action = this.itemProtocol.getAction(); + error = this.itemProtocol.getError(); + if (mode != last_mode) { + } + if (action != last_action) { + } + if (error != last_error) { + //this.execute_log.setContainer(""); + } + last_action = action; + last_mode = mode; + last_error = error; + //message = StringFormatUtl.format("设备报警:{}", new Object[]{}); + +// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString(); + + } + + public synchronized String getStatus() { + JSONObject jo = new JSONObject(); + + if (action == 1) { + jo.put("name", this.getDevice().getDevice_code()); + jo.put("status", "OPEN"); + + } else if (action == 2) { + jo.put("name", this.getDevice().getDevice_code()); + jo.put("status", "CLOSE"); + + } else { + jo.put("name", this.getDevice().getDevice_code()); + jo.put("status", "ERROR"); + } + return jo.toString(); + } + + + public void writeing(int command) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + + String opcservcerid = this.getDevice().getOpc_server_id(); + Server server = ReadUtil.getServer(opcservcerid); + Map itemMap = new HashMap(); + itemMap.put(to_command, command); + ReadUtil.write(itemMap, server); + log.info("下发PLC信号：{},{}", to_command, command); + System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); + + } + + public synchronized void OpenOrClose(String type) { + + //开门 + if ("1".equals(type)) { + writeing(1); + } else { + writeing(2); + } + + } + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java similarity index 96% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java index bd81d1b..80e96ef 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_autodoor; +package org.nl.acs.device_driver.autodoor.standard_autodoor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java similarity index 97% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java index 5b6b3fd..c1749b8 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_autodoor; +package org.nl.acs.device_driver.autodoor.standard_autodoor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device_driver.DeviceDriver; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java similarity index 98% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java index 4f1c09f..441f808 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_autodoor; +package org.nl.acs.device_driver.autodoor.standard_autodoor; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ItemProtocol.java new file mode 100644 index 0000000..c572e27 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ItemProtocol.java @@ -0,0 +1,106 @@ +package org.nl.acs.device_driver.inspect_site.modbus_inspect_site; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Data +public class ItemProtocol { + + public static String item_heartbeat = "heartbeat"; + public static String item_mode = "mode"; + public static String item_move = "move"; + public static String item_action = "action"; + public static String item_error = "error"; + public static String item_task = "task"; + public static String item_to_command = "to_command"; + public static String item_to_target = "to_target"; + public static String item_to_task = "to_task"; + + private ModbusInspectSiteDeviceDriver driver; + + public ItemProtocol(ModbusInspectSiteDeviceDriver driver) { + this.driver = driver; + } + + public int getHeartbeat() { + return this.getOpcIntegerValue(item_heartbeat); + } + + public int getMode() { + return this.getOpcIntegerValue(item_mode); + } + + public int getMove() { + return this.getOpcIntegerValue(item_move); + } + + public int getAction() { + return this.getOpcIntegerValue(item_action); + } + + public int getError() { + return this.getOpcIntegerValue(item_error); + } + + public int getTask() { + return this.getOpcIntegerValue(item_task); + } + + public int getToCommand() { + return this.getOpcIntegerValue(item_to_command); + } + + public int getToTarget() { + return this.getOpcIntegerValue(item_to_target); + } + + public int getToTask() { + return this.getOpcIntegerValue(item_to_task); + } + + //是否有货 + public int hasGoods(int move) { + return move; + } + + Boolean isonline; + + public int getOpcIntegerValue(String protocol) { + Integer value = this.driver.getIntegeregerValue(protocol); + if (value == null) { + log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); + setIsonline(false); + } else { + setIsonline(true); + return value; + } + return 0; + + } + + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(item_heartbeat, "心跳", "30002")); + list.add(new ItemDto(item_mode, "工作状态", "30004", Boolean.TRUE)); + list.add(new ItemDto(item_move, "光电开关信号", "30006")); + list.add(new ItemDto(item_action, "取放信号", "30008")); + list.add(new ItemDto(item_error, "报警信号", "30010")); + list.add(new ItemDto(item_task, "任务号", "30012")); + return list; + } + + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(item_to_command, "作业命令", "40002", Boolean.TRUE)); + list.add(new ItemDto(item_to_target, "目标站", "40004")); + list.add(new ItemDto(item_to_task, "任务号", "40008")); + return list; + } + +} + diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDefination.java new file mode 100644 index 0000000..f4f67bf --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDefination.java @@ -0,0 +1,74 @@ +package org.nl.acs.device_driver.inspect_site.modbus_inspect_site; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceType; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** + * 检测站点驱动定义 + * 说明：该站点为普通带光电检测站点 + */ +@Service +public class ModbusInspectSiteDefination implements OpcDeviceDriverDefination { + @Override + public String getDriverCode() { + return "modbus_inspect_site"; + } + + @Override + public String getDriverName() { + return "modbus-检测站点"; + } + + @Override + public String getDriverDescription() { + return "modbus-检测站点"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return (new ModbusInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + + } + + @Override + public Class getDeviceDriverType() { + return ModbusInspectSiteDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList<>(); + types.add(DeviceType.conveyor); + return types; + } + + @Override + public List getReadableItemDtos() { + return getReadableItemDtos2(); + } + + public static List getReadableItemDtos2() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "30002")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "30004", Boolean.TRUE)); + list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "30006")); + list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "30008")); + list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "30010")); + list.add(new ItemDto(ItemProtocol.item_task, "任务号", "30014")); + return list; + } + + @Override + public List getWriteableItemDtos() { + return ItemProtocol.getWriteableItemDtos(); + } + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDeviceDriver.java new file mode 100644 index 0000000..d2109e8 --- /dev/null +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDeviceDriver.java @@ -0,0 +1,455 @@ +package org.nl.acs.device_driver.inspect_site.modbus_inspect_site; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.instruction.service.dto.Instruction; +import org.nl.acs.log.service.DeviceExecuteLogService; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.opc.WcsConfig; +import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.route.service.dto.RouteLineDto; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SpringContextHolder; +import org.nl.wql.core.bean.WQLObject; +import org.openscada.opc.lib.da.Server; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 检测站点驱动 + */ +@Slf4j +@Data +@RequiredArgsConstructor +public class ModbusInspectSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { + protected ItemProtocol itemProtocol = new ItemProtocol(this); + @Autowired + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); + @Autowired + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); + @Autowired + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); + @Autowired + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); + @Autowired + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + + String container; + String container_type_desc; + String last_container_type_desc; + String last_container; + //放货准备锁 + String putReadyLock = null; + //有货标记 + protected boolean has_goods_tag = false; + + int mode = 0; + int error = 0; + int move = 0; + int task = 0; + int last_mode = 0; + int last_error = 0; + int last_move = 0; + int last_task = 0; + Boolean isonline = true; + int hasGoods = 0; + String message = null; + Boolean iserror = false; + + + boolean hasVehicle = false; + boolean isReady = false; + protected int instruction_num = 0; + protected int instruction_num_truth = 0; + boolean isFold = false; + private String assemble_check_tag; + + protected String current_stage_instruction_message; + protected String last_stage_instruction_message; + Integer heartbeat_tag; + private Date instruction_require_time = new Date(); + private Date instruction_finished_time = new Date(); + + private int instruction_require_time_out; + boolean requireSucess = false; + + private int instruction_finished_time_out; + + int branchProtocol = 0; + //备注 + String remark; + //数量 + String qty; + //物料 + String material; + //批次 + String batch; + //当前指令 + Instruction inst = null; + //上次指令 + Instruction last_inst = null; + + //触摸屏手动触发任务 + private Boolean is_has_task = false; + + //申请搬运任务 + private Boolean apply_handling = false; + //申请物料 + private Boolean apply_material = false; + + //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 + int flag; + + String device_code; + + @Override + public Device getDevice() { + return this.device; + } + + + @Override + public void execute() { + String message = null; + try { + device_code = this.getDeviceCode(); + mode = this.itemProtocol.getMode(); + error = this.itemProtocol.getError(); + move = this.itemProtocol.getMove(); + task = this.itemProtocol.getTask(); + hasGoods = this.itemProtocol.getMove(); + + if (mode != last_mode) { + this.setRequireSucess(false); + logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); + logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); + } + if (move != last_move) { + logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); + logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); + } + if (error != last_error) { + logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); + } + if (task != last_task) { + logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); + logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); + } + + if (this.getApply_handling()) { + String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); + DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); + Device link_device = appService.findDeviceByCode(link_device_code); + ModbusInspectSiteDeviceDriver standardInspectSiteDevicedriver; + if (link_device.getDeviceDriver() instanceof ModbusInspectSiteDeviceDriver) { + standardInspectSiteDevicedriver = (ModbusInspectSiteDeviceDriver) link_device.getDeviceDriver(); +// if(standardInspectSiteDevicedriver.getMode() != 2){ +// log.debug("设备未待机"); +// return; +// } +// if(standardInspectSiteDevicedriver.getMove() != 0){ +// log.debug("设备不满足放货条件"); +// return; +// } + + //如果目标设备申请叫料 则允许生成任务 + if (standardInspectSiteDevicedriver.getApply_material()) { + TaskDto dto = new TaskDto(); + String now = DateUtil.now(); + dto.setTask_id(IdUtil.simpleUUID()); + dto.setCreate_by(this.getDevice().getDevice_code()); + dto.setUpdate_by(this.getDevice().getDevice_code()); + dto.setStart_point_code(this.getDevice().getDevice_code()); + + String taskcode = CodeUtil.getNewCode("TASK_NO"); + dto.setTask_code("-" + taskcode); + dto.setTask_status("0"); + dto.setPriority("101"); +// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); +// String next_device_codecode = jo.getNext_device_code(); +// if(StrUtil.isEmpty(next_device_codecode)){ +// throw new RuntimeException("该设备未找到对应路由"); +// } + dto.setNext_point_code(this.getDeviceCode()); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("acs_task"); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + + wo.insert(json); + standardInspectSiteDevicedriver.setApply_material(false); + } + } + this.setApply_handling(false); + } + + } catch (Exception var17) { + return; + } + + if (!this.itemProtocol.getIsonline()) { + this.setIsonline(false); + this.setIserror(true); + message = "信号量同步异常"; + //未联机 + } else if (mode == 0) { + this.setIsonline(false); + this.setIserror(true); + message = "未联机"; + //有报警 + } else if (error != 0) { + this.setIsonline(false); + this.setIserror(true); + message = "有报警"; + //无报警 + } else { + this.setIsonline(true); + this.setIserror(false); + message = ""; + Instruction instruction = null; + List toInstructions; + switch (mode) { + case 1: + log.debug("设备运转模式:等待工作"); + return; + case 2: + //申请任务 +// if (this.getApply_handling()) { +// String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); +// DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); +// Device link_device = appService.findDeviceByCode(link_device_code); +// StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver; +// if(link_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { +// standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) link_device.getDeviceDriver(); +// if(standardInspectSiteDevicedriver.getMode() != 2){ +// log.debug("设备未待机"); +// return; +// } +// if(standardInspectSiteDevicedriver.getMove() != 0){ +// log.debug("设备不满足放货条件"); +// return; +// } +// +// //如果目标设备申请叫料 则允许生成任务 +// if(standardInspectSiteDevicedriver.getApply_material()){ +// TaskDto dto = new TaskDto(); +// String now = DateUtil.now(); +// dto.setTask_id(IdUtil.simpleUUID()); +// dto.setCreate_by(this.getDevice().getDevice_code()); +// dto.setUpdate_by(this.getDevice().getDevice_code()); +// dto.setStart_point_code(this.getDevice().getDevice_code()); +// +// String taskcode = CodeGenerateUtil.getNewCode("TASK_NO"); +// dto.setTask_code("-"+taskcode); +// dto.setTask_status("0"); +// dto.setPriority("101"); +// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); +// String next_device_codecode = jo.getNext_device_code(); +// if(StrUtil.isEmpty(next_device_codecode)){ +// throw new RuntimeException("该设备未找到对应路由"); +// } +// dto.setNext_point_code(next_device_codecode); +// dto.setUpdate_time(now); +// dto.setCreate_time(now); +// +// WQLObject wo = WQLObject.getWQLObject("acs_task"); +// JSONObject json = (JSONObject) JSONObject.toJSON(dto); + +// wo.insert(json); +// standardInspectSiteDevicedriver.setApply_material(false); +// } +// } +// this.setApply_handling(false); +// } + + if (material.length() > 0 && qty.length() > 0 && !requireSucess) { + this.instruction_require(container); + } + } + + switch (flag) { + //取货完成 + case 1: + writing(2); + return; + //放货完成 + case 2: + writing(3); + return; + + } + + } + last_mode = mode; + last_error = error; + last_move = move; + last_task = task; + + } + + + public boolean exe_error() { + if (this.error == 0) { + return true; + } else { + log.debug("设备报警"); + return false; + } + } + + protected void thingToNothing() { + log.debug("从有货到无货 清理数据"); + this.set_last_container(container, container_type_desc); + } + + public void set_last_container(String barcode, String type_desc) { + this.set_last_container(barcode); + this.set_last_container_type_desc(type_desc); + } + + public void set_last_container(String barcode) { + } + + public void set_last_container_type_desc(String type) { + } + + public boolean exe_business() { + return true; + } + + protected void executing(Instruction instruction) { + this.executing(1, instruction, ""); + } + + public void executing(int command, Instruction instruction, String appendMessage) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_target; + String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_task; + if (appendMessage == null) { + appendMessage = ""; + } + if (instruction != null) { + instruction_num = Integer.parseInt(instruction.getInstruction_code()); + } + String opcservcerid = this.getDevice().getOpc_server_id(); + Server server = ReadUtil.getServer(opcservcerid); + Map itemMap = new HashMap(); + itemMap.put(to_command, 1); + itemMap.put(to_task, instruction_num); + ReadUtil.write(itemMap, server); + + } + + public void executing(Server server, Map itemMap) { + ReadUtil.write(itemMap, server); + } + + public void writing(int command) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + + String opcservcerid = this.getDevice().getOpc_server_id(); + Server server = ReadUtil.getServer(opcservcerid); + Map itemMap = new HashMap(); + itemMap.put(to_command, command); + ReadUtil.write(itemMap, server); + + } + + public void writing(int type, int command) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_target; + String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_task; + String opcservcerid = this.getDevice().getOpc_server_id(); + Server server = ReadUtil.getServer(opcservcerid); + Map itemMap = new HashMap(); + if (type == 1) { + itemMap.put(to_command, command); + } else if (type == 2) { + itemMap.put(to_target, command); + + } else if (type == 3) { + itemMap.put(to_task, command); + } + ReadUtil.write(itemMap, server); + + } + + public boolean instruction_require(String container_code) { + return instruction_require(container_code, WcsConfig.task_container_type_default_desc); + } + + /** + * 请求指令 + * + * @param container_code + * @param container_type + */ + public synchronized boolean instruction_require(String container_code, String container_type) { + Date date = new Date(); + if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); + return false; + } else { + this.instruction_require_time = date; + TaskDto dto = new TaskDto(); + String now = DateUtil.now(); + dto.setTask_id(IdUtil.simpleUUID()); + dto.setCreate_by(this.getDevice().getDevice_code()); + dto.setUpdate_by(this.getDevice().getDevice_code()); + dto.setStart_point_code(this.getDevice().getDevice_code()); + dto.setVehicle_code(container_code); + dto.setVehicle_type(container_type); + + String taskcode = CodeUtil.getNewCode("TASK_NO"); + dto.setTask_code("-" + taskcode); + dto.setTask_status("0"); + dto.setPriority("101"); + RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); + String next_device_codecode = jo.getNext_device_code(); + if (StrUtil.isEmpty(next_device_codecode)) { + throw new RuntimeException("该设备未找到对应路由"); + } + dto.setNext_point_code(next_device_codecode); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("acs_task"); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + + wo.insert(json); + requireSucess = false; + return true; + } + } + + +} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/ItemProtocol.java similarity index 97% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/ItemProtocol.java index c280d3d..824568d 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_inspect_site; +package org.nl.acs.device_driver.inspect_site.standard_inspect_site; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDefination.java similarity index 96% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDefination.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDefination.java index 2b81d41..19816ee 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_inspect_site; +package org.nl.acs.device_driver.inspect_site.standard_inspect_site; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device_driver.DeviceDriver; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDeviceDriver.java similarity index 99% rename from acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java rename to acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 6bfa198..70e2703 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_inspect_site; +package org.nl.acs.device_driver.inspect_site.standard_inspect_site; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java index 8b2e6a7..c37bd96 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java @@ -135,7 +135,7 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; + + "." + org.nl.acs.device_driver.inspect_site.standard_inspect_site.ItemProtocol.item_to_command; String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 526dbe7..64ae5af 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -12,7 +12,7 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 86ea295..91ff84e 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index d76a648..66b48bd 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 12f3429..453a2d7 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -20,7 +20,7 @@ import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.StorageCellService; import org.nl.acs.device.service.dto.DeviceAssignedDto; import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; @@ -29,7 +29,6 @@ import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.DeviceType; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskFeedbackService; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java index e53e4ca..02a46b5 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java @@ -8,13 +8,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver; import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_rgv.StandardRGVDeviceDriver; import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java index 70e69ed..f29f787 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java @@ -9,7 +9,7 @@ import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; diff --git a/acs/qd/src/views/acs/device/config.vue b/acs/qd/src/views/acs/device/config.vue index 22358a9..9fa0526 100644 --- a/acs/qd/src/views/acs/device/config.vue +++ b/acs/qd/src/views/acs/device/config.vue @@ -95,6 +95,8 @@ import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_ import standard_manipulator_stacking_site from '@/views/acs/device/driver/standard_manipulator_stacking_site' import standard_photoelectric_inspect_site from '@/views/acs/device/driver/standard_photoelectric_inspect_site' import electric_fence from '@/views/acs/device/driver/electric_fence' +import modbus_autodoor from '@/views/acs/device/driver/modbus_autodoor' +import modbus_inspect_site from '@/views/acs/device/driver/modbus_inspect_site' export default { name: 'DeviceConfig', @@ -103,7 +105,7 @@ export default { lamp_three_color, standard_storage, special_ordinary_site, standard_scanner, standard_conveyor_control_with_scanner, standard_conveyor_control_with_plcscanner, standard_conveyor_control, standard_conveyor_monitor, weighing_site, machines_site, non_line_manipulator_inspect_site, non_line_inspect_site, manipulator_inspect_site_NDC, standard_manipulator_stacking_site, - standard_photoelectric_inspect_site, electric_fence }, + standard_photoelectric_inspect_site, electric_fence, modbus_autodoor, modbus_inspect_site }, dicts: ['device_type'], mixins: [crud], data() { diff --git a/acs/qd/src/views/acs/device/driver/modbus_autodoor.vue b/acs/qd/src/views/acs/device/driver/modbus_autodoor.vue new file mode 100644 index 0000000..41e2f46 --- /dev/null +++ b/acs/qd/src/views/acs/device/driver/modbus_autodoor.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/acs/qd/src/views/acs/device/driver/modbus_inspect_site.vue b/acs/qd/src/views/acs/device/driver/modbus_inspect_site.vue new file mode 100644 index 0000000..a6ab788 --- /dev/null +++ b/acs/qd/src/views/acs/device/driver/modbus_inspect_site.vue @@ -0,0 +1,490 @@ + + + + + diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java index b9d24dd..c56db9d 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java @@ -103,13 +103,23 @@ public class PadController { /** * 查询物料 * - * @return 所有物料 + * @param param String device_id 点位标识 + * @return 点位可以选择的物料 */ @PostMapping("/matrial") @Log("查询物料") @ApiOperation("查询物料") - public ResponseEntity material() { - return new ResponseEntity<>(padService.material(), HttpStatus.OK); + public ResponseEntity material(@RequestBody JSONObject param) { + // 参数校验 + String point_id = param.getString("device_id"); + if (StrUtil.isEmpty(point_id)) { + JSONObject resultJSON = new JSONObject(); + resultJSON.put("code", "0"); + resultJSON.put("desc", "点位不能为空"); + return new ResponseEntity<>(resultJSON, HttpStatus.OK); + } + + return new ResponseEntity<>(padService.material(point_id), HttpStatus.OK); } /** diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java index 98e80a3..03187e8 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java @@ -41,9 +41,10 @@ public interface PadService { /** * 查询物料 * - * @return 所有物料 + * @param point_id 点位标识 + * @return 点位可以选择的物料 */ - JSONObject material(); + JSONObject material(String point_id); /** * 点位状态绑定 diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java index 508d682..ddb53f1 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java @@ -179,15 +179,22 @@ public class PadServiceImpl implements PadService { /** * 查询物料 * - * @return 所有物料 + * @param point_id 点位标识 + * @return 点位可以选择的物料 */ @Override - public JSONObject material() { + public JSONObject material(String point_id) { // 返回值 JSONObject resultJSON = new JSONObject(); // 查询物料 - resultJSON.put("result", WQL.getWO("PAD").addParam("flag", "3").process().getResultJSONArray(0)); + resultJSON.put("result", + WQL + .getWO("PAD") + .addParam("flag", "3") + .addParam("point_id", point_id) + .process() + .getResultJSONArray(0)); // 返回 resultJSON.put("code", "1"); diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/wql/PAD.wql b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/wql/PAD.wql index fadeca2..e6b5d19 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/wql/PAD.wql +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/wql/PAD.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.region_id TYPEAS s_string + 输入.point_id TYPEAS s_string 输入.lock_type TYPEAS s_string 输入.col TYPEAS s_string @@ -86,12 +87,15 @@ IF 输入.flag = "3" QUERY SELECT - `value`, - label + dd.label, + dd.`value` FROM - sys_dict_detail + sch_base_point point + LEFT JOIN sch_base_point_material pm ON point.point_id = pm.point_id + LEFT JOIN sys_dict_detail dd ON pm.material = dd.`value` + AND dd.`name` = 'material_type' WHERE - `name` = 'current_material_type' + point.point_id = 输入.point_id ENDSELECT ENDQUERY ENDIF diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index b6b9284..95f2068 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -43,7 +43,7 @@ public class PointController { @Log("新增点位") @ApiOperation("新增点位") //@PreAuthorize("@el.check('point:add')") - public ResponseEntity create(@Validated @RequestBody PointDto dto) { + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { pointService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -52,7 +52,7 @@ public class PointController { @Log("修改点位") @ApiOperation("修改点位") //@PreAuthorize("@el.check('point:edit')") - public ResponseEntity update(@Validated @RequestBody PointDto dto) { + public ResponseEntity updatePoint(@Validated @RequestBody JSONObject dto) { pointService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index eb9280f..d5d321c 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; -import java.util.List; import java.util.Map; /** @@ -22,21 +21,21 @@ public interface PointService { * @param page 分页参数 * @return Map */ - Map queryAll(Map whereJson, Pageable page); + Map queryAll(Map whereJson, Pageable page); /** * 查询所有数据不分页 * @param whereJson 条件参数 * @return List */ - List queryAll(Map whereJson); + JSONArray queryAll(Map whereJson); /** * 根据ID查询 * @param point_id ID * @return Point */ - PointDto findById(Long point_id); + JSONObject findById(Long point_id); /** * 根据编码查询 @@ -50,13 +49,13 @@ public interface PointService { * 创建 * @param dto / */ - void create(PointDto dto); + void create(JSONObject dto); /** * 编辑 * @param dto / */ - void update(PointDto dto); + void update(JSONObject dto); /** * 多选删除 diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java index d41c0af..7c83b5a 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java @@ -131,11 +131,6 @@ public class PointDto implements Serializable { */ private String material_code; - /** - * 物料类型 - */ - private String material_type; - /** * 上一区域id */ diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 9666b16..8b77991 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.mchange.lang.DoubleUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; @@ -25,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author ldjun @@ -36,8 +36,8 @@ import java.util.Map; @Slf4j public class PointServiceImpl implements PointService { @Override - public Map queryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap(); + public Map queryAll(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("region_id", whereJson.get("region_id")); map.put("ids", whereJson.get("ids")); @@ -46,27 +46,34 @@ public class PointServiceImpl implements PointService { map.put("is_used", whereJson.get("is_used")); map.put("point_type", whereJson.get("point_type")); map.put("name", whereJson.get("name")); - JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); - return json; + JSONObject result = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); + + JSONArray content = result.getJSONArray("content"); + WQLObject pm_table = WQLObject.getWQLObject("sch_base_point_material"); + for (Object o : content) { + JSONObject point = (JSONObject) o; + List material_type = pm_table + .query("point_id = " + point.getString("point_id")) + .getResultJSONArray(0) + .stream() + .map(pm -> ((JSONObject) pm).getString("material")) + .collect(Collectors.toList()); + point.put("material_type", material_type); + } + + return result; } @Override - public List queryAll(Map whereJson) { + public JSONArray queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(PointDto.class); - return list; + return wo.query().getResultJSONArray(0); } @Override - public PointDto findById(Long point_id) { + public JSONObject findById(Long point_id) { WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = wo.query("point_id =" + point_id + "").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(PointDto.class); - } - final PointDto obj = json.toJavaObject(PointDto.class); - return obj; + return wo.query("point_id =" + point_id + "").uniqueResult(0); } @@ -82,103 +89,134 @@ public class PointServiceImpl implements PointService { @Override @Transactional(rollbackFor = Exception.class) - public void create(PointDto dto) { + public void create(JSONObject dto) { // 参数校验 - PointDto byCode = this.findByCode(dto.getPoint_code()); + PointDto byCode = this.findByCode(dto.getString("point_code")); if (ObjectUtil.isNotEmpty(byCode)) { throw new BadRequestException("存在相同的点位编码"); } - if (!StrUtil.equals(dto.getMaterial_type(), "14")) { - int count = WQLObject.getWQLObject("sch_base_point") - .query("is_delete = '0' AND seq = " + dto.getSeq() + " AND region_id = " + dto.getRegion_id() + "'") - .getResultJSONArray(0) - .size(); - if (count > 0) { - throw new BadRequestException("该区域存在相同的出入库顺序"); - } + int count = WQLObject.getWQLObject("sch_base_point") + .query("is_delete = '0' AND seq = " + dto.getLong("seq") + " AND region_id = '" + dto.getString("region_id") + "'") + .getResultJSONArray(0) + .size(); + if (count > 0) { + throw new BadRequestException("该区域存在相同的出入库顺序"); } - if (StrUtil.equals(dto.getPoint_status(), "00") && !StrUtil.equals(dto.getCurrent_material_type(), "14")) { + String current_material_type = dto.getString("current_material_type"); + if (StrUtil.equals(dto.getString("point_status"), "00") && StrUtil.isNotBlank(current_material_type)) { throw new BadRequestException("当前为空位但是存放物料类型不为空"); } - if (StrUtil.equals(dto.getPoint_status(), "01") && StrUtil.equals(dto.getCurrent_material_type(), "14")) { + if (StrUtil.equals(dto.getString("point_status"), "01") && StrUtil.isBlank(current_material_type)) { throw new BadRequestException("当前为有货但是存放物料类型为空"); } - if (dto.getSeq() < 0L) { + if (dto.getLongValue("seq") < 0L) { throw new BadRequestException("出入库顺序号不能小于0"); } - if (dto.getCol() < 0L) { + if (dto.getLongValue("col") < 0L) { throw new BadRequestException("排号不能小于0"); } - JSONObject colPoint = WQLObject.getWQLObject("sch_base_point").query("region_id = '" + dto.getRegion_id() + "' AND col = " + dto.getCol()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(colPoint) && !StrUtil.equals(colPoint.getString("material_type"), dto.getMaterial_type())) { - throw new BadRequestException("当前排不能限定这种物料"); - } - if (!StrUtil.equals(dto.getCurrent_material_type(), "14") - && !StrUtil.equals(dto.getMaterial_type(), "14") - && !StrUtil.equals(dto.getMaterial_type(), dto.getCurrent_material_type())) { - throw new BadRequestException("当前存放物料与限定物料不一致"); + List material_types = dto.getJSONArray("material_type").stream().map(Object::toString).collect(Collectors.toList()); + if (StrUtil.isNotBlank(current_material_type) && !material_types.contains(current_material_type)) { + throw new BadRequestException("该点位不能存放这种物料"); } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - dto.setPoint_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); + WQLObject pm_table = WQLObject.getWQLObject("sch_base_point_material"); + long point_id = IdUtil.createSnowflake(1L, 1L).nextId(); + JSONObject pm = new JSONObject(); + pm.put("point_id", point_id); + for (String material_type : material_types) { + pm.put("pm_id", IdUtil.getSnowflake(1L, 1L).nextId()); + pm.put("material", material_type); + pm_table.insert(pm); + } - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); + JSONObject point = new JSONObject(); + point.put("point_id", point_id); + point.put("point_code", dto.getString("point_code")); + point.put("point_name", dto.getString("point_name")); + point.put("point_status", dto.getString("point_status")); + point.put("lock_type", dto.getString("lock_type")); + point.put("current_material_type", dto.getString("current_material_type")); + point.put("col", dto.getString("col")); + point.put("region_id", dto.getString("region_id")); + point.put("prev_region_id", dto.getString("prev_region_id")); + point.put("next_region_id", dto.getString("next_region_id")); + point.put("seq", dto.getString("seq")); + point.put("remark", dto.getString("remark")); + point.put("create_id", SecurityUtils.getCurrentUserId()); + point.put("create_name", SecurityUtils.getNickName()); + point.put("create_time", DateUtil.now()); + WQLObject.getWQLObject("sch_base_point").insert(point); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PointDto dto) { - Long pointId = dto.getPoint_id(); - PointDto entity = this.findById(pointId); + public void update(JSONObject dto) { + Long point_id = dto.getLong("point_id"); + JSONObject entity = this.findById(point_id); if (entity == null) { throw new BadRequestException("被删除或无权限，操作失败!"); } // 参数校验 - PointDto byCode = this.findByCode(dto.getPoint_code()); - if (!byCode.getPoint_id().equals(pointId)) { + PointDto byCode = this.findByCode(dto.getString("point_code")); + if (!byCode.getPoint_id().equals(point_id)) { throw new BadRequestException("该点位编码已被其他点位占用"); } - if (!StrUtil.equals(dto.getMaterial_type(), "14")) { - int count = WQLObject.getWQLObject("sch_base_point") - .query("is_delete = '0' AND seq = " + dto.getSeq() + " AND region_id = " + dto.getRegion_id() + " AND point_id <> " + pointId) - .getResultJSONArray(0) - .size(); - if (count > 0) { - throw new BadRequestException("该区域的其他点位中存在相同的出入库顺序"); - } + int count = WQLObject.getWQLObject("sch_base_point") + .query("is_delete = '0' AND seq = " + dto.getString("seq") + " AND region_id = " + dto.getLongValue("region_id") + " AND point_id <> " + point_id) + .getResultJSONArray(0) + .size(); + if (count > 0) { + throw new BadRequestException("该区域的其他点位中存在相同的出入库顺序"); } - if (StrUtil.equals(dto.getPoint_status(), "00") && !StrUtil.equals(dto.getCurrent_material_type(), "14")) { + + String current_material_type = dto.getString("current_material_type"); + if (StrUtil.equals(dto.getString("point_status"), "00") && StrUtil.isNotBlank(current_material_type)) { throw new BadRequestException("当前为空位但是存放物料类型不为空"); } - if (StrUtil.equals(dto.getPoint_status(), "01") && StrUtil.equals(dto.getCurrent_material_type(), "14")) { + if (StrUtil.equals(dto.getString("point_status"), "01") && StrUtil.isBlank(current_material_type)) { throw new BadRequestException("当前为有货但是存放物料类型为空"); } - if (!StrUtil.equals(dto.getMaterial_type(), "14") && StrUtil.equals(dto.getCurrent_material_type(), dto.getMaterial_type())) { - throw new BadRequestException("当前存放物料类型与限定物料类型不一致"); + if (dto.getLongValue("seq") < 0L) { + throw new BadRequestException("出入库顺序号不能小于0"); + } + if (dto.getLongValue("col") < 0L) { + throw new BadRequestException("排号不能小于0"); + } + List material_types = dto.getJSONArray("material_type").stream().map(Object::toString).collect(Collectors.toList()); + if (StrUtil.isNotBlank(current_material_type) && !material_types.contains(current_material_type)) { + throw new BadRequestException("该点位不能存放这种物料"); + } + WQLObject pm_table = WQLObject.getWQLObject("sch_base_point_material"); + pm_table.delete("point_id = " + point_id); + JSONObject pm = new JSONObject(); + pm.put("point_id", point_id); + for (String material_type : material_types) { + pm.put("pm_id", IdUtil.getSnowflake(1L, 1L).nextId()); + pm.put("material", material_type); + pm_table.insert(pm); } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + JSONObject point = new JSONObject(); + point.put("point_code", dto.getString("point_code")); + point.put("point_name", dto.getString("point_name")); + point.put("point_status", dto.getString("point_status")); + point.put("lock_type", dto.getString("lock_type")); + point.put("current_material_type", dto.getString("current_material_type")); + point.put("col", dto.getString("col")); + point.put("region_id", dto.getString("region_id")); + point.put("prev_region_id", dto.getString("prev_region_id")); + point.put("next_region_id", dto.getString("next_region_id")); + point.put("seq", dto.getString("seq")); + point.put("remark", dto.getString("remark")); + point.put("update_optid", SecurityUtils.getCurrentUserId()); + point.put("update_optname", SecurityUtils.getNickName()); + point.put("update_time", DateUtil.now()); - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); + WQLObject + .getWQLObject("sch_base_point") + .update(point, "point_id = " + point_id); } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql index 8d18d4d..5e5c9a0 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql @@ -82,10 +82,8 @@ point.next_region_id, prev_region.region_name AS prev_region_name, next_region.region_name AS next_region_name, - d5.label AS material_type_name, point.seq, d6.label AS current_material_type_name, - point.material_type, point.current_material_type, point.col FROM @@ -96,7 +94,6 @@ LEFT JOIN sys_dict_detail d4 ON point.point_status = d4.value and d4.name='sch_point_status' LEFT JOIN SCH_BASE_Region prev_region ON point.prev_region_id = prev_region.region_id LEFT JOIN SCH_BASE_Region next_region ON point.next_region_id = next_region.region_id - LEFT JOIN sys_dict_detail d5 ON point.material_type = d5.`value` AND d5.`name` = 'material_type' LEFT JOIN sys_dict_detail d6 ON point.current_material_type = d6.`value` AND d6.`name` = 'current_material_type' WHERE point.is_delete = '0' diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls index c1221c64d7c22e7ff6e9da357780831ff22c0832..f2678ce024e9433491b7d84af099683db283ce03 100644 GIT binary patch delta 47470 zcmcJ22VfON{{PIrk^~Y+AVBCZfb_siCG?j{=%I+9Cr&KgdCnzMpuLC=#Q7F1MFJP`~3&v(kceJK>Z|0MHf_B-GCw&}C8yQRk)m9CE} z>)pr67~}B5MKhL(hy(ujGiT07AY=0pISGFaH_LA~y6!3|O2;Vjk?`+ky zro2etDg3|^*Tp>Ej9Jc`o6*a;b9aqvhAYsxQSZRQ#!;LHRy1zanj8F<%O;FXWU=fc z(1~SbLW{LLFf^=AYD_ToKeh96mcpJjK!PD}RAjBZ25S|}JGgc#LtcyT{MxCU4GmJh zJF*od|1Bc;yDdz_1$@4M%iqhR0N;I8)Uvq1I@*@5pyxC5W(4&eU{6b>88 ze*(R>fky^M2RtL)fd__lp)dbSinCxnx7Ww+kDad7lHq4AbzC4=fCM#AbOND zaNn@F0AaNYl#L$B+l${0;U8r4SRm{Px_0s#i)Iv`yrs!3 zf{mdn3|L9gf*IFdcgrONd**b)8nUm_}GfjlhMmQ7=Waw|Y3434HeZGXB`bBl9+miyd-i=#jazUjOGEFMD3`=bjiH^W<%Rdvx8_ znG-$PYw{+oi5~3P@j>jWfpf--u%b={`i{7znpk+@*UCJsyEzlbkOKaE3bC) z6)~e)jC}IMkyl=Lt4E7;(=%z^;mie(jCynBg1^nHH%@|`z!e5lWDBS&0% z!>l7)UcTX-$o7v^77e)D{l%0!B9pef@$%dM{p{85lb)XP+NxEn9=(5VPI2}{kFTH7 zW?1fh|NPt3sZ(FS^z@@wMfnM>+I#G}4=Ns-*mLfedwPGp>&+XtU2@~#3EfujKmEgh z%T`=9^>mk4e*0m-u>mu$X8!*aJr$Pnf4M`-SC9Xt=)YfYeCg?F_b&PJtv#Ki9@&t+ zU{lzDzu$bXnN@ybN^Y;+cV6qrxM@WA?VIxQ*WQ;qYto@NMs0ZZ@}GbI`p8@1lRjI0 z`jdl4{rCOrqpRMY<#E;=-FIhRT!r&e{_V=R{MN6$R~;Am*tQK>BZuDVYf4AY0 zI{jGF`j*oHUn_5uvaamo)|;pFSyJ=CYvVrgtsL^;ll^baXg~I=xT?4=ude^U^c!B< zf9V_ltun7}y!grS3%}q8-Z_-rHEZgN*ERZQ){No~k8WNuX?e=Dxf8$bbGl z^|5#6c3A(`!FE#~dG+<1Rub0!p(}Q$-PUtM>Fm2Qrx!o=Y~L>5-T%*bM?80T*o@{+ zOxW5#h28M!_QZpioql)4#N}~M-}><8g{}U1ZQCWpZ{NY!S3kM2TSeG+SI0m3)h`9F z%-9z3ZI5do`rdPDKxNr7e(*+qf0DP*cgX+DH#J%8mt6@j&M12|@~!8$Ij-3kJ7em5 zuQlB|^NQ22Uv}vI4;H=ruLZyQU%4gW^M9A09(?V0{TKJhDLk=q*wZ=9o@@H}y?5{W z?Va5(-1n3Jo->b~nbiFA33H!MZWoyQ;IxE2UtIIr)_>o3V&iAO{kru2_h0$f^8eoS z(z14`FTC^ii#NPd_QBANpC9oL@6_U7o4dX+bNNTknx`Ls=JS7T{B7;dLl?83Zd}^o zsOuhI^fLEL?87%#>^=CGx!-2q`R0KwU)+AxW;S)G^BrcUe;hIG^5?Gm=F1U>#t(BY z9azke#> zhl9>}u86$C(qD&mY4KCfK%XU%O_=vkAucQFZCbC%4WBHYTk2r$J7T;bJSh%(2loGa(&0!1J zQZ^0KoR{sVD8d&Jj=7q#B8(sh z5FSOibs1w%q5_Ox&e$B(j872$jL^J>vB#q@|GAd2kxd{3!rcfXuVbt;MzukxRTE&F zI}q+d7={|wA%?NV2ya68pOt>hDG@nU%2?A_NWKb^BYgIHRI3)yW;Lo+OU9bqz}Q7` zjI~(HSnt-1HM^0q9+=I1g^;&p?16QRJ%@1HO^iL&jmwp)G#6nMw{_^#29Q>=@@9*y&>AvhFx~cyL@}FwE z@#Fg<9!3rt?{^0t`?yua-*EK={Ilj8Ym8RypGNc(0{nx_$B%EK%Tbfry@Cm$?`L_r@7J<=-XCcUy!Ob#wlY%(2 zSz`pP%}I@UXWquVMh07D@DCY$PC;9%+id;o7AKLq@nvnh}o%?O<_Q5Y&< zP?X%B!GriTw|^6&gMHM1dPCB0*|kWOR|c-G!xcB&NOQ0g3hrdzF{j2|5&gSv)eH4SCf?_aYIzN+mC^;I&fm@(Q*6xFUOdEw#NuZOz1q;g^i*F?efdh?MSY+e@Ra;HBTcpcG!%NCUkRvmf6e@%qpQjlk( z*c&BHQjljO+YOk!GH~^Tb>+Yn4QDdVi7U)t)Rl{E^s}d|OE(htSXW^z!1h{K;Yj7W3j|+f-66bCS<2ngv4ByPAYWTfgwzy zro!YqSfq93U=OiH)|HcOu_|6FN@0f}pNdj=NDL`79Zf|kJj^QC?fAP>{N07#2z;lC z^)WGKK9VX8jQ6rAMLZ3Rw_!w*6)p`Gu1pY5Lxrov_@m)2wpGFHOw-K4dAzm1pVBN` zFz5#cn_0AC&<_kAU@?kNKZ`*>FxbMHS#THfka+zpt>jf0dyqA^Xoa)S*d$!hbhIC8 z^zG~pcBk1biAQx#S3*P!A<~5qv_vN|=|YGW=JGt=mw#kquo z*#y%yocC=X2ZEHjKP(%Rp+D+(1#4xF8_q9EjuSKn2pVyU#sJXxf=$E~HQ@nJ*c4<2 zK;a#%wfPV-M!gT(G&>&vYMagYB;LI9KqY@WL35y>*+$VEC}>`6wjaTZ{2qZY2nc^? zZ56^GAUw_5DW-$K^l`y-5SacQBbXFs5bDk|3hqV~?f^K|ok7s>ImDi^{fWB61}mXD z37&(&^GE@kt(Xo5(<7`{5g%-6Iv7m%S%b!4Fg+re4o1E*gB?~H4u$3# zu3HUt1VbUfW5AJBU?>E*Lsn$bY#&FneV;ip*%tHaQM|pmWfboeRw_nxpPUEmAI05G zYrq^%jrEyg8qgvOkmf8jDO*k?Jfksr5L1THf(joagRwHmHxFRC;Ti`5P0d}Sd8;Yi zh2B1)cW0%yPw3r6>Fu-h_6fZ&vfx^8pJ>cf;#AFiLhn1w14A&G@r}XKyrM$~NhoQSivu_f2 z4a|giRM5SJFquM_UWz~_gxSn!4n>VQ6T-;GoGFA!Fuxmv#@t8Hk43U>%%*QFwCf`X zW(f=SRRpty1%CoNBA8`aFiTjFwiYE^TQEy#r@NvoX!imeXwjmYlPI`111;4Z>RMzT z8p2)vY^9x72$KzA{>n}PM#jp9Fgsb2B9{$ewlnN5sWkhjlZ~o;w}QJ7BY{ZJYzU;` z;h=RIaGL65hs-txe=;aD}zkxpG%N6ue6}?=GUM}eEVrgdEalCDNVwG#jo{NIRh841q z?73o^W=8XT= zsd_Ywstj`|&ch_UA~@#>&gqI*p5QzKS41Tbs>#}zr%ly+Ja6M7Q{|c8W$<{j zbUY}f3QEHTrT&W2a6t*%wSv-cP?FQ@;et{MGoKyL^9s{M&JoC2#RjXKBapL-4N*Bq zAZHaLvyVW|DuyMMpg01WONt|)`6f|csOuX6o6|h|_|WHBJ2t{RJb`!gj|6~fM?b-C zB-s6fjZy4Ig58U3v?4na>|PS=MuOe{S!2vdu=|ICyVA;5>B<@&xCpV<38Po;n7i2j{6{ zAikcb`iTrCs@6Pp3``cBr;dRR!FlQ!RG8pAbqq8K&Qr%gpx``p471Nu$6%*CI8PnJ zZ1Yq<*waK+&r`=jCn^p(PaO-LPO~+tIL1P!(>Nm_o7!0D6r87yg-*fM!dR$uOxS3w z)rHX@Fc#`O%#LEf)AQ6BYNE>W6=OM1%?IOO*uMcIL+69>uk1!u5AwlSjtco9O!L9? zu)^0PE-}rQ^Hdt$NHaN49R~(Kvvo?BabWNpyIC<9XE7KD2EVhLEVy3wjSJCg9JG2+ zX!WV+e(%H$2^z+`GRTe<`BJu?m70NxJSJi-mNReT9Kurb-iiD&-o-pKk#|q+12$+n ztPlR2&f6gji}(!H&$RxP2aYH)scuhnp({+-;LC96~#VA!P!3 z8i5%ZlVlJE?mh?#UAmA#$f=BHqFqSCpHhzcC~nT1!bimx1M9f+%$cJI9h8MRd?ZDz zSu=$@dlKL{JPAm|=-OCKJB%_;AvXVJF(8T<9GInR_ z`7CzSx&84I78hvUgLLR@^He^$6z^D z#WL9Kw)h;~CZJz`)n|~d#GYIi8L-)ylHdlRK{o^rp`~2v{W9XC0@M+E43`K8PV553ZKNVCJLCd-B_%h5}B3s{=fler-6$v_92(u`P79D zby^!0v8o*Pw9PxL12`OwlgoYyS47`Y0H`aSnI*UJxVVl;PqYa}T_8;5GV?D*7k0%o z?#}KAdjQEQ9B%bBOgM+nKo8h~71}V0WfGe%LqA$|ZlH9XvkgBE$cK>Q9ZEqcYC6Ky zJs(fy_wX&3@NDy?t%ldtAL-wj%P-+0%&gfwF>*MrzfhWNnZ>iQM%;ciZ;P=i)-{FF z%;mHA2)Ec>iwzx^8qY!cU9uQW{}nvL+&LL{gYwKb=JBkiB!O=1)UAIvnYS?WcNQ!{ ziMc_PeQvPVd}BJ#YFT@njI^jJP`h3y!$0G#V9M9+IT1 zRa?4rSO&OHB~n1w;o|zZQw*4dK}?j;djFC zf~OnLbU(vEo z9Fw!yI6GYVXV^IFu&G9wgk#!$7@>4d1df78zQZ8~H&k}>jg3Z*V=7BBV*8jd+2K``Np=kV_LeV3jDOe*wNs z#os}^RK?#ze4UEFk9e7iA4I%D#s7nNrHX%y_zo36g!oRxBcu-a4fL!@>P_o_ZBDi( zTu;cDj>i$Af_p{Wyl4X!x#8yG4V-R)KfZyt^2f0nN?R2k-V76Hs`7|OHiNyxi811l zm}q)rJh}~Tba+)f9P_z+6*sUqA}j=a12tM$2sCLuA`Da-A-Z^~=Ag-2I)H?{UE_Ml zcKHtK+C#n2C-lZi^N*xVEKclrpLg4hZ) z&{Q->FYd|_JQJ8i!Hal*5hFg-R4FAz#L$=tmqc47nFg+HH26{jnNFp)8n zi~KrvkFXyf5(cn^%e9&A$ z$+a~oSaXF)t~MV-vJ)Fja{DPoEiGXO>8c#G_2gu?1lcPEt}~)Bt~ndbS?!>FPPU;= z&QhZoIb99r-0#4_ZTto5I^4qSW*rLaj5rsL`8CM9 z#(^~a-Bl;&dZPq6!yC+b)PbYn_}f+|XPHrroDmJ?Jno3VlD-kUw@%J2h6gKToH}iw zbWS-ML85SV&(>bO?lP7kXJeJK-JrOOB=Oo6lsR#L6@PRvg&eAvD&HhyKPW`9hIofN zBcW4-IDHbD^BSWPjVwy%w6-+6qf?_=743{->+tsyWrN#fFutdB1z*FRO_*Y5WjX~? zlqn8rH{frS5Km>w_w&2BvuT}7HK@jv$%C}{_&Z?BWP($>Jrh^q^cs2q$*$d?{a7GZ z{t~Q76_|_?h3>$)27g0D-y_*VWb`JJt=?qIYTcRa1Zk@&QfEY{zBP{;M6TMrdlk-f z?KFQ|ffiXo)Zv0y`wb6P2Bl`gN+cJ{R9o^>MmUo5&C8LDM=TOb5qQj7an(kQbs@B# zHI9Sh@!!qoSMru^4$=%eB)!Vmi}b4B%`4XMmd+Sf+v>&G?V}uCq}__p#K<aeNnt%9e{EFI*j zJKPKN6~I$BMcoE9{AkpGb!bL4SpSm39>7Q~5?u460l5@bC0Bd1LqgA(9jEXX?J2|c zm3@RxsxF>^tZ?eSLi0w1a+GSBgXC`0C=T*?;q&Bmo4pue%aH6vNVvsV@logz4?VXu zcDA8>o&5WeUX3)Gyp$rew=)m&6TAZOQpyZR?N7r?kk{VuH2fg&^Ch~4e;lx#@Or=` zx^Vt8=@fJf5-tEyB49_11I$Z!aC%my2%PCI!6EQG;72RCUEoTXwWe*`s71crAB0AX2hn{sZJY^}N zUbeluR}km#uE3Nu%g8m>N*bVtY5=cIa*7b(?50|WyfqSRm5Ii$ZUDYB6z&%c_JYt3 zl|b#xV`E%d3y#~KtQx)WL3EzQ2q`%aFokxe2C#JaQ}FpJozhAXuTa-ih4&x;w&v;eL*-62@z^Tt5M*-JGW3MCo0k2d=W;b9} zN5~Wkmj$LulMw2GR|9_ZS7-%ix7<3=*x!xUU{KQRrR|d_VA`>wzBy z{1oPW!Jz5ZA4X&$* zK}R{?A-w&75dn=y$wLgEk*S9p;Lt2i8(R0{x~`v6`Q=dPmx$qApfOQ`(;dDCFcLs+ za7sKMU=@VaF^J~{jPh%|$?6)5ci~8oV!+BMADpIN3YgE2AB@8mVkNHE5mv__Vi{mW zK;!LI*Qi}qzG}cqDIc6>Py-mz!@q?`>C5P+qr~g)LDF$x5CM%y>2$3ZhT4<`lmI78 zsRr{+9v|ivE%E1KsBy~CERry3rfKHi#$%Icj##1Qos>eZ0wyZfW+7(#)G*i)NT7np*bI1AG+^AjpP3G)AG z;~h(*4ss7$Z4FaX7F)x92rf3I)!uNGOb~m+`&FFwhL5W_?G2w&nQ3oWl!)3Jral2g z1+zFA7yHm&85jG|Xwud`bOGXiWDv~6%{at~8Lb)!PRuG)24Yqz<6(Xm5s-;QEb0NMb#U{j;eSx z8)bG~!uv*#V);3ID2)`cS|jRtz&>b$dr%ihz@B)@ zjh>XJIN=vi9Qc?IvJwT41H8Z(|`H2`8jeSy@$MDatbe z!S>YvpUb27q;0};kO;Tj!3R?Kb|p@bMY-9je#j01qM6q`eLvsek7d#QC5R4N#i{rj zc9M5j@h;fM+o|Glc&y~0j6>sCc3j2VAb!dQj~gIp3LKA$k72K~?i5FFM@>6lkq5m=UZ?$tB`RwaLic`iO%Hahfqh{=F@cbp84@ZsFrEW zmudc|f_F08KFnK2ZDPwZ1!){=nq&@nn75kTfz?P*L^SiT<1&u^9St%|pt^gaiG`~; zl|j0Ui!L&c;-T%s(Fe!5^RqB1U??^f8RmX`bqv8 zgn?_;=KwE(pA0_*{!(~6DBwp`WbAVIE8wTW7r+<7 zPlu<6CuYJI!Ow!94Nv!Y=fGbHKNo%;{Cs#4Vl~1N_(kxG;g`TKgQq8x{{nwCJmD=z zxDo!hGcC`Yq35Vqz^{b&!xXal;yI*E{0w!Di`X{7hC*!_mW_n6eLK5z0CiYKFN$u|q z&rRNQVvx~vaG=w7nSLkhj}n&7Dc%sHZD$zlMh9KLWE>Ps+8}O<_!oGH9@Q0WzCt+L7=+)STo>7>fq|Wx-$pK< zFLKaA=_%u=AWNDovNWM?{$)c7NQ1sSHoHxTd7lt|guplo(X`%4HoYOWO>eEXf32$m z%zizG-W4EyetOpkN@v&GMvcn)I-P483n>b=%Q3%u_Q@Sklo zT;A2^t@nF^&Dr%1r6$z&LyEJN_xFNqUA;;AG^B;<-NmN2w1=+ey1duAmLaE1BenhY z*Yi{7t@rDqx}9C`P--E??MEA}ubxW@>*`I?_ZBRJY2~7=m$-+Z*~Othm~GG*>)%}k zz-`7}RIN$kBY~B=TJpxh3T zK2=>&k3deJcBl9$zJLP8Jn+PlkkVBgf#qx`+x=ar3xL~1vsXAxkhJ}aTXs>~9UjOL z>;co3Ec$vsYu#>#hk0TRX z1=>kofJN;_k#U}*6v@Y2c$5zz5xK>cj$az0XB!(q-~^{TA=?Zupp}Z{IhombRWk?p zde8XJoH^i%29ZW=o6#NNKF3M!!C{82;_4)?#1lxzT;Y}=#E|g5f^d|N#L&IwQCvSH z1g(UKvyD-fpudX_u`wI&raapW`3vRzf?;>TP@04oKJTD-D2v*}BI^?S1GM~7vZ((F zF-faQ1GLKOQ__D9Et_5lv0Aix!~Dmw48Z&746< z|BR_<_gMUZ0TK7Y+Z*I7#(MOavyGSQ5z{z-G5xhW z#CrNDl9Nns7qh@Q+d=pL%7wKWno&N1K@D$Y6qxlZJJgCm8p$6Tu6-)HH~+ zidHhp@oqW>#+`!keb%A|3eZTe+&iJDw{y@HX+8@;^nsZB5Rd}MUXAN%Wu0lV2j7tG$^#iSJ~q6gM-42v&9$L;@fTU z6SO0x+_(%G5#_&1T@YxWEsm3FfHY&}G?7wnpDljE7LS+q6j*4h!WG)m!%^S6gWNb9 z-geGBiY#ZVYzcJcUU_vhX4z;W;H^u*%DZCpCn_W2H7YJ#V1B)RoRb&awIhO|<}2qr@goL$VgysM3=Q+DlpK6zLo}zlRi> zY91^YEw+9dlJx|J3GL_^2<4RpOGN$xSgfJ^qCOb}A?Q&H z?WI;Yg;qeX5|+-=s#7@nUD|KjW#e9GD}lq!#e={t@KOd;bvoF*T;4DNAx))B$VR(V z4as&ORxw6Ek9%k@Wuw!^{VnM=RjM6PVk@g5s@$qkc>EJowU<=sByta{R)$htcNSR_ zZB*$I6zwHdIyu|F8`Kaklxo>os219&(!(s;OR9AKxWB$RY}u9S9Ns4cs^zxa+ij(@ z&jzQ*Vw6{P#w+qyo+bZbTYh?!MtPlIl)#R&XvOK_Yvt(i8||f5bT+yN-Io$B)K)vs zLKXMeEJqLWXfLVKx#{Kc8o{D!mfnVU|Fy(h#7|fTau@$$F`-_Sg~zM z^HJe|Z*|VVkFB+aJ@=H&FQ%4fpR-kf743$dd(L*@Q#SvfnId1<)U&!iHT-9pNdM_6 z^m)vn{TDukK2@I{7p#U$t^~jzGj&?@{P`8jxr+l$NNvpMy=DKOtya$SU(wW89DcRK zqjz1-uQ=>_{JGZQ*9%C;pVQ-ys^PcFqu%Cm!PUxrfofouyH#v~V8`v;y;TF9mAyDF zuyxReEOp*;wYtdtBGapU3EhvDA)yqTZP0||Wn-n-c11MgjUAIYZB>o})V9PUBznn_ za>12oKIj?DpDqI0pQAy5wq&KVx_)t(7Vj4WhC@8a<`74=9jv>6P@^-%;cL994)!s` zISitqr}+AfAO%6*f(3DijuX+k`@m;^xyau7Nc|y7^eBMc38BtL$^W5By-tOCTX-I> zHt5{^ANn-_K zhsAB~xndWQV3mMr5khb3ND<@^Ls%!d9Px?D+pcu{%00|*#AvJ4gOIjbv&4!2EkcA- zF8@Jn4RAbCMaTNv8mC-znqF@G(m8xB4xQB}ap*8VHh}S4`yLa)^oU1TS{$PCw#$oO zDGnW`CvoBsLL9#_QJkaiCr-`V4C5-nnQ|!z9e3A)(2;l&qzd6SqZ+@p1tFLggs`+A zMCEOl55H0nIAmWgu_`%oZ~QTXgWO}6BL&U;2rUN$0uKjfvX>%JI~$3+{IgJ?0>_VPMB~V8L!weW&;%uF9+GDp zdj%m9M-u9!bh9@psta<_QGu9lQB-*wZc$>kPEA918Pwi&mqBFSc9G7q%OG3DfUzt9 z5~g;;`U(w=@U^{g-Upi}TE*H*bY^4yqJ;je7PRE}V@inQQ|Hn`%kL3|U@szF<^-!f z2385!=g4DMuNY9dQWu5f{~wQcx4FsuF<>bxb}LkDj20+3S-lIKjhyt*&`+)|IQ>=i zi=UbsJzewz-XTPFRhBJ1KlC*ni9kr`^;w9@n3xeGU41EEXicxgR_$zqjwi|?_@Yp2 zQ2%E$$N$(G<;ogkISKi@>mYvHs|qX&#V=+dV$_!l-7=u)rc;6V|8mqH%c*CSV}DnO zfnL;)o{Wrk%!Owz(4eUKQN^$ixAq~H^zgz{F)?`A)!KUyYL;6BP1*ZBr3R)4>Zyof z%uo7>n)v_8^s>~uiGHtcEpqxrr%Bc56~m1#S$C|#p02y<>CUD{xY(okBWn0Bd;%%& z)!Pe84?|Lo(~+cx?9QnV2<^^0h}2g_PXZd)(HRtjjt{rQFVgnr$h z%f`_YVo>#x#;#jlxETQU)bgn!QYC!Z_*Q5ntDvRV`Ksl&8r%O?uk%&QPnCv7_}Y5O zKL2F{_kXPMOX?_p-_s?CuCy0cNNttHj5ehwt(o-a2re{bLm-9kdL-a(tzS+Ip z$8A7wt+v0`QN8okn+zR;c{A;~)vl&ms7X*o&mswLn;}(cEhc*u|J^0#zrC#qHj%Z@ z_d{EDB$oHOWgirnJMhcVw@t;I&WGEFy8EKFt{evwtnN#$e`W1?Kv)?NDu0?p%3+AA zOWhe9G5Iqso-~!Uh18>#K}C+~JNWu*8_%w>*2b=@p79V&&x@WC+K?K$uaj7`o~BMr zE@LYY(<7_Z*lGO#BQ1b5v9|!(ebMx~zV6v=jWVS9E5@5B$d`>gOws*XhY`9&RJrxB zmI!3Ny7k{~#88{%)}quGv#L^%kT#JE5U*NYVg4H|i%>G3f{dJ+Y5UZ-1#{5ZhIMk# zG;NVs({2%?yH;Q_X~8519^2E}Ec;n&GtTQbF~#llg}SPI3IQEtZ6-U+INbxv~H z33|>UXNpd1BBLiR#E!-aqDuv5o48>8VRf$_VYs^0NN*=$oI$BwA#&iywo@O+3Y@fo zMcq)Xy)@j6)y}%TFCMeU+ty(aKi=~Ui45^1xuJG$sk6}gw=_A!QE7ogrD(7U@mnPz z#Uh?Aem&wB1F+`Dtmjh1JQ|-M11&DB;}9>-aIgxh|F{VN!#LPZ@mnT-t1(e@h!-OO zRm7`+FfhcM32-w(C{ZJR^OSgK0&sW&P~T0U z_wv}?Irk15+()K2``8_^lI-dh&)N4_tE_wBlHMPuL~ky#yFX4zzn4f;J0~SPRwkI4m>z^*xF-uvKVTU!qpZ;sYz6+jcc;n6iz%*c7V2E zgmbdPR^_Wr$RkmdSemS+H|J8wugPjcRPXk64-(Stu#0BvC>HHdcRG47!og5UF~62ap*`ZR~aa-i;?(u z#7Bhk@r9>!+c!0wz;P7d)lUxfNs2b~Ns8dNGMqRjOX+(<(i3g{Djk(%tSTfu-qu~x zaYej4AtXJ9YL9SEyhX)PfFsx;>4&M%g>&MOYexZ&>V>2SkGwe<9YAGxIfY&Rcw47L zhXwH%Sx9<}=xi9AlhLs|EWSe04|hP4a8A6k&QX8~Tu6GNDqhM@$7&fOA^dGkpN>Fc zE}_%os1$<7@SRw+I|^`E)+yeKj$_=3w$ihgDue5Y$HQ}x|AcjPpL%}EA9q3dgU9`y zctalL_gql^6A2^@IXvyfD1Y}0${#$?kI_fu_g+ALA3KpqyvaFn4&70JTPreu?@;>@ z2HDKVVr*Rjy?@h**Ch#yH<;saD&;2U#48pkN8UMd1RphUGJ5l-ljX}C=qBx@N;F9- zYi2|Mxal&WPNKs(KX9_3p|6aLnXtTqhEJ-3)cSoYv^uHt`o_w&#t}as_e3d&_VltE z@1zk%8Q*Uhc@Zo>HpZRjK*z9thr>w?q}`;5V2&36=!z=MYD;8;t7-TfUeJtL8$_}h zc=_l>!>?eDo>TG8f3Me@LqN> zf|(1iUNUt8TfSsz(fs73smn`>+Gi9n_m)zliaX7HrAFImXV${`(-&qgT$a@RU;&G8 z?m1R!oZ#HK=i}>*PJGK+Av5QS_%u})zDe<=FFIT^N|8bckz;<#kmU?&mZF~U`>eC{K5q@Gp|~@bm4*&|2uVH zsik#cNh|8Yl2-!e_B%%vPA{65cx!K5$avCih}UA2wyG|He%IH9rLV3F>%WE=3B5SW zDlS|wyXf9m3Roin@pCqO!JMUY3g^wars!W|pszxlmR&Tf@Tz%Bulxs4*|f}Qe<@r% zZSunXTbx3QVgB4@^7U=zK%Y&4QbZc)z14sn61R(>sr4 zqjEeMS1nyQzou~MoP`S*J^;Tu$1`@;tT{8*FDJD$CnKXYE2Y%sPFj~!S}}WZ;e31+ZO*)+B~!B& zM$ezWaDmf3dd>{Cc;OQN!dXi_6IgNK;-Z;T$D)%To|TiBHg$CAgt2|HM~&)yV>Dkq z+LM^p$LkquOkcInGiuKC#f9q^FUQw1ajHD5)L^40P{ms^WDPzS?#AnYbJ>HXi}Bj$ zB`mqr$sGmW?3C1`oE%?bLXI~*mwPju3F*w4;7v;NvUGn|O13vMGlfS?7(OO@>?ISX z{$q)2Lhk4!@2GB>?Q=a<(_Zh|mknf{5{Fi?>_x`h>*q)EtVLe$(G{J&nTtACMV7Ly zsl{IKjJT^-)f2wazHmsGEk(HK~ot|i9tV^RN zv&27@T|>2PYDNhw$wnbh9kr0nD4aKSV$u8(HZ^D2jG}qzeb#zQXBg>yik8h>H#4lo z;Hplg>~No)s12;9P4o?YjDq!XqZ>cL-_A-NUoknv#Q3Yq~#{#3ne+;w0^0%E7o>4Kf1-3jcZ|}s9@N&3>0grX) z9NpcADb^!Jqr3J?UC}gkc~ks0O7%Bo{x0bGx4M=$HJjdQ^uhP`d`!BALPI96tUp|Z z>E`wDOW`-e-vGZBp1$-+PlenBk8Peaw;)^(e=GcL@EhRqd`B)TM`R6r03Pp{W?SIz zfH&dkQH|T-?}Xn5e>Xf4+lsJK#kW(qtMFR>)NRHB*D(3Hi8PkXGV#R-`cOqOo`Xzg z^ic}>07VuiuL14r`3R&ZW=9P>U_%4oMswrTXMDx$b5F zp%_BwFF>Z?<$h^M?q^5@^Ig+u+G8MQll1;V^eq@zi!jRe$85%nKCD(wGpYjP-$2t_ zVYG_5vQFw`q}D?$O%SW|xh(Tup!Yp4csFAgqYpw=hVd5ScRmbD64d!DrFpW#=x!u_ zWOle67MWj1gdDutI!fw87U6h_eA(?rxAGD%FH^B_bHnXM_wtf1c)OWQ>mE^{Ea+8` z-Yw{*e?-CVm`cs_k130JHM(<2#@{-uzv?gjnqNm)sD#Y<)xBGO{^ggEJ2D$_lZ zKMnslqSXU6pS2(LM6Wxaxn=o>SsGrL@!qGt-u=g}Z}woyj(ayA)9|XpZ;!aYS3>qp zudM1g=FLswo!>;isMA+7KK}2|R}6n{)u!sX>qlT$ zqABW;FZ-v#5^d|}#xEe_ZfYp#U&NQjV*N%sk3%zyYbQUr%cCz9AKoQ{TW*&4pj(yS zNb$c4;C$FkxsVB5no~l>J5(qdlG;zF>PMw!7cHfMY$9eWXtv}Gz3R25pwr|OOQ$y% z+h4%c)5vMT`Ig2}8y2C=Q>KYI=vi@6&jZJwejZ5u&jTmrPmv=er-jnb()vrHYkxDe9_TXJMb=IrT7!8E_2 z%TeYXy*!wP52Z^dld{KWPtcaPl`zfxiQ~MYjF~gFKp3=zQ&lHBGYN@0v)FV;G9}Ki za*tj(bIz>g8mATm5RmCzB;6(k_T^*4!;NsdqYM`{k<$y=s^RI&3ECAS;xZ36$IBJ1 z4;i)B^}a}9g{!dQLXfL31o>1w$o_`JP|`b^;l+RCs>CnL)$k8$!Ik(>@PM_QgDtU+ zG8_F;4@yoM)!&tXXoF20#(dgSwBu?nAJ*a`@&vPtizgb==`8Qp%A)FQSb4I>42n`< z_#4|cD{wPPn*+FNS4_$oNZQ^ijf(GtzdzzAm>vCPd3NacNVFyV#C6DTZ zq-F5#WHf}}zCJeUr13=#Ww*w(wcx=#X*}jd8Cd=2;A$dbnRp(F;=?iYd)OFkJx)ZJ z!zKeV0r3gAs%5{zXx#^brZ!-5`?qh&JoaYH)+l_NzQFjw%HvonwtmN1+hJCo#?(eh zxh2?En64=`b_03|=6WM72=N#X*(n9CG2VZU_Zk93Q$`YB2_dp(L!~69>{qK847(JT zgt8*plXNLqod|@ShrcC?6K(&X zRhnbdg~pa;Hv0>TDqB!nW%PLK_LXIHNArdXN|+&RoV9HyU(^ixjY;tCmVUVMvuLmC zm>YLNqR0B{&GJz$!|~DB41`kvABpmr5}F+^3sDk_Q-Y+zq|BUtw2Ic{<{==OkAXV} zvEhb77c~aV{EDAdA%JR^!HzzkEl0U6LLr5=Awl2jUfgIx8EFzmzxlQ%?U7(5OE~Vz z3H#$?n8G!2IIk5|Jlt+>T^lI$*lmYbhuhP}ShbpZj$jKMgDLqa{3(MprgHb7Rpg+Z zX81)SHPmh)#JbfYmW5U_8h<%x*o1vH3q->LF@uCg;-}1Jfj9}a?p*q1v4}TGBdIaj zJ0B%&SFE?yDk-%GxObOS8gEk9B-Jp~l`)WSFv11+TL=|1gNj;uX0bd`qb2}%BJ&SM zi(87tRC>Lr*dW56?B#-()6mDv0Sl@qwGA^Eux=p&cf(GKx&skxR;s5+w6#B7)u<{` zFP3B#0W}a>Ocmn2u(V^UF=el}L{-X6X%rhp4v3+#9S3U-Oo9qBIa<#TyVn@~z}QEM zs!LBkxpjsj@9@-@0r=ORc(9_XpiSPR-Jah5#pl_WPy76Vkv*Suh_e(}y~4>gv5e6# zIr(A|8KaNkX_$`bo`vwF4Dw5Y^ff{KCqBWf1oR0Cj3JatYk+FZ4eWBT^M`k>bBnGd@RX6;UUpL9lb>!iEYg-n6UZ^NSX}_T#sezGs_dE-_*@Wpiw2!(wRF zI3HgquxK+vx-ho-=0emhLQ~K&syE?d!q*@fEX{B4TLiDKGl?UT~ zb|82WqH|0ujgFTR+2ZB4_yJoycz6Q%sxKo7<+k_%TU^>yl{XjrMv`HoEnaAgm)qj| zZ1EGec%pUi0G11r=SWQ;^_hiyT-pw=qsQMG)^6K@5FjwT+Px zA+I7S(B~Db+^Qj3OQhgNgF-P>OJHJaAX($vSq23(*L!e|wK`1E%tfAJDowgLn z>4mj6M5r|SV|b45@ZNB8RpOWBs)@IeDX$rBH{~y0hz))Je2?DHr~Q0&flYnv>5DCW zxuXv&Ooi{)ClP_1jA(iFNQh*`rO_&tM$B|gru*=u#4cOfIEU(G2r-|2LYy+Kqj{}P zTg}>y{tDYtM(Yw3Uv33W615rdhHe`2=*M`$Jy&~TzM)4;u zS_|}0f@y{=?SL&_qC^S?S_yBh647%xqocy5JAnEIpuYbnceTWg9c^x1`(%=qb(Pit z#I&s1(7SADxUpinGKvZPEsz#=)c#Wmr!Q+8{oH3*uVjBbUa>KTD$F_-rxkz0wP$Ru zz8xg*2HA9x{AJN7*^GL3h>}7!TO93U9{Dxi*(>AGqmL!?=W<@thS+6OFlY#A?8COS zMQUUa{C8Rg&=GA2ad$@FoWZ>rRchjm;Dk$srtUW_(S=4gooKeMwbWyf+KSYYZWpwa z{pE$^uFLI!Vn)#58A2>zC7SppTzQ8Z5l72`fB7agrF!({(+59#bk@N(YDO!bGaz(G zD{fXz)wiljviQ_;@Rw8zUkU-g+^ZTsp{QH{dS#JzH@VvOE21Alv5&+{^D=?84_ zXxnUnqQNp*;d}M|Av`+c*$ufrTwgPLnl2NylJwVCD7DH2J?>N`y}dZL>mjEBSr6FK z?Xr69vQqsEmPftw=|4Z6-mIHbOtv(C6}ZA-=S$XqL)R?pc!JKcuZeN(yuZE~vn>}r z(Iq3sD!8G{7`ls`sB`&}T<_0$^NpAXuV(+@v4bwr@Rv4Ban4)&R?H*Ufm+pux5735 zdb=EK)zZNT)eNIN%mbO%k>D_ycEyO`q^|hYY{t0P4>)u1j?5<$uSqQPJ^hJ>zc;F2 zO3T7y!*96L`LEXZL^J|i=z|i^LlSR2ZUAJAo@_pB6oni0$5tEktl1A^%Oi0|E zQ}%;~k4h@@mH(|MZ`;-PJTv*a&)R5sQmyR^1-Hzr_w6l1#ruyYJbF*sTQQ{*XlE+o zv~CEyf)njJ1B&if?QJ|dXc1+ZhIl81B#{1EDr+uPZ{enEC7U&%q$($Cqh0f)~iQ~mZ08LJs+&Uxll=n`d5FlE)GYht?SL5@4OlFLIUc@ zP@mpFwWgl(P>+&36lxW=6tB)Q)95aZV4DULz;rt$E` z!TRYCcc}4jrFLPqRbudlwHo{*PAH2J_I7PG#8rtQ#`P{m#45E+Cfq{Xy3$Jk;jE6{ zAFgT9T*x{!m8jX;NtN43P zz_6v6ajSvP^O(2aYQ*EFE{lsWU$__d-zPBh%X^JJM(^2sTHj~%=RlcoztN4BDdvj% zjhlIq8UBFL(}5#xX6ggR6+kpMKVbCY3-w)8r;C=ytwV3%@`L78Ta5|4O)cjak0j3OWzHqCNVS4T{+@`zISZ_p~F(bDdoy?~yjdsrWu09rF zHrZ}?%>PyzvBnIx2WcG)7{cs*ud!)Q)dPmlvE@M8v)-4 zp03T_)!Z9FvDO6HRd^@gQ}wt}hT-YXq&ZV_Kj4nQ0arJ(beB=O#5 mH)EwM4q4`)ghraaDd+?CFXQ26{%&LEo~kEcmVo!Ws{aQhR$y5G delta 16410 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 diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallTask.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallTask.java index 2bbef30..630590b 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallTask.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallTask.java @@ -8,12 +8,16 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SpringContextHolder; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.stream.Collectors; + /** * 徐工叫料任务类 * @@ -25,8 +29,6 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j public class CallTask extends AbstractAcsTask { - private final SendTask sendTask = new SendTask(); - /** * 更新任务状态 * @@ -36,7 +38,7 @@ public class CallTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) @Override public void updateTaskStatus(JSONObject taskJSON, String status) { - sendTask.updateTaskStatus(taskJSON, status); + SpringContextHolder.getBean(SendTask.class).updateTaskStatus(taskJSON, status); } @Override @@ -60,12 +62,7 @@ public class CallTask extends AbstractAcsTask { @Override public String createTask(JSONObject param) { String nextPointCode = param.getString("next_point_code"); - String materialType = param.getString("material_type"); - - // 判断呼叫的物料类型 - if (StrUtil.equals(materialType, "14")) { - throw new BadRequestException("不能呼叫空物料"); - } + String materialType = param.getString("call_material_type"); // 判断点位是否存在 JSONObject nextPoint = WQLObject @@ -83,8 +80,14 @@ public class CallTask extends AbstractAcsTask { } // 判断叫的物料是否为点位的限定物料 - String nextPointMaterialType = nextPoint.getString("material_type"); - if (!StrUtil.equals(nextPointMaterialType, "14") && !StrUtil.equals(nextPointMaterialType, materialType)) { + List materialTypes = WQLObject + .getWQLObject("sch_base_point_material") + .query("point_id = " + nextPoint.getLong("point_id")) + .getResultJSONArray(0) + .stream() + .map(o -> ((JSONObject) o).getString("material")) + .collect(Collectors.toList()); + if (!materialTypes.contains(materialType)) { throw new BadRequestException("该点位不能呼叫这种物料"); } @@ -98,10 +101,7 @@ public class CallTask extends AbstractAcsTask { throw new BadRequestException("该点位不是空位"); } - // 起点 - JSONObject startPoint = null; - - // 查询该区域存放此物料的排 + // 查询叫料区域存放此物料的排 JSONArray colArray = WQL .getWO("SEND_TASK") .addParam("flag", "2") @@ -111,9 +111,10 @@ public class CallTask extends AbstractAcsTask { .getResultJSONArray(0); // 遍历该区域存放此物料的排寻找合适的点位 + JSONObject startPoint = null; for (Object o : colArray) { // 查找该排有货 或 已锁定的点位（出入库顺序降序） - startPoint = WQL + JSONObject tempPoint = WQL .getWO("SEND_TASK") .addParam("flag", "3") .addParam("region_id", startRegionId) @@ -122,19 +123,17 @@ public class CallTask extends AbstractAcsTask { .uniqueResult(0); // 点位不为空 且 点位未锁定，则为合适的叫料点位 - if (ObjectUtil.isNotEmpty(startPoint) && StrUtil.equals(startPoint.getString("lock_type"), "00")) { + if (ObjectUtil.isNotEmpty(tempPoint) && StrUtil.equals(tempPoint.getString("lock_type"), "00")) { + startPoint = tempPoint; break; } - - // 如果不合适重置为null - startPoint = null; } if (ObjectUtil.isEmpty(startPoint)) { throw new BadRequestException("未找到合适的叫料点位"); } assert startPoint != null; - return sendTask.createTaskRelated( + return SpringContextHolder.getBean(SendTask.class).createTaskRelated( startPoint, nextPoint, param, @@ -151,7 +150,7 @@ public class CallTask extends AbstractAcsTask { */ @Override public void forceFinish(String task_id) { - sendTask.forceFinish(task_id); + SpringContextHolder.getBean(SendTask.class).forceFinish(task_id); } @Override diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java index d67878d..831359e 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java @@ -194,32 +194,16 @@ public class SendTask extends AbstractAcsTask { throw new BadRequestException("该点位是空位"); } - // 如果起点是大吨位装配线下线区这根据物料类型给终点 + // 查送料点位（出入库顺序升序） JSONObject nextPoint; - String startRegionId = startPoint.getString("region_id"); String currentMaterialType = startPoint.getString("current_material_type"); - if (StrUtil.equals(startRegionId, "1578917189698850816") || StrUtil.equals(startRegionId, "1578917627470942208")) { - String nextPointCode = null; - if (StrUtil.equals(currentMaterialType, "08")) { - nextPointCode = "TZSXDCP1"; - } - if (StrUtil.equals(currentMaterialType, "09")) { - nextPointCode = "TZSXDCP2"; - } - nextPoint = WQLObject - .getWQLObject("sch_base_point") - .query("is_delete = '0' AND is_used = '1' AND point_code = '" + nextPointCode + "'") - .uniqueResult(0); - } else { - // 查送料点位（出入库顺序升序） - nextPoint = WQL - .getWO("SEND_TASK") - .addParam("flag", "1") - .addParam("region_id", nextRegionId) - .addParam("material_type", currentMaterialType) - .process() - .uniqueResult(0); - } + nextPoint = WQL + .getWO("SEND_TASK") + .addParam("flag", "1") + .addParam("region_id", nextRegionId) + .addParam("material_type", currentMaterialType) + .process() + .uniqueResult(0); if (ObjectUtil.isEmpty(nextPoint)) { throw new BadRequestException("未找到合适的送料点位"); } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SEND_TASK.wql b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SEND_TASK.wql index b825593..886f1d0 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SEND_TASK.wql +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/SEND_TASK.wql @@ -45,17 +45,18 @@ SELECT * FROM - sch_base_point + sch_base_point point + LEFT JOIN sch_base_point_material pm ON point.point_id = pm.point_id WHERE - point_status = '00' - AND lock_type = '00' - AND is_delete = '0' - AND is_used = '1' + point.point_status = '00' + AND point.lock_type = '00' + AND point.is_delete = '0' + AND point.is_used = '1' OPTION 输入.region_id <> "" - region_id = 输入.region_id + point.region_id = 输入.region_id ENDOPTION OPTION 输入.material_type <> "" - material_type = 输入.material_type + pm.material = 输入.material_type ENDOPTION ORDER BY seq ASC @@ -66,17 +67,18 @@ IF 输入.flag = "2" QUERY SELECT DISTINCT - col + point.col FROM - `sch_base_point` + `sch_base_point` point + LEFT JOIN sch_base_point_material pm ON point.point_id = pm.point_id WHERE - is_delete = '0' - AND is_used = '1' + point.is_delete = '0' + AND point.is_used = '1' OPTION 输入.region_id <> "" - region_id = 输入.region_id + point.region_id = 输入.region_id ENDOPTION OPTION 输入.material_type <> "" - material_type = 输入.material_type + pm.material = 输入.material_type ENDOPTION ORDER BY col diff --git a/lms/hd/nladmin-system/src/test/java/org/nl/PointTest.java b/lms/hd/nladmin-system/src/test/java/org/nl/PointTest.java index 10d9dfe..8626ea5 100644 --- a/lms/hd/nladmin-system/src/test/java/org/nl/PointTest.java +++ b/lms/hd/nladmin-system/src/test/java/org/nl/PointTest.java @@ -3,13 +3,16 @@ package org.nl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.junit.Test; import org.junit.runner.RunWith; +import org.nl.utils.SecurityUtils; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wql.core.bean.WQLObject; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @RunWith(SpringRunner.class) @@ -17,40 +20,48 @@ public class PointTest { @Test public void test01() { - for (int i = 0; i < 21; i++) { - int nameSeq = i + 1; - PointDto point = new PointDto(); - - point.setMaterial_type("10"); - if (nameSeq < 10) { - point.setPoint_code("XCPM0" + nameSeq); - } else { - point.setPoint_code("XCPM" + nameSeq); + WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); +// JSONObject point = new JSONObject(); +// point.put("region_id", "1628275194667864064"); +// point.put("point_type", "00"); +// point.put("point_status", "00"); +// point.put("lock_type", "00"); +// point.put("is_used", "1"); +// point.put("is_delete", "0"); +// String now = DateUtil.now(); +// point.put("create_id", 1); +// point.put("create_name", "管理员"); +// point.put("create_time", now); +// point.put("update_optid", 1); +// point.put("update_optname", "管理员"); +// point.put("update_time", now); +// point.put("current_material_type", "14"); +// +// int seq = 0; +// for (int i = 1; i < 6; i++) { +// for (int j = 1; j < 6; j++) { +// point.put("point_id", IdUtil.createSnowflake(1L, 1L).nextId()); +// point.put("point_code", "HC" + i + "-0" + j + "-01"); +// point.put("point_name", "缓存周转区" + i + "排" + j + "列"); +// point.put("seq", ++seq); +// point.put("col", i); +// point.put("seq_num", ((i - 1) * 10) + j); +// point_table.insert(point); +// } +// } + JSONArray points = point_table + .query("region_id = 1628275194667864064") + .getResultJSONArray(0); + WQLObject pm_table = WQLObject.getWQLObject("sch_base_point_material"); + JSONObject pm = new JSONObject(); + String[] materials = new String[]{"08", "09", "10", "11", "12", "13"}; + for (Object o : points) { + pm.put("point_id", ((JSONObject) o).getLongValue("point_id")); + for (String material : materials) { + pm.put("pm_id", IdUtil.getSnowflake(1L, 1L).nextId()); + pm.put("material", material); + pm_table.insert(pm); } - point.setPoint_name("小吨位成品满框" + nameSeq + "号位"); - -//--------------------------------------------------------------------------------------------------------- - point.setRegion_id(1578915492142387200L); - -//--------------------------------------------------------------------------------------------------------- - point.setSeq((long) i); - point.setPoint_status("00"); - point.setPoint_type("00"); - point.setLock_type("00"); - Long currentUserId = 1L; - String nickName = "管理员"; - String now = DateUtil.now(); - point.setPoint_id(IdUtil.getSnowflake(1, 1).nextId()); - point.setCreate_id(currentUserId); - point.setCreate_name(nickName); - point.setUpdate_optid(currentUserId); - point.setUpdate_optname(nickName); - point.setUpdate_time(now); - point.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("sch_base_point"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(point)); - wo.insert(json); } } } diff --git a/lms/qd/src/views/wms/sch/point/index.vue b/lms/qd/src/views/wms/sch/point/index.vue index f3fb313..e6ce5de 100644 --- a/lms/qd/src/views/wms/sch/point/index.vue +++ b/lms/qd/src/views/wms/sch/point/index.vue @@ -117,6 +117,7 @@ - + - - - - - - - - - - - - + + + + + + + + + + + +