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

保湿间新任务判断断电情况&输送线更新点位状态

Browse Source
This commit is contained in:
psh
2024-06-27 10:17:54 +08:00
parent 17fb6a8853
commit c41db16f77
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
View File

@@ -185,7 +185,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
log.info("设备{}反馈收片任务完成", this.device_code);
this.writing("x6", 0);
this.writing("x8", 0);
} else if (x1 != last_x1 && x1 == 1 &&!in ) {
} else if (x1 != last_x1 && x1 == 1 &&!in && x6==0 && x8==0) {
in = false;
JSONObject jsonObject = new JSONObject();
String device_code = this.device_code + "DJW01";
@@ -205,7 +205,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
log.info("设备{}反馈上空架完成", this.device_code);
this.writing("x5", 0);
this.writing("x7", 0);
} else if (x2 != last_x2 && x2 == 1 && !out) {
} else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) {
out = false;
JSONObject jsonObject = new JSONObject();
String device_code = this.device_code + "DJW02";

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
View File

@@ -157,9 +157,10 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
//反馈输送线点位状态
if (device_code.startsWith("ZCSSX")) {
BaseRequest request = new BaseRequest();
request.setType("2");
request.setType("1");
request.setDevice_code(device_code);
request.setState(String.valueOf(move));
//1无货 2有货
request.setState(String.valueOf(move+1));
acsToWmsService.notify(request);
}
}