root/acs1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
loujf
2022-11-27 12:41:10 +08:00
parent ffa9ff130a
commit 4f9634299d
1 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -435,12 +435,22 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
json.put("device_name", obj.optString("device_name"));
Device device = deviceAppService.findDeviceByCode(obj.optString("device_code"));
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardOrdinarySiteDeviceDriver.getQty());
json.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial());
json.put("remark", standardOrdinarySiteDeviceDriver.getRemark());
json.put("islock",standardOrdinarySiteDeviceDriver.getIslock());
json.put("hasGood",standardOrdinarySiteDeviceDriver.getHasGoods());
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardInspectSiteDeviceDriver.getQty());
json.put("material_type", standardInspectSiteDeviceDriver.getMaterial());
json.put("remark", standardInspectSiteDeviceDriver.getRemark());
json.put("islock",standardInspectSiteDeviceDriver.getIslock());
json.put("hasGood",standardInspectSiteDeviceDriver.getHasGoods());
}
result.add(json);
}
@@ -461,12 +471,22 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
json.put("device_name", obj.optString("device_name"));
Device device = deviceAppService.findDeviceByCode(obj.optString("device_code"));
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardOrdinarySiteDeviceDriver.getQty());
json.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial());
json.put("remark", standardOrdinarySiteDeviceDriver.getRemark());
json.put("islock",standardOrdinarySiteDeviceDriver.getIslock());
json.put("hasGood",standardOrdinarySiteDeviceDriver.getHasGoods());
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardInspectSiteDeviceDriver.getQty());
json.put("material_type", standardInspectSiteDeviceDriver.getMaterial());
json.put("remark", standardInspectSiteDeviceDriver.getRemark());
json.put("islock",standardInspectSiteDeviceDriver.getIslock());
json.put("hasGood",standardInspectSiteDeviceDriver.getHasGoods());
}
result.add(json);
}
@@ -487,6 +507,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
json.put("device_name", obj.optString("device_name"));
Device device = deviceAppService.findDeviceByCode(obj.optString("device_code"));
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardOrdinarySiteDeviceDriver.getQty());
@@ -495,6 +516,14 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
json.put("islock",standardOrdinarySiteDeviceDriver.getIslock());
json.put("hasGood",standardOrdinarySiteDeviceDriver.getHasGoods());
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
json.put("quantity", standardInspectSiteDeviceDriver.getQty());
json.put("material_type", standardInspectSiteDeviceDriver.getMaterial());
json.put("remark", standardInspectSiteDeviceDriver.getRemark());
json.put("islock",standardInspectSiteDeviceDriver.getIslock());
json.put("hasGood",standardInspectSiteDeviceDriver.getHasGoods());
}
result.add(json);
}
return result;
@@ -1140,6 +1169,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
}
Device device = deviceAppService.findDeviceByCode(device_code);
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setQty(quantity);
@@ -1151,6 +1181,17 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
device.setRemark(remark);
device.setHas_goods(hasGoods);
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setQty(quantity);
standardInspectSiteDeviceDriver.setMaterial(material_type);
standardInspectSiteDeviceDriver.setRemark(remark);
standardInspectSiteDeviceDriver.setHasGoods(hasGoods);
device.setMaterial_type(material_type);
device.setQuantity(quantity);
device.setRemark(remark);
device.setHas_goods(hasGoods);
}
}
@@ -1242,6 +1283,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
Device startDevice = deviceAppService.findDeviceByCode(start_device_code);
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (startDevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) startDevice.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setBranchProtocol(0);
@@ -1264,6 +1306,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
Device device = deviceAppService.findDeviceByCode(device_code);
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setHasGoods(0);
@@ -1275,6 +1318,17 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
jsonjo.put("hasGoodStatus", "0");
changeDeviceStatus(jsonjo);
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setHasGoods(0);
standardInspectSiteDeviceDriver.setQty("");
standardInspectSiteDeviceDriver.setMaterial("");
standardInspectSiteDeviceDriver.setRemark("");
JSONObject jsonjo = new JSONObject();
jsonjo.put("device_code", device_code);
jsonjo.put("hasGoodStatus", "0");
changeDeviceStatus(jsonjo);
}
}
@Override
@@ -1289,6 +1343,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
String device_code = arrjo.get("device_code").toString();
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
Device device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
@@ -1301,6 +1356,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
jsonjo.put("hasGoodStatus", "0");
changeDeviceStatus(jsonjo);
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setMaterial("");
standardInspectSiteDeviceDriver.setQty("");
standardInspectSiteDeviceDriver.setRemark("");
}
}
}
}
@@ -1317,6 +1378,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
String device_code = arrjo.get("device_code").toString();
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
Device device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
@@ -1329,6 +1391,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
jsonjo.put("hasGoodStatus", "0");
changeDeviceStatus(jsonjo);
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setMaterial("");
standardInspectSiteDeviceDriver.setQty("");
standardInspectSiteDeviceDriver.setRemark("");
}
}
}
}
@@ -1345,6 +1413,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
String device_code = arrjo.get("device_code").toString();
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
Device device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
@@ -1357,6 +1426,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
jsonjo.put("hasGoodStatus", "0");
changeDeviceStatus(jsonjo);
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setMaterial("");
standardInspectSiteDeviceDriver.setQty("");
standardInspectSiteDeviceDriver.setRemark("");
}
}
}
}
@@ -1373,11 +1448,16 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
throw new RuntimeException("当前行的库位有任务！");
}
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
Device device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setIslock(Boolean.valueOf(islock));
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setIslock(Boolean.valueOf(islock));
}
}
}
@@ -1393,11 +1473,16 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
throw new RuntimeException("当前行的库位有任务！");
}
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
Device device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setIslock(Boolean.valueOf(islock));
}
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setIslock(Boolean.valueOf(islock));
}
}
}