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

联调

Browse Source
This commit is contained in:
psh
2023-09-04 08:32:08 +08:00
parent c5ecf71e77
commit b1e133cb31
6 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -159,28 +159,31 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
inst.setAgv_jobno(String.valueOf(index)); inst.setAgv_jobno(String.valueOf(index));
inst.setSend_status("1"); inst.setSend_status("1");
instructionService.update(inst); instructionService.update(inst);
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")) { // if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")
// ||StrUtil.startWith(inst.getTask_code(), "-")) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} else { // } else {
JSONArray req = new JSONArray(); // JSONArray req = new JSONArray();
JSONObject map = new JSONObject(); // JSONObject map = new JSONObject();
map.put("uuid", IdUtil.simpleUUID()); // map.put("uuid", IdUtil.simpleUUID());
map.put("taskNo", inst.getTask_id()); // map.put("taskNo", inst.getTask_code());
map.put("businessType", "PENDING"); // map.put("businessType", "PENDING");
req.add(map); // map.put("containerNo",inst.getVehicle_code());
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); // map.put("deviceNo",inst.getCarno());
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { // req.add(map);
JSONObject resp = JSONObject.parseObject(httpResponse.body()); // HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
if (resp.getInteger("code") == 200) { // if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); // JSONObject resp = JSONObject.parseObject(httpResponse.body());
log.info("指令号:{},acs请求wms任务执行申请成功,wms允许agv任务执行,已反馈agv任务执行", inst.getInstruction_code()); // if (resp.getInteger("code") == 200) {
} else { // data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.warn("指令号:{},acs请求wms任务执行任务执行失败,wms不允许agv任务执行离开,未反馈agv任务执行", inst.getInstruction_code()); // log.info("指令号:{},acs请求wms任务执行申请成功,wms允许agv任务执行,已反馈agv任务执行", inst.getInstruction_code());
} // } else {
} else { // log.warn("指令号:{},acs请求wms任务执行任务执行失败,wms不允许agv任务执行离开,未反馈agv任务执行", inst.getInstruction_code());
log.warn("指令号:{},acs请求wms任务执行任务执行失败，连接被拒绝,未反馈agv任务执行", inst.getInstruction_code()); // }
} // } else {
} // log.warn("指令号:{},acs请求wms任务执行任务执行失败，连接被拒绝,未反馈agv任务执行", inst.getInstruction_code());
// }
// }
} }
} }
//任务完毕 //任务完毕

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

@@ -132,7 +132,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
inst.setCarno(String.valueOf(carno)); inst.setCarno(String.valueOf(carno));
instructionService.update(inst); instructionService.update(inst);
logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + "反馈:" + data); logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + "反馈:" + data);
// JSONArray req = new JSONArray();
JSONObject map = new JSONObject();
map.put("uuid", IdUtil.simpleUUID());
map.put("taskNo", inst.getTask_code());
map.put("businessType", "PENDING");
map.put("containerNo",inst.getVehicle_code());
map.put("deviceNo",inst.getCarno());
// req.add(map);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(map);
//到达取货点 //到达取货点
//(需要WCS反馈) //(需要WCS反馈)
} else if (phase == 0x03) { } else if (phase == 0x03) {
@@ -208,16 +216,19 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")
||StrUtil.startWith(inst.getTask_code(), "-")) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} else { } else {
JSONArray req = new JSONArray(); // JSONArray req = new JSONArray();
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("uuid", IdUtil.simpleUUID()); map.put("uuid", IdUtil.simpleUUID());
map.put("taskNo", inst.getTask_id()); map.put("taskNo", inst.getTask_code());
map.put("businessType", "LEAVE_FROM_POINT"); map.put("businessType", "LEAVE_FROM_POINT");
req.add(map); map.put("containerNo",inst.getVehicle_code());
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); map.put("deviceNo",inst.getCarno());
// req.add(map);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(map);
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
JSONObject resp = JSONObject.parseObject(httpResponse.body()); JSONObject resp = JSONObject.parseObject(httpResponse.body());
if (resp.getInteger("code") == 200) { if (resp.getInteger("code") == 200) {
@@ -301,16 +312,19 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("未找到编号{}对应的指令", ikey); log.info("未找到编号{}对应的指令", ikey);
return; return;
} }
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "0")
||StrUtil.startWith(inst.getTask_code(), "-")) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} else { } else {
JSONArray req = new JSONArray(); // JSONArray req = new JSONArray();
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("uuid", IdUtil.simpleUUID()); map.put("uuid", IdUtil.simpleUUID());
map.put("taskNo", inst.getTask_id()); map.put("taskNo", inst.getTask_code());
map.put("businessType", "ARRIVE_TO_POINT"); map.put("businessType", "ARRIVE_TO_POINT");
req.add(map); map.put("containerNo",inst.getVehicle_code());
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); map.put("deviceNo",inst.getCarno());
// req.add(map);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(map);
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
JSONObject resp = JSONObject.parseObject(httpResponse.body()); JSONObject resp = JSONObject.parseObject(httpResponse.body());
if (resp.getInteger("code") == 200) { if (resp.getInteger("code") == 200) {

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java
View File

@@ -107,7 +107,7 @@ public class AcsToWmsController {
@PostMapping("/feedAgvTaskStatus") @PostMapping("/feedAgvTaskStatus")
@Log(value = "反馈AGV取放货状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) @Log(value = "反馈AGV取放货状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
@ApiOperation("反馈AGV取放货状态") @ApiOperation("反馈AGV取放货状态")
public ResponseEntity<Object> feedAgvTaskStatus(@RequestBody JSONArray from) { public ResponseEntity<Object> feedAgvTaskStatus(@RequestBody JSONObject from) {
return new ResponseEntity<>(acstowmsService.feedAgvTaskStatus(from), HttpStatus.OK); return new ResponseEntity<>(acstowmsService.feedAgvTaskStatus(from), HttpStatus.OK);
} }

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

@@ -113,7 +113,7 @@ public interface AcsToWmsService {
* @param from * @param from
* @return * @return
*/ */
HttpResponse feedAgvTaskStatus(JSONArray from); HttpResponse feedAgvTaskStatus(JSONObject from);
JSONObject test(JSONObject form); JSONObject test(JSONObject form);
} }

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

@@ -556,7 +556,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
@Override @Override
public HttpResponse feedAgvTaskStatus(JSONArray from) { public HttpResponse feedAgvTaskStatus(JSONObject from) {
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
log.info("开始反馈WMS AGV取放货状态，请求参数：{}", from); log.info("开始反馈WMS AGV取放货状态，请求参数：{}", from);
this.getTokenFromWms(); this.getTokenFromWms();

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

@@ -467,7 +467,7 @@ public class JDToAcsServiceImpl implements JDToAcsService {
String start_device_code = reqs.getCarryTask().getFromPoint(); String start_device_code = reqs.getCarryTask().getFromPoint();
String next_device_code = reqs.getCarryTask().getToPoint(); String next_device_code = reqs.getCarryTask().getToPoint();
String priority = reqs.getPriority(); String priority = reqs.getPriority();
String vehicle_code = reqs.getDeviceNo(); String vehicle_code = reqs.getCarryTask().getContainerNo();
// String vehicle_type = req.getVehicle_type(); // String vehicle_type = req.getVehicle_type();
String task_type = "1"; String task_type = "1";
// String remark = req.getRemark(); // String remark = req.getRemark();