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

伊科拜克更新

Browse Source
This commit is contained in:
loujf
2022-09-27 10:34:22 +08:00
parent 5e0275c755
commit bfa04d5842
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
View File

@@ -813,6 +813,7 @@ public class AgvServiceImpl implements AgvService {
SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver;
YzjaSpecialDeviceDriver yzjaSpecialDeviceDriver; YzjaSpecialDeviceDriver yzjaSpecialDeviceDriver;
StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver; StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver;
StandardManipulatorInspectSiteDeviceDriver standardManipulatorInspectSiteDeviceDriver;
//请求进入 //请求进入
if ("onEntry".equals(type)) { if ("onEntry".equals(type)) {
@@ -851,6 +852,24 @@ public class AgvServiceImpl implements AgvService {
} }
} }
} }
if (addressdevice.getDeviceDriver() instanceof StandardManipulatorInspectSiteDeviceDriver) {
standardManipulatorInspectSiteDeviceDriver = (StandardManipulatorInspectSiteDeviceDriver) addressdevice.getDeviceDriver();
//请求取货
if ("Load".equals(action)) {
if (standardManipulatorInspectSiteDeviceDriver.getMove() > 0
&& (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 3 || standardManipulatorInspectSiteDeviceDriver.getIo_action() == 1)) {
inst.setExecute_status("1");
is_feedback = true;
}
//请求放货
} else if ("Unload".equals(action)) {
if (standardManipulatorInspectSiteDeviceDriver.getMove() == 0
&& (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 3 || standardManipulatorInspectSiteDeviceDriver.getIo_action() == 2)) {
inst.setExecute_status("3");
is_feedback = true;
}
}
}
if (addressdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) {
specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();
//请求取货 //请求取货

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

@@ -73,7 +73,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try { try {
//{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"}
result2 = HttpRequest.post(url) result2 = HttpRequest.post(url)
.header("Authorization", token) // .header("Authorization", token)
.body(String.valueOf(jo)) .body(String.valueOf(jo))
.execute(); .execute();
System.out.println(result2); System.out.println(result2);
@@ -117,7 +117,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
try { try {
result2 = HttpRequest.post(wmsurl + methods_url) result2 = HttpRequest.post(wmsurl + methods_url)
.header("Authorization", token).body(String.valueOf(data)) .body(String.valueOf(data))
.execute(); .execute();
System.out.println(result2); System.out.println(result2);
log.info("feedbackTaskStatusToWms-----返回参数{}", result2.body()); log.info("feedbackTaskStatusToWms-----返回参数{}", result2.body());
@@ -244,7 +244,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
try { try {
result2 = HttpRequest.post(wmsurl + methods_url) result2 = HttpRequest.post(wmsurl + methods_url)
.header("Authorization", token).body(String.valueOf(data)) // .header("Authorization", token)
.body(String.valueOf(data))
.execute(); .execute();
} catch (Exception e) { } catch (Exception e) {
String msg = e.getMessage(); String msg = e.getMessage();
@@ -324,7 +325,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try { try {
result2 = HttpRequest.post(url) result2 = HttpRequest.post(url)
.header("Authorization", token) // .header("Authorization", token)
.body(String.valueOf(jo)) .body(String.valueOf(jo))
.execute().body(); .execute().body();
System.out.println(result2); System.out.println(result2);
@@ -350,7 +351,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("apply_OutEmpty----请求参数{}", jo); log.info("apply_OutEmpty----请求参数{}", jo);
try { try {
result2 = HttpRequest.post(url) result2 = HttpRequest.post(url)
.header("Authorization", token) // .header("Authorization", token)
.body(String.valueOf(jo)) .body(String.valueOf(jo))
.execute().body(); .execute().body();
System.out.println(result2); System.out.println(result2);
@@ -462,7 +463,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try { try {
result = HttpRequest.post(url) result = HttpRequest.post(url)
. header("Authorization", token).body(String.valueOf(from)) // . header("Authorization", token)
.body(String.valueOf(from))
.execute(); .execute();
System.out.println(result); System.out.println(result);
log.info("feedWeighing----返回参数{}", result); log.info("feedWeighing----返回参数{}", result);