From 9051d96029c8e860c6e6657b7df2106bfbfdc010 Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期五, 06 三月 2026 15:20:54 +0800
Subject: [PATCH] 111
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 111 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 34 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index 81ee08f..a2e1f79 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -35,9 +35,14 @@
showClose: true, //鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
type: "warning", //鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
}).then(() => {
- var param = rows[0].taskNum;
+ var param = rows[0].palletCode;
+ let data = {
+ BusinessId: "1",
+ TaskId: 1,
+ PalletCode: param
+ }
this.http
- .get("api/Task/ManualTaskCompleted?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
+ .post("v1/pallet/rmsPalletTask/mockComplete", data)
.then((x) => {
if (x.status) {
this.$Message.success('浠诲姟鎵嬪姩瀹屾垚鎴愬姛.');
@@ -50,42 +55,80 @@
}
}
+ //鑷畾涔夋墜鍔ㄥ彂閫佷换鍔′俊鎭寜閽�
+ let Manualtasksendingbutton = this.buttons.find(x => x.value == 'Manualtasksendingbut');
+ if (Manualtasksendingbutton) {
+ Manualtasksendingbutton.onClick = function() {
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ this.$confirm(`鏄惁纭畾鎵嬪姩鍙戦�佷换鍔′俊鎭嚦wcs锛�${rows[0].taskNum}浠诲姟!`, "鎻愮ず", {
+ // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
+ confirmButtonText: "纭", //纭鎸夐挳鏂囧瓧鏇存崲
+ cancelButtonText: "鍙栨秷", //鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+ // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+ showClose: true, //鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
+ type: "warning", //鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
+ }).then(() => {
+ var task = rows[0].taskNum;
+ // let data = {
+ // BusinessId: "1",
+ // TaskId: 1,
+ // PalletCode: param
+ // }
+ this.http
+ .get(`api/Task/WCSTask?task=${task}`)
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('浠诲姟鎵嬪姩涓嬪彂鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ }
+ });
+ })
+
+ }
+ }
var btnHandOutbound = this.buttons.find(x => x.value == "TaskCancellation");
- if (btnHandOutbound != null) {
- btnHandOutbound.onClick = () => {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) {
- return this.$error("璇烽�夋嫨鏁版嵁!");
- } else {
-
-
- this.$confirm(`鏄惁纭畾瑕佸彇娑堜换鍔★紝${rows[0].taskNum}浠诲姟`, "鎻愮ず", {
- // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
- confirmButtonText: "纭", //纭鎸夐挳鏂囧瓧鏇存崲
- cancelButtonText: "鍙栨秷", //鍙栨秷鎸夐挳鏂囧瓧鏇存崲
- // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
- showClose: true, //鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
- type: "warning", //鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
- }).then(() => {
- var ids = rows.map(x => {
- return x.taskNum
- })
- this.http
- .get("api/Task/Cancelinventory?TaskNum=" + ids, "鏁版嵁澶勭悊涓�...")
- .then((x) => {
- if (x.status) {
- this.$Message.success('鎴愬姛.');
- this.refresh();
- } else {
- return this.$error(x.message);
- }
- });
- })
- }
+if (btnHandOutbound != null) {
+ btnHandOutbound.onClick = () => {
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) {
+ return this.$error("璇烽�夋嫨鏁版嵁!");
+ } else {
+ this.$confirm(`鏄惁纭畾瑕佸彇娑堜换鍔★紝${rows[0].taskNum}浠诲姟`, "鎻愮ず", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ showClose: true,
+ type: "warning",
+ }).then(() => {
+ // 淇敼杩欓噷锛氫娇鐢ㄦ墭鐩樺彿(palletCode)鑰屼笉鏄换鍔″彿(taskNum)
+ var palletCodes = rows.map(x => {
+ return x.palletCode // 鍋囪琛ㄦ牸鏁版嵁涓湁palletCode瀛楁
+ })
+ var palletCode = rows[0].palletCode; // 鐩存帴鍙栫涓�涓�
+var requestData = { palletCode: palletCode }; // 鍒涘缓JSON瀵硅薄
+ // 娉ㄦ剰锛氳繖閲屼竴娆″彧鑳藉鐞嗕竴涓墭鐩橈紝鎵�浠ュ彇绗竴涓�変腑鐨勬墭鐩樺彿
+ if (palletCodes.length > 0) {
+ this.http
+ .post("v1/pallet/rmsPalletTask/cancelTask", requestData, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ }
+ });
+ } else {
+ this.$error("鏈壘鍒版墭鐩樺彿淇℃伅!");
}
- }
+ })
+ }
+ }
+}
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
--
Gitblit v1.9.3