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

更新

Browse Source
This commit is contained in:
loujf
2022-09-14 09:03:01 +08:00
parent 9d1aa573bf
commit b8635df9e4
3 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java
View File

@@ -302,6 +302,7 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
ReadUtil.write(itemMap, server); ReadUtil.write(itemMap, server);
} }
public void executing(Server server, Map<String, Object> itemMap) { public void executing(Server server, Map<String, Object> itemMap) {
ReadUtil.write(itemMap, server); ReadUtil.write(itemMap, server);
} }
@@ -318,6 +319,18 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
} }
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + ItemProtocol.item_to_command1;
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
ReadUtil.write(itemMap, server);
}
public synchronized boolean finish_instruction() throws Exception { public synchronized boolean finish_instruction() throws Exception {
instructionService.finish(inst); instructionService.finish(inst);
return true; return true;
@@ -337,7 +350,9 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
List<String> device_code_list = Arrays.asList(demoArray); List<String> device_code_list = Arrays.asList(demoArray);
TaskDto task = null; TaskDto task = null;
for (int i = 0; i < device_code_list.size(); i++) { for (int i = 0; i < device_code_list.size(); i++) {
if (ObjectUtil.isNotEmpty(taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"", "")))) {
task = taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"", "")).get(0); task = taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"", "")).get(0);
}
if (ObjectUtil.isNotEmpty(task)) break; if (ObjectUtil.isNotEmpty(task)) break;
} }
if (!ObjectUtil.isEmpty(task)) { if (!ObjectUtil.isEmpty(task)) {
@@ -385,16 +400,16 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
//创建指令后修改任务状态 //创建指令后修改任务状态
task.setTask_status("1"); task.setTask_status("1");
taskserver.update(task); taskserver.update(task);
requireSucess = false; requireSucess = true;
String start_addr = startdevice.getAddress(); String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
String next_addr = nextdevice.getAddress(); String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
writing("to_command1","1"); writing(1);
writing("item_to_onset1",start_addr); writing("RGV1.RGV1.RGV1.to_onset1", start_addr);
writing("item_to_target1",next_addr); writing("RGV1.RGV1.RGV1.to_target1", next_addr);
writing("item_to_task1",instdto.getInstruction_code()); writing("RGV1.RGV1.RGV1.to_task1", instdto.getInstruction_code());
} else { } else {

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//叫空托盘 //叫空托盘
jsonObject.put("next_point_code", device_code); jsonObject.put("next_point_code", device_code);
//如果是叠盘位3 ，则去铁托盘缓存区取 //如果是叠盘位3 ，则去铁托盘缓存区取
if (!StrUtil.equals(device_code,"KTPHCW3")){ if (StrUtil.equals(device_code,"KTPDDW3")){
//1 更新缓存位 //1 更新缓存位
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0); JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr); PointUpdateUtil.updatePoint(pointarr);

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql
View File

@@ -76,6 +76,7 @@
IF 输入.flag = "2" IF 输入.flag = "2"
QUERY QUERY
SELECT SELECT
DISTINCT
point.point_id, point.point_id,
point.point_code, point.point_code,
point.point_name, point.point_name,