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

Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-09-14 10:56:51 +08:00
parent a907c7343e 33f10cad62
commit 9d83010593
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,6 +333,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message; agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logService.deviceExecuteLog(device_code, "", "", message); logService.deviceExecuteLog(device_code, "", "", message);
log.info("{},{}", device_code,message); log.info("{},{}", device_code,message);
log.info("模式为{} 光电信号{} 取放信号{}",conveyorPressStationDeviceDriver.getMode(),conveyorPressStationDeviceDriver.getMove(),conveyorPressStationDeviceDriver.getIo_action());
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
} }
} }
@@ -585,6 +586,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message; agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logService.deviceExecuteLog(device_code, "", "", message); logService.deviceExecuteLog(device_code, "", "", message);
log.info("{},{}", device_code,message); log.info("{},{}", device_code,message);
log.info("模式为{} 光电信号{} 取放信号{}",conveyorPressStationDeviceDriver.getMode(),conveyorPressStationDeviceDriver.getMove(),conveyorPressStationDeviceDriver.getIo_action());
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
} }
} }
@@ -857,6 +859,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message; agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logService.deviceExecuteLog(device_code, "", "", message); logService.deviceExecuteLog(device_code, "", "", message);
log.info("{},{}", device_code,message); log.info("{},{}", device_code,message);
log.info("模式为{} 光电信号{} 取放信号{}",conveyorPressStationDeviceDriver.getMode(),conveyorPressStationDeviceDriver.getMove(),conveyorPressStationDeviceDriver.getIo_action());
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
} }
} }
@@ -1114,6 +1117,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message; agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logService.deviceExecuteLog(device_code, "", "", message); logService.deviceExecuteLog(device_code, "", "", message);
log.info("{},{}", device_code,message); log.info("{},{}", device_code,message);
log.info("模式为{} 光电信号{} 取放信号{}",conveyorPressStationDeviceDriver.getMode(),conveyorPressStationDeviceDriver.getMove(),conveyorPressStationDeviceDriver.getIo_action());
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
} }
} }

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java
View File

@@ -458,6 +458,7 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme
jo.put("isOnline", isonline); jo.put("isOnline", isonline);
jo.put("hasGoods", hasGoods); jo.put("hasGoods", hasGoods);
jo.put("message", message); jo.put("message", message);
jo.put("requireSucess",requireSucess);
return jo; return jo;
} }

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

@@ -276,14 +276,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resp.setMessage("请求成功"); resp.setMessage("请求成功");
log.info("createFromWms - 返回参数 {}", JSON.toJSON(resp)); log.info("createFromWms - 返回参数 {}", JSON.toJSON(resp));
// LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
// .device_code("LMSTOACS") .requestparam(JSON.toJSON(resp).toString())
// .requestparam(JSON.toJSON(resp).toString()) .responseparam(JSON.toJSON(resp).toString())
// .responseparam(JSON.toJSON(resp).toString()) .status_code(String.valueOf(resp.getCode()))
// .status_code(String.valueOf(resp.getCode())) .method(tasks.getRequest_medthod_code())
// .method(tasks.getRequest_medthod_code()) .build();
// .build(); lucene.interfaceExecuteLog(logDto);
// lucene.interfaceExecuteLog(logDto);
return (JSONObject) JSON.toJSON(resp); return (JSONObject) JSON.toJSON(resp);
} finally { } finally {
MDC.remove(log_file_type); MDC.remove(log_file_type);
@@ -550,6 +549,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
lnshSplitManipulatorDeviceDriver.writing(100); lnshSplitManipulatorDeviceDriver.writing(100);
is_flag = true; is_flag = true;
} }
//下发成功后，写入工单信息表记录 //下发成功后，写入工单信息表记录
// ProduceshiftorderDto dto = new ProduceshiftorderDto(); // ProduceshiftorderDto dto = new ProduceshiftorderDto();
@@ -578,9 +578,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resp.setRequestNo(request_no); resp.setRequestNo(request_no);
resp.setResponseDate(AgvUtil.getDate()); resp.setResponseDate(AgvUtil.getDate());
resp.setMessage("请求成功"); resp.setMessage("请求成功");
log.info("createOrder - 返回参数 {}", JSON.toJSON(resp)); LuceneLogDto logDto = LuceneLogDto.builder()
.requestparam(JSON.toJSON(resp).toString())
.responseparam(JSON.toJSON(resp).toString())
.status_code(String.valueOf(resp.getCode()))
.method(orders.getRequest_medthod_code())
.build();
lucene.interfaceExecuteLog(logDto);
return (JSONObject) JSON.toJSON(resp); return (JSONObject) JSON.toJSON(resp);
} finally { } finally {
MDC.remove(log_file_type); MDC.remove(log_file_type);
} }