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

rev:重新约定输送线触发送空架请求，写入信号5；

Browse Source 
增加子母车取货完成写入输送线信号日志，待观察。
This commit is contained in:
gongbaoxiong
2024-12-14 10:55:21 +08:00
parent 4163897a72
commit fb845ecfff
4 changed files with 37 additions and 45 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); siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10); siteDeviceDriver.writing(10);
log.error("子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); log.error("tofix子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
}catch(Exception e){ }catch(Exception e){
log.error("子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage()); log.error("tofix子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage());
} }
} }
} }

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -19,8 +19,6 @@ import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.monitor.DeviceStageMonitor;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.opc.WcsConfig; import org.nl.acs.opc.WcsConfig;
import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.dto.RouteLineDto;
@@ -32,7 +30,6 @@ import org.nl.acs.utils.ConvertUtil;
import org.nl.common.utils.CodeUtil; import org.nl.common.utils.CodeUtil;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.openscada.opc.lib.da.Server; import org.openscada.opc.lib.da.Server;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;

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

@@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.domain.Device; import org.nl.acs.device.domain.Device;
import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.RequestMethodEnum;
import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
@@ -31,6 +30,7 @@ import org.nl.acs.task.service.mapper.TaskMapper;
import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.ConvertUtil;
import org.nl.common.utils.CodeUtil; import org.nl.common.utils.CodeUtil;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -216,29 +216,30 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
case 2: case 2:
break; break;
case 5: case 5:
//叫料 //申请空盘
if (move==0 && !requireSucess){ if (move == 0 && !requireSucess) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
apply(5); apply(5);
} }
break; break;
case 6: case 6:
//满料出库 //空托盘出库，协议重新约，无此业务
if(move==1 && !requireSucess){ // if(move==1 && !requireSucess){
apply(6); // apply(6);
} // }
break; // break;
case 7: // case 7:
//申请空盘 // //申请空盘，协议重新约定位5
if (move==0 && !requireSucess){ // if (move==0 && !requireSucess){
apply(7); // apply(7);
} // }
break; // break;
case 8: // case 8:
//空托盘出库 // //空托盘出库，协议重新约，无此业务
if(move==1 && !requireSucess){ // if(move==1 && !requireSucess){
apply(8); // apply(8);
} // }
break; // break;
} }
switch (flag) { switch (flag) {
@@ -345,12 +346,6 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
dto.setNext_point_code(next_device_codecode); dto.setNext_point_code(next_device_codecode);
dto.setUpdate_time(now); dto.setUpdate_time(now);
dto.setCreate_time(now); dto.setCreate_time(now);
// WQLObject wo = WQLObject.getWQLObject("acs_task");
// JSONObject json = (JSONObject) JSONObject.toJSON(dto);
//
// wo.insert(json);
Task entity = ConvertUtil.convert(dto, Task.class); Task entity = ConvertUtil.convert(dto, Task.class);
taskMapper.insert(entity); taskMapper.insert(entity);
requireSucess = false; requireSucess = false;
@@ -416,13 +411,13 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
String device_code = this.device_code; String device_code = this.device_code;
jsonObject.put("device_code", device_code); jsonObject.put("device_code", device_code);
jsonObject.put("requestDate", new Date()); jsonObject.put("requestDate", new Date());
jsonObject.put("vehicle_type",this.pallet_type); jsonObject.put("vehicle_type", this.pallet_type);
jsonObject.put("requestNo", IdUtil.simpleUUID()); jsonObject.put("requestNo", IdUtil.simpleUUID());
switch (type) { switch (type) {
case 7: case 5:
if(device_code.startsWith("ZCSSX")) { if (device_code.startsWith("ZCSSX")) {
jsonObject.put("request_method_code", "KJQKTask"); jsonObject.put("request_method_code", "KJQKTask");
}else{ } else {
jsonObject.put("request_method_code", "TBXQKTask"); jsonObject.put("request_method_code", "TBXQKTask");
} }
break; break;
@@ -430,15 +425,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
jsonObject.put("request_method_code", "KJSKTask"); jsonObject.put("request_method_code", "KJSKTask");
break; break;
} }
String result=acsToWmsService.applyTaskToWms(jsonObject); String result = acsToWmsService.applyTaskToWms(jsonObject);
JSONObject res_jo = JSONObject.parseObject(result); JSONObject res_jo = JSONObject.parseObject(result);
// if (StrUtil.equals(res_jo.getString("code"), "200")) { // if (StrUtil.equals(res_jo.getString("code"), "200")) {
this.writing(type); this.writing(type);
this.setRequireSucess(true); this.setRequireSucess(true);
log.info("acs申请任务", this.device_code, "任务申请成功!"); log.info("acs申请任务", this.device_code, "任务申请成功!");
// }else{ // }else{
// this.writing(99); // this.writing(99);
// } // }
return true; return true;
} }
} }

4
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); siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10); siteDeviceDriver.writing(10);
log.error("子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); log.error("tofix子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode());
}catch(Exception e){ }catch(Exception e){
log.error("子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage()); log.error("tofix子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage());
} }
} }
} }