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

rev

Browse Source
This commit is contained in:
张江玮
2023-09-13 14:11:07 +08:00
parent 4a505caacc
commit bf5401fcc0
72 changed files with 1407 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java
View File

@@ -156,9 +156,13 @@ public class ReadUtil {
return server;
}
public static void write(Map<String, Object> strings, Server server) {
public static void write(Map<String, Object> strings, Server server, int writeCount) {
try {
//Group group = this.opcServerService.getServer(opcServiceCode);
if (writeCount == 3) {
server.disconnect();
return;
}
try {
server.connect();
} catch (AlreadyConnectedException ignored) {
@@ -176,7 +180,7 @@ public class ReadUtil {
OpcUtl.writeValue(group, list.toArray(new WriteRequest[0]));
}
} catch (Exception e) {
write(strings, server);
write(strings, server, ++writeCount);
} finally {
server.disconnect();
}

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

@@ -1314,7 +1314,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
}
}
Server server = ReadUtil.getServer(opc_id);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
}
/**

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java
View File

@@ -287,8 +287,7 @@ public class CargoLiftConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -315,7 +314,7 @@ public class CargoLiftConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
logServer.deviceExecuteLog(this.device_code, "", "", "to_task 写入 " + command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDeviceDriver.java
View File

@@ -183,8 +183,7 @@ public class EmptyVehicleStackingPositionDeviceDriver extends AbstractOpcDeviceD
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -196,7 +195,7 @@ public class EmptyVehicleStackingPositionDeviceDriver extends AbstractOpcDeviceD
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", key + " 写入 " + value);
}

11
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
View File

@@ -318,13 +318,13 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -336,8 +336,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -356,7 +355,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
itemMap.put(to_command, command);
itemMap.put(to_target, target);
itemMap.put(to_task, task);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -378,7 +377,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
} else if (type == 3) {
itemMap.put(to_task, command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

13
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java
View File

@@ -541,13 +541,13 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -565,7 +565,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
itemMap.put(to_command, 1);
itemMap.put(to_target, deviceAppservice.findDeviceByCode(inst.getNext_device_code()).getAddress());
itemMap.put(to_task, inst.getInstruction_code());
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -584,7 +584,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
itemMap.put(to_target, target);
itemMap.put(to_task, task);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -595,8 +595,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -622,7 +621,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
logServer.deviceExecuteLog(this.device_code, "", "", "to_task 写入 " + command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -251,13 +251,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -269,8 +269,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -295,7 +294,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
itemMap.put(to_task, command);
logServer.deviceExecuteLog(this.device_code, "", "", "to_task 写入 " + command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
View File

@@ -143,8 +143,7 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
log.info("下发PLC信号：{},{}", to_command, command);
System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value：" + command);

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@@ -179,7 +179,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -191,8 +191,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -215,7 +214,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
} else if (type == 3) {
itemMap.put(to_task, command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -229,7 +228,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDeviceDriver.java
View File

@@ -240,7 +240,7 @@ public class LnshCrusherDeviceDriver extends AbstractOpcDeviceDriver implements
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -253,7 +253,7 @@ public class LnshCrusherDeviceDriver extends AbstractOpcDeviceDriver implements
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java
View File

@@ -194,13 +194,13 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -212,8 +212,7 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java
View File

@@ -202,13 +202,13 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -220,8 +220,7 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java
View File

@@ -201,8 +201,7 @@ public class LnshKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implement
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDeviceDriver.java
View File

@@ -172,7 +172,7 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -181,7 +181,7 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -195,7 +195,7 @@ public class LnshLabelingMachineDeviceDriver extends AbstractOpcDeviceDriver imp
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
View File

@@ -297,7 +297,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -309,8 +309,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -332,7 +331,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
} else if (type == 2) {
itemMap.put(to_material_code, command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -346,7 +345,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
itemMap.put(to_param, value);
// itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

14
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
View File

@@ -164,6 +164,10 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
logServer.deviceItemValue(this.device_code,"outKiln_device" ,String.valueOf(outKiln_device));
logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_device：" + last_outKiln_device + " -> " + outKiln_device);
}
if (cool_number != last_cool_number) {
logServer.deviceItemValue(this.device_code,"cool_number" ,String.valueOf(cool_number));
logServer.deviceExecuteLog(this.device_code,"","","信号cool_number：" + last_cool_number + " -> " + cool_number);
}
} catch (Exception var17) {
return;
@@ -205,13 +209,13 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
break;
case 5:
if (!requireSucess && outKiln_move != 0 && outKiln_barcode != 0) {
if (!requireSucess && outKiln_barcode != 0 && cool_number != 0) {
outKiln();
}
break;
case 17:
if (!requireSucess && outKiln_move != 0 && outKiln_barcode != 0 && cool_number != 0) {
if (!requireSucess && outKiln_barcode != 0 && cool_number != 0) {
outKilnConfirm();
}
break;
@@ -259,6 +263,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
JSONObject param = new JSONObject();
param.put("vehicle_code", outKiln_barcode);
param.put("cool_number", cool_number);
HttpResponse result = acsToWmsService.outKiln(param);
if (ObjectUtil.isNotEmpty(result)) {
if (result.getStatus() == HttpStatus.OK.value()) {
@@ -286,8 +291,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
@@ -302,7 +306,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java
View File

@@ -262,7 +262,7 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -275,7 +275,7 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
@@ -287,8 +287,7 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

10
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -251,7 +251,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
return;
case 2:
break;
case 4:
case 3:
//排产单确认
if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
JSONObject json = new JSONObject();
@@ -285,7 +285,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
// applyEmpty();
// }
// break;
case 9:
case 4:
//工单完成
if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
JSONObject json = new JSONObject();
@@ -637,7 +637,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -665,7 +665,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_feedback, feedback);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback);
}
@@ -679,7 +679,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java
View File

@@ -218,8 +218,7 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -233,7 +232,7 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java
View File

@@ -217,7 +217,7 @@ public class LnshPalletStorageDeviceDriver extends AbstractOpcDeviceDriver imple
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
View File

@@ -471,13 +471,13 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
itemMap.put(to_param, value);
// itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -490,8 +490,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

220
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@@ -14,21 +14,20 @@ import org.nl.acs.device_driver.DeviceDriver;
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.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.monitor.DeviceStageMonitor;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.ItemValue;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.order.service.ProduceshiftorderService;
import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.task.service.TaskService;
import org.nl.modules.lucene.service.dto.LuceneLogDto;
import org.nl.modules.lucene.service.impl.LuceneExecuteLogServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import org.openscada.opc.lib.da.Server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import java.util.Date;
@@ -47,7 +46,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
protected ItemProtocol itemProtocol = new ItemProtocol(this);
InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
@@ -63,6 +61,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean("produceshiftorderServiceImpl");
LuceneExecuteLogServiceImpl lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
DeviceAppService deviceAppService = SpringContextHolder.getBean("deviceAppServiceImpl");
String device_code;
int mode = 0;
@@ -233,6 +232,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
int last_pressLayerX3_offset = 0;
int last_pressLayerY3_offset = 0;
int last_tool_coordinate = 0;
long vd_id = 0;
@Override
public Device getDevice() {
@@ -663,18 +663,37 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
if (!requireSucess && this.move != 0) {
this.toPackage(false);
}
break;
case 21:
// 分拣码垛完成
if (!requireSucess && this.move != 0) {
this.fjPalletizationCompleted("1");
}
break;
case 22:
// 分拣强制半托
if (!requireSucess && this.move != 0) {
this.fjPalletizationCompleted("0");
}
break;
case 23:
// 分拣呼叫空托
if (!requireSucess && this.move == 0) {
this.fjCallEmpty();
}
break;
case 25:
// 分拣需要半托回码
if (!requireSucess && this.move == 0 && this.vd_id != 0) {
this.fjNeed();
}
break;
case 26:
// 分拣不需要半托回码
if (!requireSucess && this.move == 0) {
this.fjNoNeed();
}
}
// switch (flag) {
// //取货完成
// case 2:
// writing(2);
// return;
// //放货完成
// case 4:
// writing(3);
// return;
// }
}
last_mode = mode;
@@ -781,11 +800,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
*
* @param
*/
public synchronized boolean palletizing() {
public synchronized void palletizing() {
Date date = new Date();
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
return false;
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
@@ -860,7 +878,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
}
}
}
return true;
}
}
@@ -1021,13 +1038,13 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -1049,7 +1066,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else if (type == 3) {
itemMap.put(to_task, command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -1061,25 +1078,164 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
public synchronized void OpenOrClose(String type) {
public String toString() {
return super.toString();
}
//进入区域
if ("1".equals(type)) {
writing(5);
public synchronized void fjPalletizationCompleted(String isFull) {
Date date = new Date();
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
} else {
//离开区域
writing(6);
this.instruction_require_time = date;
JSONObject json = new JSONObject();
json.put("device_code", device_code);
json.put("qty", encoder_qty);
json.put("weight", weight);
json.put("is_full", isFull);
json.put("is_package", "1");
json.put("product_code", product_code);
json.put("AlongSide", AlongSide);
json.put("BshortSide", BshortSide);
json.put("Htrapezoidal", Htrapezoidal);
json.put("Wthickness", Wthickness);
json.put("tray_qty", tray_qty);
json.put("tray_high", tray_high);
json.put("crib_category", crib_category);
json.put("palletX1_line", palletX1_line);
json.put("palletY1_row", palletY1_row);
json.put("palletA1_angle", palletA1_angle);
json.put("palletX2_line", palletX2_line);
json.put("palletY2_row", palletY2_row);
json.put("palletA2_angle", palletA2_angle);
json.put("palletX3_line", palletX3_line);
json.put("palletY3_row", palletY3_row);
json.put("palletA3_angle", palletA3_angle);
json.put("pressCribX1_line", pressCribX1_line);
json.put("pressCribY1_row", pressCribY1_row);
json.put("pressCribA1_angle", pressCribA1_angle);
json.put("pressCribX2_line", pressCribX2_line);
json.put("pressCribY2_row", pressCribY2_row);
json.put("pressCribA2_angle", pressCribA2_angle);
json.put("pressCribX3_line", pressCribX3_line);
json.put("pressCribY3_row", pressCribY3_row);
json.put("pressCribA3_angle", pressCribA3_angle);
json.put("Zoffset", Zoffset);
json.put("pallet_layerQty", pallet_layerQty);
json.put("pressCrib_layerQty", pressCrib_layerQty);
json.put("codeLayerX1_interval", codeLayerX1_interval);
json.put("codeLayerY1_interval", codeLayerY1_interval);
json.put("codeLayerX2_interval", codeLayerX2_interval);
json.put("codeLayerY2_interval", codeLayerY2_interval);
json.put("codeLayerX3_interval", codeLayerX3_interval);
json.put("codeLayerY3_interval", codeLayerY3_interval);
json.put("codeLayerX1_offset", codeLayerX1_offset);
json.put("codeLayerY1_offset", codeLayerY1_offset);
json.put("codeLayerX2_offset", codeLayerX2_offset);
json.put("codeLayerY2_offset", codeLayerY2_offset);
json.put("codeLayerX3_offset", codeLayerX3_offset);
json.put("codeLayerY3_offset", codeLayerY3_offset);
json.put("pressLayerX1_interval", pressLayerX1_interval);
json.put("pressLayerY1_interval", pressLayerY1_interval);
json.put("pressLayerX2_interval", pressLayerX2_interval);
json.put("pressLayerY2_interval", pressLayerY2_interval);
json.put("pressLayerX3_interval", pressLayerX3_interval);
json.put("pressLayerY3_interval", pressLayerY3_interval);
json.put("pressLayerX1_offset", pressLayerX1_offset);
json.put("pressLayerY1_offset", pressLayerY1_offset);
json.put("pressLayerX2_offset", pressLayerX2_offset);
json.put("pressLayerY2_offset", pressLayerY2_offset);
json.put("pressLayerX3_offset", pressLayerX3_offset);
json.put("pressLayerY3_offset", pressLayerY3_offset);
json.put("tool_coordinate", tool_coordinate);
HttpResponse response = acsToWmsService.applyTaskManipulatorToWms(json);
if (ObjectUtil.isNotEmpty(response) && response.getStatus() == HttpStatus.OK.value()) {
JSONObject responseBody = JSONObject.parseObject(response.body());
if (ObjectUtil.isNotEmpty(responseBody) && "200".equals(responseBody.getString("status"))) {
this.writing(this.mode);
this.setRequireSucess(true);
}
}
}
}
public String toString() {
return "";
public synchronized void fjCallEmpty() {
Date date = new Date();
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
} else {
this.instruction_require_time = date;
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
HttpResponse response = acsToWmsService.fjCallEmpty(param);
if (ObjectUtil.isNotEmpty(response) && response.getStatus() == HttpStatus.OK.value()) {
JSONObject responseBody = JSONObject.parseObject(response.body());
if (ObjectUtil.isNotEmpty(responseBody) && "200".equals(responseBody.getString("status"))) {
JSONObject data = responseBody.getJSONObject("data");
if (ObjectUtil.isEmpty(data)) {
Device fmj = deviceAppService.findDeviceByCode("FMJ01");
if (fmj.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
LnshLaminatingMachineDeviceDriver driver = (LnshLaminatingMachineDeviceDriver) fmj.getDeviceDriver();
driver.writing(1);
}
this.writing(23);
} else {
JSONObject write = new JSONObject();
this.vd_id = data.getLongValue("ve_id");
write.put("to_tray_qty", data.getString("qty"));
write.put("to_command", 24);
this.writing(write);
}
this.setRequireSucess(true);
}
}
}
}
public synchronized void fjNeed() {
Date date = new Date();
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
} else {
this.instruction_require_time = date;
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("vd_id", this.vd_id);
HttpResponse response = acsToWmsService.fjNeed(param);
if (ObjectUtil.isNotEmpty(response) && response.getStatus() == HttpStatus.OK.value()) {
JSONObject responseBody = JSONObject.parseObject(response.body());
if (ObjectUtil.isNotEmpty(responseBody) && "200".equals(responseBody.getString("status"))) {
this.writing(this.mode);
this.setRequireSucess(true);
this.vd_id = 0;
}
}
}
}
public synchronized void fjNoNeed() {
Date date = new Date();
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
} else {
this.instruction_require_time = date;
Device fmj = deviceAppService.findDeviceByCode("FMJ01");
if (fmj.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
LnshLaminatingMachineDeviceDriver driver = (LnshLaminatingMachineDeviceDriver) fmj.getDeviceDriver();
driver.writing(1);
}
this.writing(this.mode);
this.setRequireSucess(true);
this.vd_id = 0;
}
}
@Override
@@ -1359,7 +1515,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
View File

@@ -368,7 +368,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -382,13 +382,13 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -400,8 +400,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}

10
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -804,7 +804,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
@@ -821,7 +821,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
}
@@ -833,7 +833,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
}
public void writing1(int command) {
@@ -844,7 +844,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command1, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
}
@@ -856,7 +856,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command2, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
}

10
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@@ -974,13 +974,13 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -991,7 +991,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_feedback, feedback);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback);
}
@@ -1000,7 +1000,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -1014,7 +1014,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

11
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -472,13 +472,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -502,7 +502,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
itemMap.put(to_task, command);
logServer.deviceExecuteLog(this.device_code, "", "", "to_task 写入 " + command);
}
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
@@ -514,8 +514,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
@@ -615,7 +614,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -145,8 +145,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
log.info("下发PLC信号：{},{}", to_command, command);
System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value：" + command);

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java
View File

@@ -452,13 +452,13 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, 1);
itemMap.put(to_task, instruction_num);
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}
public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server);
ReadUtil.write(itemMap, server, 0);
server.disconnect();
}

6
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -176,4 +176,10 @@ public interface AcsToWmsService {
HttpResponse mark(JSONObject param);
HttpResponse reportForWork(JSONObject param);
HttpResponse fjPalletizationCompleted(JSONObject param);
HttpResponse fjCallEmpty(JSONObject param);
HttpResponse fjNeed(JSONObject param);
}

75
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1082,4 +1082,79 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
MDC.remove(log_file_type);
}
}
@Override
public HttpResponse fjPalletizationCompleted(JSONObject param) {
try {
MDC.put(log_file_type, log_type);
String wmsurl = acsConfigService.findByCode(AcsConfig.WMSURL).getValue();
HttpResponse result = null;
log.info("fjPalletizationCompleted - 请求参数 {}", param);
AddressDto addressDto = addressService.findByCode("fjPalletizationCompleted");
String methods_url = addressDto.getMethods_url();
try {
result = HttpRequest
.post(wmsurl + methods_url)
.body(param.toJSONString())
.execute();
log.info("fjPalletizationCompleted - 响应参数 {}", result.body());
} catch (Exception e) {
log.error("fjPalletizationCompleted - 请求错误！", e);
}
return result;
} finally {
MDC.remove(log_file_type);
}
}
@Override
public HttpResponse fjCallEmpty(JSONObject param) {
try {
MDC.put(log_file_type, log_type);
String wmsurl = acsConfigService.findByCode(AcsConfig.WMSURL).getValue();
HttpResponse result = null;
log.info("fjCallEmpty - 请求参数 {}", param);
AddressDto addressDto = addressService.findByCode("fjCallEmpty");
String methods_url = addressDto.getMethods_url();
try {
result = HttpRequest
.post(wmsurl + methods_url)
.body(param.toJSONString())
.execute();
log.info("fjCallEmpty - 响应参数 {}", result.body());
} catch (Exception e) {
log.error("fjCallEmpty - 请求错误！", e);
}
return result;
} finally {
MDC.remove(log_file_type);
}
}
@Override
public HttpResponse fjNeed(JSONObject param) {
try {
MDC.put(log_file_type, log_type);
String wmsurl = acsConfigService.findByCode(AcsConfig.WMSURL).getValue();
HttpResponse result = null;
log.info("fjNeed - 请求参数 {}", param);
AddressDto addressDto = addressService.findByCode("fjNeed");
String methods_url = addressDto.getMethods_url();
try {
result = HttpRequest
.post(wmsurl + methods_url)
.body(param.toJSONString())
.execute();
log.info("fjNeed - 响应参数 {}", result.body());
} catch (Exception e) {
log.error("fjNeed - 请求错误！", e);
}
return result;
} finally {
MDC.remove(log_file_type);
}
}
}

3
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -342,8 +342,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
map.put("to_BshortSide", BshortSide);
map.put("to_Htrapezoidal", Htrapezoidal);
map.put("to_Wthickness", Wthickness);
map.put("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2));
map.put("to_command", 1);
map.put("to_feedback", 1);
lnshPackagePalletManipulatorDeviceDriver.writing(map);
}
if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) {

72
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -145,10 +145,8 @@ public class AutoCreateInst {
continue;
}
//普通站点
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
StandardEmptyPalletSiteDeviceDriver standardEmptsyPalletSiteDeviceDriver;
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver;
String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue();
@@ -247,6 +245,39 @@ public class AutoCreateInst {
taskserver.updateByCodeFromCache(acsTask);
continue;
}
int count = instructionService.queryDeviceInstCount(next_device_code);
if (count > 0) {
log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
} else if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver
&& "true".equals(nextdevice.getExtraValue().get("inspect_in_stocck"))) {
StandardInspectSiteDeviceDriver deviceDriver = (StandardInspectSiteDeviceDriver) nextdevice.getDeviceDriver();
if (deviceDriver.getMode() == 0) {
log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
} else if (deviceDriver.getMove() != 0) {
log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
} else if (deviceDriver.getError() != 0) {
log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
int count = instructionService.queryDeviceInstCount(next_device_code);
if (count > 0) {
log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
}
if (startdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) {
@@ -278,8 +309,6 @@ public class AutoCreateInst {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
//this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code());
//this.execute_log.log("存在相同终点的指令,任务号：" + taskcode);
continue;
}
@@ -303,6 +332,41 @@ public class AutoCreateInst {
taskserver.updateByCodeFromCache(acsTask);
continue;
}
int count = instructionService.queryDeviceInstCount(start_device_code);
if (count > 0) {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
} else if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver
&& "true".equals(startdevice.getExtraValue().get("inspect_in_stocck"))) {
StandardInspectSiteDeviceDriver deviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver();
if (deviceDriver.getMode() == 0) {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
} else if (deviceDriver.getMove() == 0) {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
} else if (deviceDriver.getError() != 0) {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
int count = instructionService.queryDeviceInstCount(start_device_code);
if (count > 0) {
log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。");
taskserver.updateByCodeFromCache(acsTask);
continue;
}
}
Instruction instdto = new Instruction();