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

opt:增加任务及点位消息通知

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-20 23:32:51 +08:00
parent 84ed95bc24
commit 3ed4f5fe10
15 changed files with 81 additions and 88 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/agv/server/impl/ZheDaAgvServiceImpl.java
View File

@@ -192,9 +192,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
log.error("tofix子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
//log.error("tofix子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
}catch(Exception e){
log.error("tofix子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage());
//log.error("tofix子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage());
}
}
}

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java
View File

@@ -34,7 +34,7 @@ public class ItemProtocol {
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);
if (value == null) {
log.error("读取错误!");
//log.error("读取错误!");
} else {
return value;
}

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -221,6 +221,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
//输送线对接，增加取货完成写入确认信号10
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
}
//校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) {

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java
View File

@@ -51,7 +51,7 @@ public class ItemProtocol {
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);
if (value == null) {
log.error("读取错误!");
//log.error("读取错误!");
} else {
return value;
}

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

@@ -11,7 +11,6 @@ import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.data.BaseRequest;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.instruction.service.InstructionService;
@@ -24,7 +23,6 @@ import org.openscada.opc.lib.da.Server;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -221,20 +219,24 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
this.writing("x7", 0);
} else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) {
//DJW02申请空盘
mode2 =1;
mode2 = 1;
out = false;
JSONObject jsonObject = new JSONObject();
String device_code = this.device_code + "DJW02";
jsonObject.put("device_code", device_code);
jsonObject.put("requestDate", new Date());
jsonObject.put("vehicle_type",2);
jsonObject.put("vehicle_type", 2);
jsonObject.put("requestNo", IdUtil.simpleUUID());
jsonObject.put("request_method_code", "TBXQKTask");
String result=acsToWmsService.applyTaskToWms(jsonObject);
//log.error("tofix涂板线呼叫空架BaoshijianSiteDeviceDriver：" + device_code + "信号为" + mode + ":" + "x2" + ":" + x2 + ",满足请求条件，发出请求空架任务");
String result = acsToWmsService.applyTaskToWms(jsonObject);
JSONObject res_jo = JSONObject.parseObject(result);
if (res_jo.getString("status").equals("200")){
if ("200".equals(res_jo.getString("status"))) {
// log.error("tofix涂板线呼叫空架BaoshijianSiteDeviceDriver：" + device_code + "信号为" + mode + ":" + "x2" + ":" + x2 + ",请求空架任务成功！");
this.writing("x5", 1);
out = true;
} else {
log.error("tofix涂板线呼叫空架BaoshijianSiteDeviceDriver：" + device_code + "信号为" + mode + ":" + "x2" + ":" + x2 + ",请求空架任务失败！");
}
}

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

@@ -224,21 +224,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
break;
case 6:
//空托盘出库
if (move == 1 && !requireSucess) {
apply(6);
}
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break;
case 7:
//涂板线申请空盘
if (move == 0 && !requireSucess) {
apply(7);
}
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break;
case 8:
//空托盘出库
if (move == 1 && !requireSucess) {
apply(8);
}
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break;
}
switch (flag) {
@@ -250,9 +244,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
case 2:
writing(3);
return;
}
}
last_mode = mode;
last_error = error;
@@ -412,31 +404,21 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
jsonObject.put("requestDate", new Date());
jsonObject.put("vehicle_type", this.pallet_type);
jsonObject.put("requestNo", IdUtil.simpleUUID());
switch (type) {
case 5:
if (device_code.startsWith("ZCSSX")) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
jsonObject.put("request_method_code", "KJQKTask");
} else {
jsonObject.put("request_method_code", "TBXQKTask");
}
break;
case 7:
jsonObject.put("request_method_code", "TBXQKTask");
break;
case 8:
jsonObject.put("request_method_code", "KJSKTask");
break;
if (type == 5) {
if (device_code.startsWith("ZCSSX")) {
log.error("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
jsonObject.put("request_method_code", "KJQKTask");
}
}
String result = acsToWmsService.applyTaskToWms(jsonObject);
JSONObject res_jo = JSONObject.parseObject(result);
// if (StrUtil.equals(res_jo.getString("code"), "200")) {
this.writing(type);
this.setRequireSucess(true);
log.info("acs申请任务", this.device_code, "任务申请成功!");
// }else{
// this.writing(99);
// }
if (StrUtil.equals(res_jo.getString("code"), "200")) {
this.writing(type);
this.setRequireSucess(true);
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！");
} else {
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message"));
}
return true;
}
}

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
View File

@@ -84,9 +84,9 @@ public class QueryZDAgvTaskStatus {
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
log.error("tofix子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
//log.error("tofix子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
}catch(Exception e){
log.error("tofix子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage());
//log.error("tofix子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage());
}
}
}
@@ -120,7 +120,7 @@ public class QueryZDAgvTaskStatus {
}
}
} catch (Exception e){
log.error("自动线程开始查询浙大AGV任务状态失败！失败原因:{}", e.getMessage());
//log.error("自动线程开始查询浙大AGV任务状态失败！失败原因:{}", e.getMessage());
}
}

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -246,7 +246,7 @@ public class SyncDeviceStatus {
redisUtils.set("agv", agv);
// log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis() - startTime);
} catch (Exception e) {
log.error("tofix自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage());
//log.error("tofix自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage());
}
}
}