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

更新

Browse Source
This commit is contained in:
gengby
2022-10-26 19:38:15 +08:00
parent 8a0d1e2caa
commit 93b6ca1055
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java
View File

@@ -18,17 +18,17 @@ import java.util.List;
public class HaiLiangPackingDefination implements OpcDeviceDriverDefination { public class HaiLiangPackingDefination implements OpcDeviceDriverDefination {
@Override @Override
public String getDriverCode() { public String getDriverCode() {
return "lamp_three_color"; return "lamp_three_color1";
} }
@Override @Override
public String getDriverName() { public String getDriverName() {
return "标准版-三色灯"; return "海亮包裝機";
} }
@Override @Override
public String getDriverDescription() { public String getDriverDescription() {
return "标准版-三色灯"; return "海亮包裝機";
} }
@Override @Override

6
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
View File

@@ -49,13 +49,11 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
int mode = 0; int mode = 0;
int action = 0; int action = 0;
int error = 0; int error = 0;
int move = 0;
int task = 0;
int last_action = 0; int last_action = 0;
int last_mode = 0; int last_mode = 0;
int last_error = 0; int last_error = 0;
int last_move = 0;
int last_task = 0;
boolean hasVehicle = false; boolean hasVehicle = false;
boolean isReady = false; boolean isReady = false;

11
hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java
View File

@@ -7,6 +7,7 @@ import net.sf.json.JSONObject;
import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.AgvService;
import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver;
import org.nl.acs.device_driver.hailiang.hailiang_packing.HaiLiangPackingDeviceDriver; import org.nl.acs.device_driver.hailiang.hailiang_packing.HaiLiangPackingDeviceDriver;
import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
import org.nl.acs.device_driver.ndxy_special_two.NdxySpecialTwoDeviceDriver; import org.nl.acs.device_driver.ndxy_special_two.NdxySpecialTwoDeviceDriver;
import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver; import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver;
import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.InstructionService;
@@ -50,7 +51,7 @@ public class QueryMagicAgvDeviceStatus {
List<Device> allDevice = appService.findAllDevice(); List<Device> allDevice = appService.findAllDevice();
WeighingSiteDeviceDriver weighingSiteDeviceDriver; WeighingSiteDeviceDriver weighingSiteDeviceDriver;
NdxySpecialTwoDeviceDriver ndxySpecialTwoDeviceDriver; NdxySpecialTwoDeviceDriver ndxySpecialTwoDeviceDriver;
HaiLiangPackingDeviceDriver haiLiangPackingDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
for (int z = 0; z < allDevice.size(); z++) { for (int z = 0; z < allDevice.size(); z++) {
Device deviceBycode = allDevice.get(z); Device deviceBycode = allDevice.get(z);
if (deviceBycode.getDeviceDriver() instanceof WeighingSiteDeviceDriver) { if (deviceBycode.getDeviceDriver() instanceof WeighingSiteDeviceDriver) {
@@ -66,14 +67,14 @@ public class QueryMagicAgvDeviceStatus {
// ndxySpecialTwoDeviceDriver.writing("to_agv_status",0); // ndxySpecialTwoDeviceDriver.writing("to_agv_status",0);
// } // }
// } // }
if (deviceBycode.getDeviceDriver() instanceof HaiLiangPackingDeviceDriver){ if (deviceBycode.getDeviceDriver() instanceof LampThreecolorDeviceDriver){
haiLiangPackingDeviceDriver = (HaiLiangPackingDeviceDriver) deviceBycode.getDeviceDriver(); lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) deviceBycode.getDeviceDriver();
if(jo.optString("state").equals("IDLE") || jo.optString("state").equals("EXECUTING")){ if(jo.optString("state").equals("IDLE") || jo.optString("state").equals("EXECUTING")){
haiLiangPackingDeviceDriver.writing(0); lampThreecolorDeviceDriver.writing(0);
flag = false; flag = false;
} else if (jo.optString("state").equals("ERROR")){ } else if (jo.optString("state").equals("ERROR")){
if (!flag){ if (!flag){
haiLiangPackingDeviceDriver.writing(3); lampThreecolorDeviceDriver.writing(3);
flag = true; flag = true;
} }
} }