diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index e6714f5e..98afe0df 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -36,6 +36,7 @@ function service(options = {}) {
 							}else {
 								if(res.data.code==401){
 									uni.clearStorageSync()
+									uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
 									removeToken();
 									uni.reLaunch({
 										url: '/pages/login/index'
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 24515c2e..8b0ae440 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -19,6 +19,8 @@
 			</view>
 		</view>
 	</uni-popup>
+	<!-- 模拟扫描功能 -->
+	<win-com-scan  v-show="false" ref="comscansimulate" @getResult="getScanResult" :clearResult="true" :boxFocus="true" :isShowHistory="false" headerType=""></win-com-scan>
 	<comMessage ref="comMessage"></comMessage>
 </template>
 
@@ -67,8 +69,15 @@
 					this.$refs.popup.open('bottom')
 				}, 500)
 			},
+			openScanPopupSimulate(location) {
+				this.$refs.comscansimulate.setItemCodeSimulate(location)
+				this.$refs.comscansimulate.clickScanMsg();
+			},
 			closeScanPopup() {
-				this.$refs.popup.close()
+				if(this.$refs.popup){
+					this.$refs.popup.close()
+				}
+				
 			},
 			scanClick() {
 				this.$refs.scan.clickScanMsg();
@@ -77,6 +86,7 @@
 				this.$refs.scan.clearScanValue();
 			},
 			getScanResult(result) {
+				
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
@@ -94,6 +104,7 @@
 				}
 				
 				getBasicLocationByCode(this.code).then(res => {
+					
 					uni.hideLoading();
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
@@ -142,10 +153,14 @@
 				return isPass
 			},
 			getfocus() {
-				this.$refs.scan.getfocus();
+				if(this.$refs.scan){
+					this.$refs.scan.getfocus();
+				}
 			},
 			losefocus() {
-				this.$refs.scan.losefocus();
+				if(this.$refs.scan){
+					this.$refs.scan.losefocus();
+				}
 			},
 			showErrorMessage(message) {
 				setTimeout(r => {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index fe64744a..96b0d9cf 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -1,507 +1,516 @@
-<template>
-	<view>
-		<uni-popup ref="popup" @change="change" :mask-click="false">
-			<view class="popup_box">
-				<view class="pop_title uni-flex space-between">
-					<view class="" style="font-size: 35rpx;">
-						扫描{{title}}
-					</view>
-
-					<view class="">
-						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
-							@click="closeScanPopup()"></image>
-					</view>
-				</view>
-				<view class="uni-flex uni-row" style="align-items: center;
-					background-color: #fff; 
-					margin-left: 20rpx;
-					margin-right: 20rpx;
-					border-radius: 8rpx;
-					height: 30px;">
-					<view class="uni-center" style="width: 25%; ">
-						来源库位
-					</view>
-					<!-- style="width: 75%;padding: 8rpx" -->
-					<view class="">
-						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
-							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
-
-						<view v-if='allowModifyLocation'>
-							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
-								@confirm="" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
-						</view>
-						<view v-else>
-							<text style="padding: 5px">
-								{{fromLocationCode}}
-							</text>
-						</view>
-					</view>
-				</view>
-				<view class="">
-					<view class="">
-						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
-							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
-		<!-- 模拟扫描功能 -->
-		<win-com-scan v-show="false" ref="comscansimulate"  @getResult="getScanResult" :headerType="headerType" :isShowHistory="false" :clearResult="true"></win-com-scan>
-		
-	</view>
-	<comMessage ref="comMessage"></comMessage>
-</template>
-
-<script>
-	import winComScan from '@/mycomponents/scan/winComScan.vue'
-	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
-	import {
-		getBalanceByManagementPrecision,
-	} from '@/common/balance.js';
-
-	import {
-		getBasicLocationByCode,
-	} from '@/api/request2.js';
-
-	import {
-		getListLocationAreaTypeDesc,
-		checkDirectoryItemExist,
-		getDirectoryItemArray,
-		getLocationAreaTypeName,
-		getInventoryStatusDesc
-	} from '@/common/directory.js';
-	export default {
-		name: 'winScanPack',
-		emits: ["getResult", "close", "getCountScanResult"],
-		components: {
-			winComScan,
-			balanceSelect
-		},
-		props: {
-			title: {
-				type: String,
-				default: '箱标签'
-			},
-			isShowHistory: {
-				type: Boolean,
-				default: true
-			},
-			allowNullBalance: {
-				type: Boolean,
-				default: false
-			},
-			//不提示库存错误
-			noShowBalanceMessage: {
-				type: Boolean,
-				default: false
-			},
-			//是否允许修改库位
-			allowModifyLocation: {
-				type: Boolean,
-				default: true
-			},
-			headerType: {
-				type: String,
-				default: "HPQ,HMQ"
-			},
-			queryBalance: {
-				type: Boolean,
-				default: true
-			},
-			balanceFromInventoryStatuses:{//是否传fromInventoryStatuses
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				scanResult: {},
-				show: false,
-				scanList: [],
-				expand: false,
-				showScanResult: {},
-				expendIcon: 'arrow-down',
-				fromLocationCode: '',
-				fromLocation: '',
-				fromLocationList: [],
-				fromLocationAreaTypeList: [],
-				locationOnFocus: false,
-				businessType: {},
-				inventoryStatus: [],
-				managementPrecision: '',
-				fromInventoryStatuses: "",
-				isCheck: false
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//直接扫描
-			openScanPopupForType(fromLocationCode, businessType) {
-				this.businessType = businessType;
-				this.fromLocationCode = fromLocationCode;
-				if (fromLocationCode != '') {
-					this.packGetFocus();
-				} else {
-					this.locationGetFocus();
-				}
-				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) 
-				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
-				}, 500)
-			},
-
-			//在任务中扫描
-			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
-				this.fromLocationCode = fromLocationCode;
-				this.fromLocationList = fromLocationList;
-				if (fromLocationCode != '') {
-					this.packGetFocus();
-				} else {
-					if (this.fromLocationList.length == 0) {
-						this.locationGetFocus();
-					} else {
-						this.fromLocationCode = this.fromLocationList[0];
-					}
-				}
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
-				}, 500)
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
-			},
-			//模拟扫描
-			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent,item) {
-				this.fromLocationCode = fromLocationCode;
-				this.fromLocationList = fromLocationList;
-				if (fromLocationCode != '') {
-					// this.packGetFocus();
-					if (this.$refs.comscansimulate != undefined) {
-						this.$refs.comscansimulate.getfocus();
-					}
-					
-				} else {
-					if (this.fromLocationList.length == 0) {
-						// this.locationGetFocus();
-						alert('没有来源库位：List')
-					} else {
-						this.fromLocationCode = this.fromLocationList[0];
-					}
-				}
-				
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
-				 let timer = setTimeout(res => {
-					 if(timer){
-						 clearTimeout(timer)
-					 }
-					 this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
-					 this.$refs.comscansimulate.clickScanMsg();
-				}, 500)
-				
-				
-			},
-
-			closeScanPopup(content) {
-				this.$refs.popup.close();
-				this.$emit("close", '');
-			},
-
-
-			scanLocation(scanResult) {
-				var isCheck = false;
-				if (this.fromLocationCode == '') {
-					this.showErrorMessage('来源库位不能为空', callback => {
-						this.locationGetFocus();
-					})
-					return;
-				}
-
-				if (this.fromLocationList.length > 0) {
-					if (!this.isInLocationList(this.fromLocationCode)) {
-						this.showErrorMessage("扫描库位【" + this.fromLocationCode + '】不在任务来源库位中', callback => {
-							this.locationGetFocus();
-						})
-						return;
-					}
-				}
-
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				});
-				getBasicLocationByCode(this.fromLocationCode).then(res => {
-					uni.hideLoading();
-					if (res.data.total > 0) {
-						let result = res.data.list[0];
-						var type = result.areaType;
-						var available = result.available;
-						if (available == "TRUE") {
-							if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) {
-								this.location = result;
-								// this.packGetFocus();
-								this.checkPackage(scanResult);
-							} else {
-								var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList);
-								this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]是[" +
-									getLocationAreaTypeName(result.areaType) + "],需要的库区是[" + hint + "]")
-							}
-						} else {
-							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {
-								this.locationGetFocus();
-							})
-						}
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']', res => {
-							this.locationGetFocus();
-						})
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					this.showErrorMessage(error, res => {
-						this.locationGetFocus();
-					})
-				})
-			},
-
-			getScanResult(result) {
-				// console.log("扫描", result)
-				// if (this.fromLocationCode == '' || this.fromLocationCode == null) {
-				// 	this.showMessage('请先扫描来源库位', callback => {
-				// 		this.locationGetFocus();
-				// 	})
-				// 	return;
-				// } else
-				this.scanLocation(result);
-				// debugger
-				// if(this.isCheck){
-				// 	this.checkPackage(result);
-				// }
-			},
-
-			checkPackage(result) {
-				if (result.label != null) {
-					this.scanResult = result;
-					if (this.queryBalance == true) {
-						// uni.showLoading({
-						// 	title: '查询中...',
-						// 	mask: true
-						// })
-						// 采购上架任务--大哥让去掉 fromInventoryStatuses
-						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
-							res => {
-								uni.hideLoading();
-								if (res.success) {
-									this.managementPrecision = res.managementPrecision
-									this.afterQueryBalance(res.data.list);
-								} else {
-									this.showErrorMessage(res.message, res => {
-										this.packGetFocus();
-									})
-								}
-								// uni.hideLoading();
-							});
-					} else {
-						this.packCallBack(null);
-					}
-				}
-			},
-
-
-			afterQueryBalance(datas) {
-				if (this.allowNullBalance) {
-					this.allowNoneBalance(datas);
-				} else if (this.noShowBalanceMessage) {
-					if(Array.isArray(datas)){
-						this.countCallBack(datas[0]);
-					}else{
-						this.countCallBack(datas);
-					}
-				} else {
-					this.mustHavaBalance(datas);
-				}
-				uni.hideLoading();
-			},
-
-			//允许无库存
-			allowNoneBalance(datas) {
-				if (datas.length == 0) {
-					this.packCallBack(null);
-				} else {
-					this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],已经查找到该包装的库存记录,请重新扫描', res => {
-						this.packGetFocus();
-					})
-				}
-			},
-
-			//必须有库存
-			mustHavaBalance(datas) {
-				if (datas.length == 0) {
-					this.showErrorMessage(this.getQueryCondition() + '<br>未查找到库存记录', res => {
-						this.packGetFocus();
-					})
-				} else if (datas.length == 1) {
-					let balance = datas[0];
-					this.packCallBack(balance);
-
-					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
-
-					// if (balance.qty > 0) {
-					// 	this.packCallBack(balance);
-					// } else {
-					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
-					// 		res => {
-					// 			this.packGetFocus();
-					// 		})
-					// }
-				} else {
-					this.showBalanceSelect(datas);
-				}
-			},
-
-			showBalanceSelect(items) {
-				this.$refs.balanceSelect.openPopup(items);
-			},
-
-			selectBalanceItem(balance) {
-				this.packCallBack(balance);
-				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
-				// if (balance.qty > 0) {
-				// 	this.packCallBack(balance);
-				// } else {
-				// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
-				// 		res => {
-				// 			this.packGetFocus();
-				// 		})
-				// }
-			},
-
-			//盘点回调
-			countCallBack(datas) {
-				if(this.$refs.comscan){
-					this.$refs.comscan.clear();
-				}
-				//返回标签信息、库存信息和管理模式
-				let data = {
-					label: this.scanResult.label,
-					package: this.scanResult.package,
-					balance: datas,
-					fromLocationCode: this.fromLocationCode,
-				}
-				this.packGetFocus();
-				this.$emit("getResult", data);
-				this.$emit("getCountScanResult", data);
-			},
-
-			packCallBack(item) {
-				if(this.$refs.comscan){
-					this.$refs.comscan.clear();
-				}
-				//返回标签信息、库存信息和管理模式
-				let data = {
-					label: this.scanResult.label,
-					package: this.scanResult.package,
-					balance: item,
-					fromLocationCode: this.fromLocationCode,
-				}
-				this.packGetFocus();
-				this.$emit("getResult", data);
-			},
-
-			packGetFocus() {
-				if (this.$refs.comscan != undefined) {
-					this.$refs.comscan.getfocus();
-				}
-			},
-
-			packLoseFocus() {
-				if (this.$refs.comscan != undefined) {
-					this.$refs.comscan.losefocus();
-				}
-			},
-
-			locationGetFocus() {
-				this.fromLocationCode = '';
-				this.locationOnFocus = true;
-			},
-
-			getQueryCondition() {
-				let condition = '按照以下条件:<br>';
-				let label = this.scanResult.label;
-				let status = getInventoryStatusDesc(this.inventoryStatus);
-				switch (this.managementPrecision) {
-					case 'BY_PACKAGING':
-						condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber +
-							']<br>批次=[' +
-							label.batch +
-							']<br>库位=[' + this.fromLocationCode + ']'
-
-						break;
-					case 'BY_BATCH':
-						condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' +
-							label.batch +
-							']<br>库位=[' + this.fromLocationCode + ']'
-						break;
-					case 'BY_QUANTITY':
-						condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']'
-						break;
-					case 'BY_UNIQUEID':
-						condition = condition + '物料号=[' + label.itemCode + ']'
-						break;
-				}
-				if (this.inventoryStatus.length > 0) {
-					condition = condition + '<br>库存状态=[' + status + ']'
-				}
-				return condition;
-			},
-
-
-			showMessage(message, callback) {
-				setTimeout(r => {
-					this.packLoseFocus();
-					this.$refs.comMessage.showMessage(message, callback);
-				})
-			},
-
-			showErrorMessage(message, callback) {
-				setTimeout(r => {
-					this.packLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, callback)
-				})
-			},
-
-			change(e) {
-				this.show = e.show
-			},
-			isInLocationList(location) {
-
-				var item = this.fromLocationList.find(res => res == location)
-
-				if (item = undefined) {
-					return false
-				}
-				return true
-			},
-			addLocationCode(code) {
-				if (!this.isInLocationList(code)) {
-					this.fromLocationList.push(code)
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.scroll-view {
-		overflow-y: scroll;
-		height: auto;
-		max-height: 300rpx;
-	}
-</style>
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" :mask-click="false" >
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="uni-flex uni-row" style="align-items: center;
+					background-color: #fff; 
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+					border-radius: 8rpx;
+					height: 30px;">
+					<view class="uni-center" style="width: 25%; ">
+						来源库位
+					</view>
+					<!-- style="width: 75%;padding: 8rpx" -->
+					<view class="">
+						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
+							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
+
+						<view v-if='allowModifyLocation'>
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
+								@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
+						</view>
+						<view v-else>
+							<text style="padding: 5px">
+								{{fromLocationCode}}
+							</text>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<!-- 模拟扫描功能 -->
+		<win-com-scan v-show="false" ref="comscansimulate" @getResult="getScanResult" :headerType="headerType"
+			:isShowHistory="false" :clearResult="true"></win-com-scan>
+
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import {
+		getBalanceByManagementPrecision,
+	} from '@/common/balance.js';
+
+	import {
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getListLocationAreaTypeDesc,
+		checkDirectoryItemExist,
+		getDirectoryItemArray,
+		getLocationAreaTypeName,
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+	export default {
+		name: 'winScanPack',
+		emits: ["getResult", "close", "getCountScanResult", "confirm"],
+		components: {
+			winComScan,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			allowNullBalance: {
+				type: Boolean,
+				default: false
+			},
+			//不提示库存错误
+			noShowBalanceMessage: {
+				type: Boolean,
+				default: false
+			},
+			//是否允许修改库位
+			allowModifyLocation: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+			queryBalance: {
+				type: Boolean,
+				default: true
+			},
+			balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				scanResult: {},
+				show: false,
+				scanList: [],
+				expand: false,
+				showScanResult: {},
+				expendIcon: 'arrow-down',
+				fromLocationCode: '',
+				fromLocation: '',
+				fromLocationList: [],
+				fromLocationAreaTypeList: [],
+				locationOnFocus: false,
+				businessType: {},
+				inventoryStatus: [],
+				managementPrecision: '',
+				fromInventoryStatuses: "",
+				isCheck: false,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			
+			handleConfirm() {
+				this.$emit('confirm', this.fromLocationCode)
+			},
+			//直接扫描
+			openScanPopupForType(fromLocationCode, businessType) {
+
+				this.businessType = businessType;
+				this.fromLocationCode = fromLocationCode;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					this.locationGetFocus();
+				}
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
+				if (!this.show) {
+					setTimeout(res => {
+						this.$refs.popup.open('bottom')
+					}, 500)
+				}
+			},
+
+			//在任务中扫描
+			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
+				this.fromLocationCode = fromLocationCode;
+				this.fromLocationList = fromLocationList;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					if (this.fromLocationList.length == 0) {
+						this.locationGetFocus();
+					} else {
+						this.fromLocationCode = this.fromLocationList[0];
+					}
+				}
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+			},
+			//模拟扫描
+			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, item) {
+				this.fromLocationCode = fromLocationCode;
+				this.fromLocationList = fromLocationList;
+				if (fromLocationCode != '') {
+					// this.packGetFocus();
+					if (this.$refs.comscansimulate != undefined) {
+						this.$refs.comscansimulate.getfocus();
+					}
+
+				} else {
+					if (this.fromLocationList.length == 0) {
+						// this.locationGetFocus();
+						alert('没有来源库位：List')
+					} else {
+						this.fromLocationCode = this.fromLocationList[0];
+					}
+				}
+
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+				let timer = setTimeout(res => {
+					if (timer) {
+						clearTimeout(timer)
+					}
+					this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+					this.$refs.comscansimulate.clickScanMsg();
+				}, 500)
+
+
+			},
+
+			closeScanPopup(content) {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+
+			scanLocation(scanResult) {
+				var isCheck = false;
+				if (this.fromLocationCode == '') {
+					this.showErrorMessage('来源库位不能为空', callback => {
+						this.locationGetFocus();
+					})
+					return;
+				}
+
+				if (this.fromLocationList.length > 0) {
+					if (!this.isInLocationList(this.fromLocationCode)) {
+						this.showErrorMessage("扫描库位【" + this.fromLocationCode + '】不在任务来源库位中', callback => {
+							this.locationGetFocus();
+						})
+						return;
+					}
+				}
+
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				getBasicLocationByCode(this.fromLocationCode).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						let result = res.data.list[0];
+						var type = result.areaType;
+						var available = result.available;
+						if (available == "TRUE") {
+							if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) {
+								this.location = result;
+								// this.packGetFocus();
+								this.checkPackage(scanResult);
+							} else {
+								var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList);
+								this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]是[" +
+									getLocationAreaTypeName(result.areaType) + "],需要的库区是[" + hint + "]")
+							}
+						} else {
+							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {
+								this.locationGetFocus();
+							})
+						}
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']', res => {
+							this.locationGetFocus();
+						})
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, res => {
+						this.locationGetFocus();
+					})
+				})
+			},
+
+			getScanResult(result) {
+				// console.log("扫描", result)
+				// if (this.fromLocationCode == '' || this.fromLocationCode == null) {
+				// 	this.showMessage('请先扫描来源库位', callback => {
+				// 		this.locationGetFocus();
+				// 	})
+				// 	return;
+				// } else
+				this.scanLocation(result);
+				// debugger
+				// if(this.isCheck){
+				// 	this.checkPackage(result);
+				// }
+			},
+
+			checkPackage(result) {
+				if (result.label != null) {
+					this.scanResult = result;
+					if (this.queryBalance == true) {
+						// uni.showLoading({
+						// 	title: '查询中...',
+						// 	mask: true
+						// })
+						// 采购上架任务--大哥让去掉 fromInventoryStatuses
+						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this
+							.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined,
+							res => {
+								uni.hideLoading();
+								if (res.success) {
+									this.managementPrecision = res.managementPrecision
+									this.afterQueryBalance(res.data.list);
+								} else {
+									this.showErrorMessage(res.message, res => {
+										this.packGetFocus();
+									})
+								}
+								// uni.hideLoading();
+							});
+					} else {
+						this.packCallBack(null);
+					}
+				}
+			},
+
+
+			afterQueryBalance(datas) {
+				if (this.allowNullBalance) {
+					this.allowNoneBalance(datas);
+				} else if (this.noShowBalanceMessage) {
+					if (Array.isArray(datas)) {
+						this.countCallBack(datas[0]);
+					} else {
+						this.countCallBack(datas);
+					}
+				} else {
+					this.mustHavaBalance(datas);
+				}
+				uni.hideLoading();
+			},
+
+			//允许无库存
+			allowNoneBalance(datas) {
+				if (datas.length == 0) {
+					this.packCallBack(null);
+				} else {
+					this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],已经查找到该包装的库存记录,请重新扫描', res => {
+						this.packGetFocus();
+					})
+				}
+			},
+
+			//必须有库存
+			mustHavaBalance(datas) {
+				if (datas.length == 0) {
+					this.showErrorMessage(this.getQueryCondition() + '<br>未查找到库存记录', res => {
+						this.packGetFocus();
+					})
+				} else if (datas.length == 1) {
+					let balance = datas[0];
+					this.packCallBack(balance);
+
+					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+
+					// if (balance.qty > 0) {
+					// 	this.packCallBack(balance);
+					// } else {
+					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+					// 		res => {
+					// 			this.packGetFocus();
+					// 		})
+					// }
+				} else {
+					this.showBalanceSelect(datas);
+				}
+			},
+
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			selectBalanceItem(balance) {
+				this.packCallBack(balance);
+				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+				// if (balance.qty > 0) {
+				// 	this.packCallBack(balance);
+				// } else {
+				// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
+				// 		res => {
+				// 			this.packGetFocus();
+				// 		})
+				// }
+			},
+
+			//盘点回调
+			countCallBack(datas) {
+				if (this.$refs.comscan) {
+					this.$refs.comscan.clear();
+				}
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: datas,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getResult", data);
+				this.$emit("getCountScanResult", data);
+			},
+
+			packCallBack(item) {
+				if (this.$refs.comscan) {
+					this.$refs.comscan.clear();
+				}
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: item,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getResult", data);
+			},
+
+			packGetFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			packLoseFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			locationGetFocus() {
+				this.fromLocationCode = '';
+				this.locationOnFocus = true;
+			},
+
+			getQueryCondition() {
+				let condition = '按照以下条件:<br>';
+				let label = this.scanResult.label;
+				let status = getInventoryStatusDesc(this.inventoryStatus);
+				switch (this.managementPrecision) {
+					case 'BY_PACKAGING':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber +
+							']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+
+						break;
+					case 'BY_BATCH':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_QUANTITY':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_UNIQUEID':
+						condition = condition + '物料号=[' + label.itemCode + ']'
+						break;
+				}
+				if (this.inventoryStatus.length > 0) {
+					condition = condition + '<br>库存状态=[' + status + ']'
+				}
+				return condition;
+			},
+
+
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback)
+				})
+			},
+
+			change(e) {
+				this.show = e.show
+			},
+			isInLocationList(location) {
+
+				var item = this.fromLocationList.find(res => res == location)
+
+				if (item = undefined) {
+					return false
+				}
+				return true
+			},
+			addLocationCode(code) {
+				if (!this.isInLocationList(code)) {
+					this.fromLocationList.push(code)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index b066203f..228b3757 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -60,8 +60,8 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
-		</win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="true" @confirm="handleConfirm">
+		</win-scan-pack-and-location >
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
@@ -139,7 +139,7 @@
 				itemCode: ""
 			};
 		},
-		onLoad(option) {
+		onShow(){
 			var typeCode = "OverPackage"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -209,7 +209,10 @@
 				this.toPackQty = pack.packQty;
 				this.toPackUnitShow = e[0].label
 			},
-
+			//修改库位
+			handleConfirm(fromLocationCode){
+				this.$refs.scanLocationCode.openScanPopupSimulate(fromLocationCode)
+			},
 			getScanResult(result) {
 				let balance = result.balance;
 				let label = result.label;
@@ -289,7 +292,13 @@
 			},
 			showFromLocationPopup() {
 				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
+					let overPackageRecord = uni.getStorageSync('overPackageRecord')
+					
+					if(overPackageRecord){
+						this.$refs.scanLocationCode.openScanPopupSimulate(overPackageRecord)
+					}else{
+						this.$refs.scanLocationCode.openScanPopup();
+					}
 				})
 
 			},
@@ -429,6 +438,9 @@
 				this.scanPopupGetFocus();
 			},
 			getLocation(location, code) {
+				if(code){
+					uni.setStorageSync('overPackageRecord', code)
+				}
 				this.getFromLocationCode(location, code)
 			},
 			getFromLocationCode(location, code) {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 06a8cb07..509c9484 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -118,6 +118,7 @@ const user = {
 					commit('SET_ID',[])
 					storage.removeStorage(storage.constant.token)
 					storage.clearStorage()
+					uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
 					resolve()
 				}).catch(error => {
 					reject(error)