init:删除无用代码

2024-04-02 10:46:09 +08:00
parent 8bd479961d
commit 1fcd93aa8a
8 changed files with 11 additions and 1816 deletions
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java
@@ -1,20 +1,14 @@
 package org.nl.acs.agv;

-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 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.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.one_manipulator.box_storage_manipulator.BoxStorageManipulatorDeviceDriver;
 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.opc.DeviceAppService;
-import org.nl.common.exception.BadRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
@@ -13,7 +13,6 @@ import org.nl.acs.agv.server.ZheDaAgvService;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.device.domain.Device;

-import org.nl.acs.device_driver.two_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;
@@ -187,31 +186,16 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
        DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
        Device addressdevice = appService.findDeviceByCode(address);

-        HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;

        //取货的进入前等待和离开等待
        if (LOAD.equals(action)) {
            if (ENTRY_REQUIRED.equals(type)) {

-                //豪凯自动线对接位
-                if (addressdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) addressdevice.getDeviceDriver();
-                    if ((hongXiangConveyorDeviceDriver.getAction() == CommonFinalParam.ACTION_ONE || hongXiangConveyorDeviceDriver.getAction() == CommonFinalParam.ACTION_THREE)) {
-                        if(hongXiangConveyorDeviceDriver.getMove() == 1){
-                            inst.setExecute_status(CommonFinalParam.ONE);
-                            is_feedback = true;
-                        }
-                    }
-                }
+
            }
            if (PAUSE_ON_STATION.equals(type)) {

-                if (addressdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) addressdevice.getDeviceDriver();
-                    inst.setExecute_status(CommonFinalParam.TWO);
-                    hongXiangConveyorDeviceDriver.writing(2);
-                    is_feedback = true;
-                }
+


            }
@@ -290,23 +274,10 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
        //放货的进入前等待和离开等待
        if (UNLOAD.equals(action)) {
            if (ENTRY_REQUIRED.equals(type)) {
-                if (addressdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) addressdevice.getDeviceDriver();
-                    if ((hongXiangConveyorDeviceDriver.getAction() == CommonFinalParam.ACTION_TWO || hongXiangConveyorDeviceDriver.getAction() == CommonFinalParam.ACTION_THREE)) {
-                        if(hongXiangConveyorDeviceDriver.getMove() == 0){
-                            inst.setExecute_status("3");
-                            is_feedback = true;
-                        }
-                    }
-                }
+
            }
            if (PAUSE_ON_STATION.equals(type)) {
-                if (addressdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-                    hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) addressdevice.getDeviceDriver();
-                    inst.setExecute_status(CommonFinalParam.FOUR);
-                    hongXiangConveyorDeviceDriver.writing(3);
-                    is_feedback = true;
-                }
+
            }
        }
        JSONObject requestjo = new JSONObject();
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -28,10 +28,7 @@ import org.nl.acs.device.domain.DeviceRunpoint;
 import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
 import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
 import org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor.ConveyorWithScannerWeightDeviceDriver;
-import org.nl.acs.device_driver.one_manipulator.volume_two_manipulator.VolumeTwoManipulatorManipulatorDeviceDriver;
 import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
-import org.nl.acs.device_driver.two_conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver;
-import org.nl.acs.device_driver.two_conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.route.domain.RouteLine;
 import org.nl.acs.route.service.mapper.RouteLineMapper;
@@ -45,8 +42,6 @@ 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.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.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;
@@ -931,7 +926,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
            throw new BadRequestException(LangProcess.msg("error_isNull", device_code));
        }
        StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
-        SlitTwoManipulatorDeviceDriver slitTwoManipulatorDeviceDriver;
        //检测站点
        StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
        if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
@@ -996,35 +990,17 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
            standardInspectSiteDeviceDriver.setBatch(batch);
            device.setMaterial_type(material_type);
            device.setBatch(batch);
-        } else if (device.getDeviceDriver() instanceof SlitTwoManipulatorDeviceDriver) {
-            slitTwoManipulatorDeviceDriver = (SlitTwoManipulatorDeviceDriver) device.getDeviceDriver();
-            slitTwoManipulatorDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
+        }  else if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
            SiemensConveyorDeviceDriver siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
            siemensConveyorDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof SiemensConveyorLabelingDeviceDriver) {
-            SiemensConveyorLabelingDeviceDriver siemensConveyorLabelingDeviceDriver = (SiemensConveyorLabelingDeviceDriver) device.getDeviceDriver();
-            siemensConveyorLabelingDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) {
-            OvenGantryManipulatorDeviceDriver ovenGantryManipulatorDeviceDriver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver();
-            ovenGantryManipulatorDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof SiemensConveyorCkkDeviceDriver) {
-            SiemensConveyorCkkDeviceDriver siemensConveyorCkkDeviceDriver = (SiemensConveyorCkkDeviceDriver) device.getDeviceDriver();
-            siemensConveyorCkkDeviceDriver.setDeviceStatus(form);
        } else if (device.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) {
            StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver
                    = (StandardCoveyorControlWithScannerDeviceDriver) device.getDeviceDriver();
            standardCoveyorControlWithScannerDeviceDriver.setDeviceStatus(form);
-        }/* else if (device.getDeviceDriver() instanceof DeviceStageMonitor) {
-            DeviceStageMonitor deviceStageMonitor = (DeviceStageMonitor) device.getDeviceDriver();
-            deviceStageMonitor.setDeviceStatus(form);
-        }*/else if (device.getDeviceDriver() instanceof StandardStackerDeviceDriver) {
+        }else if (device.getDeviceDriver() instanceof StandardStackerDeviceDriver) {
            StandardStackerDeviceDriver standardStackerDeviceDriver = (StandardStackerDeviceDriver) device.getDeviceDriver();
            standardStackerDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof VolumeTwoManipulatorManipulatorDeviceDriver) {
-            VolumeTwoManipulatorManipulatorDeviceDriver volumeTwoManipulatorManipulatorDeviceDriver = (VolumeTwoManipulatorManipulatorDeviceDriver) device.getDeviceDriver();
-            volumeTwoManipulatorManipulatorDeviceDriver.setDeviceStatus(form);
-        }else if (device.getDeviceDriver() instanceof ConveyorWithScannerWeightDeviceDriver) {
+        } else if (device.getDeviceDriver() instanceof ConveyorWithScannerWeightDeviceDriver) {
            ConveyorWithScannerWeightDeviceDriver conveyorWithScannerWeightDeviceDriver = (ConveyorWithScannerWeightDeviceDriver) device.getDeviceDriver();
            conveyorWithScannerWeightDeviceDriver.setDeviceStatus(form);
        }else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -16,11 +16,8 @@ import org.nl.acs.device_driver.FeedLmsRealFailed;
 import org.nl.acs.device_driver.agv.utils.TwoAgvPhase;
 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.paper_tube_pick_site.PaperTubePickSiteDeviceDriver;
 import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
-import org.nl.acs.device_driver.two_conveyor.hongxiang_conveyor.HongXiangStationDeviceDriver;
-import org.nl.acs.device_driver.two_conveyor.manipulator_agv_station.ManipulatorAgvStationDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.history.ErrorUtil;
@@ -150,13 +147,10 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
        //货架
        StandardStorageDeviceDriver standardStorageDeviceDriver;
        //纸管抓取位
-        PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver;
        //标准-光电检测
        StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
        //烘箱对接位
-        HongXiangStationDeviceDriver hongXiangStationDeviceDriver;
        //行架-agv对接位
-        ManipulatorAgvStationDeviceDriver manipulatorAgvStationDeviceDriver;

        if (phase == 0x02) {
            if (ObjectUtil.isEmpty(inst)) {
@@ -237,49 +231,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction()
                            , standardInspectSiteDeviceDriver.getError(), ikey);
                }
-            } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                try {
-                    manipulatorAgvStationDeviceDriver.writing(2);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                try {
-                    hongXiangStationDeviceDriver.writing(1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (hongXiangStationDeviceDriver.getMove() > 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                            , hongXiangStationDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                try {
-                    paperTubePickSiteDeviceDriver.writing(2);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (paperTubePickSiteDeviceDriver.getMove() > 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                            , paperTubePickSiteDeviceDriver.getError(), ikey);
-                }
-            } else {
+            }  else {
                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                LuceneLogDto logDto = LuceneLogDto.builder()
                        .device_code(device_code)
@@ -343,49 +295,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                standardOrdinarySiteDeviceDriver.setAgvphase(phase);
                standardOrdinarySiteDeviceDriver.setIndex(index);
                standardOrdinarySiteDeviceDriver.setInst(inst);
-            } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                try {
-                    manipulatorAgvStationDeviceDriver.writing(3);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                try {
-                    hongXiangStationDeviceDriver.writing(0);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (hongXiangStationDeviceDriver.getMove() > 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                            , hongXiangStationDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                try {
-                    paperTubePickSiteDeviceDriver.writing(3);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (paperTubePickSiteDeviceDriver.getMove() == 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                            , paperTubePickSiteDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+            }  else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();

                try {
@@ -458,49 +368,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                    standardOrdinarySiteDeviceDriver.setAgvphase(phase);
                    standardOrdinarySiteDeviceDriver.setIndex(index);
                    standardOrdinarySiteDeviceDriver.setInst(inst);
-                } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                    manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                    try {
-                        manipulatorAgvStationDeviceDriver.writing(2);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                    paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                    try {
-                        paperTubePickSiteDeviceDriver.writing(2);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (paperTubePickSiteDeviceDriver.getMove() == 1) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                                , paperTubePickSiteDeviceDriver.getError(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                    hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                    try {
-                        hongXiangStationDeviceDriver.writing(1);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (hongXiangStationDeviceDriver.getMove() > 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                                , hongXiangStationDeviceDriver.getError(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+                }  else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                    standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();

                    try {
@@ -571,48 +439,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                    standardOrdinarySiteDeviceDriver.setAgvphase(phase);
                    standardOrdinarySiteDeviceDriver.setIndex(index);
                    standardOrdinarySiteDeviceDriver.setInst(inst);
-                } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                    hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                    try {
-                        hongXiangStationDeviceDriver.writing(0);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (hongXiangStationDeviceDriver.getMove() == 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                                , hongXiangStationDeviceDriver.getError(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                    manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                    try {
-                        manipulatorAgvStationDeviceDriver.writing(3);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                    paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                    try {
-                        paperTubePickSiteDeviceDriver.writing(3);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (paperTubePickSiteDeviceDriver.getMove() == 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                                , paperTubePickSiteDeviceDriver.getError(), ikey);
-                    }
                } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                    standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();

@@ -705,49 +531,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                standardOrdinarySiteDeviceDriver.setIndex(index);
                standardOrdinarySiteDeviceDriver.setInst(inst);

-            } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                try {
-                    paperTubePickSiteDeviceDriver.writing(4);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (paperTubePickSiteDeviceDriver.getMove() == 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                            , paperTubePickSiteDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                try {
-                    manipulatorAgvStationDeviceDriver.writing(4);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                try {
-                    hongXiangStationDeviceDriver.writing(1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (hongXiangStationDeviceDriver.getMove() == 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                            , hongXiangStationDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+            }  else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
                standardInspectSiteDeviceDriver.writing(1);
                if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)) {
@@ -819,48 +603,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                standardOrdinarySiteDeviceDriver.setAgvphase(phase);
                standardOrdinarySiteDeviceDriver.setIndex(index);
                standardOrdinarySiteDeviceDriver.setInst(inst);
-            } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                try {
-                    manipulatorAgvStationDeviceDriver.writing(5);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                try {
-                    hongXiangStationDeviceDriver.writing(0);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (hongXiangStationDeviceDriver.getMove() > 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                            , hongXiangStationDeviceDriver.getError(), ikey);
-                }
-            } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                try {
-                    paperTubePickSiteDeviceDriver.writing(5);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                if (paperTubePickSiteDeviceDriver.getMove() > 0) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                } else {
-                    message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                            , paperTubePickSiteDeviceDriver.getError(), ikey);
-                }
            } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
                standardInspectSiteDeviceDriver.writing(0);
@@ -932,48 +674,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                    standardOrdinarySiteDeviceDriver.setIndex(index);
                    standardOrdinarySiteDeviceDriver.setInst(inst);

-                } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                    manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                    try {
-                        manipulatorAgvStationDeviceDriver.writing(4);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                    hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                    try {
-                        hongXiangStationDeviceDriver.writing(1);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (hongXiangStationDeviceDriver.getMove() == 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                                , hongXiangStationDeviceDriver.getError(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                    paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                    try {
-                        paperTubePickSiteDeviceDriver.writing(4);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (paperTubePickSiteDeviceDriver.getMove() == 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                                , paperTubePickSiteDeviceDriver.getError(), ikey);
-                    }
                } else {
                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                }
@@ -1040,48 +740,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                    standardOrdinarySiteDeviceDriver.setIndex(index);
                    standardOrdinarySiteDeviceDriver.setInst(inst);

-                } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) {
-                    manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver();
-
-                    try {
-                        manipulatorAgvStationDeviceDriver.writing(5);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if ((manipulatorAgvStationDeviceDriver.getAction() == 1)) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + ",动作信号:" + manipulatorAgvStationDeviceDriver.getAction() + "报警信号:" + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}，动作信号{} ,不满足取货条件,指令号{}", device_code, manipulatorAgvStationDeviceDriver.getAction(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
-                    paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
-                    try {
-                        paperTubePickSiteDeviceDriver.writing(5);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (paperTubePickSiteDeviceDriver.getMove() > 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + paperTubePickSiteDeviceDriver.getMove() + ",动作信号:" + paperTubePickSiteDeviceDriver.getAction() + "报警信号:" + paperTubePickSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, paperTubePickSiteDeviceDriver.getMove(), paperTubePickSiteDeviceDriver.getAction()
-                                , paperTubePickSiteDeviceDriver.getError(), ikey);
-                    }
-                } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
-                    hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
-                    try {
-                        hongXiangStationDeviceDriver.writing(0);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (hongXiangStationDeviceDriver.getMove() > 0) {
-                        data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
-                    } else {
-                        message = "设备号:" + device_code + "光电信号:" + hongXiangStationDeviceDriver.getMove() + ",动作信号:" + hongXiangStationDeviceDriver.getAction() + "报警信号:" + hongXiangStationDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
-                        log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, hongXiangStationDeviceDriver.getMove(), hongXiangStationDeviceDriver.getAction()
-                                , hongXiangStationDeviceDriver.getError(), ikey);
-                    }
                } else {
                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java
@@ -48,59 +48,9 @@ public class WmsToAcsController {
        return new ResponseEntity<>(wmstoacsService.cancelFromWms(reqs), HttpStatus.OK);
    }

-    @PostMapping("/updateDeviceGoodsFromWms")
-    @Log(value = "WMS修改点位状态")
-    public ResponseEntity<Object> updateDeviceGoodsFromWms(@RequestBody String whereJson) {
-        return new ResponseEntity<>(wmstoacsService.updateDeviceGoodsFromWms(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/areaControl")
-    @Log(value = "区域控制")
-    public ResponseEntity<Object> areaControl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(wmstoacsService.areaControl(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/action")
-    @Log(value = "WMS下发点位信号")
-    @SaIgnore
-    public ResponseEntity<Object> putAction(@RequestBody String whereJson) throws Exception {
-        return new ResponseEntity<>(wmstoacsService.putAction(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/querydevice")
-    @Log(value = "WMS查询设备状态")
-    @SaIgnore
-    public ResponseEntity<Object> queryDevice(@RequestBody String whereJson) throws Exception {
-        return new ResponseEntity<>(wmstoacsService.queryDevice(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/queryDeviceDBValue")
-    @Log(value = "WMS查询设备DB值")
-    @SaIgnore
-    public ResponseEntity<Object> queryDeviceDBValue(@RequestBody String whereJson) {
-        return new ResponseEntity<>(wmstoacsService.queryDeviceDBValue(whereJson), HttpStatus.OK);
-    }


-    @PostMapping("/putPlusPullAction")
-    @Log(value = "WMS下发插拔轴动作")
-    @SaIgnore
-    public ResponseEntity<Object> putPlusPullAction(@RequestBody String whereJson) {
-        return new ResponseEntity<>(wmstoacsService.putPlusPullAction(whereJson), HttpStatus.OK);
-    }

-    @PostMapping("/notify")
-    @Log("wms下发任务动作")
-    @SaIgnore
-    public ResponseEntity<Object> notify(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(wmstoacsService.notifyAcs(param), HttpStatus.OK);
-    }

-    @PostMapping("/getWeight")
-    @Log("wms下发废箔重量")
-    @SaIgnore
-    public ResponseEntity<Object> getWeight(@RequestBody String whereJson) throws Exception {
-        return new ResponseEntity<>(wmstoacsService.putWeightAction(whereJson), HttpStatus.OK);
-    }

 }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java
@@ -34,79 +34,10 @@ public interface WmsToAcsService {
     */
    CancelTaskResponse cancelFromWms(List<CancelTaskRequest> reqs) throws Exception;

-    /**
-     * 修改设置有无货属性
-     *
-     * @param jsonObject 条件
-     * @return Map<String, Object>
-     */
-    Map<String, Object> updateDeviceGoodsFromWms(String jsonObject);
-
-    /**
-     * 区域控制
-     *
-     * @param jsonObject 条件
-     * @return Map<String, Object>
-     */
-    Map<String, Object> areaControl(JSONObject jsonObject);
-
-    /**
-     * 下发动作
-     * @param jsonObject
-     * @return
-     * @throws Exception
-     */
-    org.nl.acs.ext.wms.data.PutActionResponse putAction(String jsonObject) throws Exception;
-
-    /**
-     * 查询设备状态
-     *
-     * @param jsonObject 条件
-     * @return Map<String, Object>
-     */
-    Map<String, Object> queryDevice(String jsonObject) throws Exception;
-
-    /**
-     * 查询设备DB值
-     *
-     * @param whereJson
-     * @return
-     */
-    Map<String, Object> queryDeviceDBValue(String whereJson);


-    /**
-     * ACS系统在获取空的托盘号
-     *
-     * @param whereJson
-     * @return
-     */
-    Map<String, Object> querydevice(String whereJson);


-    /**
-     * 下发插拔轴动作
-     *
-     * @param whereJson 条件
-     * @return Map<String, Object>
-     */
-    Map<String, Object> putPlusPullAction(String whereJson);


-    /**
-     * 下发wms任务动作
-     *
-     * @param param 条件
-     * @return Map<String, Object>
-     */
-    JSONObject notifyAcs(JSONObject param);
-
-    /**
-     * 下发废箔称重动作
-     *
-     * @param jsonObject
-     * @return
-     */
-    Map<String, Object> putWeightAction(String jsonObject) throws Exception;
-
 }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -35,7 +35,6 @@ 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.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.two_conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
 import org.nl.acs.ext.wms.liKuData.*;
 import org.nl.acs.ext.wms.service.AcsToLiKuService;
 import org.nl.acs.instruction.domain.InstructionMybatis;
@@ -433,7 +432,6 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
        DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
        Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());

-        HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
        StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;

        try {
@@ -587,14 +585,6 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
        Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());
        Device nextdevice = appService.findDeviceByCode(dto.getNext_device_code());

-        HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
-        StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
-
-        if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
-            hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
-            hongXiangConveyorDeviceDriver.writing("3", dto.getInstruction_code());
-        }
-
        try {
            String start_device_code = dto.getStart_device_code();
            String next_device_code = dto.getNext_device_code();