From 6a9ccbb5e9f9789446ebbdc51deca0f17e11a99f 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: Thu, 5 Mar 2026 14:38:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(automatedWarehouse):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=BC=BA=E5=88=B6=E5=AE=8C=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 closeNotifyTask API 接口用于关闭申请单任务
- 在通知详情查询表格中添加操作列，显示强制完成按钮
- 只有推送WCS=是且立库取出=否的数据才显示关闭按钮
- 实现 closeTask 方法处理强制完成逻辑
- 添加确认对话框防止误操作
- 调用接口更新 transport_flag 为 'Y' 并解除栈板调用状态
- 完成后刷新列表并显示成功消息
- 使用 $nextTick 确保表格高度计算正确
---
 .../automatedWarehouse/notifyDetailQuery.js   |  7 +++
 .../automatedWarehouse/notifyDetailQuery.vue  | 63 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/api/automatedWarehouse/notifyDetailQuery.js b/src/api/automatedWarehouse/notifyDetailQuery.js
index 3181390..a00bb30 100644
--- a/src/api/automatedWarehouse/notifyDetailQuery.js
+++ b/src/api/automatedWarehouse/notifyDetailQuery.js
@@ -15,3 +15,10 @@ export const searchNotifyOrderList = data => createAPI('/automatedWarehouse/noti
  */
 export const searchMaterialListDetail = data => createAPI('/automatedWarehouse/notifyDetailQuery/searchMaterialListDetail', 'post', data)
 
+// ========== 业务操作 ========== - rqrq
+
+/**
+ * 关闭申请单任务 - rqrq
+ * 功能：更新transport_flag为'Y'，解除栈板调用状态
+ */
+export const closeNotifyTask = data => createAPI('/automatedWarehouse/notifyDetailQuery/closeNotifyTask', 'post', data)
diff --git a/src/views/modules/automatedWarehouse/notifyDetailQuery.vue b/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
index 1f8765e..265da29 100644
--- a/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
+++ b/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
@@ -78,6 +78,21 @@
           <span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
         </template>
       </el-table-column>
+
+      <!-- 操作列 - rqrq -->
+      <el-table-column header-align="center" align="center" width="120" label="操作" fixed="right">
+        <template slot-scope="scope">
+          <!-- 只有推送WCS=是且立库取出=否的数据才显示关闭按钮 - rqrq -->
+          <a
+            v-if="scope.row.pushWmsFlag === 'Y' && scope.row.transportFlag === 'N'"
+            type="text"
+            @click="closeTask(scope.row)"
+            style="color: #F56C6C;">
+            强制完成
+          </a>
+          <span v-else style="color: #C0C4CC;">-</span>
+        </template>
+      </el-table-column>
     </el-table>
 
     <!-- 分页 - rqrq -->
@@ -137,7 +152,8 @@
 <script>
 import {
   searchNotifyOrderList,
-  searchMaterialListDetail
+  searchMaterialListDetail,
+  closeNotifyTask
 } from '@/api/automatedWarehouse/notifyDetailQuery.js'
 
 export default {
@@ -149,6 +165,7 @@ export default {
       activeName: 'labelDetail',
       dataListLoading: false,
       detailLoading: false,
+      closeTaskLoading: false, // 关闭任务loading - rqrq
       dataList: [],
       detailList: [],
       currentRow: null,
@@ -612,8 +629,10 @@ export default {
   },
   mounted() {
     // 计算表格高度 - rqrq
-    this.height = (window.innerHeight - 280) / 2
-    this.detailHeight = (window.innerHeight - 280) / 2
+    this.$nextTick(() => {
+      this.height = (window.innerHeight - 280) / 2
+      this.detailHeight = (window.innerHeight - 280) / 2
+    })
   },
   methods: {
     // 获取订单类型颜色 - rqrq
@@ -700,6 +719,44 @@ export default {
     currentChangeHandle(val) {
       this.pageIndex = val
       this.searchTable()
+    },
+    // 关闭任务 - rqrq
+    closeTask(row) {
+      // 再次确认
+      this.$confirm('确认强制完成此任务？完成后将更新立库取出为"是"，并解除相关栈板的调用状态。', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.closeTaskLoading = true
+        const params = {
+          site: row.site,
+          notifyNo: row.notifyNo,
+          itemNo: row.itemNo,  // 主键：行号 - rqrq
+          soorderNo: row.soorderNo  // 用于匹配栈板remark - rqrq
+        }
+        closeNotifyTask(params).then(({ data }) => {
+          if (data && data.code === 0) {
+            // 显示成功消息（包含解除的栈板列表）- rqrq
+            this.$message({
+              message: data.msg || '强制完成成功',
+              type: 'success',
+              duration: 5000,
+              showClose: true
+            })
+            // 刷新列表
+            this.searchTable()
+          } else {
+            this.$alert(data.msg || '强制完成失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch((error) => {
+          this.$message.error('强制完成失败')
+        }).finally(() => {
+          this.closeTaskLoading = false
+        })
+      }).catch(() => {
+        // 用户取消
+      })
     }
   }
 }