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-19 15:30:24 +08:00
parent 42e7c9b536
commit 92d72e9caf
10 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -912,6 +912,11 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
HttpResponse result = acsToWmsService.queryCribbingInfo(json);
if (ObjectUtil.isNotEmpty(result)) {
if (ObjectUtil.isEmpty(result.body())) {
this.writing(20);
this.setRequireSucess(true);
return true;
}
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
JSONObject content = jsonObject.getJSONObject("content");

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

@@ -352,6 +352,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
}
//前工位申请任务
if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) {
System.out.println("move_2:" + move_2 + ",action_2:" + action_2 + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1);
instruction_require();
}
break;

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

@@ -1138,6 +1138,11 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
HttpResponse result = acsToWmsService.queryCribbingInfo(json);
if (ObjectUtil.isNotEmpty(result)) {
if (ObjectUtil.isEmpty(result.body())) {
this.writing(20);
this.setRequireSucess(true);
return true;
}
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"), "200")) {
JSONObject content = jsonObject.getJSONObject("content");
@@ -1391,9 +1396,9 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
List<String> demoList = Arrays.asList(demoArray);
json.put("device_code",demoList.get(put_station-1).replace("\"",""));
//如果是1号对接位请求，那么数量就传1号垛数量
if (put_station == 1) {
if (put_station == 3) {
json.put("qty",one_qty);
} else if (put_station == 2) {
} else if (put_station == 4) {
json.put("qty",two_qty);
}
json.put("vehicle_code",barcode);