From 7bdfffc95379cd57adf0513bfc656e0af467d345 Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Tue, 15 Apr 2025 19:04:08 +0800
Subject: [PATCH] =?UTF-8?q?feat=20pda=20=E9=80=80=E6=96=99=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/ProduceReturnPage/index.vue      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pages/material/features/ProduceReturnPage/index.vue b/pages/material/features/ProduceReturnPage/index.vue
index 7cef36d..2a97a92 100644
--- a/pages/material/features/ProduceReturnPage/index.vue
+++ b/pages/material/features/ProduceReturnPage/index.vue
@@ -114,18 +114,17 @@
 								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 								<text class="card-description"> 料号: {{ item.MATERIALSPECNAME }}</text>
 							</div>
-							<div>
+							<!-- <div>
 								<text class="card-description"> 阶段: {{ item.PHASE }}</text>
 								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 								<text class="card-description"> 实际规格: {{ item.TRUEGG }}</text>
-							</div>
+							</div> -->
 							<div>
 								<text class="card-description"> 系统数量: {{ item.TOTALQTY }} {{ item.UNIT }}</text>
 								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 								<!-- <text class="card-description"> 备货数量: {{ item.ASSIGNEDQUANTITY }}
 									{{ item.UNIT }}</text> -->
-									<text class="card-description"> 已扫描数量: {{ item.HAVEQUANTITY }}
-										{{ item.UNIT }}</text>
+									<text class="card-description"> 已扫描数量: {{ item.HAVEQUANTITY }} {{ item.UNIT }}</text>
 							</div>
 						</view>
 		
@@ -144,8 +143,8 @@
 						<div>
 							<text class="card-description"> 料号: {{ item.MATERIALSPECNAME }}</text>
 							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-							<text class="card-description"> 规格: {{ item.SPECNAME }}</text>
-							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+							<!-- <text class="card-description"> 规格: {{ item.SPECNAME }}</text>
+							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
 							<text class="card-description"> 阶段: {{ item.PHASE }}</text>
 						</div>
 						<div>
@@ -153,13 +152,13 @@
 							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 							<text class="card-description"> 数量: {{ item.MATERIALQUANTITY }} {{ item.UNIT }}</text>
 						</div>
-						<div>
+						<!-- <div>
 							<text class="card-description"> 组织: {{ item.ERPFACTORY }}</text>
 							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 							<text class="card-description"> 仓库: {{ item.ERPLOCATION }}</text>
 							&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 							<text class="card-description"> 货位: {{ item.LOCATIONNAME }}</text>
-						</div>
+						</div> -->
 <!-- 						<div>
 							<text class="card-description" v-if="isFolded[index]" @click.stop>点击折叠</text>
 							<text class="card-description" v-else @click.stop>点击展开</text>
@@ -550,7 +549,7 @@
 					})
 					this.$playFail()
 					return;
-				}
+				}/*
 				if (this.ERPFACTORY == null || this.ERPFACTORY == "") {
 					this.$showMessage("请选择组织！");
 					this.$nextTick(() => {
@@ -570,7 +569,7 @@
 					})
 					this.$playFail()
 					return;
-				}
+				}*/
 
 				var barCodeArr = this.MATERIALPACKINGNAME.split("|");
 				// 470110856|1|C|75mm*1000m|SHBP01JT1202305240009|20230524|11|75
@@ -588,19 +587,20 @@
 				var materialSpecName = barCodeArr[0];
 
 				this.$MyRequest('/ProduceReturn/getBarCode', {
-					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME,
+					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME/* ,
 					ERPLOCATION: this.ERPLOCATION,
 					ERPFACTORY: this.ERPFACTORY,
 					LOCATIONNAME: this.LOCATIONNAME,
-					materialSpecName: materialSpecName
+					materialSpecName: materialSpecName */
 				}).then(res => {
 					if (res.data.success) {
 						var _Arr = res.data.resultObj;
 						// res.data.resultObj[0]
 						
 						let PakageList = res.data.resultObj?.list2[0];	
-						let orderList = res.data.resultObj?.list4;
+						let orderList = res.data.resultObj?.list4[0];
 						this.BoxListInfo.unshift(PakageList);
+						this.sumList.unshift(orderList);
 						this.MATERIALPACKINGQTY = 0
 						this.MATERIALPACKINGNUMBER = 0
 						for (let i = 0; i < this.BoxListInfo.length; i++) {
@@ -638,13 +638,13 @@
 						// 		// }
 						// 	})
 						// }
-						console.log('orderList',orderList)
+						/* console.log('orderList',orderList)
 						for (let i = 0; i < this.BoxListInfo.length; i++) {
 							if (this.sumList.every(el => ((el.RECEIVEREQUESTNAME != this.BoxListInfo[i].RECEIVEREQUESTNAME)))) {
 								console.log(111)
 								this.sumList = [...this.sumList,...orderList]
 							}
-						}
+						}*/
 						this.sumList.map(val => {
 							if((val.RECEIVEREQUESTNAME == PakageList.RECEIVEREQUESTNAME && val.MATERIALSPECNAME == PakageList.MATERIALSPECNAME)) {
 								val.HAVEQUANTITY = cals.add(val.HAVEQUANTITY,PakageList.MATERIALQUANTITY).toNumber()