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

伊科拜克，营口更新

Browse Source
This commit is contained in:
loujf
2022-10-20 19:12:53 +08:00
parent a91ca9f560
commit 967ea380df
4 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -812,6 +812,8 @@ public class AgvServiceImpl implements AgvService {
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver;
YzjaSpecialDeviceDriver yzjaSpecialDeviceDriver; YzjaSpecialDeviceDriver yzjaSpecialDeviceDriver;
StandardManipulatorInspectSiteDeviceDriver standardManipulatorInspectSiteDeviceDriver;
//请求进入 //请求进入
if ("onEntry".equals(type)) { if ("onEntry".equals(type)) {
@@ -846,7 +848,24 @@ public class AgvServiceImpl implements AgvService {
is_feedback = true; is_feedback = true;
} }
} }
}
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 StandardOrdinarySiteDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();

14
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java
View File

@@ -278,7 +278,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String device_code = ""; String device_code = "";
StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver;
List<RouteLineDto> list = routelineserver.getPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getPathLinesByCode(this.device_code, "normal");
@@ -488,7 +488,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String start_device_code = ""; String start_device_code = "";
List<RouteLineDto> list = routelineserver.getPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -557,7 +557,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String next_device_code = ""; String next_device_code = "";
List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -652,7 +652,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String next_device_code = ""; String next_device_code = "";
List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -730,7 +730,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String next_device_code = ""; String next_device_code = "";
List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -801,7 +801,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String next_device_code = ""; String next_device_code = "";
List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -871,7 +871,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
dto.setCreate_by(this.getDevice().getDevice_code()); dto.setCreate_by(this.getDevice().getDevice_code());
dto.setUpdate_by(this.getDevice().getDevice_code()); dto.setUpdate_by(this.getDevice().getDevice_code());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
String next_device_code = ""; String next_device_code = "";
List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); List<RouteLineDto> list = routelineserver.getShortPathLinesByCode(this.device_code, "normal");
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);

12
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);
@@ -239,7 +239,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();
@@ -319,7 +320,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);
@@ -345,7 +346,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);
@@ -457,7 +458,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);

3
hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -2158,6 +2158,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
standardPhotoelectricInspectSiteDeviceDriver.writing(1, 8); standardPhotoelectricInspectSiteDeviceDriver.writing(1, 8);
standardPhotoelectricInspectSiteDeviceDriver.writing(4, Integer.parseInt(inst.getVehicle_type()));
flag = true; flag = true;
} else { } else {
log.info("AGV请求取货设备{}有货,无法反馈", device_code); log.info("AGV请求取货设备{}有货,无法反馈", device_code);
@@ -2346,7 +2347,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
else if (phase == 0x30) { else if (phase == 0x30) {
flag = true; flag = true;
if (!ObjectUtil.isEmpty(inst)) { if (!ObjectUtil.isEmpty(inst)) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(0x8F, index, 0);
} else { } else {
log.info("未找到对应的指令无法删除"); log.info("未找到对应的指令无法删除");
break; break;