From 96115bd44008850357822a9fe67571df099819c3 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 5 Jan 2026 10:15:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(out):=20=E4=BF=AE=E5=A4=8D=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E5=92=8C=E6=97=A5=E5=BF=97=E8=A1=A8=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复出库单查询中产品号字段从 phase 改为 power
- 调整出库单表格中代号和产品号列的显示顺序
- 修复接口日志表格中请求ID列标题显示问题
- 移除接口日志表格中请求URL和请求头列的显示
- 优化数据库查询中产品号和相位字段的模糊匹配搜索
- 优化数据库查询中错误详情字段的模糊匹配搜索
---
 .../mapper/out/ViewProductAndStockMapper.xml  |  4 +--
 .../requestInterface/RequestLogMapper.xml     | 14 +++++-----
 ruoyi-ui/src/views/out/addOutStockout.vue     |  6 ++--
 .../src/views/requestInterface/log/index.vue  | 28 +++++++++----------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
index d79c8c7..f728d7b 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
@@ -54,8 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
             <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
+            <if test="power != null  and power != ''"> and power like concat('%',#{power}, '%')</if>
+            <if test="phase != null  and phase != ''"> and phase like concat('%',#{phase}, '%')</if>
             <if test="distribution != null  and distribution != ''"> and distribution like concat('%', #{distribution}, '%')</if>
             <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
index 794571f..9748091 100644
--- a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.log.mapper.RequestLogMapper">
-    
+
     <resultMap type="RequestLog" id="RequestLogResult">
         <result property="requestId"    column="request_id"    />
         <result property="requestTime"    column="request_time"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
         <include refid="selectRequestLogVo"/>
-        <where>  
+        <where>
             <if test="requestTime != null  and requestTime != ''"> and request_time = #{requestTime}</if>
             <if test="sourceSystem != null  and sourceSystem != ''"> and source_system = #{sourceSystem}</if>
             <if test="targetSystem != null  and targetSystem != ''"> and target_system = #{targetSystem}</if>
@@ -36,16 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="requestUrl != null  and requestUrl != ''"> and request_url = #{requestUrl}</if>
             <if test="requestMethod != null  and requestMethod != ''"> and request_method = #{requestMethod}</if>
             <if test="requestHeaders != null  and requestHeaders != ''"> and request_headers = #{requestHeaders}</if>
-            <if test="requestBody != null  and requestBody != ''"> and request_body = #{requestBody}</if>
+            <if test="requestBody != null  and requestBody != ''"> and request_body like concat('%',#{requestBody},'%') </if>
             <if test="responseTime != null  and responseTime != ''"> and response_time = #{responseTime}</if>
             <if test="responseBody != null  and responseBody != ''"> and response_body = #{responseBody}</if>
             <if test="responseStatus != null  and responseStatus != ''"> and response_status = #{responseStatus}</if>
-            <if test="errorDetails != null  and errorDetails != ''"> and error_details = #{errorDetails}</if>
+            <if test="errorDetails != null  and errorDetails != ''"> and error_details  like concat('%',#{errorDetails},'%')  </if>
             <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
             <if test="isSuccessful != null  and isSuccessful != ''"> and Is_successful = #{isSuccessful}</if>
         </where>
     </select>
-    
+
     <select id="selectRequestLogByRequestId" parameterType="Long" resultMap="RequestLogResult">
         <include refid="selectRequestLogVo"/>
         where request_id = #{requestId}
@@ -113,9 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteRequestLogByRequestIds" parameterType="String">
-        delete from request_log where request_id in 
+        delete from request_log where request_id in
         <foreach item="requestId" collection="array" open="(" separator="," close=")">
             #{requestId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index b3dd7d3..072d731 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -135,9 +135,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="产品号" prop="phase">
+        <el-form-item label="产品号" prop="power">
           <el-input
-            v-model="queryParams.phase"
+            v-model="queryParams.power"
             placeholder="请输入产品号"
             clearable
             @keyup.enter.native="handleQuery"
@@ -189,8 +189,8 @@
         <el-table-column label="仓库编码" align="center" prop="warehouseId" />
         <el-table-column label="仓库" align="center" prop="warehouseName" />
         <el-table-column label="合同号" align="center" prop="orderId" />
-        <el-table-column label="代号" align="center" prop="distribution" />
         <el-table-column label="产品号" align="center" prop="power" />
+        <el-table-column label="代号" align="center" prop="distribution" />
         <el-table-column label="台次" align="center" prop="spare5" />
 
         <el-table-column label="物料编码" align="center" prop="productId" />
diff --git a/ruoyi-ui/src/views/requestInterface/log/index.vue b/ruoyi-ui/src/views/requestInterface/log/index.vue
index 086176d..a608582 100644
--- a/ruoyi-ui/src/views/requestInterface/log/index.vue
+++ b/ruoyi-ui/src/views/requestInterface/log/index.vue
@@ -81,21 +81,21 @@
 
     <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange" >
 <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column width="120" :label="'请求ID'" align="left" prop="requestId" show-overflow-tooltip />
-      <el-table-column width="160" :label="'请求时间'" align="left" prop="requestTime" show-overflow-tooltip />
-      <el-table-column width="120" :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip />
-      <el-table-column width="120" :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip />
-      <el-table-column width="120" :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip />
-      <el-table-column width="300" :label="'请求URL'"  align="left" prop="requestUrl" show-overflow-tooltip />
-      <el-table-column width="120" :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip />
-      <el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip />
+      <el-table-column  :label="'Id'" align="left" prop="requestId" show-overflow-tooltip />
+      <el-table-column  :label="'请求时间'" align="left" prop="requestTime" show-overflow-tooltip />
+      <el-table-column  :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip />
+      <el-table-column  :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip />
+      <el-table-column  :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip />
+<!--      <el-table-column width="300" :label="'请求URL'"  align="left" prop="requestUrl" show-overflow-tooltip />-->
+      <el-table-column  :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip />
+<!--      <el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip />-->
       <el-table-column width="300" :label="'请求体'" align="left" prop="requestBody" show-overflow-tooltip />
-      <el-table-column width="160" :label="'响应时间'"  align="left" prop="responseTime" show-overflow-tooltip />
-      <el-table-column width="120" :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip />
-      <el-table-column width="120" :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip />
-      <el-table-column width="120" :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip />
-      <el-table-column width="120" :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip />
-      <el-table-column width="120" :label="'是否成功'" align="left" prop="isSuccessful" show-overflow-tooltip>
+      <el-table-column  :label="'响应时间'"  align="left" prop="responseTime" show-overflow-tooltip />
+      <el-table-column  :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip />
+      <el-table-column  :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip />
+      <el-table-column  :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip />
+      <el-table-column  :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip />
+      <el-table-column  :label="'是否成功'" align="left" prop="isSuccessful" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_available" :value="scope.row.isSuccessful"/>
         </template>