From b472c53f8dc543f7fee455bec1edf96920ef763a 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: Mon, 3 Nov 2025 21:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B8=8B=E8=BE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderIssure/soIssueNotify.js          |  8 +++
 .../orderIssure/searchIssureNotify.vue        | 65 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 7102f5d..87fa93b 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -67,5 +67,13 @@ export const pushNotifyToWcs = data => createAPI(`/orderIssure/newIssure/pushNot
 export const checkIssueNotifyInventory = data => createAPI(`/orderIssure/newIssure/checkIssueNotifyInventory`,'post',data)
 export const pushInventoryToWcs = data => createAPI(`/orderIssure/newIssure/pushInventoryToWcs`,'post',data)
 
+// ================== rqrq - 取消下达功能接口 ==================
+
+// 检查用户是否有未下达的shoporder申请单 - rqrq
+export const checkUserHasUnissueShopOrder = data => createAPI(`/orderIssure/issureNotify/checkUserHasUnissueShopOrder`,'post',data)
+
+// 取消下达申请单 - rqrq
+export const cancelIssueNotify = data => createAPI(`/orderIssure/issureNotify/cancelIssueNotify`,'post',data)
+
 
 
diff --git a/src/views/modules/orderIssure/searchIssureNotify.vue b/src/views/modules/orderIssure/searchIssureNotify.vue
index 7d4ddf7..08bac6e 100644
--- a/src/views/modules/orderIssure/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/searchIssureNotify.vue
@@ -103,12 +103,14 @@
       <el-table-column
         header-align="center"
         align="center"
-        width="120"
+        width="180"
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a>
           <a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a>
           <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'&&scope.row.pushWcsFlag==='未推送'" @click="cancelIssueNotifyHandle(scope.row)" style="margin-left: 10px;">取消下达</a>
 <!--          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='Y'" @click="pushToWcs(scope.row)" style="margin-left: 10px;">推送WCS</a>-->
         </template>
       </el-table-column>
@@ -369,6 +371,8 @@
     , pushNotifyToWcs
     , checkIssueNotifyInventory
     , pushInventoryToWcs
+    , checkUserHasUnissueShopOrder
+    , cancelIssueNotify
 
   } from "@/api/orderIssure/soIssueNotify.js"
 
@@ -1328,6 +1332,65 @@
           })
         })
       },
+
+      /**
+       * @Description 取消下达处理方法 - rqrq
+       * @param row 当前行数据
+       */
+      cancelIssueNotifyHandle(row) {
+        // 先判断发起人是否有未下达的shoporder申请单 - rqrq
+        let checkData = {
+          site: row.site,
+          username: row.username
+        }
+        
+        checkUserHasUnissueShopOrder(checkData).then(({ data }) => {
+          if (data && data.code === 0) {
+            // 如果有未下达的申请单 - rqrq
+            if (data.row != null) {
+              this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+                confirmButtonText: '确定'
+              })
+              return
+            }
+            
+            // 没有未下达的申请单，执行取消下达 - rqrq
+            this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              let cancelData = {
+                site: row.site,
+                notifyNo: row.notifyNo
+              }
+              
+              cancelIssueNotify(cancelData).then(({ data }) => {
+                if (data && data.code === 0) {
+                  this.$message.success('取消下达成功')
+                  // 重新加载数据 - rqrq
+                  this.searchTable()
+                } else {
+                  this.$alert(data.msg, '错误', {
+                    confirmButtonText: '确定'
+                  })
+                }
+              }).catch(() => {
+                this.$message.error('取消下达失败')
+              })
+            }).catch(() => {
+              // 用户取消操作 - rqrq
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.$message.error('检查用户申请单失败')
+        })
+      },
+
       deleteNotifyMaterial(row){
         this.$confirm('确认删除?', '提示', {
           confirmButtonText: '确定',