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

更新

Browse Source
This commit is contained in:
loujf
2022-10-12 12:13:08 +08:00
parent 4ca3835f74
commit c41887c1fa
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,10 +721,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
case 7:
//码垛强制完成 半托缓存
if (!requireSucess) {
applyEmpty();
if (resultSucess) {
// applyEmpty();
// if (resultSucess) {
mandatoryPalletizing("0");
}
// }
}
break;
case 8:
@@ -747,10 +747,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
case 11:
//强制去包装
if (!requireSucess) {
applyEmpty();
if (resultSucess) {
// applyEmpty();
// if (resultSucess) {
mandatoryPalletizing("1");
}
// }
}
break;
}

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

@@ -68,6 +68,8 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
private int instruction_require_time_out;
boolean requireSucess = false;
boolean resultSucess = false;
private int instruction_finished_time_out;
int branchProtocol = 0;
@@ -727,19 +729,23 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
//码垛完成
if (!requireSucess) {
applyEmpty();
palletizing();
if (resultSucess) {
palletizing();
}
}
break;
case 7:
//码垛强制完成 半托缓存
if (!requireSucess) {
applyEmpty();
mandatoryPalletizing("0");
// applyEmpty();
// if (resultSucess) {
mandatoryPalletizing("0");
// }
}
break;
case 8:
//申请空盘
if (!requireSucess) {
if (!resultSucess) {
applyEmpty();
}
break;
@@ -764,8 +770,10 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
case 11:
//强制去包装
if (!requireSucess) {
applyEmpty();
mandatoryPalletizing("1");
// applyEmpty();
// if (resultSucess) {
mandatoryPalletizing("1");
// }
}
break;
case 12:
@@ -1485,7 +1493,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
this.writing(this.mode);
this.setRequireSucess(true);
this.setResultSucess(true);
}
}
return true;