feat:项目结构调整
This commit is contained in:
@@ -201,14 +201,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
|
|||||||
if (driver.getMode() != 2) {
|
if (driver.getMode() != 2) {
|
||||||
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
||||||
}
|
}
|
||||||
} else if (deviceDriver instanceof StandardOrdinarySiteDeviceDriver) {
|
|
||||||
StandardOrdinarySiteDeviceDriver driver = (StandardOrdinarySiteDeviceDriver) deviceDriver;
|
|
||||||
if (driver.getAction() != 1) {
|
|
||||||
error_action = "动作信号:" + driver.getAction() + "不满足条件";
|
|
||||||
}
|
|
||||||
if (driver.getMode() != 2) {
|
|
||||||
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
|
||||||
}
|
|
||||||
} else if (deviceDriver instanceof HongXiangStationDeviceDriver) {
|
} else if (deviceDriver instanceof HongXiangStationDeviceDriver) {
|
||||||
HongXiangStationDeviceDriver driver = (HongXiangStationDeviceDriver) deviceDriver;
|
HongXiangStationDeviceDriver driver = (HongXiangStationDeviceDriver) deviceDriver;
|
||||||
if (driver.getAction() != 1) {
|
if (driver.getAction() != 1) {
|
||||||
@@ -225,14 +217,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
|
|||||||
if (driver.getMode() != 2) {
|
if (driver.getMode() != 2) {
|
||||||
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
||||||
}
|
}
|
||||||
} else if (deviceDriver instanceof RangingStationsDeviceDriver) {
|
|
||||||
RangingStationsDeviceDriver driver = (RangingStationsDeviceDriver) deviceDriver;
|
|
||||||
if (driver.getAction() != 1) {
|
|
||||||
error_action = "动作信号:" + driver.getAction() + "不满足条件";
|
|
||||||
}
|
|
||||||
if (driver.getMode() != 2) {
|
|
||||||
error_mode = "模式:" + driver.getMode() + "不满足条件";
|
|
||||||
}
|
|
||||||
} else if (deviceDriver instanceof StandardInspectSiteDeviceDriver) {
|
} else if (deviceDriver instanceof StandardInspectSiteDeviceDriver) {
|
||||||
StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) deviceDriver;
|
StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) deviceDriver;
|
||||||
if (driver.getAction() != 1) {
|
if (driver.getAction() != 1) {
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ import java.util.*;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.locks.Lock;
|
import java.util.concurrent.locks.Lock;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 输送线
|
* 输送线
|
||||||
@@ -40,7 +40,6 @@ import java.util.*;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.locks.Lock;
|
import java.util.concurrent.locks.Lock;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 一楼木箱机械手、子卷机械手对接位
|
* 一楼木箱机械手、子卷机械手对接位
|
||||||
@@ -40,7 +40,6 @@ import java.util.*;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.locks.Lock;
|
import java.util.concurrent.locks.Lock;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 一楼出库捆轧贴标位
|
* 一楼出库捆轧贴标位
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package org.nl.acs.device_driver.lk_conveyor.finished_product_out_with_bind_lable_conveyor;
|
package org.nl.acs.device_driver.lk_conveyor.finished_product_out_with_bind_lable_conveyor;
|
||||||
|
|
||||||
import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
|
import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
|
||||||
import org.nl.acs.device_driver.lk_conveyor.finished_product_out_with_bind_lable_conveyor.FinishedProductOutBindLableDeviceDriver;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -42,7 +42,6 @@ import java.util.*;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.locks.Lock;
|
import java.util.concurrent.locks.Lock;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拆叠盘机
|
* 拆叠盘机
|
||||||
@@ -44,7 +44,6 @@ import java.util.*;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.locks.Lock;
|
import java.util.concurrent.locks.Lock;
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 出入库输送线工位-带扫码称重
|
* 出入库输送线工位-带扫码称重
|
||||||
@@ -548,7 +547,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
|
|||||||
param.put("weight", this.weight);
|
param.put("weight", this.weight);
|
||||||
}
|
}
|
||||||
param.put("type", type);
|
param.put("type", type);
|
||||||
HttpResponse httpResponse = acsToWmsService.c(param);
|
HttpResponse httpResponse = acsToWmsService.applyTwo(param);
|
||||||
if (ObjectUtil.isNotEmpty(httpResponse)) {
|
if (ObjectUtil.isNotEmpty(httpResponse)) {
|
||||||
JSONObject resp = JSONObject.parseObject(httpResponse.body());
|
JSONObject resp = JSONObject.parseObject(httpResponse.body());
|
||||||
if (resp != null && resp.getIntValue("status") == 200) {
|
if (resp != null && resp.getIntValue("status") == 200) {
|
||||||
Reference in New Issue
Block a user