From 16abbb459b93fe81f4454ee073f9616b262a973a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 3 Sep 2024 11:16:22 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=8E=A5=E5=8F=A3=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/wql/QSCH_INTERFACE_LOGS.wql       | 20 ++++++++++---------
 .../impl/InAndOutRetrunServiceImpl.java       |  7 +++++--
 .../src/views/monitor/interfaceLog/index.vue  |  3 ++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/wql/QSCH_INTERFACE_LOGS.wql b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/wql/QSCH_INTERFACE_LOGS.wql
index b51b3c93e..e7798fcc3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/wql/QSCH_INTERFACE_LOGS.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/wql/QSCH_INTERFACE_LOGS.wql
@@ -48,31 +48,33 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-                    *
+                    logtab.*,
+                    classtab.class_name
                 FROM
-                    sys_interface_log
+                    sys_interface_log logtab
+                    LEFT JOIN md_pb_classstandard classtab ON logtab.method = classtab.long_class_code
                 WHERE
                     1=1
                     OPTION 输入.blurry <> ""
-                            (params like "%" 输入.blurry "%" OR return_result like "%" 输入.blurry "%")
+                            (logtab.params like "%" 输入.blurry "%" OR logtab.return_result like "%" 输入.blurry "%")
                     ENDOPTION
                     OPTION 输入.logType <> ""
-                            log_type = 输入.logType
+                            logtab.log_type = 输入.logType
                     ENDOPTION
                     OPTION 输入.log_dtl_info <> ""
-                            log_dtl_info = 输入.log_dtl_info
+                            logtab.log_dtl_info = 输入.log_dtl_info
                     ENDOPTION
                     OPTION 输入.method <> ""
-                            method = 输入.method
+                            logtab.method = 输入.method
                     ENDOPTION
                     OPTION 输入.log_type <> ""
-                            log_type = 输入.log_type
+                            logtab.log_type = 输入.log_type
                     ENDOPTION
                     OPTION 输入.begin_time <> ""
-                            create_time >= 输入.begin_time
+                            logtab.create_time >= 输入.begin_time
                     ENDOPTION
                     OPTION 输入.end_time <> ""
-                            create_time <= 输入.end_time
+                            logtab.create_time <= 输入.end_time
                     ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 129be038a..e76859df4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -20,6 +20,7 @@ import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.system.service.user.ISysUserService;
 import org.nl.system.service.user.dao.SysUser;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
+import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl;
 import org.nl.wms.st.returns.service.InAndOutReturnService;
@@ -186,7 +187,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         paramMesMst.put("PackageBoxSN", box_row.getString("box_no"));
                         SysUser sysUser = iSysUserService.getById(box_row.getString("input_optid"));
                         paramMesMst.put("User", sysUser.getUsername());
-                        new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
+                        LmsToMesService lmsToMesService = SpringContextHolder.getBean(LmsToMesService.class);
+                        lmsToMesService.childRollFGInboundComplete(paramMesMst);
 
                         jo_mst.put("is_upload", "1");
                         jo_mst.put("upload_mes", "1");
@@ -1023,7 +1025,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     SysUser sysUser = iSysUserService.getById(box_row.getString("input_optid"));
                     paramMesMst.put("User", sysUser.getUsername());
 
-                    new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
+                    LmsToMesService lmsToMesService = SpringContextHolder.getBean(LmsToMesService.class);
+                    lmsToMesService.childRollFGInboundComplete(paramMesMst);
 
                     jo_mst.put("is_upload", "1");
                     jo_mst.put("upload_mes", "1");
diff --git a/lms/nladmin-ui/src/views/monitor/interfaceLog/index.vue b/lms/nladmin-ui/src/views/monitor/interfaceLog/index.vue
index ec5890bbb..b09eb420c 100644
--- a/lms/nladmin-ui/src/views/monitor/interfaceLog/index.vue
+++ b/lms/nladmin-ui/src/views/monitor/interfaceLog/index.vue
@@ -35,7 +35,8 @@
       </el-table-column>
       <el-table-column prop="username" label="用户名" />
       <el-table-column prop="request_ip" label="IP" />
-      <el-table-column prop="method" label="接口方法" width="150" />
+      <el-table-column prop="method" label="接口方法" width="220" />
+      <el-table-column prop="class_name" label="接口名称" width="220" />
       <el-table-column prop="log_type" label="日志类型" />
       <el-table-column show-overflow-tooltip prop="address" label="IP来源" />
       <el-table-column prop="time" label="请求耗时" align="center">