From af7db6a417729be99dc51021de2c5018c57ac2d3 Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Wed, 12 Apr 2023 16:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/mycomponents/coms/task/comReceipt.vue |  2 +-
 fe/PDA/pages/task/receipt.vue                |  2 +-
 fe/PDA/pages/task/receipt_check.vue          |  6 ++++--
 fe/PDA/pages/task/receipt_detail.vue         | 12 ++++++++----
 fe/PDA/pages/task/receipt_result.vue         | 15 +++++++--------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/fe/PDA/mycomponents/coms/task/comReceipt.vue b/fe/PDA/mycomponents/coms/task/comReceipt.vue
index d2fef243b..683645db0 100644
--- a/fe/PDA/mycomponents/coms/task/comReceipt.vue
+++ b/fe/PDA/mycomponents/coms/task/comReceipt.vue
@@ -12,7 +12,7 @@
 			</view>
 			<view class="label_order">
 				<image class="icon_normal" src="@/static/icons_ui/icon_avn.svg"></image>
-				<text>{{receiptItem.arriveNoticeNumber}}</text>
+				<text>{{receiptItem.purchaseReceiptRequestNumber}}</text>
 				<!-- <text>到货单：{{receiptItem.arriveNoticeNumber}}</text> -->
 			</view>
 		</view>
diff --git a/fe/PDA/pages/task/receipt.vue b/fe/PDA/pages/task/receipt.vue
index 02272146a..7bfaebe94 100644
--- a/fe/PDA/pages/task/receipt.vue
+++ b/fe/PDA/pages/task/receipt.vue
@@ -226,7 +226,7 @@
 					mask: true
 				});
 				let params = {
-					number: code,
+					asnNumber: code,
 					isToday: that.isToday
 				}
 				getReceiptJobByAsnNumber(params).then(res => {
diff --git a/fe/PDA/pages/task/receipt_check.vue b/fe/PDA/pages/task/receipt_check.vue
index 4a8b8b322..f4223e695 100644
--- a/fe/PDA/pages/task/receipt_check.vue
+++ b/fe/PDA/pages/task/receipt_check.vue
@@ -134,6 +134,7 @@
 						let fileKey = file.FileKey;
 						let fileName = file.FileName;
 						getFileByCode(fileKey).then(res => {
+							
 							let result = res;
 							var byteString = atob(res.bytes)
 							var arrayBuffer = new ArrayBuffer(byteString.length) // 创建缓冲数组
@@ -232,11 +233,12 @@
 						filesList: imgFiles
 					};
 					let param = JSON.stringify(item);
-					console.log('param', param);
+					// console.log('param', param);
 					//保存目检
 					saveReceiptResult(this.dataContent.masterID, param).then(res => {
+						console.log("保存",res)
 						if (res != null) {
-							console.log('param', param);
+							// console.log('param', param);
 							this.afterSave();
 						}
 						uni.hideLoading();
diff --git a/fe/PDA/pages/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue
index 215b29dab..f83de2535 100644
--- a/fe/PDA/pages/task/receipt_detail.vue
+++ b/fe/PDA/pages/task/receipt_detail.vue
@@ -33,7 +33,7 @@
 										<uni-th width="100" align="center">实际</uni-th>
 									</uni-tr>
 									<uni-tr>
-										<uni-th width="100">数量({{item.recommendUom}})</uni-th>
+										<uni-th width="100">数量({{item.uom}})</uni-th>
 										<uni-th width="100" align="center">
 											<text class="text_black"
 												style="font-size: 1rem;">{{item.recommendQty}}</text>
@@ -233,6 +233,9 @@
 						res.details.sort(compareDesc('purchaseReceiptInspectStatus')); //按扫描信息排序
 						that.receiptJob = res;
 						callBack();
+						let params = JSON.stringify(that.receiptJob.details);
+						console.log("测试",params)
+						
 					})
 					.catch(err => {
 						this.showMessage(err.message);
@@ -242,9 +245,9 @@
 			afterPurchase() {
 				let that = this;
 				//查询任务明细
-				that.getJoDetail(() => {
-					this.calcScanCount();
-				})
+					that.getJoDetail(() => {
+						this.calcScanCount();
+					})
 			},
 
 			//处理扫描解析的返回值
@@ -403,6 +406,7 @@
 							details.push(r.id);
 						})
 						let param = JSON.stringify(details);
+						
 						resetReceiptResult(that.id, param).then(res => {
 							if (res != null) {
 								that.getJoDetail(() => {
diff --git a/fe/PDA/pages/task/receipt_result.vue b/fe/PDA/pages/task/receipt_result.vue
index 1fa633bfc..244fb88eb 100644
--- a/fe/PDA/pages/task/receipt_result.vue
+++ b/fe/PDA/pages/task/receipt_result.vue
@@ -43,7 +43,7 @@
 						<view class="cen_card margin_xs_bottom">
 							<view class="label_box uni-flex uni-row space-between">
 								<view class="label_info">
-									<text>不合格数量:{{ item.recommendQty}}({{ item.recommendUom}})</text>
+									<text>不合格数量:{{ item.recommendQty}}({{ item.uom}})</text>
 								</view>
 								<view v-if="item.purchaseReceiptInspectStatus==3?true:false" @click="seePhoto(item)">
 									<!-- <label class="">
@@ -146,7 +146,6 @@
 				that.itemList = that.receiptJob.details.filter(r => {
 					return r.purchaseReceiptInspectStatus == 3
 				})
-
 				that.receiptJob.details.forEach(r => {
 					that.allCount += r.recommendQty;
 					switch (r.purchaseReceiptInspectStatus) {
@@ -202,23 +201,23 @@
 				})
 				//赋值
 				that.receiptJob.details.forEach(r => {
-					r.handledLocationCode = r.recommendLocationCode;
+					r.handledToLocationCode = r.recommendToLocationCode;
 					r.worker = localStorage.userName
 					if (r.purchaseReceiptInspectStatus == 1) {
 						r.handledArriveDate = new Date(); //
 						r.purchaseReceiptInspectStatus = 4; //未收货
 						r.handledQty = 0;
-						r.handledUom = r.recommendUom;
+						// r.handledUom = r.recommendUom;
 						r.handledContainerCode = r.recommendContainerCode;
 						r.handledPackingCode = r.recommendPackingCode;
 						r.handledSupplierBatch = r.recommendSupplierBatch;
 						r.handledProduceDate = r.recommendProduceDate;
 						r.handledExpireDate = r.recommendExpireDate;
 						r.handledLot = r.recommendLot;
-						r.handledLocationCode = r.recommendLocationCode;
-						r.handledLocationArea = r.recommendLocationArea;
-						r.handledLocationGroup = r.recommendLocationGroup;
-						r.handledLocationErpCode = r.recommendLocationErpCode;
+						r.handledToLocationCode = r.recommendToLocationCode;
+						r.handledToLocationArea = r.recommendToLocationArea;
+						r.handledToLocationGroup = r.recommendToLocationGroup;
+						r.handledToLocationErpCode = r.recommendToLocationErpCode;
 					}
 				});