From 48710581fbbdd40eb3a743d91fa04e81531ba2ab Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 05 十二月 2025 08:39:42 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
index 19960e4..b3b0c40 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
@@ -71,9 +71,8 @@
                         // 鍙戣捣鎾ら攢缁勭洏璇锋眰
                         try {
                             //console.log('鍙戣捣鎾ら攢缁勭洏璇锋眰锛屾墭鐩樺彿锛�', formData.palletCode.trim());
-                            const response = await http.post('/api/InboundOrder/CancelPalletGroup', {
-                                palletCode: formData.palletCode.trim()
-                            });
+                            const response = await http.post('/api/InboundOrder/UndoPalletGroup?palletCode='+formData.palletCode.trim());
+                              
 
                             const { status, message, data } = response;
                             if (status) {
@@ -416,6 +415,14 @@
       searchBefore(param) {
         //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
         //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+      // this.searchFormFields.orderType=[0]
+         let wheres = [{
+            'name': 'orderType',
+            'value': '0',
+            'displayType': 'text'}];
+   
+
+          param.wheres.push(...wheres);
         return true;
       },
       searchAfter(result) {

--
Gitblit v1.9.3