lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zj
2025-12-31 15:20:47 +08:00
parent 9a065e7b91
commit 95dfb624b1
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -35,7 +35,7 @@ public class ToErpServiceImpl implements IToErpService {
private IMydoJobDetailService mydoJobDetailService; private IMydoJobDetailService mydoJobDetailService;
@Autowired @Autowired
private IBasJobIdService basJobIdService; private IBasJobIdService basJobIdService;
@Autowired @Autowired
private IRequestLogService requestLogService; private IRequestLogService requestLogService;
@@ -100,11 +100,15 @@ public class ToErpServiceImpl implements IToErpService {
objectErpParameter.setDatas(List.of(wipTransferDoc)); objectErpParameter.setDatas(List.of(wipTransferDoc));
erpStdData.setParameter(objectErpParameter); erpStdData.setParameter(objectErpParameter);
param.setStd_data(erpStdData); param.setStd_data(erpStdData);
RequestLog requestLog = requestLogService.getRequestLogGd(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单", "wms", "erp"); RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单","wms","erp");
// String post = requestLog.getResponseBody();
if (requestLog != null && "1".equals(requestLog.getIsSuccessful())) { // ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
// if ("0".equals(bean.getStd_data().getExecution().getCode())) {
// return AjaxResult.success();
// }
if(requestLog != null && "1".equals(requestLog.getIsSuccessful())){
return AjaxResult.success(); return AjaxResult.success();
} else { }else{
return AjaxResult.error(); return AjaxResult.error();
} }
} }

6
ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
View File

@@ -311,7 +311,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return requestLog * @return requestLog
*/ */
@Override @Override
public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult) { public RequestLog getRequestLog(String param, String remark,AjaxResult ajaxResult) {
RequestLog requestLog = new RequestLog(); RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setRequestBody(param); requestLog.setRequestBody(param);
@@ -322,9 +322,9 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
requestLog.setResponseStatus("1"); requestLog.setResponseStatus("1");
if (ajaxResult.isSuccess()) { if (ajaxResult.isSuccess()){
requestLog.setIsSuccessful("1"); requestLog.setIsSuccessful("1");
} else { }else {
requestLog.setIsSuccessful("0"); requestLog.setIsSuccessful("0");
} }
requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg"))); requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));