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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-01-03 16:21:30 +08:00
parent 7834e4863f
commit b5dc92f7da
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,6 +923,24 @@ public class AgvServiceImpl implements AgvService {
} }
} }
if (addressdevice.getDeviceDriver() instanceof StandardInspectSiteSmartDeviceDriver) {
standardInspectSiteSmartDeviceDriver = (StandardInspectSiteSmartDeviceDriver) addressdevice.getDeviceDriver();
//请求取货
if ("Load".equals(action)) {
if(standardInspectSiteSmartDeviceDriver.getMode()>0
&& standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getError()==0){
is_feedback = true;
}
//请求放货
} else if ("Unload".equals(action)) {
if(standardInspectSiteSmartDeviceDriver.getMode()>0
&& standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getError()==0){
is_feedback = true;
}
}
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
//请求取货 //请求取货
if ("Load".equals(action)) { if ("Load".equals(action)) {
@@ -966,7 +984,7 @@ public class AgvServiceImpl implements AgvService {
//如果开启呼叫按钮，那么就需要判断进出动作信号 //如果开启呼叫按钮，那么就需要判断进出动作信号
if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) { if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) {
if (standardInspectSiteSmartDeviceDriver.getMode() != 0 if (standardInspectSiteSmartDeviceDriver.getMode() != 0
&& standardInspectSiteSmartDeviceDriver.getMove() == 0 //&& standardInspectSiteSmartDeviceDriver.getMove() == 0
&& standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getAction() == 3
&& standardInspectSiteSmartDeviceDriver.getIo_action() == 3) { && standardInspectSiteSmartDeviceDriver.getIo_action() == 3) {
inst.setExecute_device_code(processingVehicle); inst.setExecute_device_code(processingVehicle);
@@ -974,7 +992,9 @@ public class AgvServiceImpl implements AgvService {
standardInspectSiteSmartDeviceDriver.writing(2); standardInspectSiteSmartDeviceDriver.writing(2);
is_feedback = true; is_feedback = true;
} }
} else if (standardInspectSiteSmartDeviceDriver.getMode() != 0 && standardInspectSiteSmartDeviceDriver.getMove() == 0) { } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0
// && standardInspectSiteSmartDeviceDriver.getMove() == 0
) {
inst.setExecute_device_code(processingVehicle); inst.setExecute_device_code(processingVehicle);
inst.setExecute_status("2"); inst.setExecute_status("2");
standardInspectSiteSmartDeviceDriver.writing(2); standardInspectSiteSmartDeviceDriver.writing(2);
@@ -985,7 +1005,7 @@ public class AgvServiceImpl implements AgvService {
if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) { if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) {
if (standardInspectSiteSmartDeviceDriver.getMode() != 0 if (standardInspectSiteSmartDeviceDriver.getMode() != 0
&& standardInspectSiteSmartDeviceDriver.getMove() > 0 // && standardInspectSiteSmartDeviceDriver.getMove() > 0
&& standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getAction() == 3
&& standardInspectSiteSmartDeviceDriver.getIo_action() == 3) { && standardInspectSiteSmartDeviceDriver.getIo_action() == 3) {
inst.setExecute_device_code(address); inst.setExecute_device_code(address);
@@ -993,7 +1013,9 @@ public class AgvServiceImpl implements AgvService {
standardInspectSiteSmartDeviceDriver.writing(3); standardInspectSiteSmartDeviceDriver.writing(3);
is_feedback = true; is_feedback = true;
} }
} else if (standardInspectSiteSmartDeviceDriver.getMode() != 0 && standardInspectSiteSmartDeviceDriver.getMove() > 0) { } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0
//&& standardInspectSiteSmartDeviceDriver.getMove() > 0
) {
inst.setExecute_device_code(address); inst.setExecute_device_code(address);
inst.setExecute_status("4"); inst.setExecute_status("4");
standardInspectSiteSmartDeviceDriver.writing(3); standardInspectSiteSmartDeviceDriver.writing(3);