From 8d06982c1144f74b7c95ed87507fc5869130d75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Sat, 11 Oct 2025 14:24:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/ifsCallErrorLog.js          |  1 +
 .../modules/warehouse/ifsCallErrorLog.vue     | 61 +++++++++++++------
 .../modules/warehouse/ifsInventoryInit.vue    |  2 +-
 .../modules/warehouse/interfaceCallLog.vue    |  4 +-
 .../modules/warehouse/wcsCallBackSearch.vue   |  2 +-
 5 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/api/warehouse/ifsCallErrorLog.js b/src/api/warehouse/ifsCallErrorLog.js
index d99981c..2890add 100644
--- a/src/api/warehouse/ifsCallErrorLog.js
+++ b/src/api/warehouse/ifsCallErrorLog.js
@@ -14,3 +14,4 @@ export const getUserAuthorizedSites = data => createAPI('api/ifsCallErrorLog/get
 
 // 手工重试IFS接口调用 - rqrq
 export const retryIfsCall = data => createAPI('api/ifsCallErrorLog/retry', 'POST', data)
+export const closeIfsCall = data => createAPI('api/ifsCallErrorLog/closeRetry', 'POST', data)
diff --git a/src/views/modules/warehouse/ifsCallErrorLog.vue b/src/views/modules/warehouse/ifsCallErrorLog.vue
index 83e977a..d4933cf 100644
--- a/src/views/modules/warehouse/ifsCallErrorLog.vue
+++ b/src/views/modules/warehouse/ifsCallErrorLog.vue
@@ -122,10 +122,13 @@
       <el-table-column
         header-align="center"
         align="center"
-        width="100"
+        fixed="right"
+        width="180"
         label="操作">
         <template slot-scope="scope">
+          <a type="text" size="small" @click="showDetailDialog(scope.row)">查看详情</a>
           <a type="text" size="small" v-if="scope.row.processStatus === 'PENDING'" @click="handleRetry(scope.row)">重试</a>
+<!--          <a type="text" size="small" v-if="scope.row.processStatus === 'PENDING'" @click="closeRetry(scope.row)">忽略</a>-->
         </template>
       </el-table-column>
     </el-table>
@@ -153,7 +156,7 @@
         <!-- 基本信息 - rqrq -->
         <el-row>
           <el-col :span="8">
-            <el-form-item label="站点：">
+            <el-form-item label="工厂编码：">
               <span>{{ currentRow.site }}</span>
             </el-form-item>
           </el-col>
@@ -209,44 +212,48 @@
         <el-form-item label="错误信息：">
           <el-input
             type="textarea"
-            :rows="4"
+            :rows="6"
+            resize='none'
             v-model="currentRow.errorMessage"
             readonly>
           </el-input>
         </el-form-item>
 
         <!-- 请求数据 - rqrq -->
-        <el-form-item label="请求数据：">
+        <el-form-item label="请求数据：" style="margin-top: 105px">
           <el-input
             type="textarea"
             :rows="6"
+            resize='none'
             v-model="currentRow.requestData"
             readonly>
           </el-input>
         </el-form-item>
 
         <!-- 响应数据 - rqrq -->
-        <el-form-item label="响应数据：">
+        <el-form-item label="响应数据：" style="margin-top: 105px">
           <el-input
             type="textarea"
-            :rows="6"
+            :rows="4"
+            resize='none'
             v-model="currentRow.responseData"
             readonly>
           </el-input>
         </el-form-item>
 
         <!-- 处理备注 - rqrq -->
-        <el-form-item label="处理备注：">
+        <el-form-item label="处理备注：" style="margin-top: 70px">
           <el-input
             type="textarea"
             :rows="3"
+            resize='none'
             v-model="processRemark"
             placeholder="请输入处理说明（标记为已处理或已忽略时必填）">
           </el-input>
         </el-form-item>
       </el-form>
 
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="margin-top: 35px">
         <el-button
           type="success"
           @click="markAsProcessed"
@@ -275,7 +282,7 @@ import {
   markErrorAsProcessed,
   markErrorAsIgnored,
   getUserAuthorizedSites,
-  retryIfsCall
+  retryIfsCall,closeIfsCall
 } from '@/api/warehouse/ifsCallErrorLog.js'
 
 export default {
@@ -310,7 +317,7 @@ export default {
           columnProp: "site",
           headerAlign: "center",
           align: "center",
-          columnLabel: "站点",
+          columnLabel: "工厂",
           columnWidth: 60,
           columnSortable: false,
           showOverflowTooltip: true,
@@ -456,16 +463,7 @@ export default {
           showOverflowTooltip: true,
           fixed: ""
         },
-        {
-          columnProp: "operate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "操作",
-          columnWidth: 300,
-          columnSortable: false,
-          showOverflowTooltip: true,
-          fixed: "right"
-        }
+
       ],
       // 数据列表 - rqrq
       dataList: [],
@@ -645,6 +643,29 @@ export default {
         this.markIgnoredLoading = false
       })
     },
+    closeRetry(row){
+      this.$confirm('确定要忽略此记录的IFS接口调用吗？', '确认重试', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          id: row.id
+        }
+
+        closeIfsCall(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success('忽略成功')
+            // 刷新列表 - rqrq
+            this.getDataList()
+          } else {
+            this.$message.error(data.msg || '忽略失败')
+            // 刷新列表（更新重试次数）- rqrq
+            this.getDataList()
+          }
+        })
+      })
+    },
 
     // 手工重试IFS接口调用 - rqrq
     handleRetry(row) {
diff --git a/src/views/modules/warehouse/ifsInventoryInit.vue b/src/views/modules/warehouse/ifsInventoryInit.vue
index 2263005..068e922 100644
--- a/src/views/modules/warehouse/ifsInventoryInit.vue
+++ b/src/views/modules/warehouse/ifsInventoryInit.vue
@@ -39,7 +39,7 @@
         prop="site"
         header-align="center"
         align="center"
-        label="站点">
+        label="工厂编码">
       </el-table-column>
       <el-table-column
         prop="warehouseId"
diff --git a/src/views/modules/warehouse/interfaceCallLog.vue b/src/views/modules/warehouse/interfaceCallLog.vue
index 0faccba..a7dca0f 100644
--- a/src/views/modules/warehouse/interfaceCallLog.vue
+++ b/src/views/modules/warehouse/interfaceCallLog.vue
@@ -134,7 +134,7 @@
               <el-form-item label="方法名称:">
                 <span>{{ detailData.methodName }}</span>
               </el-form-item>
-              <el-form-item label="站点:">
+              <el-form-item label="工厂编码:">
                 <span>{{ detailData.site }}</span>
               </el-form-item>
               <el-form-item label="业务主键:">
@@ -293,7 +293,7 @@ export default {
           columnProp: "site",
           headerAlign: "center",
           align: "center",
-          columnLabel: "站点",
+          columnLabel: "工厂编码",
           columnWidth: 80,
           columnSortable: false,
           showOverflowTooltip: true,
diff --git a/src/views/modules/warehouse/wcsCallBackSearch.vue b/src/views/modules/warehouse/wcsCallBackSearch.vue
index c83e35c..eae41fb 100644
--- a/src/views/modules/warehouse/wcsCallBackSearch.vue
+++ b/src/views/modules/warehouse/wcsCallBackSearch.vue
@@ -150,7 +150,7 @@ export default {
           columnProp: "site",
           headerAlign: "center",
           align: "center",
-          columnLabel: "站点",
+          columnLabel: "工厂编码",
           columnWidth: 80,
           columnSortable: false,
           showOverflowTooltip: true,