diff --git a/mycomponents/scan/winScanPackAndPosition.vue b/mycomponents/scan/winScanPackAndPosition.vue
index 5c06e934..a33bc574 100644
--- a/mycomponents/scan/winScanPackAndPosition.vue
+++ b/mycomponents/scan/winScanPackAndPosition.vue
@@ -94,7 +94,6 @@
 		},
 		methods: {
 			openScanPopup() {
-
 				if (this.positionList.length == 0) {
 					uni.showLoading({
 						title: "数据加载中....",
@@ -111,6 +110,21 @@
 
 				this.$refs.popup.open('bottom');
 			},
+			
+			initData(){
+				this.positionInfo= "请选择位置";
+				this.positionList = [];
+				this.productionLineCode = '';
+				this.rawLocationCode = "";
+				this.fgLocationCode = "";
+				this.workshopCode = "";
+				this.workStationCode ="";
+				this.workShopName = "";
+				this.productionLineName="";
+				this.workStationName="";
+				this.show = false;
+				this.isEditPosition = true
+			},
 
 			closeScanPopup() {
 				this.$refs.popup.close();
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index 56600d9a..491fc8db 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -15,7 +15,7 @@
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
-								:isShowFromLocation="false"
+								:isShowFromLocation="true"
 								@updateData="updateData" @removePack="removePack">
 							</comReturnRecord>
 						</view>
@@ -215,6 +215,7 @@
 						let newDetail = this.createDetailInfo(label, pack);
 						newDetail.toLocationCode = toLocation.code;
 						newDetail.fromLocationCode = this.rawLocationCode;
+						newDetail.locationCode = this.rawLocationCode;
 						newDetail.toWarehouseCode = toLocation.warehouseCode;
 						itemp.subList.push(newDetail);
 						this.detailSource.push(itemp)
@@ -390,7 +391,6 @@
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
 
-
 			},
 
 			setFromPrecisionStrategParams() {
@@ -480,7 +480,7 @@
 							submitItem.productionlineCode = this.productionLineCode;
 							submitItem.workStationCode = this.workStationCode;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							subList.push(submitItem)
 						}
 					})
@@ -533,6 +533,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.clearData();
+					this.$refs.scanPopup.initData();
 				})
 			},
 			clearData() {