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-10-15 21:48:57 +08:00
parent bfa04d5842
commit 3fb0f11bd5
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDeviceDriver.java
View File

@@ -231,7 +231,7 @@ public class StandardManipulatorInspectSiteDeviceDriver extends AbstractOpcDevic
dto.setStart_point_code(this.getDevice().getDevice_code()); dto.setStart_point_code(this.getDevice().getDevice_code());
dto.setStart_device_code(this.getDevice().getDevice_code()); dto.setStart_device_code(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 = "";
String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid");
@@ -292,7 +292,7 @@ public class StandardManipulatorInspectSiteDeviceDriver extends AbstractOpcDevic
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 = "";
String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid");

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);

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

@@ -1905,13 +1905,13 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//机械手码垛驱动-区分托盘类型 //机械手码垛驱动-区分托盘类型
if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) {
standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver();
standardManipulatorStackingSiteDeviceDriver.writing(1, 7);
if (standardManipulatorStackingSiteDeviceDriver.getMove() != 0 if (standardManipulatorStackingSiteDeviceDriver.getMove() != 0
&& standardManipulatorStackingSiteDeviceDriver.getError() == 0 && standardManipulatorStackingSiteDeviceDriver.getError() == 0
&& (standardManipulatorStackingSiteDeviceDriver.getAction() == 1 || standardManipulatorStackingSiteDeviceDriver.getAction() == 3)) { && (standardManipulatorStackingSiteDeviceDriver.getAction() == 1 || standardManipulatorStackingSiteDeviceDriver.getAction() == 3)) {
inst.setExecute_status("1"); inst.setExecute_status("1");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
standardManipulatorStackingSiteDeviceDriver.writing(1, 7);
flag = true; flag = true;
} else { } else {
log.info("AGV请求取货设备{}无货,无法反馈", device_code); log.info("AGV请求取货设备{}无货,无法反馈", device_code);
@@ -2018,8 +2018,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) {
standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver();
if (standardManipulatorStackingSiteDeviceDriver.getMove() == 0 if (standardManipulatorStackingSiteDeviceDriver.getMove() == 0
&& standardManipulatorStackingSiteDeviceDriver.getError() == 0 && standardManipulatorStackingSiteDeviceDriver.getError() == 0) {
&& (standardManipulatorStackingSiteDeviceDriver.getAction() == 1 || standardManipulatorStackingSiteDeviceDriver.getAction() == 3)) {
inst.setExecute_status("5"); inst.setExecute_status("5");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -2243,8 +2242,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) {
standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver();
if (standardManipulatorStackingSiteDeviceDriver.getMove() != 0 if (standardManipulatorStackingSiteDeviceDriver.getMove() != 0
&& standardManipulatorStackingSiteDeviceDriver.getError() == 0 && standardManipulatorStackingSiteDeviceDriver.getError() == 0) {
&& (standardManipulatorStackingSiteDeviceDriver.getAction() == 2 || standardManipulatorStackingSiteDeviceDriver.getAction() == 3)) {
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
standardManipulatorStackingSiteDeviceDriver.writing(1, 3); standardManipulatorStackingSiteDeviceDriver.writing(1, 3);