diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 05abbf6..cec88dc 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -42,7 +42,8 @@ public enum DriverTypeEnum { DOUBLE_STATION_STACKER(16, "double_station_stacker", "标准版-双工位堆垛机", "double_station_stacker"), - DOUBLE_BELT_CONVEYOR(17, "double_belt_conveyor", "双工位输送线", "double_belt_conveyor"); + DOUBLE_BELT_CONVEYOR(17, "double_belt_conveyor", "双工位输送线", "conveyor"), + WITH_STATION_DEVICE_DRIVER(18, "with_station_device_driver", "输送线关联站点", "conveyor"); /** diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java index d751e39..7db8379 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.belt_with_station; +package org.nl.acs.device_driver.conveyor.belt_with_station; import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; @@ -16,17 +16,17 @@ import java.util.List; public class WithStationDefination implements DeviceDriverDefination { @Override public String getDriverCode() { - return "hailiang_with_station"; + return "with_station_device"; } @Override public String getDriverName() { - return "关联驱动"; + return "输送线关联站点"; } @Override public String getDriverDescription() { - return "关联驱动"; + return "输送线关联站点"; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java index c2fc855..27df61f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java @@ -1,6 +1,5 @@ -package org.nl.acs.device_driver.basedriver.belt_with_station; +package org.nl.acs.device_driver.conveyor.belt_with_station; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -16,8 +15,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.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.double_belt_conveyor.DoubleBeltConveyorDeviceDriver; +import org.nl.acs.device_driver.conveyor.double_belt_conveyor.DoubleBeltConveyorDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -43,6 +41,7 @@ import java.util.*; @Data @RequiredArgsConstructor public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { + @Autowired DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); @Autowired @@ -382,4 +381,5 @@ public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements option = Integer.parseInt(flag); } } + } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java index 8776feb..f28cf81 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_belt_conveyor; +package org.nl.acs.device_driver.conveyor.double_belt_conveyor; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device.domain.Device; @@ -17,17 +17,17 @@ import java.util.List; public class DoubleBeltConveyorDefination implements OpcDeviceDriverDefination { @Override public String getDriverCode() { - return "belt_conveyor"; + return "double_belt_conveyor"; } @Override public String getDriverName() { - return "标准版-输送机"; + return "双工位-输送机"; } @Override public String getDriverDescription() { - return "标准版-输送机"; + return "双工位-输送机"; } @Override diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java index d0c9c6e..2dc9369 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_belt_conveyor; +package org.nl.acs.device_driver.conveyor.double_belt_conveyor; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -293,7 +293,7 @@ public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver impl 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; + + "." +ItemProtocol.item_to_command; Map itemMap = new HashMap(); this.control(itemMap); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java index 9faeed6..81b27c0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_belt_conveyor; +package org.nl.acs.device_driver.conveyor.double_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/conveyor/double_belt_conveyor/Paper.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java index f0b530d..db6c691 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.basedriver.double_belt_conveyor; +package org.nl.acs.device_driver.conveyor.double_belt_conveyor; import lombok.AllArgsConstructor; import lombok.Data; 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 fe2f938..0046b3b 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 @@ -17,53 +17,31 @@ import org.nl.acs.device.service.DeviceService; 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.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.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -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; @@ -79,7 +57,61 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j public class WmsToAcsServiceImpl implements WmsToAcsService { + @Override + public CreateTaskResponse crateTask(String param) { + return null; + } + @Override + public org.nl.acs.ext.wms.data.one.CreateTaskResponse crateTask(List reqs) { + return null; + } + + @Override + public org.nl.acs.ext.wms.data.one.CancelTaskResponse cancelFromWms(List reqs) throws Exception { + return null; + } + + @Override + public Map updateDeviceGoodsFromWms(String jsonObject) { + return null; + } + + @Override + public Map areaControl(JSONObject jsonObject) { + return null; + } + + @Override + public PutActionResponse putAction(String jsonObject) throws Exception { + return null; + } + + @Override + public Map queryDevice(String jsonObject) throws Exception { + return null; + } + + @Override + public Map queryDeviceDBValue(String whereJson) { + return null; + } + + @Override + public Map querydevice(String whereJson) { + return null; + } + + @Override + public Map putPlusPullAction(String whereJson) { + return null; + } + + @Override + public JSONObject notifyAcs(JSONObject param) { + return null; + } +/** private final ApplicationContext applicationContext; private final InstructionService instructionService; @@ -1367,5 +1399,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { resp.put("message", "操作成功"); return resp; } + **/ } diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue index 0e4749b..7f3a5dd 100644 --- a/acs/nladmin-ui/src/views/acs/device/config.vue +++ b/acs/nladmin-ui/src/views/acs/device/config.vue @@ -102,6 +102,7 @@ import xg_agv from '@/views/acs/device/driver/agv/xg_agv' import led_screen from './driver/led_screen' import standard_station from '@/views/acs/device/driver/standard_station' import double_belt_conveyor from '@/views/acs/device/driver/double_belt_conveyor.vue' +import with_station_device from '@/views/acs/device/driver/with_station_device.vue' export default { name: 'DeviceConfig', components: { @@ -133,7 +134,8 @@ export default { oven_manipulator, plug_pull_device_site, slit_two_manipulator, - double_belt_conveyor + double_belt_conveyor, + with_station_device }, dicts: ['device_type'], diff --git a/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue index 378c09c..7cacccd 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue @@ -163,28 +163,6 @@ - - - - - - - - - - - - diff --git a/acs/nladmin-ui/src/views/acs/device/driver/with_station_device.vue b/acs/nladmin-ui/src/views/acs/device/driver/with_station_device.vue new file mode 100644 index 0000000..0f24ecc --- /dev/null +++ b/acs/nladmin-ui/src/views/acs/device/driver/with_station_device.vue @@ -0,0 +1,667 @@ + + + + +