From 4cd08535892b71a0b7b18f4e9a6eddd982e55305 Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 28 Nov 2023 13:20:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=A0=86=E5=9E=9B=E6=9C=BA=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceErpmappingServiceImpl.java | 1 + .../service/impl/DeviceExtraServiceImpl.java | 1 + .../StandardStackerDeviceDriver.java | 48 ++++++++----------- .../service/impl/InstructionServiceImpl.java | 34 +++++++++---- .../acs/opc/service/impl/OpcServiceImpl.java | 1 + .../service/impl/RouteLineServiceImpl.java | 1 + .../service/impl/RouteLocServiceImpl.java | 1 + .../service/impl/RoutePlanServiceImpl.java | 1 + .../service/impl/StorageCellServiceImpl.java | 1 + .../logicflow/impl/StageImageServiceImpl.java | 1 + .../logicflow/impl/StageServiceImpl.java | 1 + .../param/impl/SysParamServiceImpl.java | 1 + .../src/views/acs/device/config.vue | 2 +- 13 files changed, 58 insertions(+), 36 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java index 93f8128..8a2a7de 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java @@ -24,6 +24,7 @@ import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto; import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam; import org.nl.acs.device.service.mapper.DeviceErpmappingMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java index 4c89b41..cd78284 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java @@ -23,6 +23,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java index a5b50ce..8794721 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java @@ -428,28 +428,25 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme String next_device_code = instruction.getNext_device_code(); Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.conveyor.name())) { - List list = deviceExtraService.list(Wrappers.lambdaQuery(DeviceExtra.class).eq(DeviceExtra::getDevice_code, next_device_code)); - for (DeviceExtra deviceExtra : list) { - if ("x".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_x", deviceExtra.getExtra_value()); - } - if ("z".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_z", deviceExtra.getExtra_value()); - } - if ("y".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_y", deviceExtra.getExtra_value()); - } + if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("z")) && "z".equals(nextDevice.getExtraValue().get("z"))) { + map.put("to_x", nextDevice.getExtraValue().get("z")); + } + if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("x")) && "x".equals(nextDevice.getExtraValue().get("x"))) { + map.put("to_z", nextDevice.getExtraValue().get("x")); + } + if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("y")) && "y".equals(nextDevice.getExtraValue().get("y"))) { + map.put("to_y", nextDevice.getExtraValue().get("y")); } } if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) { - map.put("to_y", inst.getFrom_z()); - if (inst.getFrom_x().length() > 1) { - String substring = inst.getFrom_x().substring(1); + map.put("to_y", inst.getTo_z()); + if (inst.getTo_x().length() > 1) { + String substring = inst.getTo_x().substring(1); map.put("to_z", substring); } else { - map.put("to_z", inst.getFrom_x()); + map.put("to_z", inst.getTo_x()); } - map.put("to_x", inst.getFrom_y()); + map.put("to_x", inst.getTo_y()); } map.put("to_command", 2); requireSucess = true; @@ -620,17 +617,14 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme map.put("to_task", inst.getInstruction_code()); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - List list = deviceExtraService.list(Wrappers.lambdaQuery(DeviceExtra.class).eq(DeviceExtra::getDevice_code, start_device_code)); - for (DeviceExtra deviceExtra : list) { - if ("x".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_x", deviceExtra.getExtra_value()); - } - if ("z".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_z", deviceExtra.getExtra_value()); - } - if ("y".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_y", deviceExtra.getExtra_value()); - } + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("x")) && "x".equals(startDevice.getExtraValue().get("x"))) { + map.put("to_x", startDevice.getExtraValue().get("x")); + } + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z")) && "z".equals(startDevice.getExtraValue().get("z"))) { + map.put("to_z", startDevice.getExtraValue().get("z")); + } + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("y")) && "y".equals(startDevice.getExtraValue().get("y"))) { + map.put("to_y", startDevice.getExtraValue().get("y")); } } if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index be9ff62..cfb6cbe 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -452,7 +452,7 @@ public class InstructionServiceImpl extends CommonServiceImpl findByDeviceCodes(Instruction instruction1, Boolean flay) { - if (ObjectUtil.isNull(instruction1)) { + List instructionList = new ArrayList<>(); + for (Instruction instruction : instructions) { + if (flay) { + if (Integer.parseInt(instruction.getInstruction_status()) < 2) { + instructionList.add(instruction); + } + } else { + if (instruction.getInstruction_status().equals(instruction1.getInstruction_status())) { + instructionList.add(instruction); + } + } + if(StrUtil.isNotBlank(instruction.getStart_device_code()) && instruction.getStart_device_code().equals(instruction1.getStart_device_code())){ + instructionList.add(instruction); + } + if(StrUtil.isNotBlank(instruction.getNext_device_code()) && instruction.getNext_device_code().equals(instruction1.getNext_device_code())){ + instructionList.add(instruction); + } + } + /*if (ObjectUtil.isNull(instruction1)) { return null; } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1584,7 +1602,7 @@ public class InstructionServiceImpl extends CommonServiceImpl instructionMybatis = instructionMapper.selectList(wrapper); - List instructions = ConvertUtil.convertList(instructionMybatis, Instruction.class); - return instructions; + List instructions = ConvertUtil.convertList(instructionMybatis, Instruction.class);*/ + return instructionList; } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java index 63c8f17..e4abbf9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.acs.opc.service.dto.OpcDto; import org.nl.acs.opc.service.dto.OpcQueryParam; import org.nl.acs.opc.service.mapper.OpcMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java index 9206641..e19c463 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java @@ -34,6 +34,7 @@ import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.dto.RouteLineQueryParam; import org.nl.acs.route.service.mapper.RouteLineMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java index 6f842d7..0965841 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java @@ -21,6 +21,7 @@ import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.FileUtil; import org.nl.acs.utils.PageUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java index 6887c27..6d43e5b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java @@ -22,6 +22,7 @@ import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.FileUtil; import org.nl.acs.utils.PageUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java index fce258a..e54b60e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java @@ -24,6 +24,7 @@ import org.nl.acs.storage_cell.service.dto.StorageCellDto; import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java index 82e55db..e4ae472 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.logicflow.IStageImageService; import org.nl.system.service.logicflow.dao.StageImage; import org.nl.system.service.logicflow.dao.mapper.StageImageMapper; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java index 780a680..e9a3e25 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.logicflow.IStageService; import org.nl.system.service.logicflow.dao.Stage; import org.nl.system.service.logicflow.dao.mapper.StageMapper; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index d4c6d0e..78c598a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.MapOf; +import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; import org.nl.system.service.param.dao.mapper.SysParamMapper; diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue index 0297364..5c27dbb 100644 --- a/acs/nladmin-ui/src/views/acs/device/config.vue +++ b/acs/nladmin-ui/src/views/acs/device/config.vue @@ -115,7 +115,7 @@ export default { standard_stacker, siemens_conveyor_labeling, siemens_conveyor, - belt_conveyor, + belt_conveyor // standard_station }, dicts: ['device_type'],