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

更新

Browse Source
This commit is contained in:
zhangjiangwei
2023-03-18 13:47:44 +08:00
parent f98efc0ca2
commit 2acfa85a68
6 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,9 +392,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("device_code",this.device_code);
json.put("type","4");
// json.put("vehicle_code",barcode);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "申请空盘请求参数：" + json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请空盘请求参数：" + json);
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "申请空盘返回参数：" + result);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请空盘返回参数：" + result);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -418,9 +418,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
return false;
} else {
this.instruction_require_time = date;
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "排产单确认请求参数：" + json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "排产单确认请求参数：" + json);
HttpResponse result = acsToWmsService.enterOrder(json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "排产单确认返回参数：" + result);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "排产单确认返回参数：" + result);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -463,9 +463,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("producetask_code",order_No);
json.put("unqualified_qty",unqualified_qty);
json.put("is_full","1");
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "码垛完成请求参数：" + json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛完成请求参数：" + json);
HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "码垛完成返回参数：" + result);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛完成返回参数：" + result);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -501,9 +501,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("batch",batch);
json.put("producetask_code",order_No);
json.put("is_full","0");
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "码垛强制完成请求参数：" + json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛强制完成请求参数：" + json);
HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "码垛强制完成返回参数：" + result);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "码垛强制完成返回参数：" + result);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -535,9 +535,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("qty",encoder_qty);
json.put("unqualified_qty",unqualified_qty);
json.put("is_full","1");
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "申请入库请求参数：" + json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请入库请求参数：" + json);
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), "申请入库返回参数：" + result);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", "申请入库返回参数：" + result);
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
@@ -607,13 +607,13 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Map<String, Object> itemMap = new HashMap<String, Object>();
if (type == 1) {
itemMap.put(to_command, command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), to_command + "下发" + command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_command + "下发" + command);
} else if (type == 2) {
itemMap.put(to_target, command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), to_target + "下发" + command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_target + "下发" + command);
} else if (type == 3) {
itemMap.put(to_task, command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), to_task + "下发" + command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_task + "下发" + command);
}
ReadUtil.write(itemMap, server);
@@ -627,7 +627,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), to_param + "下发" + value);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_param + "下发" + value);
ReadUtil.write(itemMap, server);
}
@@ -638,7 +638,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), inst.getInstruction_code(), to_command + "下发" + command);
logServer.deviceExecuteLog(device_code, String.valueOf(barcode), "", to_command + "下发" + command);
ReadUtil.write(itemMap, server);
}

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
View File

@@ -1579,7 +1579,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
logServer.deviceExecuteLog(this.device_code,"","","下发电气信号:to_command,value"+command);
}
public void writing(String param, String value) {
@@ -1592,6 +1592,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
logServer.deviceExecuteLog(this.device_code,"","","下发电气信号:"+to_param+",value"+value);
}
@Override