From 4f3b0a6727ecfa555892ebea64bd76e5a07cd6fb Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 17 三月 2026 10:01:38 +0800
Subject: [PATCH] feat: 新增WMS异常上报自动恢复异常按钮

---
 项目代码/WCSClient/src/extension/taskinfo/task.js |   94 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 67 insertions(+), 27 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/taskinfo/task.js"
index c578edf..5601e5f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/taskinfo/task.js"
@@ -36,37 +36,40 @@
           });
         };
       }
-      let TaskCancelBtn = this.buttons.find(
-        (x) => x.value == "TaskCancel"
-      );
-      if (TaskCancelBtn) {
-        TaskCancelBtn.onClick = function () {
-          let rows = this.$refs.table.getSelected();
-          if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
-          if (rows.length > 1) {
-            return this.$error("涓�娆″彧鑳芥搷浣滀竴鏉℃暟鎹�!");
-          }
-            this.$confirm("纭畾璐х鍙栨秷鍚楋紵", "鎻愮ず", {
+      // 娣诲姞WMS寮傚父鎭㈠鎸夐挳鍔熻兘
+      let WmsRecoveryBtn = this.buttons.find((x) => x.value == "WmsRecovery");
+      if (WmsRecoveryBtn) {
+        WmsRecoveryBtn.onClick = () => {
+          this.$confirm("纭畾瑕佹墽琛學MS寮傚父鎭㈠鍚楋紵", "鎻愮ず", {
             confirmButtonText: "纭畾",
             cancelButtonText: "鍙栨秷",
             type: "warning",
-          }).then(() => {
-            const taskNum = rows[0].taskNum;
-            this.http
-              .post(
-                `api/Task/ManualTaskCancellation?taskNum=${taskNum}`,
-                null,
-                "浠诲姟鍙栨秷涓�"
-              )
-              .then((x) => {
-                if (!x.status) return this.$message.error(x.message);
-                this.$message.success("鎿嶄綔鎴愬姛");
-              })
           })
-        }
+            .then(() => {
+              // 鐩存帴璋冪敤鎭㈠鎺ュ彛锛屼笉闇�瑕佸弬鏁�
+              this.http
+                .post(
+                  `api/Task/WmsRecovery`, // WMS寮傚父鎭㈠鎺ュ彛
+                  null, // 涓嶉渶瑕佽姹備綋
+                  "WMS寮傚父鎭㈠涓�",
+                )
+                .then((x) => {
+                  if (!x.status) return this.$message.error(x.message);
+                  this.$message.success("WMS寮傚父鎭㈠鎴愬姛");
+                })
+                .catch((error) => {
+                  this.$message.error("鎿嶄綔澶辫触锛�" + error.message);
+                });
+            })
+            .catch(() => {
+              this.$message.info("宸插彇娑堟仮澶嶆搷浣�");
+            });
+        };
       }
       // 娣诲姞浠诲姟鎭㈠鎸夐挳鍔熻兘
-      let TaskRecoveryBtn = this.buttons.find((x) => x.value == "ExceptionTask");
+      let TaskRecoveryBtn = this.buttons.find(
+        (x) => x.value == "ExceptionTask",
+      );
       if (TaskRecoveryBtn) {
         TaskRecoveryBtn.onClick = function () {
           let rows = this.$refs.table.getSelected();
@@ -98,8 +101,35 @@
             });
         };
       }
+      let TaskCancelBtn = this.buttons.find((x) => x.value == "TaskCancel");
+      if (TaskCancelBtn) {
+        TaskCancelBtn.onClick = function () {
+          let rows = this.$refs.table.getSelected();
+          if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+          if (rows.length > 1) {
+            return this.$error("涓�娆″彧鑳芥搷浣滀竴鏉℃暟鎹�!");
+          }
+          this.$confirm("纭畾璐х鍙栨秷鍚楋紵", "鎻愮ず", {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          }).then(() => {
+            const taskNum = rows[0].taskNum;
+            this.http
+              .post(
+                `api/Task/ManualTaskCancellation?taskNum=${taskNum}`,
+                null,
+                "浠诲姟鍙栨秷涓�",
+              )
+              .then((x) => {
+                if (!x.status) return this.$message.error(x.message);
+                this.$message.success("鎿嶄綔鎴愬姛");
+              });
+          });
+        };
+      }
       let TaskCompletedBtn = this.buttons.find(
-        (x) => x.value == "TaskCompleted"
+        (x) => x.value == "TaskCompleted",
       );
 
       if (TaskCompletedBtn) {
@@ -118,13 +148,23 @@
           })
             .then(() => {
               const taskNum = rows[0].taskNum;
+
+              // 鏂规硶1锛氬彂閫丣SON鏁版嵁锛堥渶瑕佸悗绔敮鎸乕FromBody]锛�
+              // this.http.post("api/Task/RecTaskCompleted", { taskNum }, "浠诲姟瀹屾垚涓�")
+
+              // 鎴栨柟娉�2锛歎RL鍙傛暟鏂瑰紡
               this.http
                 .post(
                   `api/Task/RecTaskCompleted?taskNum=${taskNum}`,
                   null,
-                  "浠诲姟瀹屾垚涓�"
+                  "浠诲姟瀹屾垚涓�",
                 )
 
+                // 鎴栨柟娉�3锛氳〃鍗曟暟鎹柟寮�
+                // let formData = new FormData();
+                // formData.append('taskNum', taskNum);
+                // this.http.post("api/Task/RecTaskCompleted", formData, "浠诲姟瀹屾垚涓�")
+
                 .then((x) => {
                   if (!x.status) return this.$message.error(x.message);
                   this.$message.success("鎿嶄綔鎴愬姛");

--
Gitblit v1.9.3