From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/PDA/pages/stash/raworderboxing.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
index e1ac0c7..939a73e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
@@ -137,6 +137,7 @@
matInfos: [],
orderNo: "",
batchNo: "",
+ materielCode: "",
orderqty: 0,
Inqty: 0,
goods_no: "",
@@ -160,6 +161,7 @@
matInfo: [],
value2: "",
matTotals: [],
+ id: "",
warehouseId: "",
Test: false,
Testlabel: "",
@@ -173,18 +175,20 @@
onShow() {},
onLoad(res) {
this.focus = false;
+ this.id = res.id;
this.addressFocus = false;
this.orderNo = res.orderNo;
this.Inqty = res.order_Inqty;
this.orderqty = res.order_qty;
this.batchNo = res.batchNo;
+ this.materielCode = res.goods_no;
this.warehouseId = res.warehouseId;
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.batch_num = "鎵规鍙凤細" + res.batchNo;
this.order_qty = "鍗曟嵁鏁伴噺锛�" + res.order_qty;
this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
this.goods_no = "鐗╂枡缂栧彿锛�" + res.goods_no;
- this.getData();
+ // this.getData();
},
methods: {
// voiceSpeech(src) {
@@ -458,8 +462,10 @@
this.$u.post('/api/CabinOrder/FeedbackIn', {
MainData: {
"LocationCode": this.barcode,
+ "id":this.id,
"warehouseCode": this.warehouseId,
"orderNo": this.orderNo,
+ "materielCode": this.materielCode,
"Inqty": this.materSn,
"batchNo": this.batchNo,
},
@@ -477,7 +483,7 @@
this.barcode = "";
this.materSn = "";
if (this.Inqty == this.orderqty) {
- uni.setStorageSync('isLoaded', true);
+ uni.setStorageSync('isIn', true);
this.handleInboundComplete();
}
} else {
@@ -520,18 +526,18 @@
// 鎴栬�呯洿鎺ヨ烦杞紙涓嶈闂敤鎴凤級
setTimeout(() => {
- // 鏂瑰紡2锛氳烦杞埌鎸囧畾椤甸潰
- // uni.redirectTo({
- // url: '/pages/order/list' // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
- // });
- // 鏂瑰紡3锛氳烦杞埌棣栭〉
- // uni.switchTab({
- // url: '/pages/index/index'
- // });
- // 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
- uni.navigateBack({
- delta: 2
- });
+ // 鏂瑰紡2锛氳烦杞埌鎸囧畾椤甸潰
+ // uni.redirectTo({
+ // url: '/pages/order/list' // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
+ // });
+ // 鏂瑰紡3锛氳烦杞埌棣栭〉
+ // uni.switchTab({
+ // url: '/pages/index/index'
+ // });
+ // 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
+ uni.navigateBack({
+ delta: 1
+ });
}, 600);
}
}
--
Gitblit v1.9.3