diff --git a/acs/nladmin-system/nlsso-server/pom.xml b/acs/nladmin-system/nlsso-server/pom.xml index d17bd49..f05cb67 100644 --- a/acs/nladmin-system/nlsso-server/pom.xml +++ b/acs/nladmin-system/nlsso-server/pom.xml @@ -443,6 +443,26 @@ ${commons-csv.version} + + org.apache.poi + poi + 4.1.2 + + + org.apache.poi + poi-ooxml + 4.1.2 + + + org.apache.poi + poi-ooxml-schemas + 4.1.2 + + + xerces + xercesImpl + 2.12.0 + diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 3325839..f9e79f9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -13,9 +13,9 @@ import org.nl.acs.agv.AgvUtil; import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index 6258c84..2ad3d42 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -12,7 +12,7 @@ import org.nl.acs.agv.AgvUtil; import org.nl.acs.agv.server.ZheDaAgvService; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 0a1a200..f3d6c38 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -6,7 +6,7 @@ import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver; +import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -71,6 +71,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { return "NDC在线连接"; } + @Override public void autoRun() throws IOException { System.out.println("NDCAgv链接开始"); ISysParamService ISysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java index 246fff7..d0b27a7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java @@ -3,7 +3,7 @@ package org.nl.acs.common; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; import org.springframework.stereotype.Service; /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java index 28d4422..0f09ae0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java @@ -3,7 +3,7 @@ package org.nl.acs.common; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.springframework.stereotype.Service; /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java index 589f6ce..b419359 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java @@ -2,7 +2,7 @@ package org.nl.acs.common; import com.alibaba.fastjson.JSONObject; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.springframework.stereotype.Service; /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java index 8d71384..235e4f5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java @@ -2,7 +2,7 @@ package org.nl.acs.common; import com.alibaba.fastjson.JSONObject; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.springframework.stereotype.Service; /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 294122e..22581b3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -1,6 +1,5 @@ package org.nl.acs.device.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -41,15 +40,15 @@ import org.nl.acs.device.service.DeviceDriverDefinationAppService; import org.nl.acs.device.service.DeviceExtraService; import org.nl.acs.device_driver.DeviceDriverDefination; import org.nl.acs.device_driver.ScannerDeviceDriver; -import org.nl.acs.device_driver.basedriver.oven_manipulator.OvenGantryManipulatorDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver; -import org.nl.acs.device_driver.basedriver.slit_two_manipulator.SlitTwoManipulatorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_scanner.StandardScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver; +import org.nl.acs.device_driver.conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.scanner.standard_scanner.StandardScannerDeviceDriver; import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; import org.nl.acs.device.service.dto.DeviceRunpointDto; import org.nl.acs.opc.DeviceAppService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java index 8bf68b4..5c2a2c3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.magic_agv; +package org.nl.acs.device_driver.agv.magic_agv; import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java similarity index 92% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java index 4524c4b..2ccc733 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.magic_agv; +package org.nl.acs.device_driver.agv.magic_agv; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java index d5671ed..68913dc 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.ndcone; +package org.nl.acs.device_driver.agv.ndcone; import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java index 6ca382c..c3f6304 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -1,6 +1,5 @@ -package org.nl.acs.device_driver.basedriver.agv.ndcone; +package org.nl.acs.device_driver.agv.ndcone; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -13,28 +12,21 @@ import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.FeedLmsRealFailed; -import org.nl.acs.device_driver.basedriver.agv.utils.OneAgvPhase; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.device_driver.agv.utils.OneAgvPhase; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.ext.wms.data.one.BaseRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.impl.InstructionServiceImpl; -import org.nl.acs.log.LokiLog; -import org.nl.acs.log.LokiLogType; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.impl.TaskServiceImpl; import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; -import org.nl.system.service.param.impl.SysParamServiceImpl; import java.util.ArrayList; import java.util.HashMap; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java index 248a713..2fc507b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.ndctwo; +package org.nl.acs.device_driver.agv.ndctwo; import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 3ad913d..61dd51e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.ndctwo; +package org.nl.acs.device_driver.agv.ndctwo; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,8 +9,8 @@ import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/IAgv.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java similarity index 54% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/IAgv.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java index 33c98fd..3a5aec8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/IAgv.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.utils; +package org.nl.acs.device_driver.agv.utils; public interface IAgv { String getPhaseName(Integer phase); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/OneAgvPhase.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java similarity index 94% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/OneAgvPhase.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java index b37a94f..d611d3f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/OneAgvPhase.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.utils; +package org.nl.acs.device_driver.agv.utils; import org.springframework.stereotype.Service; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java index 2cb652a..0050427 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.utils; +package org.nl.acs.device_driver.agv.utils; import org.springframework.stereotype.Service; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java index 4022d77..6647fc2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.xg_agv; +package org.nl.acs.device_driver.agv.xg_agv; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java index ddbea3e..1ce3a1a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.xg_agv; +package org.nl.acs.device_driver.agv.xg_agv; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java index b2e3fcd..d11d4f2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.agv.xg_agv; +package org.nl.acs.device_driver.agv.xg_agv; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -13,11 +13,10 @@ import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.utils.ReadUtil; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.DeviceAppService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java index aeb0542..719a568 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.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/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java index 8865936..c37bb0c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.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.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java index 48a09ba..a8a81e8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_autodoor; +package org.nl.acs.device_driver.autodoor.standard_autodoor; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDeviceDriver.java deleted file mode 100644 index dd42480..0000000 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDeviceDriver.java +++ /dev/null @@ -1,227 +0,0 @@ -package org.nl.acs.device_driver.basedriver.led_screen; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.server.NDCAgvService; -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.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.config.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - -/** - * LED点阵屏 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LedScreenDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - @Autowired - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - @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 - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - @Autowired - NDCAgvService agvService = SpringContextHolder.getBean(NDCAgvService.class); - - Integer hasGoods = 0; - int error = 0; - Boolean iserror = false; - Boolean islock = false; - - int branchProtocol = 0; - int last_branchProtocol = 0; - //是否需要输入物料 - String input_material = "0"; - //备注 - String remark = ""; - //数量 - String qty = ""; - //批次 - String batch = ""; - //物料 - String material = ""; - //目标点位 - String purpose = ""; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - boolean requireSucess = false; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - // 1取货完成 2放货完成 3进入区域 4离开区域 - private int flag; - - //人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0 - private int manua_confirm = 0; - - String device_code = null; - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - - String message; - - // 1 上位系统允许进入 2 上位系统允许离开 - int status = 0; - - int agvphase = 0; - int index = 0; - - int mode = 2; - - int move; - - @Override - public void execute() { - hasGoods = this.getDevice().getHas_goods(); - batch = this.getDevice().getBatch(); - device_code = this.getDeviceCode(); - - if (agvphase == 0x03) { - if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("1"); - instructionService.update(inst); - byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - - } - } - - if (agvphase == 0x05) { - if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("2"); - instructionService.update(inst); - byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - - } - } - - if (agvphase == 0x07) { - if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("5"); - instructionService.update(inst); - byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - } - } - - if (agvphase == 0x09) { - if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("6"); - instructionService.update(inst); - byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - - } - } - - } - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - String action = ""; - String move = ""; - if (this.getMode() == 0) { - mode = "未联机"; - } else if (this.getMode() == 1) { - mode = "单机"; - } else if (this.getMode() == 2) { - mode = "联机"; - } else if (this.getMode() == 3) { - mode = "运行中"; - } - - if (this.getMove() == 0) { - move = "无货"; - jo.put("hasGoods", false); - } else if (this.getMove() == 1) { - move = "有货"; - jo.put("hasGoods", true); - } else if (this.getMove() == 2) { - move = "有托盘有货"; - jo.put("hasGoods", true); - } - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("isOnline", true); - jo.put("error", this.getError()); - jo.put("isError", this.getIserror()); - return jo; - } - - - @Override - public void setDeviceStatus(JSONObject data) { - - } -} diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java index 7bad724..0008a24 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.belt_conveyor; +package org.nl.acs.device_driver.conveyor.belt_conveyor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 2bc5de8..01ede0f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.belt_conveyor; +package org.nl.acs.device_driver.conveyor.belt_conveyor; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; @@ -26,7 +25,6 @@ import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.domain.Task; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; @@ -300,7 +298,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements 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.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; + + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; Map itemMap = new HashMap(); this.control(itemMap); @@ -389,6 +387,19 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements //查找有没有对应的指令 Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code); if (ObjectUtil.isNotNull(inst) && "1".equals(inst.getInstruction_type())) { + List routeLineDtos = routeLineService.selectDeviceCodeList(this.device_code); + if (routeLineDtos.size() < 1) { + return false; + } + int i = 0; + for (RouteLineDto routeLineDto : routeLineDtos) { + if (routeLineDto.getNext_device_code().equals(inst.getNext_device_code())) { + i++; + } + } + if (i == 0) { + return false; + } Device nextdevice = deviceAppservice.findDeviceByCode(inst.getNext_device_code()); String next_addr = nextdevice.getExtraValue().get("address").toString(); TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); @@ -485,7 +496,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements instructionService.create(instdto); } catch (Exception e) { e.printStackTrace(); - log.error("指令创建失败!", e.getMessage()); + log.error("指令创建失败!,{}", e.getMessage()); return false; } taskdto.setTask_status("1"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index b12f5b9..d0d8e73 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.belt_conveyor; +package org.nl.acs.device_driver.conveyor.belt_conveyor; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/Paper.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java similarity index 84% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/Paper.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java index 9e6f9b2..791799c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/Paper.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.belt_conveyor; +package org.nl.acs.device_driver.conveyor.belt_conveyor; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java index de1c84f..dd6e27a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator; +package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java index 59081e9..f11d9a1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator; +package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/ItemProtocol.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/ItemProtocol.java index 74a42e8..fc412bb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.box_palletizing_manipulator; +package org.nl.acs.device_driver.conveyor.box_palletizing_manipulator; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java index afb2cb1..d02180f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_station_stacker; +package org.nl.acs.device_driver.conveyor.double_station_stacker; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java index 8673652..1739b73 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_station_stacker; +package org.nl.acs.device_driver.conveyor.double_station_stacker; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; @@ -20,10 +20,10 @@ import org.nl.acs.device.service.DeviceExtraService; import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.double_station_stacker.enums.CommandEnum; -import org.nl.acs.device_driver.basedriver.double_station_stacker.enums.SortEnum; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.CommandEnum; +import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.SortEnum; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.domain.Instruction; @@ -578,7 +578,7 @@ public class DoubleStationStackerDeviceDriver extends AbstractOpcDeviceDriver im //根据排序进行加减 String nextPointCodeDown = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) - 1) + "-" + splitFront[2]; String nextPointCodeUp = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) + 1) + "-" + splitFront[2]; - if (CollectionUtil.isNotEmpty(sort)&&SortEnum.BACK.getCode().equals(sort.get(0).getExtra_value())){ + if (CollectionUtil.isNotEmpty(sort)&& SortEnum.BACK.getCode().equals(sort.get(0).getExtra_value())){ nextPointCodeDown = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) + 1) + "-" + splitFront[2]; nextPointCodeUp = splitFront[0] + "-" + (Integer.parseInt(splitFront[1]) - 1) + "-" + splitFront[2]; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java index 70f74f6..1d7e6f1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_station_stacker; +package org.nl.acs.device_driver.conveyor.double_station_stacker; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/CommandEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java similarity index 86% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/CommandEnum.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java index 898eba6..05afe5f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/CommandEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java @@ -2,11 +2,10 @@ * @author ls * @date 2023/12/4 13:42 */ -package org.nl.acs.device_driver.basedriver.double_station_stacker.enums; +package org.nl.acs.device_driver.conveyor.double_station_stacker.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.nl.acs.task.enums.TaskStatusEnum; @Getter @AllArgsConstructor diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/SortEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java similarity index 77% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/SortEnum.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java index 3aa98d7..73ba115 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/enums/SortEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java @@ -2,7 +2,7 @@ * @author ls * @date 2023/12/4 17:43 */ -package org.nl.acs.device_driver.basedriver.double_station_stacker.enums; +package org.nl.acs.device_driver.conveyor.double_station_stacker.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDefination.java index 9d8eb4c..23e9b1e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_conveyor; +package org.nl.acs.device_driver.conveyor.hongxiang_conveyor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java index ce48506..77207b6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/HongXiangStationDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_conveyor; +package org.nl.acs.device_driver.conveyor.hongxiang_conveyor; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/ItemProtocol.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/ItemProtocol.java index 3ed88d3..87955d8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_conveyor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_conveyor; +package org.nl.acs.device_driver.conveyor.hongxiang_conveyor; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDefination.java index 0d1c1e3..aa25d69 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_device; +package org.nl.acs.device_driver.conveyor.hongxiang_device; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java index 4b9a345..ecabbab 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_device; +package org.nl.acs.device_driver.conveyor.hongxiang_device; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/ItemProtocol.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/ItemProtocol.java index f034f14..d17dba0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/hongxiang_device/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.hongxiang_device; +package org.nl.acs.device_driver.conveyor.hongxiang_device; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/ItemProtocol.java index f475f67..214189b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.lnsh_station; +package org.nl.acs.device_driver.conveyor.lnsh_station; import cn.hutool.core.util.StrUtil; import lombok.Getter; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDefination.java index 26cbcd6..d8621bb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.lnsh_station; +package org.nl.acs.device_driver.conveyor.lnsh_station; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDeviceDriver.java index 88dadbd..1ac2000 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDeviceDriver.java @@ -1,14 +1,12 @@ -package org.nl.acs.device_driver.basedriver.lnsh_station; +package org.nl.acs.device_driver.conveyor.lnsh_station; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.jinterop.dcom.common.JIException; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -18,9 +16,6 @@ import org.nl.acs.device_driver.StandardRequestMethod; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus.ApplySignalStatusRequest; -import org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus.ApplySignalStatusResponse; -import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; -import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; @@ -31,9 +26,6 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.config.SpringContextHolder; import org.nl.system.service.lucene.LuceneExecuteLogService; -import org.nl.system.service.lucene.dto.LuceneLogDto; -import org.openscada.opc.lib.da.AddFailedException; -import org.openscada.opc.lib.da.Server; import java.lang.reflect.Method; import java.util.*; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java index c963542..a21cd8e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.oven_manipulator; +package org.nl.acs.device_driver.conveyor.oven_manipulator; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDefination.java index a8150b3..8449377 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.oven_manipulator; +package org.nl.acs.device_driver.conveyor.oven_manipulator; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 1e53aca..2788c79 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.oven_manipulator; +package org.nl.acs.device_driver.conveyor.oven_manipulator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -8,12 +8,11 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Lang; import org.nl.acs.device.domain.Device; 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.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/Test.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/Test.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/Test.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/Test.java index a113759..1a4b7bf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/Test.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/Test.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.oven_manipulator; +package org.nl.acs.device_driver.conveyor.oven_manipulator; import java.text.DecimalFormat; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/ItemProtocol.java index 8826af7..eb0a26e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.plug_pull_device_site; +package org.nl.acs.device_driver.conveyor.plug_pull_device_site; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDefination.java index 8e5f3ed..f2dbcd4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.plug_pull_device_site; +package org.nl.acs.device_driver.conveyor.plug_pull_device_site; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 9ec84a2..3bdda6c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.plug_pull_device_site; +package org.nl.acs.device_driver.conveyor.plug_pull_device_site; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java index 32616f2..edeea2b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor; +package org.nl.acs.device_driver.conveyor.siemens_conveyor; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java similarity index 93% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java index 9836801..76ee4ab 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor; +package org.nl.acs.device_driver.conveyor.siemens_conveyor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; @@ -44,7 +44,7 @@ public class SiemensConveyorDefination implements OpcDeviceDriverDefination { @Override public List getFitDeviceTypes() { List types = new LinkedList(); - types.add(DeviceType.station); + types.add(DeviceType.conveyor); return types; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java similarity index 94% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java index 0d0bb18..250698e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor; +package org.nl.acs.device_driver.conveyor.siemens_conveyor; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -406,33 +406,10 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme } - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - //String opcservcerid = this.getDevice().getOpc_server_id(); -//Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - - itemMap.put(to_param, Integer.parseInt(value)); -// itemMap.put(to_param, Integer.parseInt(value)); - this.control(itemMap); - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + value); - } - public void executing(Server server, Map itemMap) { this.control(itemMap); } - public void writing(int command) { - - //String opcservcerid = this.getDevice().getOpc_server_id(); -//Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - this.control(itemMap); - - } - @Override public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); @@ -513,8 +490,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme public void writing(List list) { -// String opcservcerid = this.getDevice().getOpc_server_id(); -// Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); for (int i = 0; i < list.size(); i++) { Object ob = list.get(i); @@ -526,7 +501,16 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme } } logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); - this.control(itemMap); + try { + this.checkcontrol(itemMap); + } catch (Exception e) { + e.printStackTrace(); + try{ + this.checkcontrol(itemMap); + } catch (Exception e1){ + e1.printStackTrace(); + } + } } @@ -575,11 +559,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", "1"); list.add(map3); this.writing(list); -// if (task != Integer.parseInt(inst.getInstruction_code())) { -// this.writing(list); -// message = "重新下发电气信号"; -// logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); -// } message = "下发电气任务号成功"; requireSucess = true; return true; @@ -682,11 +661,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", "1"); list.add(map3); this.writing(list); -// if (task != Integer.parseInt(inst.getInstruction_code())) { -// this.writing(list); -// message = "重新下发电气信号"; -// logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); -// } } else { //如果不存在则直接找对应指令 Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code); @@ -714,10 +688,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", "1"); list.add(map3); this.writing(list); - if (task != Integer.parseInt(inst.getInstruction_code())) { - this.writing(list); - logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); - } } return true; } @@ -853,8 +823,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme map5.put("value", "4"); list.add(map5); this.writing(list); -// this.writing(list); - message = "申请捆扎成功"; requireSucess = true; } else { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java index 6d64f74..5cd1dee 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java index 71c9a51..5a8ab88 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index 8ceced4..f8b058d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_ckk; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/ItemProtocol.java index baa5e9a..33b4114 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java index fa3fc96..a4453bf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index ee33f9e..4e96a63 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.siemens_conveyor_labeling; +package org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/ItemProtocol.java index 2ca2c06..35419ed 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.slit_two_manipulator; +package org.nl.acs.device_driver.conveyor.slit_two_manipulator; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDefination.java index 04c1ad9..cea7504 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.slit_two_manipulator; +package org.nl.acs.device_driver.conveyor.slit_two_manipulator; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index bfca5d1..5fdfaa9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.slit_two_manipulator; +package org.nl.acs.device_driver.conveyor.slit_two_manipulator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -13,7 +13,7 @@ import org.nl.acs.device.domain.Device; 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.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java index 40c8e91..90344a1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java index 154b055..49e296e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java index 3b475b0..54604ed 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -352,11 +352,11 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver public void writing(int command, int target, int task) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; + + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target; + + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target; String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task; + + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task; //String opcservcerid = this.getDevice().getOpc_server_id(); //Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java index 7b2de41..251364e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java index 19335f0..35c5adf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java similarity index 83% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java index 557bedd..a3ed588 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; public class StandardConveyorWithPlcScannerConfig { public static String relation_scanner = "link_scanner"; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java index f6ccd5a..57b1152 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java index 780a025..fb43755 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java index 1f2edb5..f8986f8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java similarity index 83% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java index ebc1f60..43a939f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; public class StandardConveyorWithScannerConfig { public static String relation_scanner = "link_scanner"; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 2da4139..d539dc0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner; +package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java index f8495a0..8a1caea 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_inspect_site; +package org.nl.acs.device_driver.conveyor.standard_inspect_site; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java index e69daa6..96997e7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_inspect_site; +package org.nl.acs.device_driver.conveyor.standard_inspect_site; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 4aca474..ff17ec8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_inspect_site; +package org.nl.acs.device_driver.conveyor.standard_inspect_site; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -10,11 +10,9 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RequestMethodEnum; 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.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java similarity index 94% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java index fb9a65b..f2fd473 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_ordinary_site; +package org.nl.acs.device_driver.conveyor.standard_ordinary_site; import org.nl.acs.device.domain.Device; import org.nl.acs.device_driver.DeviceDriver; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 31c9456..f495031 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_ordinary_site; +package org.nl.acs.device_driver.conveyor.standard_ordinary_site; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java index b60bba1..9d7ef11 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/led_screen/LedScreenDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.led_screen; +package org.nl.acs.device_driver.led.led_screen; import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java new file mode 100644 index 0000000..be389c2 --- /dev/null +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java @@ -0,0 +1,35 @@ +package org.nl.acs.device_driver.led.led_screen; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +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.monitor.DeviceStageMonitor; + +/** + * LED点阵屏 + * @author 涂强 + */ +@Slf4j +@Data +@RequiredArgsConstructor +public class LedScreenDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { + @Override + public void execute() { + + } + + @Override + public JSONObject getDeviceStatusName() throws Exception { + return null; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } +} diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java similarity index 95% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java index b874e6c..1564986 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_scanner; +package org.nl.acs.device_driver.scanner.standard_scanner; import org.nl.acs.device.domain.Device; import org.nl.acs.device_driver.DeviceDriver; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java similarity index 97% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java index 2e1b6a9..fe793d8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_scanner; +package org.nl.acs.device_driver.scanner.standard_scanner; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java similarity index 99% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java index ff57e47..77f0318 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_stacker; +package org.nl.acs.device_driver.stacker.standard_stacker; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java index a5956d5..cbd46bf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_stacker; +package org.nl.acs.device_driver.stacker.standard_stacker; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; 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/stacker/standard_stacker/StandardStackerDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 5febdc9..260060b 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/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -1,22 +1,20 @@ -package org.nl.acs.device_driver.basedriver.standard_stacker; +package org.nl.acs.device_driver.stacker.standard_stacker; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device.service.DeviceExtraService; import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.instruction.domain.Instruction; @@ -622,13 +620,13 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme map.put("to_task", inst.getInstruction_code()); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("x"))) { - map.put("to_x", startDevice.getExtraValue().get("x")); + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z")) ) { + map.put("to_x", startDevice.getExtraValue().get("z")); } - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z"))) { - map.put("to_z", startDevice.getExtraValue().get("z")); + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("x")) ) { + map.put("to_z", startDevice.getExtraValue().get("x")); } - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("y"))) { + if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("y")) ) { map.put("to_y", startDevice.getExtraValue().get("y")); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java similarity index 94% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java index 06d1207..f400fe9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_storage; +package org.nl.acs.device_driver.storage.standard_storage; import org.nl.acs.device.domain.Device; import org.nl.acs.device_driver.DeviceDriver; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java similarity index 91% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java index d882563..4311add 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.standard_storage; +package org.nl.acs.device_driver.storage.standard_storage; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/ItemProtocol.java similarity index 94% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/ItemProtocol.java index 1d48fda..fa4e1c8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.lamp_three_color; +package org.nl.acs.device_driver.three_color.lamp_three_color; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDefination.java similarity index 96% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDefination.java index 0435cad..b9ec9fb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.lamp_three_color; +package org.nl.acs.device_driver.three_color.lamp_three_color; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDeviceDriver.java similarity index 98% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDeviceDriver.java index de33763..7c4288f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/lamp_three_color/LampThreecolorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/three_color/lamp_three_color/LampThreecolorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.lamp_three_color; +package org.nl.acs.device_driver.three_color.lamp_three_color; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index 807d4cb..1c15d11 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -7,9 +7,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.address.service.AddressService; -import org.nl.acs.address.service.AddressService; import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.ext.wms.RespUtil; import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 2f3de99..954f283 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -3,38 +3,67 @@ package org.nl.acs.ext.wms.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; +import org.nl.acs.agv.server.NDCAgvService; +import org.nl.acs.agv.server.impl.NDCAgvServiceImpl; import org.nl.acs.common.IDriverService; -import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.basedriver.hongxiang_conveyor.HongXiangStationDeviceDriver; -import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.plug_pull_device_site.PlugPullDeviceSiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; -import org.nl.acs.ext.wms.data.one.*; +import org.nl.acs.device_driver.FeedLmsRealFailed; +import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver; +import org.nl.acs.device_driver.agv.ndctwo.AgvNdcTwoDeviceDriver; +import org.nl.acs.device_driver.basedriver.cargo_lift_conveyor.CargoLiftConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.casing_station.CasingStationConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.device_status.DeviceStatusDeviceDriver; +import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.EmptyVehicleStackingPositionDeviceDriver; +import org.nl.acs.device_driver.conveyor.hongxiang_conveyor.HongXiangStationDeviceDriver; +import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.indoor_manipulator.IndoorManipulatorDeviceDriver; +import org.nl.acs.device_driver.three_color.lamp_three_color.LampThreecolorDeviceDriver; +import org.nl.acs.device_driver.conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver; +import org.nl.acs.device_driver.basedriver.paper_tube_device.PaperTubeConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.paper_tube_device2.Paper; +import org.nl.acs.device_driver.basedriver.paper_tube_device2.PaperTubeConveyor2DeviceDriver; +import org.nl.acs.device_driver.conveyor.plug_pull_device_site.PlugPullDeviceSiteDeviceDriver; +import org.nl.acs.device_driver.basedriver.plugging_unplugging_machine.PluggingUnpluggingMachineDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver; +import org.nl.acs.device_driver.basedriver.siemens_onefloor_agv_conveyor.SiemensOneFloorAGVConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.ext.wms.data.*; +import org.nl.acs.ext.wms.liKuData.OutConfirmReportResponse; +import org.nl.acs.ext.wms.liKuData.OutConfirmRequest; +import org.nl.acs.ext.wms.liKuData.Resp; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.WmsToAcsService; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.instruction.service.dto.Instruction; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceExtraManageDto; +import org.nl.acs.opc.DeviceType; import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.storage_cell.domain.StorageCell; -import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.exception.BadRequestException; -import org.nl.config.language.LangProcess; -import org.nl.system.service.param.ISysParamService; - -import org.nl.config.SpringContextHolder; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.domain.Dict; +import org.nl.modules.system.service.DictDetailService; +import org.nl.modules.system.service.DictService; +import org.nl.modules.system.service.ParamService; +import org.nl.modules.system.service.dto.DictDetailDto; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.exception.WDKException; +import org.nl.modules.wql.util.SpringContextHolder; import org.slf4j.MDC; import org.springframework.context.ApplicationContext; import org.springframework.http.HttpStatus; @@ -44,6 +73,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -52,39 +82,47 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { private final ApplicationContext applicationContext; - private final InstructionService InstructionService; + private final InstructionService instructionService; private final TaskService taskService; private final DeviceService deviceService; private final DeviceAppService deviceAppService; private final RouteLineService routeLineService; private final AcsToLiKuService acsToLiKuService; - private final StorageCellMapper storageCellMapper; + private final DictDetailService dictDetailService; + private final DictService dictService; + private String log_file_type = "log_file_type"; private String log_type = "LMS请求ACS"; @Override - public CancelTaskResponse cancelFromWms(List reqs) throws Exception { - ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); + public CancelTaskResponse cancelFromWms(String param) throws Exception { + ParamService paramService = SpringContextHolder.getBean(ParamService.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); + JSONArray datas = JSONArray.parseArray(param); CancelTaskResponse response = new CancelTaskResponse(); JSONArray errArr = new JSONArray(); - for (int i = 0; i < reqs.size(); i++) { - CancelTaskRequest request = reqs.get(i); + for (int i = 0; i < datas.size(); i++) { + String data = datas.get(i).toString(); + CancelTaskRequest request = JsonUtl.format(param, CancelTaskRequest.class); + + String task_uuid = request.getExt_task_id(); String task_code = request.getTask_code(); String vehicle_code = request.getVehicle_code(); - Map params = request.getParams(); - if (StrUtil.isEmpty(task_code)) { - throw new BadRequestException(LangProcess.msg("error_checkNull", "task_code")); + + if (StrUtil.isEmpty(task_uuid)) { + throw new WDKException("任务标识不能为空"); + } + if (StrUtil.isEmpty(task_code)) { + throw new WDKException("任务号不能为空"); } - TaskDto taskDto = taskService.findByCodeFromCache(task_code); String cancelTaskCheck = paramService.findByCode(AcsConfig.CANCELTASKCHECK).getValue(); if (StrUtil.equals(cancelTaskCheck, "1")) { - taskService.cancelNoSendWms(taskDto.getTask_id()); + taskService.cancel(task_uuid); } else if (StrUtil.equals(cancelTaskCheck, "0")) { Instruction inst = instructionService.findByTaskcode(task_code); if (inst == null) { - taskService.cancelNoSendWms(taskDto.getTask_id()); + taskService.cancel(task_uuid); } else { throw new RuntimeException("指令正在执行中,操作失败!"); } @@ -161,11 +199,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new Exception("未找到对应设备:" + device_code); } HongXiangStationDeviceDriver hongXiangStationDeviceDriver; - PlugPullDeviceSiteDeviceDriver plugPullDeviceSiteDeviceDriver; + LampThreecolorDeviceDriver lampThreecolorDeviceDriver; if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); hongXiangStationDeviceDriver.writing(code, value); } + if (device.getDeviceDriver() instanceof LampThreecolorDeviceDriver) { + lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) device.getDeviceDriver(); + lampThreecolorDeviceDriver.writing(code, value); + } } @@ -193,9 +235,21 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver; //货梯对接线-带扫码器 StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver; + //纸管库 + PaperTubeConveyorDeviceDriver paperTubeConveyorDeviceDriver; + //纸管库2 + PaperTubeConveyor2DeviceDriver paperTubeConveyor2DeviceDriver; + //立库设备 + DeviceStatusDeviceDriver deviceStatusDeviceDriver; + //插拔轴机 + PlugPullDeviceSiteDeviceDriver plugPullDeviceSiteDeviceDriver; + //内包间行架机械手 + IndoorManipulatorDeviceDriver indoorManipulatorDeviceDriver; + //套管工位 + CasingStationConveyorDeviceDriver casingStationConveyorDeviceDriver; if (datas.size() == 0) { - throw new BadRequestException(LangProcess.msg("error_nullPoint")); + throw new BadRequestException("缺少输入参数！"); } for (int i = 0; i < datas.size(); i++) { @@ -203,14 +257,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONObject data = datas.getJSONObject(i); String parent_device_code = data.getString("device_code"); String device_code = ""; -// JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + parent_device_code + "'").uniqueResult(0); - - StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getParent_storage_code, parent_device_code) - .one(); - if (!ObjectUtil.isEmpty(storageCell)) { -// device_code = (String) device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); - device_code = (String) storageCell.getParent_storage_code() == null ? parent_device_code : (String) storageCell.getStorage_code(); + JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + parent_device_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(device_json)) { + device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code"); + } else { + device_code = parent_device_code; } Device device = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { @@ -227,22 +278,194 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", parent_device_code); jo.put("mode", hongXiangConveyorDeviceDriver.getMode()); + jo.put("status", Math.min(3, hongXiangConveyorDeviceDriver.getMode())); jo.put("move", hongXiangConveyorDeviceDriver.getMove()); jo.put("countdown_house", hongXiangConveyorDeviceDriver.getCountdown_house()); jo.put("countdown_min", hongXiangConveyorDeviceDriver.getCountdown_min()); jo.put("countdown_sec", hongXiangConveyorDeviceDriver.getCountdown_sec()); //温度需要除以10 - jo.put("temperature", hongXiangConveyorDeviceDriver.getTemperature() / 10); + jo.put("temperature", hongXiangConveyorDeviceDriver.getTo_temperature() / 10); + jo.put("now_temperature", hongXiangConveyorDeviceDriver.getTemperature() / 10); + jo.put("door", hongXiangConveyorDeviceDriver.getDoor()); jo.put("finish", hongXiangConveyorDeviceDriver.getFinish()); jo.put("task", hongXiangConveyorDeviceDriver.getTask()); jo.put("error", hongXiangConveyorDeviceDriver.getError()); + jo.put("isError", hongXiangConveyorDeviceDriver.getError()); } else if (device.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) { standardCoveyorControlWithScannerDeviceDriver = (StandardCoveyorControlWithScannerDeviceDriver) device.getDeviceDriver(); jo.put("device_code", parent_device_code); jo.put("move", standardCoveyorControlWithScannerDeviceDriver.getMove()); jo.put("action", standardCoveyorControlWithScannerDeviceDriver.getAction()); jo.put("error", standardCoveyorControlWithScannerDeviceDriver.getError()); + + } else if (device.getDeviceDriver() instanceof CasingStationConveyorDeviceDriver) { + casingStationConveyorDeviceDriver = (CasingStationConveyorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", parent_device_code); + jo.put("mode", casingStationConveyorDeviceDriver.getMode()); + jo.put("move", casingStationConveyorDeviceDriver.getMove()); + jo.put("heartbeat", casingStationConveyorDeviceDriver.getHeartbeat()); + jo.put("carrier_direction", casingStationConveyorDeviceDriver.getCarrier_direction()); + jo.put("error", casingStationConveyorDeviceDriver.getError()); + jo.put("task", casingStationConveyorDeviceDriver.getTask()); + jo.put("material1", casingStationConveyorDeviceDriver.getMaterial1()); + jo.put("material2", casingStationConveyorDeviceDriver.getMaterial2()); + + + } else if (device.getDeviceDriver() instanceof PaperTubeConveyorDeviceDriver) { + paperTubeConveyorDeviceDriver = (PaperTubeConveyorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", parent_device_code); + jo.put("qty", paperTubeConveyorDeviceDriver.getInventory_qty()); + jo.put("mode", paperTubeConveyorDeviceDriver.getMode()); + jo.put("error", paperTubeConveyorDeviceDriver.getError()); + jo.put("material_code", ObjectUtil.isEmpty(paperTubeConveyorDeviceDriver.getMaterial()) ? "" : paperTubeConveyorDeviceDriver.getMaterial()); + jo.put("out_finish", paperTubeConveyorDeviceDriver.getOut_finish()); + + } else if (device.getDeviceDriver() instanceof DeviceStatusDeviceDriver) { + deviceStatusDeviceDriver = (DeviceStatusDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", deviceStatusDeviceDriver.getDevice().getDevice_code()); + jo.put("device_name", deviceStatusDeviceDriver.getDevice().getDevice_name()); + jo.put("x", deviceStatusDeviceDriver.getX()); + jo.put("y", deviceStatusDeviceDriver.getY()); + jo.put("power", deviceStatusDeviceDriver.getPower()); + jo.put("error", deviceStatusDeviceDriver.getAlarm()); + String errorInfo = ErrorUtil.getDictDetail("rgv_error_type", String.valueOf(deviceStatusDeviceDriver.getAlarm())); + jo.put("error_name", errorInfo); + jo.put("error_msg", errorInfo); + //楼层 + jo.put("map_id", deviceStatusDeviceDriver.getMap_id()); + jo.put("z", deviceStatusDeviceDriver.getMap_id()); + jo.put("pallet", deviceStatusDeviceDriver.getPallet()); + jo.put("move", deviceStatusDeviceDriver.getHasGoods() == false ? 0 : 1); + jo.put("status", StrUtil.isBlank(deviceStatusDeviceDriver.getTask_id()) ? 2 : 3); + + } else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { + AgvNdcOneDeviceDriver driver = (AgvNdcOneDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", driver.getStatus()); + jo.put("power", driver.getElectric_qty()); + jo.put("x", driver.getX()); + jo.put("y", driver.getY()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); + } else if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + AgvNdcTwoDeviceDriver driver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", driver.getStatus()); + jo.put("power", driver.getElectric_qty()); + jo.put("x", driver.getX()); + jo.put("y", driver.getY()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); + } else if (device.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { + OvenGantryManipulatorDeviceDriver driver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("x", driver.getX_position()); + jo.put("y", driver.getY_position()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(driver.getError()))); + } else if (device.getDeviceDriver() instanceof SlitTwoManipulatorDeviceDriver) { + SlitTwoManipulatorDeviceDriver driver = (SlitTwoManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("x", driver.getX_position()); + jo.put("y", driver.getY_position()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(driver.getError()))); + }else if (device.getDeviceDriver() instanceof PaperTubeConveyor2DeviceDriver) { + paperTubeConveyor2DeviceDriver = (PaperTubeConveyor2DeviceDriver) device.getDeviceDriver(); + jo.put("device_code", parent_device_code); + jo.put("heartbeat",paperTubeConveyor2DeviceDriver.getHeartbeat()); + jo.put("mode",paperTubeConveyor2DeviceDriver.getMode()); + jo.put("move",paperTubeConveyor2DeviceDriver.getMove()); + jo.put("carrier_direction",paperTubeConveyor2DeviceDriver.getCarrier_direction()); + jo.put("error",paperTubeConveyor2DeviceDriver.getError()); + jo.put("task",paperTubeConveyor2DeviceDriver.getTask()); + jo.put("out_seq_arr",paperTubeConveyor2DeviceDriver.getItem_out_seq_arr()); + jo.put("out_qty_arr",paperTubeConveyor2DeviceDriver.getItem_out_qty_arr()); + jo.put("material1",paperTubeConveyor2DeviceDriver.getItem_material1()); + jo.put("qty1",paperTubeConveyor2DeviceDriver.getItem_qty1()); + jo.put("material2",paperTubeConveyor2DeviceDriver.getItem_material2()); + jo.put("qty2",paperTubeConveyor2DeviceDriver.getItem_qty2()); + jo.put("material3",paperTubeConveyor2DeviceDriver.getItem_material3()); + jo.put("qty3",paperTubeConveyor2DeviceDriver.getItem_qty3()); + jo.put("material4",paperTubeConveyor2DeviceDriver.getItem_material4()); + jo.put("qty4",paperTubeConveyor2DeviceDriver.getItem_qty4()); + jo.put("material5",paperTubeConveyor2DeviceDriver.getItem_material5()); + jo.put("qty5",paperTubeConveyor2DeviceDriver.getItem_qty5()); + jo.put("material6",paperTubeConveyor2DeviceDriver.getItem_material6()); + jo.put("qty6",paperTubeConveyor2DeviceDriver.getItem_qty6()); + jo.put("material7",paperTubeConveyor2DeviceDriver.getItem_material7()); + jo.put("qty7",paperTubeConveyor2DeviceDriver.getItem_qty7()); + jo.put("material8",paperTubeConveyor2DeviceDriver.getItem_material8()); + jo.put("qty8",paperTubeConveyor2DeviceDriver.getItem_qty8()); + jo.put("material9",paperTubeConveyor2DeviceDriver.getItem_material9()); + jo.put("qty9",paperTubeConveyor2DeviceDriver.getItem_qty9()); + jo.put("material10",paperTubeConveyor2DeviceDriver.getItem_material10()); + jo.put("qty10",paperTubeConveyor2DeviceDriver.getItem_qty10()); + jo.put("material11",paperTubeConveyor2DeviceDriver.getItem_material11()); + jo.put("qty11",paperTubeConveyor2DeviceDriver.getItem_qty11()); + jo.put("material12",paperTubeConveyor2DeviceDriver.getItem_material12()); + jo.put("qty12",paperTubeConveyor2DeviceDriver.getItem_qty12()); + + } else if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { + SiemensConveyorDeviceDriver driver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); + } else if (device.getDeviceDriver() instanceof SiemensConveyorCkkDeviceDriver) { + SiemensConveyorCkkDeviceDriver driver = (SiemensConveyorCkkDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); + } else if (device.getDeviceDriver() instanceof SiemensConveyorLabelingDeviceDriver) { + SiemensConveyorLabelingDeviceDriver driver = (SiemensConveyorLabelingDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); + } else if (device.getDeviceDriver() instanceof SiemensOneFloorAGVConveyorDeviceDriver) { + SiemensOneFloorAGVConveyorDeviceDriver driver = (SiemensOneFloorAGVConveyorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); + } else if (device.getDeviceDriver() instanceof IndoorManipulatorDeviceDriver) { + IndoorManipulatorDeviceDriver driver = (IndoorManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("mode", driver.getMode()); + jo.put("move", driver.getMove()); + jo.put("action", driver.getAction()); + jo.put("walk_y", driver.getWalk_y()); + jo.put("task", driver.getTask()); + jo.put("x_position", driver.getX_position()); + jo.put("y_position", driver.getY_position()); + jo.put("inflatable_shaft_size", driver.getInflatable_shaft_size()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); + }else if (device.getDeviceDriver() instanceof PluggingUnpluggingMachineDeviceDriver) { + PluggingUnpluggingMachineDeviceDriver driver = (PluggingUnpluggingMachineDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", Math.min(3, driver.getMode())); + jo.put("mode", driver.getMode()); + jo.put("move", driver.getMove()); + jo.put("task1", driver.getTask1()); + jo.put("task2", driver.getTask2()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError()))); } else { jo.put("device_code", parent_device_code); } @@ -457,37 +680,62 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override - public CreateTaskResponse crateTask(List reqs) { + public CreateTaskResponse crateTask(String param) { try { MDC.put(log_file_type, log_type); - log.info("crateTask-----输入参数{}", reqs); + log.info("crateTask-----输入参数{}", param); + JSONArray datas = JSONArray.parseArray(param); CreateTaskResponse response = new CreateTaskResponse(); + ParamService paramService = SpringContextHolder.getBean(ParamService.class); + String cancelTaskCheck = paramService.findByCode(AcsConfig.ISALLOWTASK).getValue(); JSONArray errArr = new JSONArray(); - for (int i = 0; i < reqs.size(); i++) { - CreateTaskRequest req = reqs.get(i); - String task_code = req.getTask_code(); - String task_id = req.getTask_id(); - String start_device_code = req.getStart_device_code(); - String next_device_code = req.getNext_device_code(); - String priority = req.getPriority(); - String vehicle_code = req.getVehicle_code(); - String vehicle_type = req.getVehicle_type(); - String task_type = req.getTask_type(); - String remark = req.getRemark(); - Map params = req.getParams(); + if (StrUtil.equals(cancelTaskCheck, "0")) { + response.setStatus(400); + response.setMessage("ACS系统需要更新，请稍等"); + response.setErrArr(datas); + return response; + } + for (int i = 0; i < datas.size(); i++) { + String data = datas.get(i).toString(); + CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class); + String paper_array = request.getPaper_array(); + String ext_task_id = request.getExt_task_id(); + String task_code = request.getTask_code(); + String start_device_code = request.getStart_device_code(); + String start_device_code2 = request.getStart_device_code2(); + String next_device_code = request.getNext_device_code(); + String next_device_code2 = request.getNext_device_code2(); + String put_device_code = request.getPut_device_code(); + String priority = request.getPriority(); + String vehicle_code = request.getVehicle_code(); + String vehicle_type = request.getVehicle_type(); + String route_plan_code = request.getRoute_plan_code(); + String task_type = request.getTask_type(); + String truss_type = request.getTruss_type(); + String is_bushing = request.getIs_bushing(); + String version = request.getVersion(); + String bushing_num = request.getBushing_num(); + String storage_task_type = request.getDtl_type(); + String agv_system_type = request.getAgv_system_type(); + String remark = request.getRemark(); + double oven_time = 0.00d; + if (StrUtil.isNotEmpty(request.getOven_time())) { + oven_time = Double.parseDouble(request.getOven_time()); + } + String temperature = request.getTemperature(); + String start_height = request.getStart_height(); + String next_height = request.getNext_height(); + Map params = request.getParams(); String start_point_code = ""; + String start_point_code2 = ""; String next_point_code = ""; - if (StrUtil.isEmpty(task_id)) { - JSONObject json = new JSONObject(); - json.put("task_id", task_id); - json.put("message", "任务号不能为空"); - errArr.add(json); - continue; - } + String next_point_code2 = ""; + String put_point_code = ""; if (StrUtil.isEmpty(task_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); json.put("message", "任务号不能为空"); errArr.add(json); continue; @@ -495,6 +743,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (StrUtil.isEmpty(start_device_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); json.put("message", "起点不能为空"); errArr.add(json); continue; @@ -502,25 +751,36 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (StrUtil.isEmpty(next_device_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); json.put("message", "终点不能为空"); errArr.add(json); continue; } -// JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_device_code + "'").uniqueResult(0); - StorageCell storageCell_start = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getParent_storage_code, start_device_code) - .one(); - if (!ObjectUtil.isEmpty(storageCell_start)) { -// start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_device_code : (String) start_device_json.get("storage_code"); - start_point_code = (String) storageCell_start.getParent_storage_code() == null ? start_device_code : (String) storageCell_start.getStorage_code(); + + if (StrUtil.equals(task_type, "8")) { + next_device_code = request.getPut_device_code(); + put_device_code = request.getNext_device_code(); } -// JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_device_code + "'").uniqueResult(0); - StorageCell storageCell_start_next = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getParent_storage_code, next_device_code) - .one(); - if (!ObjectUtil.isEmpty(storageCell_start_next)) { -// next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); - next_point_code = (String) storageCell_start_next.getParent_storage_code() == null ? next_point_code : (String) storageCell_start_next.getStorage_code(); + + JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_device_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(start_device_json)) { + start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_device_code : (String) start_device_json.get("storage_code"); + } + JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_device_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(next_device_json)) { + next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); + } + JSONObject start_device_json2 = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_device_code2 + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(start_device_json2)) { + start_point_code2 = (String) start_device_json2.get("parent_storage_code") == null ? start_device_code2 : (String) start_device_json2.get("storage_code"); + } + JSONObject next_device_json2 = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_device_code2 + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(next_device_json2)) { + next_point_code2 = (String) next_device_json2.get("parent_storage_code") == null ? next_device_code2 : (String) next_device_json2.get("storage_code"); + } + JSONObject put_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + put_device_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(put_device_json)) { + put_point_code = (String) put_device_json.get("parent_storage_code") == null ? put_device_code : (String) put_device_json.get("storage_code"); } if (StrUtil.isNotEmpty(start_point_code) && start_point_code.indexOf("-") > 0) { String str[] = start_point_code.split("-"); @@ -536,16 +796,64 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { next_device_code = next_point_code; } - String route_plan_code = ""; + if (StrUtil.isNotEmpty(start_point_code2) && start_point_code2.indexOf("-") > 0) { + String str[] = start_point_code2.split("-"); + start_device_code2 = str[0]; + } else { + start_device_code2 = start_point_code2; + } + + if (StrUtil.isNotEmpty(next_point_code2) && next_point_code2.indexOf("-") > 0) { + String str[] = next_point_code2.split("-"); + next_device_code2 = str[0]; + } else { + next_device_code2 = next_point_code2; + } + + if (StrUtil.isNotEmpty(put_point_code) && put_point_code.indexOf("-") > 0) { + String str[] = put_point_code.split("-"); + put_device_code = str[0]; + } else { + put_device_code = put_point_code; + } if (StrUtil.isEmpty(route_plan_code)) { route_plan_code = "normal"; } + + if (StrUtil.equals(task_type, "5")) { + Device device = deviceAppService.findDeviceByCode(next_device_code); + SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; + if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { + siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); + if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) { + if (siemensConveyorDeviceDriver.getMove() == 1) { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); + json.put("message", "终点" + siemensConveyorDeviceDriver.getDevice_code() + "有货无法生成任务"); + errArr.add(json); + continue; + } + } + } + + if (taskService.querySameDeviceReadyTask(start_device_code, next_device_code, "0") > 1) { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); + json.put("message", "已存在相同的起点:" + start_device_code + "终点:" + next_device_code + "未执行的输送任务"); + errArr.add(json); + continue; + } + } + TaskDto taskDto = taskService.findByCodeFromCache(task_code); if (taskDto != null) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", "不能存在相同的任务号"); + json.put("ext_task_id", ext_task_id); + json.put("message", "存在相同的任务号:" + task_code); errArr.add(json); continue; } @@ -554,7 +862,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (vehicle_dto != null) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", "不能存在相同的托盘号"); + json.put("ext_task_id", ext_task_id); + json.put("message", "已存在任务编号为" + vehicle_dto.getTask_code() + "托盘号:" + vehicle_code); errArr.add(json); continue; } @@ -563,43 +872,103 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (StrUtil.isEmpty(start_point_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", req.getStart_device_code() + " 该设备号未找到对应点位"); + json.put("ext_task_id", ext_task_id); + json.put("message", request.getStart_device_code() + " 该设备号未找到对应点位"); errArr.add(json); continue; } if (StrUtil.isEmpty(next_point_code)) { JSONObject json = new JSONObject(); json.put("task_code", task_code); - json.put("message", req.getNext_device_code() + " 该设备号未找到对应点位"); + json.put("ext_task_id", ext_task_id); + json.put("message", request.getNext_device_code() + " 该设备号未找到对应点位"); errArr.add(json); continue; } JSONObject jo = new JSONObject(); - jo.put("ext_task_id", task_id); - jo.put("task_code", task_code); jo.put("task_id", IdUtil.simpleUUID()); + jo.put("task_code", task_code); jo.put("start_point_code", start_point_code); jo.put("next_point_code", next_point_code); + jo.put("start_point_code2", start_point_code2); + jo.put("next_point_code2", next_point_code2); + jo.put("put_point_code", put_point_code); jo.put("start_parent_code", start_point_code); jo.put("next_parent_code", next_point_code); jo.put("start_device_code", start_device_code); jo.put("next_device_code", next_device_code); + jo.put("start_device_code2", start_device_code2); + jo.put("next_device_code2", next_device_code2); + jo.put("put_device_code", put_device_code); jo.put("priority", priority); jo.put("vehicle_code", vehicle_code); jo.put("vehicle_type", vehicle_type); - jo.put("agv_system_type", "1"); + jo.put("storage_task_type", storage_task_type); + jo.put("agv_system_type", agv_system_type); + jo.put("start_height", start_height); + jo.put("next_height", next_height); + jo.put("oven_time", (int) Math.ceil(oven_time)); jo.put("remark", remark); jo.put("params", params); jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); + jo.put("paper_array", JSONUtil.toJsonStr(paper_array)); + jo.put("truss_type", JSONUtil.toJsonStr(truss_type)); + jo.put("is_bushing", JSONUtil.toJsonStr(is_bushing)); + jo.put("version", JSONUtil.toJsonStr(version)); + jo.put("bushing_num", JSONUtil.toJsonStr(bushing_num)); + + + if (!StrUtil.isEmpty(ext_task_id)) { + jo.put("ext_task_id", ext_task_id); + } TaskDto task_dto = jo.toJavaObject(TaskDto.class); try { - taskService.create(task_dto); + // task_type=7 则是立库任务需要下刻下发 + if (StrUtil.equals(task_dto.getTask_type(), "7")) { + //创建临时指令 不创建、不生成 + //等立库反馈成功才能创建任务和指令 + Instruction inst = null; + try { + inst = taskService.createTemporaryInst(task_dto); + } catch (Exception e) { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); + json.put("message", "起始点:"+ task_dto.getStart_point_code() + ",终点:"+ + task_dto.getNext_point_code()+",条码:" + task_dto.getVehicle_code() + + "," + e.getMessage()); + errArr.add(json); + continue; + } + Resp resp = acsToLiKuService.sendInst(task_dto.getStorage_task_type(), inst); + + if (StrUtil.equals(resp.result, "true")) { + //创建任务和指令 + taskService.create(task_dto); + inst.setSend_status("1"); + taskService.extCreateInst(inst); + + } else { + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); + json.put("message", resp.getComment()); + json.put("code", resp.code); + json.put("data", data); + errArr.add(json); + continue; + } + + } else { + taskService.create(task_dto); + } } catch (Exception e) { // e.printStackTrace(); JSONObject json = new JSONObject(); json.put("task_code", task_code); + json.put("ext_task_id", ext_task_id); json.put("message", e.getMessage()); errArr.add(json); continue; @@ -618,46 +987,385 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { response.setErrArr(errArr); } log.info("createFromWms--------------:输出参数：" + JSON.toJSONString(response)); + return response; } finally { MDC.remove(log_file_type); } - } @Override - public JSONObject notifyAcs(JSONObject param) { - log.info("notifyAcs - 请求参数 {}", param); - JSONObject result = new JSONObject(); - Integer type = param.getInteger("type"); - String device_code = param.getString("device_code"); - Device device; - switch (type) { - case 1: - //wms通知固化室满料，开始固化 - device = deviceAppService.findDeviceByCode(device_code); - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { - StandardAutodoorDeviceDriver standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - standardAutodoorDeviceDriver.writing("to_state", 1); - } - break; - case 2: - //wms通知固化室取料完毕，重新开放可使用 - device = deviceAppService.findDeviceByCode(device_code); - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { - StandardAutodoorDeviceDriver standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - standardAutodoorDeviceDriver.writing("to_state", 2); - } - break; - default: - break; + public Map unLock(String param) { + try { + MDC.put(log_file_type, log_type); + log.info("unLock--------------:输入参数" + param); + JSONObject jo = JSONObject.parseObject(param); + String task_code = String.valueOf(jo.get("task_code")); + if (StrUtil.isEmpty(task_code)) { + throw new BadRequestException("任务号不能为空"); + } + String device_code = String.valueOf(jo.get("device_code")); + if (StrUtil.isEmpty(device_code)) { + throw new BadRequestException("设备号不能为空"); + } + String vehicle_code = String.valueOf(jo.get("vehicle_code")); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("载具号不能为空"); + } + OutConfirmRequest outConfirmRequest = new OutConfirmRequest(); + outConfirmRequest.setOutPortNo(device_code); + outConfirmRequest.setPalletCode(vehicle_code); + Instruction instruction = instructionService.findByCode(String.valueOf(task_code)); + if (ObjectUtil.isNotEmpty(instruction)) { + task_code = instruction.getInstruction_code(); + outConfirmRequest.setOrderId(task_code); + } + Resp resp = acsToLiKuService.outConfirm(outConfirmRequest); + if (StrUtil.equals(resp.getResult(), "false")) { + JSONObject resultJson = new JSONObject(); + resultJson.put("status", 400); + resultJson.put("message", resp.getComment()); + log.info("unLock--------------:输出参数" + resultJson); + return resultJson; + } + } catch (Exception e) { + e.printStackTrace(); + JSONObject resultJson = new JSONObject(); + resultJson.put("status", 400); + resultJson.put("message", e.getMessage()); + log.info("unLock--------------:输出参数" + resultJson); + return resultJson; + } finally { + MDC.remove(log_file_type); } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK.value()); + resultJson.put("message", "操作成功"); + log.info("unLock--------------:输出参数" + resultJson); + return resultJson; + } - result.put("status", HttpStatus.OK.value()); - result.put("message", "通知成功！"); - log.info("notifyAcs - 返回参数 {}", result); - return result; + + @Override + public Map updateTask(String whereJson) { + JSONArray datas = JSONArray.parseArray(whereJson); + log.info("updateTask--------------:输入参数" + datas.toString()); + JSONArray errArr = new JSONArray(); + if (datas.size() > 0) { + for (int i = 0; i < datas.size(); i++) { + JSONObject jsonObject = datas.getJSONObject(i); + String device_code = jsonObject.getString("device_code"); + String task_code = jsonObject.getString("task_code"); + //1-允许取放； 2-允许离开 + String option = jsonObject.getString("option"); + Instruction inst = instructionService.findByTaskcode(task_code); + if (ObjectUtil.isEmpty(inst)) { + JSONObject jo = new JSONObject(); + jo.put("task_code", task_code); + jo.put("message", "未找到对应任务"); + errArr.add(jo); + continue; + } else { + String carNo = inst.getCarno(); + if (ObjectUtil.isEmpty(carNo)) { + JSONObject jo = new JSONObject(); + jo.put("task_code", task_code); + jo.put("message", "未找到任务对应车号"); + errArr.add(jo); + continue; + } else { + Device device = deviceAppService.findDeviceByCode(carNo); + AgvNdcTwoDeviceDriver agvNdcTwoDeviceDriver; + if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); + int phase = agvNdcTwoDeviceDriver.getPhase(); + if (phase == 0x03 || phase == 0x05 || phase == 0x08) { + StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; + Device device_k = deviceAppService.findDeviceByCode(device_code + "_K"); + Device device_m = deviceAppService.findDeviceByCode(device_code + "_M"); + if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver(); + standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); + standardOrdinarySiteDeviceDriver.setTask_code(task_code); + } + if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver(); + standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); + standardOrdinarySiteDeviceDriver.setTask_code(task_code); + } + } else { + JSONObject jo = new JSONObject(); + jo.put("task_code", task_code); + jo.put("message", "AGV未就绪无法设置"); + errArr.add(jo); + continue; + } + } + } + + } + } + } + JSONObject resultJson = new JSONObject(); + if (ObjectUtil.isEmpty(errArr)) { + resultJson.put("status", HttpStatus.OK.value()); + resultJson.put("message", "操作成功"); + } else { + resultJson.put("status", HttpStatus.BAD_REQUEST.value()); + resultJson.put("message", "操作失败"); + if (ObjectUtil.isNotEmpty(errArr)) { + resultJson.put("errArr", errArr); + } + } + return resultJson; + } + + @Override + public Map sendAgvChargeTask(JSONObject param) { + log.info("sendAgvChargeTask--------------:输入参数" + param.toString()); + String agv_system = param.getString("agv_system"); + String car_no = param.getString("car_no"); + if (StrUtil.isEmpty(agv_system)) { + throw new BadRequestException("AGV系统类型不能为空"); + } + if (StrUtil.isEmpty(car_no)) { + throw new BadRequestException("AGV车号不能为空"); + } + Device device = deviceAppService.findDeviceByCode(car_no); + if (device == null) { + throw new BadRequestException("agv车号在ACS系统中不存在!"); + } + NDCAgvService agvService = SpringContextHolder.getBean(NDCAgvServiceImpl.class); + agvService.createChargingTaskToNDC(agv_system, car_no); + JSONObject resp = new JSONObject(); + resp.put("status", 200); + resp.put("message", "操作成功"); + return resp; + } + + @Override + public Map queryDeviceInfo(JSONObject param) { + log.info("queryDeviceInfo--------------:输入参数" + param.toString()); + String region_code = param.getString("region_code"); +// if (StrUtil.isEmpty(region_code)) { +// throw new BadRequestException("区域编码不能为空"); +// } + AgvNdcTwoDeviceDriver agvNdcTwoDeviceDriver; + AgvNdcOneDeviceDriver agvNdcOneDeviceDriver; + List devices = deviceAppService.findDevice(DeviceType.agv); + JSONArray data = new JSONArray(); + if (StrUtil.isEmpty(region_code)) { + if (ObjectUtil.isNotEmpty(devices)) { + for (int i = 0; i < devices.size(); i++) { + Device device = devices.get(i); + Device agvDevice = deviceAppService.findDeviceByCode(device.getDevice_code()); + if (agvDevice.getDeviceDriver() instanceof DeviceStageMonitor) { + DeviceStageMonitor deviceStageMonitor = (DeviceStageMonitor) agvDevice.getDeviceDriver(); + try { + JSONObject jo = deviceStageMonitor.getDeviceStatusName(); + data.add(jo); + } catch (Exception e) { + log.error("反馈AGV信息失败:{}", e.getMessage()); + } + } + } + } + } else { + if (ObjectUtil.isNotEmpty(devices)) { + for (int i = 0; i < devices.size(); i++) { + Device device = devices.get(i); + Device agvDevice = deviceAppService.findDeviceByCode(device.getDevice_code()); + if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + if (StrUtil.equals(region_code, "1")) { + agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver(); + JSONObject jo = agvNdcTwoDeviceDriver.getDeviceStatusName(); + data.add(jo); + } + } + if (agvDevice.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { + if (StrUtil.equals(region_code, "5")) { + agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) agvDevice.getDeviceDriver(); + JSONObject jo = agvNdcOneDeviceDriver.getDeviceStatusName(); + data.add(jo); + } + } + } + } + } + JSONObject resp = new JSONObject(); + resp.put("status", 200); + resp.put("message", "操作成功"); + resp.put("data", data); + return resp; + } + + @Override + public Map syncfaultInfo() { + log.info("syncfaultInfo--------------:输入参数"); + JSONArray data = new JSONArray(); + List dicts = dictService.queryAll(); + if (ObjectUtil.isNotEmpty(dicts)) { + List error_dists = dicts + .stream() + .filter(dict -> dict.getName().contains("error_type")) + .collect(Collectors.toList()); + if (ObjectUtil.isNotEmpty(error_dists)) { + for (int i = 0; i < error_dists.size(); i++) { + Dict dict = error_dists.get(i); + String dictName = dict.getName(); + List dictDetailDtos = dictDetailService.getDictByName(dictName); + for (DictDetailDto dictDetailDto : dictDetailDtos) { + JSONObject faultInfo = new JSONObject(); + faultInfo.put("fault_type", dictName); + faultInfo.put("fault_code", dictDetailDto.getValue()); + faultInfo.put("fault_info", dictDetailDto.getLabel()); + data.add(faultInfo); + } + } + } + } + JSONObject resp = new JSONObject(); + resp.put("status", 200); + resp.put("message", "操作成功"); + resp.put("data", data); + return resp; + } + + @Override + public Map realTimefaultInfo(JSONObject param) { + log.info("realTimefaultInfo--------------:输入参数" + param.toString()); + String device_code = param.getString("device_code"); + JSONArray data = new JSONArray(); + if (StrUtil.isNotEmpty(device_code)) { + String[] devices = device_code.split(","); + Device device = null; + for (String deviceCode : devices) { + device = deviceAppService.findDeviceByCode(deviceCode); + if (device == null) { + continue; + } + if (device.getDeviceDriver() instanceof FeedLmsRealFailed) { + FeedLmsRealFailed feedLmsRealFailed = (FeedLmsRealFailed) device.getDeviceDriver(); + JSONObject jsonObject = feedLmsRealFailed.feedLmsRealFailedInfo(); + data.add(jsonObject); + } + } + } + JSONObject resp = new JSONObject(); + resp.put("status", 200); + resp.put("message", "操作成功"); + resp.put("data", data); + return resp; + } + + + @Override + public Map paperTubeAction(JSONObject param) { + log.info("paperTubeAction--------------:输入参数" + param.toString()); + JSONObject resp = new JSONObject(); + String device_code = param.getString("device_code"); + String type = param.getString("type"); + String material_code = param.getString("material_code"); + String qty = param.getString("qty"); + + if (StrUtil.isNotEmpty(device_code)) { + + Device device = deviceAppService.findDeviceByCode(device_code); + if (device == null) { + resp.put("status", 400); + resp.put("message", "未找到对应设备"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + if (device.getDeviceDriver() instanceof PaperTubeConveyorDeviceDriver) { + PaperTubeConveyorDeviceDriver paperTubeConveyorDeviceDriver = (PaperTubeConveyorDeviceDriver) device.getDeviceDriver(); + if (paperTubeConveyorDeviceDriver.getMode() != 2) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "未待机，无法下发信号"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + if (StrUtil.equals(type, "1")) { + if (paperTubeConveyorDeviceDriver.getInventory_qty() > 0) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "当前数量为" + paperTubeConveyorDeviceDriver.getInventory_qty() + "无法设置物料"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + try{ + List list = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_material"); + map.put("value", material_code); + list.add(map); + paperTubeConveyorDeviceDriver.writing(list); + + } catch (Exception e){ + e.printStackTrace(); + } + } else if (StrUtil.equals(type, "2")) { + if (paperTubeConveyorDeviceDriver.getInventory_qty() < Integer.parseInt(qty)) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "当前数量为" + paperTubeConveyorDeviceDriver.getInventory_qty() + "小于出库数量" + qty); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + if (StrUtil.isEmpty(paperTubeConveyorDeviceDriver.getMaterial())) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "设备上报物料为空无法出库"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } else { + if (!StrUtil.equals(paperTubeConveyorDeviceDriver.getMaterial(), material_code)) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "设备上报物料为" + paperTubeConveyorDeviceDriver.getMaterial() + "与出库物料" + material_code + "不匹配"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + } + if (paperTubeConveyorDeviceDriver.getTo_command() != 0 || paperTubeConveyorDeviceDriver.getTo_target() != 0) { + resp.put("status", 400); + resp.put("message", "设备:" + device_code + "下发命令信号值为" + paperTubeConveyorDeviceDriver.getTo_command() + ",下发目标站:" + paperTubeConveyorDeviceDriver.getTo_target() + ",已存在待执行的任务"); + log.info("paperTubeAction--------------:输出参数" + resp.toString()); + return resp; + } + List list = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_out_qty"); + map.put("value", qty); + list.add(map); + Map map2 = new HashMap(); + map2.put("code", "to_target"); + map2.put("value", device.getAddress()); + list.add(map2); + Map map3 = new HashMap(); + map3.put("code", "to_command"); + map3.put("value", 2); + list.add(map3); + try{ +// paperTubeConveyorDeviceDriver.writing("to_out_qty", qty); +// paperTubeConveyorDeviceDriver.writing("to_target", device.getAddress()); +// paperTubeConveyorDeviceDriver.writing("to_command", "2"); + paperTubeConveyorDeviceDriver.writing(list); + } catch (Exception e){ + e.printStackTrace(); + } + + } else if(StrUtil.equals(type, "3")){ + List list = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", 3); + list.add(map); + paperTubeConveyorDeviceDriver.writing(list); + } + } + + } + resp.put("status", 200); + resp.put("message", "操作成功"); + return resp; } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index f34d06b..e146e08 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -154,4 +154,12 @@ public class InstructionController { instructionService.init(id); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping("/downloadInstLogging") + @Log("导出指令记录") + @ApiOperation("导出指令记录") + //@PreAuthorize("@el.check('task:list')") + public void downloadInstLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { + instructionService.downloadInstLogging(instructionService.getInstList(whereJson), response); + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java index d4afc6a..a364d27 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -1,5 +1,6 @@ package org.nl.acs.instruction.service; +import com.alibaba.fastjson.JSONObject; import org.nl.acs.instruction.domain.InstructionMybatis; import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.instruction.service.dto.InstructionQueryParam; @@ -327,5 +328,21 @@ public interface InstructionService extends CommonService { * @param instruction1 * @return */ + List findByDeviceCodes(Instruction instruction1, Boolean flay); + + + /** + * 根据条件查询指令 + * @param whereJson + * @return + */ + List getInstList(Map whereJson); + + /** + * 导出指令记录 + * @param instList + * @param response + */ + void downloadInstLogging(List instList, HttpServletResponse response) throws IOException; } 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 9c094f1..8fdabb5 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 @@ -26,15 +26,14 @@ import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; +import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.instruction.domain.InstructionMybatis; import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.SortUtlEx; import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.instruction.service.dto.InstructionQueryParam; import org.nl.acs.opc.DeviceAppService; @@ -1607,4 +1606,80 @@ public class InstructionServiceImpl extends CommonServiceImpl instructions = ConvertUtil.convertList(instructionMybatis, Instruction.class);*/ return instructionList; } + + @Override + public List getInstList(Map whereJson) { + String task_code = (String) whereJson.get("code"); + String vehicle_code = (String) whereJson.get("vehicle_code"); + String material_type = (String) whereJson.get("material_type"); + String status = (String) whereJson.get("status"); + String point_code = (String) whereJson.get("point_code"); + String create_time = (String) whereJson.get("createTime"); + String end_time = (String) whereJson.get("end_time"); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (!StrUtil.isEmpty(task_code)) { + wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code, task_code).or().like(InstructionMybatis::getTask_code, task_code)); + } + if (!StrUtil.isEmpty(vehicle_code)) { + wrapper.like(InstructionMybatis::getVehicle_code, vehicle_code); + } + if (!StrUtil.isEmpty(material_type)) { + wrapper.eq(InstructionMybatis::getMaterial, material_type); + } + if (!StrUtil.isEmpty(status)) { + wrapper.eq(InstructionMybatis::getInstruction_status, status); + } + if (!StrUtil.isEmpty(point_code)) { + wrapper.and(task -> task.like(InstructionMybatis::getStart_point_code, point_code).or().like(InstructionMybatis::getNext_point_code, point_code)); + } + if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) { + wrapper.between(InstructionMybatis::getCreate_time, create_time, end_time); + } + List instructionMybatis = instructionMapper.selectList(wrapper); + List array = new ArrayList<>(); + if(instructionMybatis.size() > 0){ + for (InstructionMybatis inst : instructionMybatis) { + JSONObject ins = new JSONObject(); + ins.put("instruction_code", inst.getInstruction_code()); + ins.put("task_code", inst.getTask_code()); + ins.put("vehicle_code", inst.getVehicle_code()); + ins.put("task_status", inst.getInstruction_status()); + ins.put("start_point_code", inst.getStart_point_code()); + ins.put("next_point_code", inst.getNext_point_code()); + ins.put("matarial", inst.getMaterial()); + ins.put("quantity", inst.getQuantity()); + ins.put("remark", inst.getRemark()); + ins.put("create_by", inst.getCreate_by()); + ins.put("create_time", inst.getCreate_time()); + ins.put("update_by", inst.getUpdate_by()); + ins.put("update_time", inst.getUpdate_time()); + array.add(ins); + } + } + return array; + } + + @Override + public void downloadInstLogging(List instList, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (JSONObject jsonObject : instList) { + Map map = new LinkedHashMap<>(); + map.put("指令编码", jsonObject.getString("instruction_code")); + map.put("任务号", jsonObject.getString("task_code")); + map.put("载具号", jsonObject.getString("vehicle_code")); + map.put("指令状态", jsonObject.getString("task_status")); + map.put("起点", jsonObject.getString("start_point_code")); + map.put("终点", jsonObject.getString("next_point_code")); + map.put("物料", jsonObject.getString("matarial")); + map.put("数量", jsonObject.getString("quantity")); + map.put("备注", jsonObject.getString("remark")); + map.put("创建者", jsonObject.getString("create_by")); + map.put("创建时间", jsonObject.getString("create_time")); + map.put("修改者", jsonObject.getString("update_by")); + map.put("修改时间", jsonObject.getString("update_time")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index 6592d91..748fe5e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alicp.jetcache.anno.method.SpringCacheContext; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.bag.SynchronizedSortedBag; import org.nl.acs.opc.service.dto.OpcServerManageDto; import org.nl.acs.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessorFactory; @@ -424,7 +425,17 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb}); // this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb}); } else { - log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + if(his instanceof int[]){ + if(!Arrays.equals((long[]) his, (long[]) value)){ + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } + } else if(his instanceof String){ + if(!StrUtil.equals((CharSequence) his, (CharSequence) value)){ + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } + } else { + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); + } // this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value}); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java index 6489137..b1a8b07 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java @@ -8,8 +8,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum AgvSystemTypeEnum { - NDC_System_Type("1", "NDC_System_Type", "NDC系统"), - XG_System_Type("2", "XG_System_Type", "仙工系统"); + One_NDC_System_Type("1", "1", "一期1楼叉车NDC系统"), + Two_NDC_System_Type("2", "2", "一期2楼NDC系统"), + XG_System_Type("3", "3", "仙工AGV系统"); //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java index ccbdb1d..9e6bce9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java @@ -11,10 +11,12 @@ import lombok.Getter; * 立库任务类型 */ public enum StorageTaskTypeEnum { - IN("1", "Conveyor_Task", "任务"), - OUT("2", "Stacker_Task", "堆垛机任务"), - MOVE("3", "Truss_Task", "行架任务"), - AGV_Task("4", "AGV_Task", "AGV任务"); + IN("1", "1", "入库任务"), + EMPTY_IN("2", "2", "空盘入库任务"), + OUT("3", "3", "出库任务"), + EMPTY_OUT("4", "4", "空盘出空任务"), + MOVE("5", "5", "转库任务"); + //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java index 6ff0938..051a87e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java @@ -8,10 +8,19 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum TaskTypeEnum { - Conveyor_Task("1", "Conveyor_Task", "输送线任务"), - Stacker_Task("2", "Stacker_Task", "堆垛机任务"), - Truss_Task("3", "Truss_Task", "行架任务"), - AGV_Task("4", "AGV_Task", "AGV任务"); + Raw_Foil_AGV_Task("1", "1", "生箔AGV任务"), + Cutting_AGV_Task("2", "2", "分切AGV任务"), + Standard_AGV_Task("3", "3", "普通AGV任务"), + Forklift_AGV_Task("4", "4", "叉车AGV任务"), + Conveyor_Task("5", "5", "输送线任务"), + Truss_Task("6", "6", "行架任务"), + AGV_Task("7", "7", "立库任务"), + + Oven_Truss_Task("8", "8", "烘箱行架任务"), + + Inner_Truss_Task("9", "9", "内包间行架任务"), + + Stacker_Task("11", "11", "堆垛机任务"); //索引 private String index; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java index b2ba9a2..eeab7c0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java @@ -156,4 +156,22 @@ public class TaskController { public ResponseEntity findAllTaskFromCache() { return new ResponseEntity<>(taskService.findAllTaskFromCache(), HttpStatus.OK); } + + @GetMapping("/downloadTaskTreeLogging") + @Log("导出任务树形记录") + @ApiOperation("导出任务树形记录") + //@PreAuthorize("@el.check('task:list')") + public void downloadTaskTreeLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { + taskService.downloadTaskTreeLogging(taskService.getTaskAndInst(whereJson), response); + } + + + @GetMapping("/downloadTaskLogging") + @Log("导出任务树形记录") + @ApiOperation("导出任务树形记录") + //@PreAuthorize("@el.check('task:list')") + public void downloadTaskLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { + taskService.downloadTaskLogging(taskService.getTaskList(whereJson), response); + } + } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index ca55e08..f22624e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -372,4 +372,36 @@ public interface TaskService extends CommonService { * @return */ Integer querySameDeviceReadyTask(String start_device, String next_device, String status); + + + + /** + * 条件查询任务和指令 + * @param whereJson + * @param page + * @return + */ + List getTaskAndInst(Map whereJson); + + /** + * 导出任务树形记录 + * @param taskAndInst + * @param response + */ + void downloadTaskTreeLogging(List list, HttpServletResponse response) throws IOException; + + /** + * 导出任务记录 + * @param all + * @param response + */ + void downloadTaskLogging(List all, HttpServletResponse response) throws IOException; + + /** + * 查询任务 + * @param whereJson + * @return + */ + List getTaskList(Map whereJson); + } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 4d70c41..3680619 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.acs.task.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; @@ -11,6 +12,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; @@ -1311,8 +1313,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme instdto.setAgv_inst_type("1"); instructionservice.create2(instdto); - // acsTask.setTask_status("1"); - // this.update(acsTask); + acsTask.setTask_status("1"); + this.update(acsTask); return instdto; } @@ -1677,6 +1679,176 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return num; } + @Override + public List getTaskAndInst(Map whereJson) { + String task_code = (String) whereJson.get("task_code"); + String vehicle_code = (String) whereJson.get("vehicle_code"); + String material_type = (String) whereJson.get("material_type"); + String status = (String) whereJson.get("status"); + String point_code = (String) whereJson.get("point_code"); + String create_time = (String) whereJson.get("createTime"); + String end_time = (String) whereJson.get("end_time"); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (!StrUtil.isEmpty(task_code)) { + wrapper.eq(Task::getTask_code, task_code); + } + if (!StrUtil.isEmpty(vehicle_code)) { + wrapper.like(Task::getVehicle_code, vehicle_code); + } + if (!StrUtil.isEmpty(material_type)) { + wrapper.eq(Task::getMaterial, material_type); + } + if (!StrUtil.isEmpty(status)) { + wrapper.eq(Task::getTask_status, status); + } + if (!StrUtil.isEmpty(point_code)) { + wrapper.and(task -> task.like(Task::getStart_point_code, point_code).or().like(Task::getNext_point_code, point_code)); + } + if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) { + wrapper.between(Task::getCreate_time, create_time, end_time); + } + List taskList = taskMapper.selectList(wrapper); + List array = new ArrayList<>(); + if (CollUtil.isNotEmpty(taskList) && taskList.size() > 0) { + for (Task task : taskList) { + JSONObject ins = new JSONObject(); + //ins.put("task_id", task.getTask_id()); + ins.put("task_code", task.getTask_code()); + ins.put("vehicle_code", task.getVehicle_code()); + ins.put("task_status", task.getTask_status()); + ins.put("priority", task.getPriority()); + ins.put("start_point_code", task.getStart_point_code()); + ins.put("next_point_code", task.getNext_point_code()); + ins.put("start_point_code2", task.getStart_point_code2()); + ins.put("next_point_code2", task.getNext_point_code2()); + ins.put("matarial", task.getMaterial()); + ins.put("quantity", task.getQuantity()); + ins.put("remark", task.getRemark()); + ins.put("create_by", task.getCreate_by()); + ins.put("create_time", task.getCreate_time()); + array.add(ins); + List list = instructionService.list(Wrappers.lambdaQuery(InstructionMybatis.class)); + if (CollUtil.isNotEmpty(list) && list.size() > 0) { + for (InstructionMybatis inst : list) { + if(task.getTask_id().equals(inst.getTask_id())){ + JSONObject ins1 = new JSONObject(); + //ins1.put("task_id", inst.getInstruction_id()); + ins1.put("task_code", inst.getInstruction_code()); + ins1.put("vehicle_code", inst.getVehicle_code()); + ins1.put("task_status", inst.getInstruction_status()); + ins1.put("start_point_code", inst.getStart_point_code()); + ins1.put("next_point_code", inst.getNext_point_code()); + ins1.put("matarial", inst.getMaterial()); + ins1.put("remark", inst.getRemark()); + ins1.put("create_by", inst.getCreate_by()); + ins1.put("create_time", inst.getCreate_time()); + array.add(ins1); + } + } + } + } + } + return array; + } + + @Override + public void downloadTaskTreeLogging(List taskAndInst, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (JSONObject jsonObject : taskAndInst) { + Map map = new LinkedHashMap<>(); + map.put("任务号(指令编码)", jsonObject.getString("task_code")); + map.put("载具号", jsonObject.getString("vehicle_code")); + map.put("状态", jsonObject.getString("task_status")); + map.put("任务优先级", jsonObject.getString("priority")); + map.put("起点", jsonObject.getString("start_point_code")); + map.put("终点", jsonObject.getString("next_point_code")); + map.put("起点2", jsonObject.getString("start_point_code2")); + map.put("终点2", jsonObject.getString("next_point_code2")); + map.put("物料", jsonObject.getString("matarial")); + map.put("数量", jsonObject.getString("quantity")); + map.put("备注", jsonObject.getString("remark")); + map.put("创建者", jsonObject.getString("create_by")); + map.put("创建时间", jsonObject.getString("create_time")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + + @Override + public void downloadTaskLogging(List taskAndInst, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (JSONObject jsonObject : taskAndInst) { + Map map = new LinkedHashMap<>(); + map.put("任务号", jsonObject.getString("task_code")); + map.put("载具号", jsonObject.getString("vehicle_code")); + map.put("任务状态", jsonObject.getString("task_status")); + map.put("任务优先级", jsonObject.getString("priority")); + map.put("起点", jsonObject.getString("start_point_code")); + map.put("终点", jsonObject.getString("next_point_code")); + map.put("物料", jsonObject.getString("matarial")); + map.put("数量", jsonObject.getString("quantity")); + map.put("备注", jsonObject.getString("remark")); + map.put("创建者", jsonObject.getString("create_by")); + map.put("创建时间", jsonObject.getString("create_time")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + @Override + public List getTaskList(Map whereJson) { + String task_code = (String) whereJson.get("task_code"); + String vehicle_code = (String) whereJson.get("vehicle_code"); + String material_type = (String) whereJson.get("material_type"); + String status = (String) whereJson.get("status"); + String point_code = (String) whereJson.get("point_code"); + String create_time = (String) whereJson.get("createTime"); + String end_time = (String) whereJson.get("end_time"); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (!StrUtil.isEmpty(task_code)) { + wrapper.eq(Task::getTask_code, task_code); + } + if (!StrUtil.isEmpty(vehicle_code)) { + wrapper.like(Task::getVehicle_code, vehicle_code); + } + if (!StrUtil.isEmpty(material_type)) { + wrapper.eq(Task::getMaterial, material_type); + } + if (!StrUtil.isEmpty(status)) { + wrapper.eq(Task::getTask_status, status); + } + if (!StrUtil.isEmpty(point_code)) { + wrapper.and(task -> task.like(Task::getStart_point_code, point_code).or().like(Task::getNext_point_code, point_code)); + } + if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) { + wrapper.between(Task::getCreate_time, create_time, end_time); + } + List taskList = taskMapper.selectList(wrapper); + List array = new ArrayList<>(); + if (CollUtil.isNotEmpty(taskList) && taskList.size() > 0) { + for (Task task : taskList) { + JSONObject ins = new JSONObject(); + //ins.put("task_id", task.getTask_id()); + ins.put("task_code", task.getTask_code()); + ins.put("vehicle_code", task.getVehicle_code()); + ins.put("task_status", task.getTask_status()); + ins.put("priority", task.getPriority()); + ins.put("start_point_code", task.getStart_point_code()); + ins.put("next_point_code", task.getNext_point_code()); + ins.put("matarial", task.getMaterial()); + ins.put("quantity", task.getQuantity()); + ins.put("remark", task.getRemark()); + ins.put("create_by", task.getCreate_by()); + ins.put("create_time", task.getCreate_time()); + array.add(ins); + } + } + return array; + } + @Override public Integer querySameTaskByType(String taskType) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java index 8585378..87b71c1 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java @@ -1,56 +1,32 @@ package org.nl.acs.taskscreen.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.common.base.PageInfo; import org.nl.acs.common.base.impl.CommonServiceImpl; import org.nl.acs.device.domain.Device; import org.nl.acs.device.domain.DeviceExtra; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.dto.DeviceDto; -import org.nl.acs.device.service.dto.DeviceExtraDto; -import org.nl.acs.device.service.dto.DeviceQueryParam; import org.nl.acs.device.service.mapper.DeviceExtraMapper; import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.led_screen.LedScreenDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; import org.nl.acs.taskscreen.mapper.TaskScreenMapper; import org.nl.acs.taskscreen.service.TaskScreenService; -import org.nl.acs.utils.ConvertUtil; import org.nl.common.exception.BadRequestException; -import org.nl.config.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.Set; /** * @author tuqiang @@ -91,24 +67,24 @@ public class TaskScreenServiceImpl extends CommonServiceImpl extraDeviceCodes = getExtraDeviceCodes(extra_value); + DeviceDto deviceDto = deviceService.findByCode(deviceCode); + String deviceId = deviceDto.getDevice_id(); + DeviceExtra deviceExtra = deviceExtraMapper.findByDeviceId(deviceId, "link_device_code"); + String extraValue = deviceExtra.getExtra_value(); + List extraDeviceCodes = getExtraDeviceCodes(extraValue); if (CollUtil.isEmpty(extraDeviceCodes) || extraDeviceCodes.size() < 0) { throw new BadRequestException("没有查询到数据"); } - String deviceCode = extraDeviceCodes.get(0); - DeviceDto link_device = deviceService.findByCode(deviceCode); - String device_code1 = link_device.getDevice_code(); - Device device = deviceAppservice.findDeviceByCode(device_code1); - JSONObject json = new JSONObject(); + String deviceCode1 = extraDeviceCodes.get(0); + DeviceDto linkDevice = deviceService.findByCode(deviceCode1); + String linkDeviceCode = linkDevice.getDevice_code(); + Device device = deviceAppservice.findDeviceByCode(linkDeviceCode); if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { BeltConveyorDeviceDriver beltConveyorDeviceDriver; beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java index e2dac4e..ec10aa5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java @@ -60,7 +60,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { * linux: /temp * */ - public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator; + public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir"); /** * 定义GB的计算常量 */ @@ -210,7 +210,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { File file = new File(tempPath); BigExcelWriter writer = ExcelUtil.getBigWriter(file); // 一次性写出内容，使用默认样式，强制输出标题 - writer.write(list, true); + for (Object item : list) { + writer.writeRow(item, true); + } SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法 sheet.trackAllColumnsForAutoSizing(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 1f4f12b..f82ac83 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -1,19 +1,10 @@ package org.nl.system.service.quartz.task; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_stacker.StandardStackerDeviceDriver; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.domain.Instruction; @@ -21,17 +12,13 @@ import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.domain.Task; import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index 01ae859..ac877d6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -4,16 +4,14 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device.service.DeviceExtraService; import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.basedriver.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_stacker.StandardStackerDeviceDriver; +import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; +import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 7f6c752..ac3aa5d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -105,6 +105,24 @@ https://juejin.cn/post/6844903775631572999 + + + + + + + + + + + + + + + + + + diff --git a/acs/nladmin-ui/src/assets/images/logo2.png b/acs/nladmin-ui/src/assets/images/logo2.png new file mode 100644 index 0000000..a1ca19b Binary files /dev/null and b/acs/nladmin-ui/src/assets/images/logo2.png differ diff --git a/acs/nladmin-ui/src/assets/images/newloge.png b/acs/nladmin-ui/src/assets/images/newloge.png new file mode 100644 index 0000000..a1ca19b Binary files /dev/null and b/acs/nladmin-ui/src/assets/images/newloge.png differ diff --git a/acs/nladmin-ui/src/i18n/langs/auto/zh.js b/acs/nladmin-ui/src/i18n/langs/auto/zh.js index 59b204d..917b398 100644 --- a/acs/nladmin-ui/src/i18n/langs/auto/zh.js +++ b/acs/nladmin-ui/src/i18n/langs/auto/zh.js @@ -1,17 +1,17 @@ export default { - 'Auto': { - 'table': { - 'name': '名称', - 'code': '编号', - 'status': '状态', - 'thread_name': '线程名', - 'thread_state': '线程状态', - 'usedStatus': '使用状态', - 'stopMessage': '停止信息', - 'operate': '操作', - }, - 'msg': { - 'stop_msg': '确定停止该线程吗？' - } + 'Auto': { + 'table': { + 'name': '名称', + 'code': '编号', + 'status': '状态', + 'thread_name': '线程名', + 'thread_state': '线程状态', + 'usedStatus': '使用状态', + 'stopMessage': '停止信息', + 'operate': '操作' + }, + 'msg': { + 'stop_msg': '确定停止该线程吗？' } -} \ No newline at end of file + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/config/en.js b/acs/nladmin-ui/src/i18n/langs/config/en.js index c86471d..35fab3c 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/en.js +++ b/acs/nladmin-ui/src/i18n/langs/config/en.js @@ -15,7 +15,8 @@ export default { 'inst_nextdevice_code': 'Command destination device', 'destination_configuration': 'Destination configuration', 'operation': 'Operation', - 'device_is_not_null': 'Device code cannot be empty' + 'device_is_not_null': 'Device code cannot be empty', + 'mapping_relationship': 'Mapping relationship' }, 'rules': { } diff --git a/acs/nladmin-ui/src/i18n/langs/config/in.js b/acs/nladmin-ui/src/i18n/langs/config/in.js index 87327c2..2b081c6 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/in.js +++ b/acs/nladmin-ui/src/i18n/langs/config/in.js @@ -15,7 +15,8 @@ export default { 'inst_nextdevice_code': 'Perangkat tujuan perintah', 'destination_configuration': 'Konfigurasi tujuan', 'operation': 'Operasi', - 'device_is_not_null': 'Kode perangkat tidak boleh kosong' + 'device_is_not_null': 'Kode perangkat tidak boleh kosong', + 'mapping_relationship': 'Hubungan pemetaan' }, 'rules': { } diff --git a/acs/nladmin-ui/src/i18n/langs/config/zh.js b/acs/nladmin-ui/src/i18n/langs/config/zh.js index d978343..867ab98 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/zh.js +++ b/acs/nladmin-ui/src/i18n/langs/config/zh.js @@ -15,7 +15,8 @@ export default { 'inst_nextdevice_code': '指令终点设备', 'destination_configuration': '终点配置', 'operation': '操作', - 'device_is_not_null': '设备编码不能为空' + 'device_is_not_null': '设备编码不能为空', + 'mapping_relationship': '映射关系' }, 'rules': { } diff --git a/acs/nladmin-ui/src/i18n/langs/instruction/in.js b/acs/nladmin-ui/src/i18n/langs/instruction/in.js index 78d74f1..4f043ba 100644 --- a/acs/nladmin-ui/src/i18n/langs/instruction/in.js +++ b/acs/nladmin-ui/src/i18n/langs/instruction/in.js @@ -1,22 +1,22 @@ export default { 'Inst': { 'table': { - 'instruction_code': 'Nomor_instruksi', - 'instruction_type': 'Jenis_instruksi', - 'task_code': 'Nomor_tugas', - 'vehicle_code': 'Nomor_kendaraan', - 'instruction_status': 'Status_perintah', - 'send_status': 'Status_pengiriman', - 'start_point_code': 'Titik_penjemputan', - 'next_point_code': 'Titik_pengantaran', - 'put_point_code': 'Titik_pembuangan', - 'execute_device_code': 'Perangkat_eksekusi_saat_ini', - 'carno': 'Nomor_kendaraan', + 'instruction_code': 'Nomor Instruksi', + 'instruction_type': 'Jenis Instruksi', + 'task_code': 'Nomor Tugas', + 'vehicle_code': 'Nomor Kendaraan', + 'instruction_status': 'Status Perintah', + 'send_status': 'Status Pengiriman', + 'start_point_code': 'Titik Penjemputan', + 'next_point_code': 'Titik Pengantaran', + 'put_point_code': 'Titik Pembuangan', + 'execute_device_code': 'Perangkat eksekusi', + 'carno': 'Nomor kendaraan', 'remark': 'deskripsi', - 'create_by': 'Dibuat_oleh', - 'create_time': 'Waktu_pembuatan', - 'update_by': 'Diubah_oleh', - 'update_time': 'Ubah_waktu', + 'create_by': 'Dibuat oleh', + 'create_time': 'Waktu pembuatan', + 'update_by': 'Diubah oleh', + 'update_time': 'Ubah waktu', 'input_taskCode_or_instCode': 'Masukkan nomor tugas atau nomor instruksi', 'input_vehicleCode': 'Masukkan nomor kendaraan', 'material': 'Jenis barang', diff --git a/acs/nladmin-ui/src/i18n/langs/task/en.js b/acs/nladmin-ui/src/i18n/langs/task/en.js index 8824491..e0b34b6 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/en.js +++ b/acs/nladmin-ui/src/i18n/langs/task/en.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': 'Please enter origin-level!', 'please_select_destination_column': 'Please select destination-column!', 'please_select_destination_level': 'Please select the destination floor!' + }, + screen: { + 'title': 'Lanzhou Hailiang equipment management task kanban', + 'task_screen': 'Task Kanban', + 'device': 'Current device', + 'Wednesday': 'Wednesday', + 'year': 'year', + 'month': 'month', + 'day': 'day', + 'task_code': 'task_code', + 'inst_code': 'inst_code', + 'start': 'start', + 'end': 'end', + 'material': 'material', + 'material_num': 'material_num', + 'vehicle_code': 'vehicle_code', + 'bar': 'bar', + 'create_time': 'create_time', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/i18n/langs/task/in.js b/acs/nladmin-ui/src/i18n/langs/task/in.js index 884a78d..d3bc8c7 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/in.js +++ b/acs/nladmin-ui/src/i18n/langs/task/in.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': 'Silakan masukkan asal-level!', 'please_select_destination_column': 'Silakan pilih tujuan-kolom!', 'please_select_destination_level': 'Silakan pilih lantai tujuan!”' + }, + screen: { + 'title': 'Lanzhou Hailiang tugas manajemen peralatan kanban', + 'task_screen': 'Tugas Kanban', + 'device': 'Perangkat saat ini', + 'Wednesday': 'Rabu', + 'year': 'tahun', + 'month': 'bulan', + 'day': 'hari', + 'task_code': 'Nomor tugas', + 'inst_code': 'Nomor instruksi', + 'start': 'Titik awal', + 'end': 'Terminal', + 'material': 'Jenis barang', + 'material_num': 'Jumlah barang', + 'vehicle_code': 'Nomor kendaraan', + 'bar': 'Kode batang', + 'create_time': 'Waktu masuk', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/i18n/langs/task/zh.js b/acs/nladmin-ui/src/i18n/langs/task/zh.js index fdb16a9..a15c7f8 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/zh.js +++ b/acs/nladmin-ui/src/i18n/langs/task/zh.js @@ -51,6 +51,25 @@ export default { 'please_enter_origin_level': '请输入起点-层!', 'please_select_destination_column': '请选择终点-列！', 'please_select_destination_level': '请选择终点-层!' + }, + screen: { + 'title': '兰州海亮设备管理任务看板', + 'task_screen': '任务看板', + 'device': '当前设备', + 'Wednesday': '星期三', + 'year': '年', + 'month': '月', + 'day': '日', + 'task_code': '任务号', + 'inst_code': '指令号', + 'start': '起点', + 'end': '终点', + 'material': '物料类型', + 'material_num': '物料数量', + 'vehicle_code': '载具号', + 'bar': '条码', + 'create_time': '入库时间', + 'IP': 'IP' } } } diff --git a/acs/nladmin-ui/src/layout/components/Navbar.vue b/acs/nladmin-ui/src/layout/components/Navbar.vue index fa087ec..5ec9de0 100644 --- a/acs/nladmin-ui/src/layout/components/Navbar.vue +++ b/acs/nladmin-ui/src/layout/components/Navbar.vue @@ -31,7 +31,7 @@ - {{ $t('common.Layout_setting') }} + {{ $t('common.Layout_setting') }} @@ -46,7 +46,7 @@ - + {{ language }} diff --git a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue index bc2a53d..34f9ee5 100644 --- a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -2,11 +2,11 @@
- +

{{ title }}

- +

{{ title }}

@@ -14,7 +14,7 @@