From 95dfb624b1766fa1199438f7c7188db14cbc248a Mon Sep 17 00:00:00 2001
From: zj <zhangjun@fortucky.cn>
Date: Wed, 31 Dec 2025 15:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/api/service/impl/ToErpServiceImpl.java   | 14 +++++++++-----
 .../log/service/impl/RequestLogServiceImpl.java    |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index c20686f..82fd706 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -35,7 +35,7 @@ public class ToErpServiceImpl implements IToErpService {
     private IMydoJobDetailService mydoJobDetailService;
 
     @Autowired
-    private IBasJobIdService basJobIdService;
+    private IBasJobIdService  basJobIdService;
 
     @Autowired
     private IRequestLogService requestLogService;
@@ -100,11 +100,15 @@ public class ToErpServiceImpl implements IToErpService {
         objectErpParameter.setDatas(List.of(wipTransferDoc));
         erpStdData.setParameter(objectErpParameter);
         param.setStd_data(erpStdData);
-        RequestLog requestLog = requestLogService.getRequestLogGd(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单", "wms", "erp");
-
-        if (requestLog != null && "1".equals(requestLog.getIsSuccessful())) {
+        RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单","wms","erp");
+//        String post = requestLog.getResponseBody();
+//        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();
-        } else {
+        }else{
             return AjaxResult.error();
         }
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
index 8ab5916..7e577df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
@@ -311,7 +311,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
      * @return requestLog
      */
     @Override
-    public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult) {
+    public RequestLog getRequestLog(String param, String remark,AjaxResult ajaxResult) {
         RequestLog requestLog = new RequestLog();
         requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
         requestLog.setRequestBody(param);
@@ -322,9 +322,9 @@ public class RequestLogServiceImpl implements IRequestLogService {
         requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
         requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
         requestLog.setResponseStatus("1");
-        if (ajaxResult.isSuccess()) {
+        if (ajaxResult.isSuccess()){
             requestLog.setIsSuccessful("1");
-        } else {
+        }else {
             requestLog.setIsSuccessful("0");
         }
         requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));