diff --git a/src/api/request2.js b/src/api/request2.js
index bff958ec..cc88d8d6 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -296,6 +296,32 @@ export function getBalanceByLocationcode(params) {
 	});
 }
 
+/**
+ * 按库位查询 预计入
+ * @param {*} 
+ */
+export function getExpectInByLocationCode(params) {
+
+	return request({
+		url: baseApi + "/wms/expectin/senior",
+		method: "post",
+		data: params,
+	});
+}
+
+/**
+ * 按库位查询 预计出
+ * @param {*} 
+ */
+export function getExpectOutByLocationCode(params) {
+
+	return request({
+		url: baseApi + "/wms/expectout/senior",
+		method: "post",
+		data: params,
+	});
+}
+
 /**
  * 查询器具信息接口
  * @param {*} number  器具代码
@@ -4169,3 +4195,15 @@ export  function getJimuPutawayJobDetail(data) {
 		data:data
 	});
 }
+
+/**
+ * 查询库位，后台自己查询管理模式
+ * @param {*}  
+ */
+export  function getBalanceByParams(data) {
+	return  request({
+		url: baseApi + "/wms/balance/getBalanceListByPackage",
+		method: "post",
+		data:data
+	});
+}
diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
index 15589b5b..931f3adc 100644
--- a/src/mycomponents/balance/balanceSelect.vue
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -3,10 +3,10 @@
 	<!-- <page-meta root-font-size="18px"></page-meta> -->
 	<uni-popup ref="popupItems" type="center">
 		<scroll-view scroll-y="true" style="background-color: #EEEEEE;height: 90vh;">
-			<item :dataContent="balanceItems[0]"></item>
+			<item style="margin: 10rpx;" :dataContent="balanceItems[0]"></item>
 			<view class="popinpop count_shadow" style="width: 90vw;margin: 20rpx 20rpx 30rpx 20rpx;"
 				v-for="(item, index) in balanceItems" :key="item.id" @click="callback(item)">
-				<balance :dataContent="item"></balance>
+				<balance :dataContent="item" :isShowStatus ="false"></balance>
 			</view>
 		</scroll-view>
 	</uni-popup>
diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
index d5956aa4..9a730b5c 100644
--- a/src/mycomponents/balance/location.vue
+++ b/src/mycomponents/balance/location.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="card_view ">
 		<text class="card_location card_content ">{{title}}</text>
-		<text class="card_content ">{{locationCode}}</text>
+		<text class="card_content " style="font-size: 37rpx;">{{locationCode}}</text>
 	</view>
 </template>
 
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 409e1cc9..12066256 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -6,7 +6,7 @@
 			<view class="tab_info">
 				<view class="conbox">
 					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
-						:focus="boxfocus" :placeholder="placeholderValue" @focus="getfocus" @blur="losefocus"
+						:focus="boxfocus" :placeholder="placeholderValue" 
 						@input="handelScanMsg" :cursor="cursorIndex" ></textarea>
 				</view>
 
@@ -225,6 +225,7 @@
 			getfocus() {
 				let that = this;
 				this.$nextTick(r => {
+					console.log("获取焦点")
 					that.boxfocus = true;
 				});
 				// this.hide()
@@ -232,7 +233,9 @@
 			losefocus() {
 				let that = this;
 				this.$nextTick(r => {
+					console.log("失去焦点")
 					that.boxfocus = false;
+					uni.hideKeyboard();
 				});
 			},
 			clear() {
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
new file mode 100644
index 00000000..7a3e012d
--- /dev/null
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -0,0 +1,227 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :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="">
+					<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>
+		<!-- 模拟扫描功能 -->
+
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import {
+		getBalanceByManagementPrecisionByPacking,
+	} from '@/common/balance.js';
+
+	import {
+		getBalanceByParams,
+		getBasicItemByCode
+	} from '@/api/request2.js';
+
+	import {
+		getListLocationAreaTypeDesc,
+		checkDirectoryItemExist,
+		getDirectoryItemArray,
+		getLocationAreaTypeName,
+		getInventoryStatusDesc,
+		getListItemTypeDesc,
+		getItemTypeInfo
+	} from '@/common/directory.js';
+	export default {
+		name: 'winScanPack',
+		emits: ["getBalance"],
+		components: {
+			winComScan,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: false
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+			balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
+				type: Boolean,
+				default: true
+			},
+			bussinessCode:{
+				type: String,
+				default: ''
+			}
+			
+			
+		},
+		data() {
+			return {
+				scanResult: {},
+				show: false,
+				scanList: [],
+				expand: false,
+				showScanResult: {},
+				expendIcon: 'arrow-down',
+				fromLocationCode: '',
+				fromLocation: '',
+				fromLocationList: [],
+				fromLocationAreaTypeList: [],
+				locationOnFocus: false,
+				businessType: {},
+				inventoryStatus: [],
+				managementPrecision: '',
+				fromInventoryStatuses: [],
+				itemTypesList: [],
+				isCheck: false,
+				resultData: {}
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup(businessType) {
+				this.businessType = businessType
+				this.fromInventoryStatuses = getDirectoryItemArray(businessType.outInventoryStatuses)
+				this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes)
+				this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
+				this.$refs.popup.open('bottom')
+
+			},
+
+			 getScanResult(result) {
+				this.resultData = result;
+				if(!result.package){
+					this.showErrorMessage(result.label.code+"包装信息为空")
+					return;
+				}
+				this.getItemCodeType(result.package.itemCode,callBack=>{
+					this.queryBalance(this.resultData)
+				})
+			},
+
+			queryBalance(result) {
+				var params = {
+					itemCode: result.package.itemCode,
+					batch: result.label.batch,
+					packingNumber: result.label.packingNumber,
+					inventoryStatus: this.fromInventoryStatuses,
+					areaType: this.fromLocationAreaTypeList,
+					bussinessCode:this.bussinessCode
+				}
+				getBalanceByParams(params).then(res => {
+					uni.hideLoading()
+					if (res.data.length == 0) {
+						var status = getInventoryStatusDesc(params.inventoryStatus)
+						var areaType = getListLocationAreaTypeDesc(params.areaType)
+						var hint =
+							"按物料号 [" + params.itemCode + "] <br>" +
+							"包装号 [" + params.packingNumber + "] <br>" +
+							"批次 [" + params.batch + "] <br>" +
+							"状态 [" + status + "] <br>" +
+							"库区 [" + areaType + "] <br>" +
+							"未查找到库存余额"
+						this.showErrorMessage(hint)
+					} else if (res.data.length == 1) {
+						result.balance = res.data[0]
+						this.$emit("getBalance", result)
+						this.closeScanPopup()
+					} else {
+						//多条记录
+						this.$refs.balanceSelect.openPopup(res.data);
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			getItemCodeType(itemCode,callBack) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				getBasicItemByCode(itemCode).then(res => {
+					if (res.data != null && res.data.list.length > 0) {
+						var result = res.data.list[0];
+						var status = result.status;
+						var type = result.type;
+						if (status == "ENABLE") {
+							if (checkDirectoryItemExist(this.itemTypesList, type)) {
+								callBack()
+							} else {
+								var hint = getListItemTypeDesc(this.itemTypesList);
+								uni.hideLoading()
+								this.showErrorMessage("扫描物料[" + itemCode + "]是[" +
+									getItemTypeInfo(type).label + "],需要的物料类型是[" + hint + "]")
+							}
+						} else {
+							uni.hideLoading()
+							this.showErrorMessage('物料【' + itemCode + '】不可用');
+						}
+					} else {
+						uni.hideLoading()
+						this.showErrorMessage('未查找到物料【' + itemCode + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error)
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if(this.$refs.comscan){
+							this.$refs.comscan.getfocus()
+						}
+					}
+				});
+			},
+			selectBalanceItem(item) {
+				this.resultData.balance = item
+				this.$emit("getBalance", this.resultData)
+				this.closeScanPopup()
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			}
+
+
+
+
+		}
+	}
+</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/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index a43cc3be..66531474 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -13,7 +13,7 @@
 			<view class="">
 				<view class="">
 					<win-com-scan ref="scan"  @getResult="getScanResult" :placeholder='title' :clearResult="true"
-						:boxFocus="true" :isShowHistory="isShowHistory" headerType="">
+						 :isShowHistory="isShowHistory" headerType="">
 					</win-com-scan>
 				</view>
 			</view>
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 55b5397e..d3063f05 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -18,7 +18,7 @@
 					margin-right: 20rpx;
 					border-radius: 8rpx;
 					height: 30px;">
-					<view class="uni-center" style="width: 25%; ">
+					<view class="uni-center" style="width: 25%; font-size: 35rpx;">
 						来源库位
 					</view>
 					<!-- style="width: 75%;padding: 8rpx" -->
@@ -31,7 +31,7 @@
 								@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
 						</view>
 						<view v-else>
-							<text style="padding: 5px">
+							<text style="padding: 5px;font-size: 40rpx;">
 								{{fromLocationCode}}
 							</text>
 						</view>
@@ -160,7 +160,7 @@
 				}
 				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
+				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.outAreaTypes); //出库库区
 				if (!this.show) {
 					setTimeout(res => {
 						this.$refs.popup.open('bottom')
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
index e0b66aad..47cba583 100644
--- a/src/mycomponents/scan/winScanPackJob.vue
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -70,11 +70,11 @@
 		methods: {
 			// 弹出
 			openScanPopup(){
-				
 				this.$refs.popup.open('bottom')
 			},
 			// 关闭
 			closeScanPopup(content) {
+				this.$refs.comscan.losefocus()
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/pages.json b/src/pages.json
index 8b9fd09c..2a6381f9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -69,7 +69,7 @@
 			"path": "pages/query/location",
 			"style": {
 				"navigationBarTitleText": "按库位查询库存",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"titleNView": {
 					"autoBackButton": "true",
 					"buttons": [{}]
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index 7d2fdafb..9b45c358 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -10,6 +10,7 @@
 				<view class="uni-flex uni-row">
 					<compareQty :dataContent="dataContent" :recommendQty="dataContent.recommendQty"
 					:handleQty="dataContent.handleQty"
+					:isShowRecommendQty ="isShowRecommendQty"
 					> </compareQty>
 					
 				</view>
@@ -71,6 +72,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
+			}
 		},
 		methods: {
 			edit(){
diff --git a/src/pages/count/coms/comCountJobCard.vue b/src/pages/count/coms/comCountJobCard.vue
index 64e5abe5..30ea3de0 100644
--- a/src/pages/count/coms/comCountJobCard.vue
+++ b/src/pages/count/coms/comCountJobCard.vue
@@ -3,7 +3,7 @@
 
 	<!-- 	<jobComMainDetailCard :dataContent="dataContent">
 		</jobComMainDetailCard> -->
-		<to-location  title="盘点库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
+		<to-location style="margin-left: 20rpx;"  title="盘点库位" :locationCode="dataContent.countSplitCode">
 		</to-location>
 		<view class="" style="margin-left: 40rpx; font-size: 32rpx; font-weight: bold;">
 			阶段 : {{getCountStageName(dataContent.stage)}}
diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
index 5b8e0783..d2870e6b 100644
--- a/src/pages/count/job/countBlindDetail.vue
+++ b/src/pages/count/job/countBlindDetail.vue
@@ -40,6 +40,7 @@
 								</view>
 								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
 									@editItem="editItem" :settingParam="jobContent" @remove="updateData"
+									:isShowRecommendQty ="false"
 									@updateData="updateData">
 								</comCountDetailcards>
 							</view>
@@ -66,7 +67,9 @@
 
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="false"  @getResult='getScanResult'>
+		<win-scan-pack-and-location 
+		 :allowModifyLocation="false"
+		 ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true"  @getResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
 			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
@@ -242,15 +245,15 @@
 					} else {
 						that.jobContent = res.data;
 						that.jobStatus = res.data.status;
-						that.fromLocationCode = that.jobContent.locationCode;
-						// res.data.subList.forEach(item => {
-						// 	item.recommendQty = item.qty
-						// 	item.handleQty = 0
-						// 	item.countTime = new Date()
-						// 	item.fromLocationCode =that.fromLocationCode;
-						// })
-						// that.allDetails = res.data.subList;
-						// that.allCount = res.data.subList.length;
+						that.fromLocationCode = that.jobContent.countSplitCode;
+						res.data.subList.forEach(item => {
+							item.recommendQty = item.qty
+							item.handleQty = 0
+							item.countTime = new Date()
+							item.fromLocationCode =that.fromLocationCode;
+						})
+						that.allDetails = res.data.subList;
+						that.allCount = res.data.subList.length;
 						that.initList()
 					}
 
@@ -335,9 +338,9 @@
 				var packingNumber = result.label.packingNumber
 				var pack = result.package
 				var batch = result.label.batch
-				var inventoryStatus =  "OK"
-				var qty = result.label.qty ? result.label.qty : 0;
-
+				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
+				var qty = result.balance ? result.balance.qty : 0;
+			
 				//按物料、箱码、批次、状态匹配
 				let items = this.allDetails.filter(r =>
 					r.itemCode === itemCode &&
@@ -346,13 +349,21 @@
 					r.inventoryStatus === inventoryStatus)
 				//不在任务列表中,是否添加库存
 				if (items.length == 0) {
-						var detail = this.createAddDetailInfo(pack,qty)
-						detail.countTime = new Date();
-						this.allDetails.push(detail)
-						this.updateList();
-						this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
-							null);
-						
+					this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
+						"】不在任务列表中,是否要添加到列表中?",
+						res => {
+							//创建盘点信息，标记为已经扫描
+							if (res) {
+								var detail = this.createAddDetailInfo(pack,qty)
+								detail.countTime = new Date();
+								this.allDetails.push(detail)
+								this.updateList();
+								this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+									null);
+							} else {
+								this.scanPopupGetFocus();
+							}
+						})
 				} else {
 					var selectItem = items[0]
 					//已经扫描
@@ -368,15 +379,15 @@
 									this.scanPopupGetFocus();
 								}
 							})
-
+			
 					} else {
 						//未扫描，赋值
 						selectItem.scaned = true;
-						selectItem.recommendQty =Number(qty);
+						selectItem.balanceQty= Number(qty)
 						selectItem.handleQty = Number(qty)
 						selectItem.packQty = pack.packQty
 						selectItem.packUnit = pack.packUnit
-
+			
 						this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
 							null);
 						selectItem.countTime = new Date();
@@ -424,7 +435,7 @@
 			//创建盘盈的明细
 			createAddDetailInfo(pack,qty) {
 				var detail = {
-					id: this.jobContent.masterId, //新增的明细
+					masterId: this.jobContent.id, //新增的明细
 					scaned: true,
 					countDetailNumber: "",
 					ownerCode: "",
@@ -448,6 +459,7 @@
 					countQty: 0,
 					balanceQty: 0,
 					fromLocationCode: this.fromLocationCode,
+					locationCode:this.fromLocationCode,
 					creator: this.$store.state.user.id,
 					countTime: new Date()
 				}
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 3f6a1ed4..85f35df4 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -152,6 +152,11 @@
 					action: "in",
 					value: this.status
 				})
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
 				
 				// filters.push({
 				// 	column: "accept_user_id",
@@ -195,20 +200,20 @@
 			},
 
 			openJobDetail(item) {
-				uni.navigateTo({
-					url: './countDetail?id=' + item.id + '&status=' + item.status
-				});
-				// //明盘
-				// if(item.isOpenCount=="TRUE"){
-				// 	uni.navigateTo({
-				// 		url: './countLightDetail?id=' + item.id + '&status=' + item.status
-				// 	});
-				// }else {
-				// 	//盲盘
-				// 	uni.navigateTo({
-				// 		url: './countBlindDetail?id=' + item.id + '&status=' + item.status
-				// 	});
-				// }
+				// uni.navigateTo({
+				// 	url: './countDetail?id=' + item.id + '&status=' + item.status
+				// });
+				//明盘
+				if(item.isOpenCount=="TRUE"){
+					uni.navigateTo({
+						url: './countLightDetail?id=' + item.id + '&status=' + item.status
+					});
+				}else {
+					//盲盘
+					uni.navigateTo({
+						url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+					});
+				}
 			},
 
 			showItemList(itemList) {
@@ -293,6 +298,12 @@
 					action: "==",
 					value: code
 				})
+				
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
 			
 				var params = {
 					filters: filters,
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 51f1b74d..a0edefd5 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -68,7 +68,9 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" @getCountScanResult='getScanResult'>
+		<win-scan-pack-and-location
+		 :allowModifyLocation="false"
+		 ref="scanPopup" :noShowBalanceMessage="true" @getCountScanResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
 			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
@@ -244,7 +246,7 @@
 					} else {
 						that.jobContent = res.data;
 						that.jobStatus = res.data.status;
-						that.fromLocationCode = that.jobContent.locationCode;
+						that.fromLocationCode = that.jobContent.countSplitCode;
 						res.data.subList.forEach(item => {
 							item.recommendQty = item.qty
 							item.handleQty = 0
@@ -434,7 +436,7 @@
 			//创建盘盈的明细
 			createAddDetailInfo(pack,qty) {
 				var detail = {
-					id: this.jobContent.masterId, //新增的明细
+					masterId: this.jobContent.id, //新增的明细
 					scaned: true,
 					countDetailNumber: "",
 					ownerCode: "",
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index 2b30bafa..c0e522eb 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -342,7 +342,7 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index d3ba15bc..128d1822 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -387,7 +387,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index f2b15e7a..2d902071 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -41,12 +41,12 @@
 						margin-right: 20rpx;
 						margin-top: 8rpx;
 						border-radius: 8rpx;">
-						<view class="uni-center" style="width: 25%; ">
+						<view class="uni-center" style="width: 25%; font-size: 35rpx; ">
 							来源库位
 						</view>
 						<view class="" style="width: 75%; padding: 8rpx;">
-							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
-								@confirm="fromLocationUpdate"></uni-combox>
+							<uni-combox class="my-combox"   :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate" :inputStyle="inputStyleObject"></uni-combox>
 						</view>
 					</view>
 
@@ -113,7 +113,8 @@
 		getDetailEditRemoveOption
 	} from '@/common/array.js';
 	import {
-		getWorkShopLineStation
+		getWorkShopLineStation,
+		getBalanceByFilter
 	} from '@/api/request2.js';
 
 	import {
@@ -161,7 +162,10 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				defaultValueList: [],
 				fromInventoryStatuses: "",
 				packageInfo: {},
-				label: {}
+				label: {},
+				inputStyleObject:{
+					fontSize: "100rpx"
+				}
 			}
 		},
 		created() {
@@ -215,7 +219,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)  
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses 
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();
@@ -250,6 +254,192 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
 				}
 			},
+			
+			onScanResult(result){
+				try {
+					let that = this;
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+				
+						this.getBalance(result.label, packageInfo, balances => {
+							this.packageInfo =packageInfo;
+							//扫描的是外包装
+							let s = '';
+							if (!result.package.parentNumber) {
+								if (balances.list.length == 0) {
+									this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+								} else {
+									let newBalances = balances.list.filter(b => b.locationCode == that
+										.fromLocationCode);
+									if (newBalances.length == 0) {
+										this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+									} else if (newBalances.length == 1) {
+										let balance = newBalances[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(newBalances);
+									}
+								}
+							} else {
+								//扫描的是小包装
+								if (balances.list.length == 0) {
+									this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+								} else {
+									//小包装库存
+									let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo
+										.number)
+									//外包装库存
+									let subParentPackitems = balances.list.filter(r => r.packingNumber ==
+										packageInfo
+										.parentNumber&&r.locationCode==this.fromLocationCode)
+				
+				
+									//小包装没有库存，
+									if (subPackitems.length == 0) {
+										//外包装有库存，出库后剩余库存未转换为出库包装规格
+										
+										if (subParentPackitems.length > 0) {
+											if(subParentPackitems.length==1){
+												let balance = subParentPackitems[0];
+												balance.qty=packageInfo.qty;
+												this.afterGetBalance(result.label, balance, packageInfo);
+											}else {
+												this.showBalanceSelect(subParentPackitems);
+											}
+											
+										} else {
+											this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' +
+												packageInfo.number + '】都未查找到库存余额')
+										}
+									} else {
+										var locationCode = this.fromLocationCode
+										if(balances.list==1){
+											 locationCode=balances.list[0].locationCode
+										}else {
+											var manyBlances = balances.list.filter(r=>r.locationCode!=this.fromLocationCode)
+											if(manyBlances.length>0){
+												locationCode = manyBlances[0].locationCode;
+											}
+											
+										}
+										this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' + 
+											locationCode +
+											'】已经有库存余额,请重新扫描')
+									}
+				
+				
+				
+									// //小包装没有库存，外包装有库存
+									// if (subitems.length == 0 && subParentPackitems.length > 0) {
+									// 	this.afterGetBalance(result.label, null, packageInfo);
+									// } else if (subitems.length > 0 && subParentPackitems.length == 0) {
+									// 	//小包装没有库存，外包装没有有库存
+									// 	this.showErrorMessage('该包装在库位【' + balances.list[0].locationCode +
+									// 		'】已经有库存余额,请重新扫描')
+									// } else {
+				
+									// }
+				
+								}
+							}
+							uni.hideLoading();
+						});
+				
+				
+						// getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+						// 	balanceRes => {
+						// 		if (balanceRes.success) {
+						// 			let s = '';
+						// 			if (balanceRes.data.list.length == 0) {
+						// 				this.afterGetBalance(result.label, null, packageInfo);
+						// 			} else if (balanceRes.data.list.length == 1) {
+						// 				let balance = balanceRes.data.list[0];
+						// 				this.afterGetBalance(result.label, balance, packageInfo);
+						// 			} else {
+						// 				this.showBalanceSelect(balanceRes.data.list);
+						// 			}
+						// 		} else {
+						// 			this.showErrorMessage(balanceRes.message.message);
+						// 		}
+						// 		uni.hideLoading();
+						// 	});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+			
+			getBalance(label, packageInfo, callback) {
+				var filters = []
+			
+				if (packageInfo.parentNumber) {
+					var packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
+					})
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: label.packingNumber
+					})
+				}
+			
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: label.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: label.batch
+				})
+			
+				if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") {
+					filters.push({
+						column: "inventoryStatus",
+						action: "in",
+						value: this.fromInventoryStatuses
+					})
+				}
+			
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					callback(res.data)
+				}).catch(err => {
+					this.showErrorMessage(err.message);
+				})
+			},
 
 
 			onScan(result) {
@@ -267,7 +457,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 					}
 				}
 			},
-			onScanResult(result) {
+			onScanResult1(result) {
 				try {
 					let that = this;
 					if (that.fromLocationCode == '') {
@@ -324,7 +514,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 			},
 
 			selectBalanceItem(balance) {
-				this.afterGetBalance(this.label, balance, this.packageInfo);
+				this.afterGetBalance(this.label, balance,this.packageInfo);
 			},
 
 			afterGetBalance(label, balance, packageInfo) {
@@ -432,6 +622,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 					scaned: true,
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
+					parentPackingNumber: packageInfo.parentNumber,
 					batch: label.batch,
 					qty: Number(balance.qty),
 					// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
@@ -585,4 +776,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 		max-height: 300rpx;
 		padding: 10rpx;
 	}
+	.my-combox{
+		font-size: 50px;
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 176fa4f8..e8719ce2 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -367,6 +367,8 @@
 													.packingNumber;
 												record.toBatch = info.batch;
 											}
+											record.fromParentPackingNumber = r
+												.parentPackingNumber;
 											subItem.recordList.push(record);
 										})
 										subList.push(deepCopyData(subItem));
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 1bcb962f..a63dc45a 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -16,10 +16,9 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
-								:isShowToLocation="false"
-								@updateData="updateData" @removePack="removePack">
+								:isShowToLocation="false" @updateData="updateData" @removePack="removePack">
 							</record-com-detail-card>
-							
+
 						</view>
 					</view>
 				</scroll-view>
@@ -44,11 +43,13 @@
 			</view>
 			<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 ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'
+			:queryBalance="false">
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 	</view>
 </template>
 
@@ -56,6 +57,7 @@
 	import {
 		issueRecordSubmit,
 		getWorkShopLineStation,
+		getBalanceByFilter
 	} from '@/api/request2.js';
 
 	import {
@@ -95,6 +97,7 @@
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 
 	export default {
 		components: {
@@ -105,7 +108,8 @@
 			winScanLocation,
 			winScanPackAndLocation,
 			recordComDetailCard,
-			recordDetailCard
+			recordDetailCard,
+			balanceSelect
 		},
 		data() {
 			return {
@@ -125,7 +129,8 @@
 				businessTypeCode: "Issue",
 				positionList: [],
 				show: false,
-				positionInfo: "请选择生产线"
+				positionInfo: "请选择生产线",
+				resultData: {}
 			};
 		},
 		onLoad(option) {
@@ -169,7 +174,139 @@
 		mounted() {},
 
 		methods: {
+			getBalance(label, packageInfo, callback) {
+				var filters = []
+
+				if (packageInfo.parentNumber) {
+					var packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
+					})
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: label.packingNumber
+					})
+				}
+
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: label.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: label.batch
+				})
+
+				if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") {
+					filters.push({
+						column: "inventoryStatus",
+						action: "in",
+						value: this.fromInventoryStatuses
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					callback(res.data)
+				}).catch(err => {
+					this.showErrorMessage(err.message);
+				})
+			},
 			getScanResult(result) {
+				this.resultData = result;
+				let packageInfo = result.package;
+				this.getBalance(result.label, packageInfo, balances => {
+
+					//扫描的是外包装
+					let s = '';
+					if (!result.package.parentNumber) {
+						if (balances.list.length == 0) {
+							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+						} else {
+							let newBalances = balances.list.filter(b => b.locationCode == this
+								.fromLocationCode);
+							if (newBalances.length == 0) {
+								this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+							} else if (newBalances.length == 1) {
+								let balance = newBalances[0];
+								result.balance = balance;
+								this.afterGetBalance(result);
+							} else {
+								this.showBalanceSelect(newBalances);
+							}
+						}
+					} else {
+						//扫描的是小包装
+						if (balances.list.length == 0) {
+							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+						} else {
+							//小包装库存
+							let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo
+								.number)
+							//外包装库存
+							let subParentPackitems = balances.list.filter(r => r.packingNumber ==
+								packageInfo
+								.parentNumber && r.locationCode == this.fromLocationCode)
+
+
+							//小包装没有库存，
+							if (subPackitems.length == 0) {
+								//外包装有库存，出库后剩余库存未转换为出库包装规格
+
+								if (subParentPackitems.length > 0) {
+									if (subParentPackitems.length == 1) {
+										let balance = subParentPackitems[0];
+										balance.qty = packageInfo.qty;
+										result.balance = balance;
+										this.afterGetBalance(result);
+									} else {
+										this.showBalanceSelect(subParentPackitems);
+									}
+
+								} else {
+									this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' +
+										packageInfo.number + '】都未查找到库存余额')
+								}
+							} else {
+								var locationCode = this.fromLocationCode
+								if (balances.list == 1) {
+									locationCode = balances.list[0].locationCode
+								} else {
+									var manyBlances = balances.list.filter(r => r.locationCode != this
+										.fromLocationCode)
+									if (manyBlances.length > 0) {
+										locationCode = manyBlances[0].locationCode;
+									}
+								}
+								this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' +
+									locationCode +
+									'】已经有库存余额,请重新扫描')
+							}
+						}
+					}
+				})
+			},
+			
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+			
+			selectBalanceItem(balance) {
+				this.resultData.balance =balance;
+				this.afterGetBalance(this.resultData);
+			},
+			
+			afterGetBalance(result){
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
@@ -187,15 +324,17 @@
 					
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.parentNumber =pack.parentNumber;
+					newDetail.packingNumber =pack.number
 					newDetail.packUnit =packUnit;
 					newDetail.packQty=packQty;
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 					calcHandleQty(this.detailSource);
-				
+			
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == balance.packingNumber &&
+						if (r.packingNumber == pack.number &&
 							r.batch == balance.batch &&
 							r.locationCode == balance.locationCode &&
 							r.inventoryStatus == balance.inventoryStatus) {
@@ -204,10 +343,60 @@
 					})
 					if (detail == undefined) {
 							let newDetail = createDetailInfo(balance, pack);
+							newDetail.parentNumber =pack.parentNumber;
+							newDetail.packingNumber =pack.number
 							newDetail.packUnit =packUnit;
 							newDetail.packQty=packQty;
 							item.subList.push(newDetail);
 							calcHandleQty(this.detailSource);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+			},
+
+
+			getScanResult1(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				let packUnit = pack.packUnit;
+				let packQty = pack.packQty
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.packUnit = packUnit;
+					newDetail.packQty = packQty;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					calcHandleQty(this.detailSource);
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.packUnit = packUnit;
+						newDetail.packQty = packQty;
+						item.subList.push(newDetail);
+						calcHandleQty(this.detailSource);
 					} else {
 						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
@@ -302,24 +491,25 @@
 				} else {
 					this.showErrorMessage("车间-生产线基础信息维护错误")
 				}
-				
+
 				//赋值到库位代码
 				let toLocationCode = ''
-				this.positionList.forEach(item=>{
-					if(this.workshopCode == item.value){ // 车间
-						item.children.find(child=>{
-							if(this.productionLineCode==child.value){
-								toLocationCode = child.children.find(subChild=>this.workStationCode==subChild.value).rawLocationCode;
+				this.positionList.forEach(item => {
+					if (this.workshopCode == item.value) { // 车间
+						item.children.find(child => {
+							if (this.productionLineCode == child.value) {
+								toLocationCode = child.children.find(subChild => this.workStationCode ==
+									subChild.value).rawLocationCode;
 							}
 						})
 					}
 				})
-				this.detailSource.forEach(item=>{
+				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = toLocationCode
 					})
 				})
-				
+
 			},
 
 			removeItem(index, item) {
@@ -380,7 +570,9 @@
 				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = {...this.setRecordParams()}
+						var params = {
+							...this.setRecordParams()
+						}
 						console.log("提交参数", JSON.stringify(params));
 
 						issueRecordSubmit(params).then(res => {
@@ -426,20 +618,20 @@
 							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 							submitItem.recordList = [{
-									toInventoryStatus:detail.inventoryStatus,
-									fromPackingNumber:info.packingNumber,
-									fromBatch:info.batch,
-									toPackingNumber:info.packingNumber,
-									toBatch:info.batch,
-									fromLocationCode:detail.locationCode,
-									toLocationCode:detail.toLocationCode,
-									handleQty:detail.handleQty,
-									fromPackUnit:detail.packUnit,
-									toPackUnit:detail.packUnit,
-									fromPackQty:detail.packQty,
-									toPackQty:detail.packQty
-								}
-							]
+								toInventoryStatus: detail.inventoryStatus,
+								fromParentPackingNumber: detail.parentNumber,
+								fromPackingNumber: info.packingNumber,
+								fromBatch: info.batch,
+								toPackingNumber: info.packingNumber,
+								toBatch: info.batch,
+								fromLocationCode: detail.locationCode,
+								toLocationCode: detail.toLocationCode,
+								handleQty: detail.handleQty,
+								fromPackUnit: detail.packUnit,
+								toPackUnit: detail.packUnit,
+								fromPackQty: detail.packQty,
+								toPackQty: detail.packQty
+							}]
 							subList.push(submitItem)
 						}
 					})
@@ -458,13 +650,6 @@
 					if (res) {}
 				});
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
@@ -502,17 +687,17 @@
 				})
 			},
 
-		updateData() {
-			calcHandleQty(this.detailSource);
-			for (var i = 0; i < this.detailSource.length; i++) {
-				let item = this.detailSource[i];
-				if (item.qty == 0) {
-					this.detailSource.splice(i, 1)
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
 				}
-			}
-			this.$forceUpdate();
-			
-		},
+				this.$forceUpdate();
+
+			},
 
 			clearData() {
 				this.fromLocationInfo = {};
@@ -520,7 +705,7 @@
 				this.fromWarehouseCode = '';
 				this.toWarehouseCode = '';
 				this.detailSource = [];
-				this.to
+				this.positionInfo= "请选择生产线";
 			}
 		}
 	}
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 4d2ccead..2206d6d9 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -4,10 +4,12 @@
 		<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
 		<view class="login_title">
 			<text>您好，欢迎使用</text><br>
-			WMS仓库管理系统
+			WMS仓库管理系统<br>
+			版本: {{version}}
 		</view>
 		<view class="bgf login_wrap">
 			<view class="loginbox">
+
 				<form>
 					<view class="mytab">
 						<!-- <view class="mytabline" :class="tapstyle == 1?'active':''" @click="tapchenge(1)">扫码登录</view> -->
@@ -28,7 +30,8 @@
 							</view>
 							<view>
 								<!-- <input class="uni-input" placeholder="请输入租户名" v-model="tenantName" disabled="true" /> -->
-								<uni-data-select class="uni-data-select" placeholder="请输入租户名" v-model="tenantValue" :clear="false" :localdata="tenantArray"></uni-data-select>
+								<uni-data-select class="uni-data-select" placeholder="请输入租户名" v-model="tenantValue"
+									:clear="false" :localdata="tenantArray"></uni-data-select>
 							</view>
 						</view>
 						<view class="conone">
@@ -104,8 +107,8 @@
 		data() {
 			return {
 				tenantArray: JSON.parse(import.meta.env.VITE_TENANT),
-				smloginmsg: "",
-				tenantValue:0,
+				smloginmsg: "",
+				tenantValue: 0,
 				// tenantName: "闻荫源码",
 				username: "",
 				password: "",
@@ -114,7 +117,8 @@
 				showPassword: true,
 				imageSrc: "",
 				code: "",
-				uuid: ""
+				uuid: "",
+				version: ""
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -161,6 +165,7 @@
 			}).catch(error => {
 				this.showErrorMessage(error);
 			})
+			this.getAppVersion()
 		},
 		methods: {
 			// ...mapMutations(['login']),
@@ -197,8 +202,8 @@
 						logininfo.password = this.password
 						logininfo.code = this.code;
 						logininfo.uuid = this.uuid;
-						logininfo.tenantName = this.tenantArray.find(item=>item.value==this.tenantValue).text;
-						
+						logininfo.tenantName = this.tenantArray.find(item => item.value == this.tenantValue).text;
+
 						uni.setStorageSync('tenantId', this.tenantValue)
 
 					} else if (this.tapstyle == 1) {
@@ -254,7 +259,20 @@
 						this.uuid = res.data.uuid
 					}
 				})
+			},
+			getAppVersion() {
+				const systemInfo = uni.getSystemInfoSync();
+				// #ifdef H5
+				this.version = systemInfo.appVersion;
+				console.log(systemInfo.appVersion, '版本号');
+				// #endif
+
+				// #ifdef APP
+				this.version = systemInfo.appWgtVersion;
+				// #endif
+
 			}
+
 		}
 	}
 </script>
@@ -284,7 +302,7 @@
 	.mytabline {
 		flex: 1;
 		text-align: center;
-		padding: 20rpx 0;
+		padding: 10rpx 0;
 		color: #666;
 		position: relative;
 		font-size: 0.875rem;
@@ -339,15 +357,16 @@
 		height: 90rpx;
 		line-height: 90rpx;
 		padding: 0 0 0 20rpx;
-	}
-	.conone .uni-data-select .uni-select{
-		background-color: #F7F9FF;
-		height: 90rpx;
-		line-height: 90rpx;
-		border: 0px;
+	}
+
+	.conone .uni-data-select .uni-select {
+		background-color: #F7F9FF;
+		height: 90rpx;
+		line-height: 90rpx;
+		border: 0px;
 		padding: 0 10rpx 0 20rpx;
-	}
-	
+	}
+
 	.conone .title {
 		font-size: .875rem;
 		align-items: center;
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 6a4e7d4f..f606ceae 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -1,7 +1,8 @@
+
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='getBusinessType' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="cen_card" style="background-color: #fff; margin:10px 0px 0px 10px;">
@@ -60,10 +61,12 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<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>
+		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' bussinessCode="OverPackage">
+		</winComScanBalance>
+
+
+		<!-- <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location> -->
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -71,7 +74,8 @@
 <script>
 	import {
 		overPackageRecordSubmit,
-		getPackUnitByItemCode
+		getPackUnitByItemCode,
+		getBalanceByParams
 	} from '@/api/request2.js';
 	import {
 		goHome
@@ -79,6 +83,9 @@
 
 	import {
 		getInventoryStatusDesc,
+		getLocationAreaTypeName,
+		getLocationAreaTypeInfo,
+		getListLocationAreaTypeDesc,
 		getDirectoryItemArray,
 		getPackUnitName,
 		getUomInfo
@@ -101,6 +108,9 @@
 	import packageTarget from '@/mycomponents/package/packageTarget.vue'
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+
+
 	import {
 		getCurrDateTime
 	} from '@/common/basic.js';
@@ -116,7 +126,8 @@
 			recommendBalance,
 			packageTarget,
 			recordComDetailCard,
-			packUnit
+			packUnit,
+			winComScanBalance
 		},
 		data() {
 			return {
@@ -126,6 +137,7 @@
 				fromLocationCode: "",
 				isShowLocation: false,
 				fromLocationAreaTypeList: [],
+				fromInventoryStatuses: [],
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
@@ -136,20 +148,12 @@
 				show: false,
 				toPackUnitShow: "请选择",
 				toPackQty: "",
-				itemCode: ""
+				itemCode: "",
+				resultData: {}
 			};
 		},
-		onShow(){
-			var typeCode = "OverPackage"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
+		onShow() {
+			this.getBusinessType();
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -165,6 +169,19 @@
 		mounted() {},
 
 		methods: {
+			getBusinessType(){
+				var typeCode = "OverPackage"
+				getBusinessType(typeCode, res => {
+					if (res.success) {
+						this.businessType=res.businessType;
+						this.fromInventoryStatuses = getDirectoryItemArray(res.fromInventoryStatuses);
+						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						this.openScanPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
+				});
+			},
 			getUomInfo(uom) {
 				let item = getUomInfo(uom);
 				if (item == '') {
@@ -173,9 +190,6 @@
 					return item.label
 				}
 			},
-			scanPopupPack() {
-				this.$refs.scanPopupPack.openScanPopup();
-			},
 			showPackage() {
 				getPackUnitByItemCode(this.itemCode).then(res => {
 					if (res.data != null && res.data.list.length > 0) {
@@ -210,15 +224,24 @@
 				this.toPackUnitShow = e[0].label
 			},
 			//修改库位
-			handleConfirm(fromLocationCode){
+			handleConfirm(fromLocationCode) {
 				this.$refs.scanLocationCode.openScanPopupSimulate(fromLocationCode)
 			},
 			getScanResult(result) {
+				this.setData(result);
+			},
+
+			setData(result) {
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
 				this.fromPackUnit = pack.packUnit;
 				this.fromPack = pack;
+				if(this.fromLocationCode&&this.fromLocationCode!=balance.locationCode){
+					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位["+this.fromLocationCode+"]没有库存余额")
+					return;
+				}
+				
 				var item = this.detailSource.find(res => {
 					if (res.itemCode == balance.itemCode) {
 						return res
@@ -234,6 +257,7 @@
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 					this.itemCode = balance.itemCode;
+					this.fromLocationCode =balance.locationCode
 				} else {
 					var detail = item.subList.find(r => {
 						if (r.packingNumber == balance.packingNumber &&
@@ -253,8 +277,6 @@
 					}
 				}
 				this.calcHandleQty();
-
-
 			},
 
 			calcHandleQty() {
@@ -284,19 +306,20 @@
 			},
 
 			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
+				if(this.businessType){
+					this.$refs.scanPopup.openScanPopup(this.businessType);
+				}else {
+					this.getBusinessType()
 				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+				
 			},
 			showFromLocationPopup() {
 				this.$nextTick(() => {
 					let overPackageRecord = uni.getStorageSync('overPackageRecord')
-					
-					if(overPackageRecord){
+
+					if (overPackageRecord) {
 						this.$refs.scanLocationCode.openScanPopupSimulate(overPackageRecord)
-					}else{
+					} else {
 						this.$refs.scanLocationCode.openScanPopup();
 					}
 				})
@@ -315,7 +338,7 @@
 			},
 			commit() {
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					if (!this.toPackUnit||this.toPackUnit == "包装规格") {
+					if (!this.toPackUnit || this.toPackUnit == "包装规格") {
 						this.showErrorMessage("请选择目标包装规格")
 						return;
 					}
@@ -357,18 +380,18 @@
 						let list = []
 						res.data.forEach(item => {
 							list.push({
-								itemCode:item.itemCode, // 物品代码
+								itemCode: item.itemCode, // 物品代码
 								itemName: item.itemName, // 物品名称
-								packName: item.packName,// 包装名称
+								packName: item.packName, // 包装名称
 								packageCode: item.toPackingNumber, // 包装号
-								batch:item.toBatch,//批次
-								parentNumber:item.parentNumber,//父包装号
-								itemType: item.itemType,//物料类型
-								asnNumber:item.asnNumber,//ASN
+								batch: item.toBatch, //批次
+								parentNumber: item.parentNumber, //父包装号
+								itemType: item.itemType, //物料类型
+								asnNumber: item.asnNumber, //ASN
 								supplierCode: item.supplierCode, // 供应商
 								qty: item.qty, // 数量
-								printTimes:getCurrDateTime(), // 打印时间
-								productionLineCode:item.productionLineCode,//生产线
+								printTimes: getCurrDateTime(), // 打印时间
+								productionLineCode: item.productionLineCode, //生产线
 								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: '',
 							})
@@ -439,7 +462,7 @@
 				this.scanPopupGetFocus();
 			},
 			getLocation(location, code) {
-				if(code){
+				if (code) {
 					uni.setStorageSync('overPackageRecord', code)
 				}
 				this.getFromLocationCode(location, code)
@@ -448,15 +471,15 @@
 				this.fromLocationCode = code;
 				this.openScanPopup();
 			},
-			
 
-			showCommitSuccessMessage(hint,pointData) {
+
+			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.detailSource = []
 					this.fromLocationCode = '';
 					this.dataContent = {}
 					if (pointData.length > 0) {
-						uni.redirectTo({
+						uni.navigateTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
 					}
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 60a16c58..6f8e1706 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -59,7 +59,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;">
+		<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;" v-show="isLoadFinish">
 			<button @click="printImage"
 				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印</button>
 		</view>
@@ -81,13 +81,67 @@
 		name: 'point',
 		data() {
 			return {
-				data: {},
+				timer:null,
+				originData:[],
+				data: [],
 				newHtmlContent: '', //打印传入的html
 				isLoadFinish: false,
 			}
 		},
 
 		methods: {
+			
+			getListData(){
+				// 获取数据
+				// 大哥：后端添加了 制造标签 生产线 ，可根据 生产线是否有值 来判断打印的是制造标签
+				// this.data = [{
+				// 	itemCode:'065.051-01M', // 物品代码
+				// 	itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称
+				// 	packName: '包装名称',// 包装名称
+				// 	packageCode: 'PS0513-000003', // 包装号
+				// 	batch:'20240514',//批次
+				// 	parentNumber:'PS0513-000003',//父包装号
+				// 	itemType:'物料类型',//物料类型
+				// 	asnNumber:'123232',//ASN
+				// 	supplierCode: 'Fewewq', // 供应商
+				// 	qty: '100', // 数量
+				// 	printTimes:'2019-09-09 09:09:00', // 打印时间
+				// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
+				// 	barcodeBase64: '',
+				// 	productionLineCode:''//生产线
+				// }]
+				
+				let _this = this
+				this.$nextTick(async () => {
+					// 获取二维码图片临时路径
+					const el = _this.$refs['qrcodeRef']
+					let str = ''
+					el.forEach(async (item, index) => {
+						await item.canvasToTempFilePath({
+							success: async (res) => {
+								// 将临时路径转换成base64
+								await pathToBase64(res.tempFilePath).then(base64 => {
+									_this.data[index].barcodeBase64 = base64
+									if (index == el.length - 1) {
+										_this.isLoadFinish = true
+										uni.hideLoading();
+				
+									}
+								}).catch(err => {
+									console.log(err);
+								})
+							},
+							fail(err) {
+								console.log('err:::', err)
+							}
+						})
+				
+					})
+				
+				})
+				
+				
+			},
 			// #ifdef APP
 			// 打印
 			printImage() {
@@ -116,6 +170,7 @@
 				if (newVal == true) {
 					// 读取html文件将文件中的内容图换成当前页面的数据
 					let str = ''
+					// #ifdef APP
 					this.readFile(htmlFileUrl, (htmlContent) => {
 						this.newHtmlContent = htmlContent
 						this.data.forEach(item => {
@@ -195,60 +250,34 @@
 							"mainBody", str); //替换物品代码
 						console.log(this.newHtmlContent)
 					});
-
+					// #endif
 				}
 			}
 		},
 		onLoad(option) {
+			uni.showLoading({
+				title: '加载中...',
+				mask: true
+			});
 			if (option.points) {
-				this.data = JSON.parse(option.points);
+				this.originData = JSON.parse(option.points);
+			}	
+		},
+		unmounted() {
+			if(this.timer){
+				clearTimeout(this.timer)
+				this.timer = null
 			}
 		},
-		async onShow() {
-			// 获取数据
-			// 大哥：后端添加了 制造标签 生产线 ，可根据 生产线是否有值 来判断打印的是制造标签
-			// this.data = [{
-			// 	itemCode:'065.051-01M', // 物品代码
-			// 	itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称
-			// 	packName: '包装名称',// 包装名称
-			// 	packageCode: 'PS0513-000003', // 包装号
-			// 	batch:'20240514',//批次
-			// 	parentNumber:'PS0513-000003',//父包装号
-			// 	itemType:'物料类型',//物料类型
-			// 	asnNumber:'123232',//ASN
-			// 	supplierCode: 'Fewewq', // 供应商
-			// 	qty: '100', // 数量
-			// 	printTimes:'2019-09-09 09:09:00', // 打印时间
-			// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
-			// 	barcodeBase64: '',
-			// 	productionLineCode:''//生产线
-			// }]
-			this.$nextTick(async () => {
-				// 获取二维码图片临时路径
-				const el = this.$refs['qrcodeRef']
-				let str = ''
-				el.forEach(async (item, index) => {
-					await item.canvasToTempFilePath({
-						success: async (res) => {
-							// 将临时路径转换成base64
-							await pathToBase64(res.tempFilePath).then(base64 => {
-								this.data[index].barcodeBase64 = base64
-								if (index == el.length - 1) {
-									this.isLoadFinish = true
-								}
-							}).catch(err => {
-								console.log(err);
-							})
-						},
-						fail(err) {
-							console.log('err:::', err)
-						}
-					})
-
-				})
-
-			})
-
+		 onShow() {
+			this.timer = setTimeout(()=>{
+				if(this.timer){
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+				this.data = this.originData
+				this.getListData()
+			},1000)
 		},
 	}
 </script>
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 2f11c595..3e3b0115 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -321,11 +321,11 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -352,7 +352,7 @@
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance,packageInfo) {
 				let batch = {
 					batch: data.lot,
 					qty: 0,
@@ -360,7 +360,7 @@
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index eb213c52..8bcf8898 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -14,9 +14,9 @@
 						@change="switchChange"></u-switch>
 				</view>
 			</view>
-			<view class="" v-if="operation=='reject'">
+			<view class="" v-if ="operation=='reject'">
 				<uni-section title="拒收原因" type="line">
-					<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
+					<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因" ></uni-easyinput>
 				</uni-section>
 
 			</view>
@@ -44,7 +44,7 @@
 				<view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10">
 					<view>
 						<locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode"
-							:locationCode="toLocationCode" @getLocation='scanLocationCode'
+							 @getLocation='scanLocationCode'
 							:locationAreaTypeList="toLocationAreaTypeList">
 						</locationCompare>
 					</view>
@@ -143,8 +143,9 @@
 				operation: '',
 				scanedPackingNumber: '',
 				status: '',
-				switchCode: '',
-				reasonText: ""
+				switchCode:"",
+				isCheckLocation: 'purchaseReceiptLocationCodeValidate',//校验收货库位
+				reasonText: "",
 			};
 		},
 
@@ -154,7 +155,7 @@
 			this.scanedPackingNumber = option.scaned || '';
 			this.operation = option.operation;
 			this.status = option.status;
-			this.switchCode = "purchasereceiptPrintPDA"
+			this.switchCode = "purchasereceiptPrintPDA"//pda打印
 
 
 		},
@@ -240,6 +241,12 @@
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getTreeDataSource(that.subList)
+							that.isCheckLocation = getSwitchInfoByCode(that.isCheckLocation)
+							if (that.isCheckLocation) {
+								that.toLocationCode = ""
+							} else {
+								that.toLocationCode = that.jobToLocationCode;
+							}
 							that.isAllReceived = false;
 							nextTick(() => {
 								that.detailSource.forEach(r => {
@@ -494,10 +501,8 @@
 				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = this.setParams()
+						var params = this.setParams();
 						purchaseReceiptJobSubmit(params).then(res => {
-
-
 							if (res.data) {
 								let isCheckPrint = getSwitchInfoByCode(this.switchCode)
 								if (!isCheckPrint) {
@@ -559,10 +564,8 @@
 										})
 									}, 2000)
 
-
 								}
 
-
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
@@ -674,7 +677,6 @@
 
 			showMessage(message) {
 				setTimeout(r => {
-					this.scanPopupLoseFocus();
 					this.$refs.comMessage.showMessage(message, res => {
 						if (res) {
 							this.scanPopupGetFocus()
@@ -685,7 +687,6 @@
 
 			showErrorMessage(message) {
 				setTimeout(r => {
-					this.scanPopupLoseFocus();
 					this.$refs.comMessage.showErrorMessage(message, res => {
 						if (res) {
 							this.scanPopupGetFocus()
@@ -708,15 +709,7 @@
 				}
 			},
 
-			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
-
-
 			showCommitSuccessMessage(hint) {
-
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					navigateBack(1)
 				})
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 8fbb2fd6..6ceb2c02 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -341,7 +341,10 @@
 			showMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+					
+					if(this.$refs.scanPopup){
+						this.$refs.scanPopup.packGetFocus()
+					}
 					}
 				});
 
@@ -361,8 +364,6 @@
 				
 			},
 			getScanResult(result) {
-				
-				
 
 				try {
 					let filters = []
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 22ea2112..44847ff6 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -87,6 +87,7 @@
 
 		onShow() {
 			this.getList('refresh');
+			
 		},
 
 		onReady() {
@@ -166,6 +167,7 @@
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
+						this.openScanPopup()
 					}
 
 					var list = res.data.list;
diff --git a/src/pages/query/coms/comLocationDetailCard.vue b/src/pages/query/coms/comLocationDetailCard.vue
index 1e49dbf0..3f4a5fcb 100644
--- a/src/pages/query/coms/comLocationDetailCard.vue
+++ b/src/pages/query/coms/comLocationDetailCard.vue
@@ -1,29 +1,57 @@
 <template>
-	<view class="">
-		<uni-collapse ref="collapse1" @change="">
-			<uni-collapse-item :open="true">
-				<view class='split_line'></view>
-				<template v-slot:title>
-					<itemQty :dataContent="dataContent" :isShowBalance="true"></itemQty>
-				</template>
-			 
-				<view v-for="(item, index) in dataContent.list">
-					<balance :dataContent="item" :isShowFromLocation="false" :isShowPack="isShowPack"
-						:isShowStdPack="false">
-					</balance>
+	<view class="" style="width: 100%; background-color: #fff; border-radius: 10rpx;">
+		
+		<view  class="uni-flex uni-row" style="align-items: center;"  >
+			<text style="font-size:35rpx; padding-left:10rpx">物料代码</text>
+			 <item :dataContent="dataContent" style="padding-top: 10rpx; margin-left: 10rpx;"></item>
+		</view>
+		
+		<view class="uni-flex uni-row space-between" style="align-items: center;">
+			<view>
+				<pack v-if="dataContent.parentNumber" title="父包装" :packingCode="dataContent.parentNumber"></pack>
+				<pack v-if=" dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
+				<view class="" v-if="dataContent.jobNumber"
+					style="font-size: 30rpx;  padding-left: 10rpx ; padding-bottom: 10rpx;">
+					<text style="color: coral; ">任务号</text>
+					{{dataContent.jobNumber}}
 				</view>
-			</uni-collapse-item>
-		</uni-collapse>
+				<view class="" v-if="dataContent.businessType"
+					style="font-size: 30rpx;  padding-left: 10rpx ; padding-bottom: 10rpx;">
+					<text style="color:green; ">业务类型</text>
+					{{dataContent.businessType}}
+				</view>
+			</view>
+			<view class="uni-flex" style="flex-direction: column;">
+				<view class="uni-flex uni-row center">
+					<qty  :dataContent="dataContent"
+						:isShowStdPack="isShowStdPack" :isShowStatus="true"></qty>
+				</view>
+			</view>
+
+		</view>
+		
+
+
+
 	</view>
 </template>
 
 <script>
 	import itemQty from '@/mycomponents/item/itemQty.vue'
-	import balance from '@/mycomponents/balance/balance.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import pack from '@/mycomponents/balance/pack.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import status from '@/mycomponents/status/status.vue'
 	export default {
 		components: {
 			itemQty,
-			balance
+			item,
+			pack,
+			batch,
+			qty,
+			status
 		},
 		data() {
 			return {
@@ -35,7 +63,7 @@
 		props: {
 			dataContent: {
 				type: Object,
-				default: {},
+				default: null,
 			},
 			isShowPack: {
 				type: Boolean,
@@ -74,4 +102,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/query/location.vue b/src/pages/query/location.vue
index cb61e4e9..5f1cd142 100644
--- a/src/pages/query/location.vue
+++ b/src/pages/query/location.vue
@@ -1,28 +1,27 @@
 <template>
 	<!-- <page-meta root-font-size="18px"></page-meta> -->
-	<view class="">
-		<com-blank-view @goScan='openScanPopup' v-if="locationCode==''"></com-blank-view>
-
-		<my-paging v-show="locationCode!=''" ref="paging" v-model="dataList" @query="queryList">
-			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
-			<template #top>
-				<view v-if="locationCode!=''">
-					<location-info :locationDetail='locationDetail' v-if="locationCode"></location-info>
-					<z-tabs :list="tabList" @change="tabChange" />
-				</view>
-
-			</template>
-			<view class="" style="padding-bottom: 50rpx;">
-				<view v-if="tabIndex == 0" v-for="(item, index) in dataList">
+	<view class="uni-flex" style="flex-direction: column" >
+		<view class="" style=" width: 100%; position: fixed; top: 0;right: 0;">
+			<com-blank-view @goScan='openScanPopup' v-if="locationCode==''"></com-blank-view>
+			<location-info :locationDetail='locationDetail' v-if="locationCode"></location-info>
+			<z-tabs v-if="locationCode" :list="tabList" @change="tabChange" />
+		</view>
+		<view style="padding-top: 200rpx;width:100%">
+				<view v-if="totalCount>0"  style="margin:10rpx; font-size:35rpx; font-weight:bold">总数 : {{totalCount}} </view>
+			<view v-for="(item, index) in dataList" style="width:100%">
+				<view class="uni-flex uni-row" style=" align-items: center; background-color: #fff; border-radius:10rpx;margin:10rpx; " >
+					<view class="" style="font-size:35rpx; ">
+						({{index+1}})
+					</view>
 					<comLocationDetailCard :isShowPack="false" :dataContent="item" style='margin: 10rpx;'>
 					</comLocationDetailCard>
 				</view>
-				<view v-if="tabIndex == 1" v-for="(item, index) in dataList">
-					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
-				</view>
+				
 			</view>
+			<uni-load-more :status="loadingType" v-if="dataList.length>0" />
+		</view>
+
 
-		</my-paging>
 
 		<win-scan-button @goScan='openScanPopup' v-if="locationCode!=''"></win-scan-button>
 		<winScanLocation ref="scanPopup" title="库位代码" @getLocation='getScanCode'></winScanLocation>
@@ -36,17 +35,19 @@
 <script>
 	import {
 		getBalanceByLocationcode,
-		getBalanceByLocationcodeGroup
+		getBalanceByLocationcodeGroup,
+		getExpectInByLocationCode,
+		getExpectOutByLocationCode
 	} from '@/api/request2.js';
 
 	import {
 		maxPageSize,
 		goHome
 	} from '@/common/basic.js';
-	
+
 	import {
-			calc
-		} from '@/common/calc.js';
+		calc
+	} from '@/common/calc.js';
 
 	import locationInfo from '@/mycomponents/location/locationInfo.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -72,15 +73,18 @@
 				balances: [],
 				dataIn: [],
 				dataOut: [],
+				pageNo: 1,
 				// 每页数据量
-				pageSize: 1000,
+				pageSize: 10,
 				// 当前页
 				pageCurrent: 1,
 				// 数据总量
 
 				dataList: [],
-				tabList: ['汇总', '明细'],
+				tabList: ['汇总', '明细', '预计入', '预计出'],
 				tabIndex: 0,
+				loadingType: "nomore",
+				totalCount:0
 			};
 		},
 		onLoad() {},
@@ -95,6 +99,21 @@
 		mounted() {
 			this.openScanPopup()
 		},
+		
+		onPullDownRefresh() {
+			this.getContentByTab(this.tabIndex, this.pageNo, this.pageSize, "refresh");
+		},
+
+		onReachBottom() {
+			console.log("底部")
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getContentByTab(this.tabIndex, this.pageNo, this.pageSize, "more");
+
+		},
+
 		methods: {
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup();
@@ -112,114 +131,181 @@
 				// this.getContentByTab(this.tabIndex);
 			},
 
-			getSummary(pageNo, pageSize) {
+			getSummary(pageNo, pageSize, type) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
 				});
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.dataList = [];
+				}
+
 				var params = {
-					itemCode: this.itemCode,
-					pageNo: pageNo,
+					locationCode: this.locationCode,
+					pageNo: this.pageNo,
 					pageSize: pageSize
 				}
 
 				getBalanceByLocationcodeGroup(params).then(res => {
 					uni.hideLoading();
-					if (res.data.list.length > 0) {
-						this.summarysList = this.setShowList(res.data.list)
-						this.$refs.paging.complete(this.summarysList);
-
-					} else {
-						this.$refs.paging.complete(false);
-						this.showMessage('未查找到库位【' + this.locationCode + '】');
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
 					}
+					this.dataList = type === "refresh" ? list : this.dataList.concat(list);
+					this.pageNo++;
+
 				}).catch(error => {
-					this.$refs.paging.complete(false);
 					uni.hideLoading();
 					this.showMessage(error);
 				})
 
 			},
 
-			getDetailList(pageNo, pageSize) {
+			getDetailList(pageNo, pageSize, type) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
 				});
 
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.dataList = [];
+				}
+
 				var params = {
 					locationCode: this.locationCode,
-					pageNo: pageNo,
+					pageNo: this.pageNo,
 					pageSize: pageSize
 				}
 				getBalanceByLocationcode(params).then(res => {
 					uni.hideLoading();
-					if (res.data.list.length > 0) {
-						this.detailList = this.setShowList(res.data.list)
-						this.$refs.paging.complete(this.detailList);
-					} else {
-						this.$refs.paging.complete(false);
-						this.showMessage('未查找到库位w【' + this.locationCode + '】');
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
 					}
+					this.dataList = type === "refresh" ? list : this.dataList.concat(list);
+					this.pageNo++;
+
 				}).catch(error => {
-					this.$refs.paging.complete(false);
 					uni.hideLoading();
 					this.showMessage(error);
 				})
 			},
 
-			setShowList(list) {
-				var resultlist = [];
-				list.forEach(res => {
-					var temp = resultlist.find(res1 =>
-						res1.itemCode == res.itemCode)
-
-					if (temp == undefined) {
-						var data = {
-							itemCode: res.itemCode,
-							qty: Number(res.qty),
-							uom: res.uom,
-							list: []
-						}
-						var item = {
-							packingNumber: res.packingNumber,
-							batch: res.batch,
-							uom: res.uom,
-							qty: Number(res.qty),
-							inventoryStatus: res.inventoryStatus,
-						}
-						data.list.push(item)
-						resultlist.push(data)
-					} else {
-						temp.qty = calc.add(temp.qty,res.qty)
-						var item = {
-							packingNumber: res.packingNumber,
-							batch: res.batch,
-							uom: res.uom,
-							qty: Number(res.qty),
-							inventoryStatus: res.inventoryStatus,
-						}
-						temp.list.push(item)
+			getExpectin(pageNo, pageSize, type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.dataList = [];
+				}
+
+				var params = {
+					pageNo: this.pageNo,
+					pageSize: pageSize,
+					filters: [{
+						column: "locationCode",
+						action: "==",
+						value: this.locationCode
+
+					}]
+				}
+
+				getExpectInByLocationCode(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
 					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.dataList = type === "refresh" ? list : this.dataList.concat(list);
+					this.pageNo++;
+				}).catch(error => {
+					uni.hideLoading();
+					this.showMessage(error);
 				})
-				return resultlist;
+
 			},
-			ontabtap(e) {
-				let index = e.target.dataset.current || e.currentTarget.dataset.current;
-				this.tabIndex = index;
-				this.getContentByTab(this.tabIndex);
+
+			getExpectOut(pageNo, pageSize, type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				});
+
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.dataList = [];
+				}
+
+				var params = {
+					pageNo: this.pageNo,
+					pageSize: pageSize,
+					filters: [{
+						column: "locationCode",
+						action: "==",
+						value: this.locationCode
+
+					}]
+				}
+
+				getExpectOutByLocationCode(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.dataList = type === "refresh" ? list : this.dataList.concat(list);
+					this.pageNo++;
+				}).catch(error => {
+					uni.hideLoading();
+					this.showMessage(error);
+				})
+
 			},
 
-			getContentByTab(index, pageNo, pageSize) {
+			getContentByTab(index, pageNo, pageSize, type) {
 				if (index === 0) {
-					this.getSummary(pageNo, pageSize);
-				} else if (index === 1) this.getDetailList(pageNo, pageSize)
+					this.getSummary(pageNo, pageSize, type);
+				} else if (index === 1) this.getDetailList(pageNo, pageSize, type)
 				else if (index === 2) {
-					this.dataIn = this.balances;
+					this.getExpectin(pageNo, pageSize, type)
 				} else if (index == 3) {
-					this.dataOut = this.balances;
+					this.getExpectOut(pageNo, pageSize, type)
 				}
 			},
 
@@ -237,14 +323,7 @@
 			},
 			tabChange(index) {
 				this.tabIndex = index;
-				this.$refs.paging.reload(true);
-			},
-			queryList(pageNo, pageSize) {
-				console.log("加载", pageNo)
-				if (this.locationCode != "") {
-					this.getContentByTab(this.tabIndex, pageNo, pageSize)
-				}
-
+				this.getContentByTab(index, this.pageNo, this.pageSize,"refresh")
 			},
 		}
 	};
@@ -254,4 +333,4 @@
 	page {
 		height: 100%;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index faeb55ec..3e1ace89 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -153,6 +153,7 @@
 				defaultValueList: [],
 				label: {},
 				fromInventoryStatuses: "",
+				packageInfo:{}
 			}
 		},
 		created() {
@@ -252,7 +253,7 @@
 						})
 
 						this.getBalance(result.label, packageInfo, balances => {
-
+							this.packageInfo =packageInfo;
 							//扫描的是外包装
 							let s = '';
 							if (!result.package.parentNumber) {
@@ -410,7 +411,7 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.afterGetBalance(this.label, balance);
+				this.afterGetBalance(this.label, balance,this.packageInfo);
 			},
 
 			afterGetBalance(label, balance, packageInfo) {
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 1bf861a3..4054b102 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -131,7 +131,6 @@
 			getBusinessType(this.businessTypeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
-					res.fromLocationAreaTypeList.push("INSPECT","SUPPER")
 					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
 					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
 					this.showFromLocationPopup();
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index 6e2942e8..4f09dcbf 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -279,13 +279,13 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 										this.showBalanceSelect(balanceRes.data.list, packageInfo);
 									}
 								} else {
-									this.showErrorMessage(balanceRes.message.message);
+									this.showErrorMessage(balanceRes.message);
 								}
 								uni.hideLoading();
 							});
 					}
-				} catch (e) {
-					this.showErrorMessage(e.stack)
+				} catch (error) {
+					this.showErrorMessage(error)
 					uni.hideLoading();
 				}
 			},
@@ -340,11 +340,11 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -371,15 +371,15 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance,packageInfo) {
 				let batch = {
-					batch: data.lot,
+					batch: data.batch,
 					qty: 0,
 					uom: data.uom,
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
diff --git a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
index fe3b2d6c..a849013e 100644
--- a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
+++ b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -169,7 +169,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style  lang="less">
 	.uni-combox {
 		font-size: 14px;
 		border: 1px solid #DCDFE6;
@@ -205,8 +205,8 @@
 	.uni-combox__input {
 		flex: 1;
 		font-size: 14px;
-		height: 22px;
-		line-height: 22px;
+		height: 26px;
+		line-height: 26px;
 	}
 
 	.uni-combox__input-plac {
@@ -245,7 +245,7 @@
 		cursor: pointer;
 		/* #endif */
 		line-height: 36px;
-		font-size: 14px;
+		font-size: 45rpx;
 		text-align: center;
 		// border-bottom: solid 1px #DDDDDD;
 		padding: 0px 10px;
@@ -294,4 +294,8 @@
 	.uni-combox__no-border {
 		border: none;
 	}
+	
+	 .uni-input-input {
+		font-size: 40rpx;
+	}
 </style>