diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 3dd6ffc2..ac4570f6 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -49,7 +49,6 @@
 
 <script>
 	import {
-		putawayRequestSubmit,
 		putawayRecordSubmit,
 		validateItemAndLocation,
 		getPutawayRecommendLocation
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index a18eec6b..1d13ea42 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="page-wraper">
+
 		<view class="">
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
@@ -8,32 +9,29 @@
 				<view class="header_item">
 					来源库位 : {{fromLocationCode}}
 				</view>
-				<view class='split_line'></view>
+				<u-line />
 			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								:isShowToLocation="false"
 								@updateData="updateData" @removePack="removePack">
-							</recordDetailCard>
+							</record-com-detail-card>
 						</view>
+
 					</view>
 				</scroll-view>
 			</view>
+
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
-					<view class="uni-row uni-flex">
-						<text>生产线:</text>
-						<view class="uni-flex u-col-center uni-row" @click="showSelect">
-							<view class="" style="margin-left: 20rpx;">
-								{{positionInfo}}
-							</view>
-							<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
-								@confirm="confirmSelect"></u-select>
-						</view>
+					<view class="">
+						<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -53,11 +51,14 @@
 <script>
 	import {
 		repleinshRecordSubmit,
-		getWorkShopLineStation,
+		validateItemAndLocation,
+		getPutawayRecommendLocation
 	} from '@/api/request2.js';
 
 	import {
 		goHome,
+		updateTitle,
+		getCurrDateTime,
 		getPackingNumberAndBatchByList,
 		deepCopyData
 	} from '@/common/basic.js';
@@ -75,7 +76,7 @@
 		getBusinessType,
 		createItemInfo,
 		createDetailInfo,
-		calcTreeHandleQty
+		calcHandleQty
 	} from '@/common/record.js';
 
 	import {
@@ -91,7 +92,6 @@
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
 
 	export default {
 		components: {
@@ -101,15 +101,13 @@
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,
-			recordComDetailCard,
-			recordDetailCard
+			recordComDetailCard
 		},
 		data() {
 			return {
 				id: '',
 				dataContent: {}, //内容
 				detailSource: [], //绑定在页面上的数据源
-				fromLocationInfo: {},
 				fromLocationCode: "",
 				fromLocationAreaTypeList: [],
 				toLocationAreaTypeList: [],
@@ -120,13 +118,11 @@
 				recommendLocationList: [], //推荐库位列表
 				fromWarehouseCode: '', //来源仓库
 				businessTypeCode: "Repleinment",
-				positionList: [],
-				show: false,
-				positionInfo: "请选择生产线"
+				toLocationCode:""
 			};
 		},
 		onLoad(option) {
-			this.clearData();
+			this.clear();
 			getBusinessType(this.businessTypeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
@@ -137,20 +133,6 @@
 					this.showErrorMessage(res.message)
 				}
 			});
-
-			// if (this.positionList.length == 0) {
-			getWorkShopLineStation().then(res => {
-				if (res.data != null && res.data.length > 0) {
-					this.positionList = res.data
-				} else {
-					this.showErrorMessage('未查找到位置信息');
-				}
-
-			}).catch(error => {
-				this.showErrorMessage(error);
-			})
-			// }
-
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -170,6 +152,8 @@
 				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
@@ -179,71 +163,37 @@
 					this.fromWarehouseCode = balance.warehouseCode;
 				}
 				if (item == undefined) {
-					// 获取推荐库位
-					// this.getRecommendLocation(balance, pack, toLocation => {
-						var itemp = createItemInfo(balance, pack);
-						let newDetail = createDetailInfo(balance, pack); //
-						// newDetail.toLocationCode = toLocation.code;
-						// newDetail.toWarehouseCode = toLocation.warehouseCode;
-						itemp.subList.push(newDetail);
-						var dataList = pack.subList
-						this.detailSource.push(itemp)
-						this.detailSource.forEach(res => {
-							res.subList.forEach(pack => {
-								pack.packList = dataList.filter(c => c.parentNumber == pack
-									.packingNumber)
-								pack.packList.forEach(pac => {
-									pac.parentPackingNumber = pac.parentNumber;
-									pac.packingNumber = pac.number;
-									pac.inventoryStatus = "OK";
-									pac.scaned = true;
-								})
-							})
-						})
-					// })
+					
+					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 itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
-						balance.batch);
-					if (itemDetail != undefined) {
-						this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
-					}
-				}
-				// calcTreeHandleQty(this.detailSource);
-			},
-
-			//获取推荐库位
-			getRecommendLocation(balance, pack, callback) {
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				})
-				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
-				if (recommend == undefined) {
-					let param = {
-						itemCode: balance.itemCode,
-						batch: balance.batch,
-						inventoryStatus: balance.inventoryStatus,
-						supplierCode: pack.supplierCode,
-						businessCode: this.businessTypeCode
-					};
-					console.log(JSON.stringify(param))
-					getPutawayRecommendLocation(param).then(res => {
-						this.recommendLocationList.push({
-							itemCode: balance.itemCode,
-							locationCode: res.data.code
-						})
-						callback(res.data);
-						uni.hideLoading();
-					}).catch(error => {
-						uni.hideLoading()
-						this.showErrorMessage(error);
-						uni.hideLoading();
+					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;
+						}
 					})
-
-				} else {
-					callback(recommend);
+					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 + "]已经在列表中")
+						}
+					}
 				}
+				
 			},
 
 			showErrorMessage(message) {
@@ -252,80 +202,22 @@
 				});
 			},
 
-			calcTreeHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty = calc.add(item.qty, detail.qty)
-						}
-					}
-				}
-				this.$forceUpdate();
-			},
 
-			showSelect() {
-				// if (this.editPosition) {
-				this.show = true
-				// }
-			},
-
-			confirmSelect(e) {
-				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
-				console.log("位置", this.positionInfo)
-				this.workshopCode = e[0].value
-				this.productionLineCode = e[1].value
-				this.workStationCode = e[2].value
-				this.workShopName = e[0].label
-				this.productionLineName = e[1].label
-				this.workStationName = e[2].label
-
-				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
-				if (shop != undefined && shop.children != undefined) {
-					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
-					if (prodLine != undefined && prodLine.children != undefined) {
-						let station = prodLine.children.find(r => r.value == this.workStationCode);
-						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
-							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
-							return;
-						} else {
-							this.rawLocationCode = station.rawLocationCode;
-							this.fgLocationCode = station.fgLocationCode;
-						}
-					} else {
-						this.showErrorMessage("生产线-工位基础信息维护错误")
+			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)
 					}
-				} 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.detailSource.forEach(item=>{
-					item.subList.forEach(detail => {
-						detail.toLocationCode = toLocationCode
-					})
-				})
+				this.$forceUpdate();
 				
 			},
 
-
-
-			updateData() {
-				this.calcTreeHandleQty();
-			},
-
 			removeItem(index, item) {
 				this.detailSource.splice(index, 1)
+				this.updateData();
 			},
 
 			removePack() {
@@ -364,7 +256,23 @@
 				}
 			},
 
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+			},
+
 			commit() {
+				if(this.toLocationCode==""){
+					this.showMessage("请输入目标库位")
+					return;
+				}
+				
+				this.detailSource.forEach(item=>{
+					item.subList.forEach(detail=>{
+						detail.toLocationCode=this.toLocationCode
+						detail.fromLocation =this.fromLocationCode
+					})
+				})
+				
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -376,7 +284,7 @@
 				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = {...this.setRecordParams()}
+						var params = this.setRecordParams()
 						console.log("提交参数", JSON.stringify(params));
 
 						repleinshRecordSubmit(params).then(res => {
@@ -398,37 +306,6 @@
 			},
 
 
-			getItemAndLocationRelations() {
-				var itemList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							detail.toLocationCode = this.toLocationCode;
-							var filterResult = itemList.filter(res => {
-								if (res.itemCode == item.itemCode &&
-									res.locationCode == detail.toLocationCode &&
-									res.batch == detail.batch &&
-									res.inventoryStatus == detail.inventoryStatus) {
-									return res
-								}
-							})
-							//去掉重复元素
-							if (filterResult.length == 0) {
-								var result = {
-									itemCode: item.itemCode,
-									locationCode: detail.toLocationCode,
-									batch: detail.batch,
-									inventoryStatus: detail.inventoryStatus,
-								}
-								itemList.push(result)
-							}
-
-						}
-					})
-				})
-				return itemList;
-			},
-
 			setRecordParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
@@ -453,7 +330,8 @@
 							// detail.toLocationCode = detail.toLocationCode
 							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
-							submitItem.recordList = [{
+							submitItem.recordList=[
+								{
 									toInventoryStatus:detail.inventoryStatus,
 									fromPackingNumber:info.packingNumber,
 									fromBatch:info.batch,
@@ -461,7 +339,11 @@
 									toBatch:info.batch,
 									fromLocationCode:detail.locationCode,
 									toLocationCode:detail.toLocationCode,
-									handleQty:detail.handleQty
+									handleQty:detail.handleQty,
+									fromPackUnit:detail.packUnit,
+									toPackUnit:detail.packUnit,
+									fromPackQty:detail.packQty,
+									toPackQty:detail.packQty
 								}
 							]
 							subList.push(submitItem)
@@ -482,13 +364,6 @@
 					if (res) {}
 				});
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
@@ -505,7 +380,6 @@
 				this.getFromLocationCode(location, code)
 			},
 			getFromLocationCode(location, code) {
-				this.fromLocationInfo = location;
 				this.fromLocationCode = code;
 				this.openScanPopup();
 			},
@@ -522,30 +396,54 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData();
+					this.clear();
 				})
 			},
 
-			updateData() {
-				// this.calcTreeHandleQty();
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-
-			clearData() {
-				this.fromLocationInfo = {};
+			clear() {
 				this.fromLocationCode = '';
 				this.fromWarehouseCode = '';
 				this.toWarehouseCode = '';
 				this.detailSource = [];
+				this.toLocationCode = "";
 			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/record/directRepleinshRecord1.vue b/src/pages/repleinsh/record/directRepleinshRecord1.vue
new file mode 100644
index 00000000..a18eec6b
--- /dev/null
+++ b/src/pages/repleinsh/record/directRepleinshRecord1.vue
@@ -0,0 +1,551 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class='split_line'></view>
+			</view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</recordDetailCard>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="uni-row uni-flex">
+						<text>生产线:</text>
+						<view class="uni-flex u-col-center uni-row" @click="showSelect">
+							<view class="" style="margin-left: 20rpx;">
+								{{positionInfo}}
+							</view>
+							<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+								@confirm="confirmSelect"></u-select>
+						</view>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</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>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		repleinshRecordSubmit,
+		getWorkShopLineStation,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcTreeHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			recordDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				businessTypeCode: "Repleinment",
+				positionList: [],
+				show: false,
+				positionInfo: "请选择生产线"
+			};
+		},
+		onLoad(option) {
+			this.clearData();
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+			// if (this.positionList.length == 0) {
+			getWorkShopLineStation().then(res => {
+				if (res.data != null && res.data.length > 0) {
+					this.positionList = res.data
+				} else {
+					this.showErrorMessage('未查找到位置信息');
+				}
+
+			}).catch(error => {
+				this.showErrorMessage(error);
+			})
+			// }
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					// 获取推荐库位
+					// this.getRecommendLocation(balance, pack, toLocation => {
+						var itemp = createItemInfo(balance, pack);
+						let newDetail = createDetailInfo(balance, pack); //
+						// newDetail.toLocationCode = toLocation.code;
+						// newDetail.toWarehouseCode = toLocation.warehouseCode;
+						itemp.subList.push(newDetail);
+						var dataList = pack.subList
+						this.detailSource.push(itemp)
+						this.detailSource.forEach(res => {
+							res.subList.forEach(pack => {
+								pack.packList = dataList.filter(c => c.parentNumber == pack
+									.packingNumber)
+								pack.packList.forEach(pac => {
+									pac.parentPackingNumber = pac.parentNumber;
+									pac.packingNumber = pac.number;
+									pac.inventoryStatus = "OK";
+									pac.scaned = true;
+								})
+							})
+						})
+					// })
+
+				} else {
+					var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
+						balance.batch);
+					if (itemDetail != undefined) {
+						this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+					}
+				}
+				// calcTreeHandleQty(this.detailSource);
+			},
+
+			//获取推荐库位
+			getRecommendLocation(balance, pack, callback) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				})
+				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: balance.itemCode,
+						batch: balance.batch,
+						inventoryStatus: balance.inventoryStatus,
+						supplierCode: pack.supplierCode,
+						businessCode: this.businessTypeCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: balance.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+						uni.hideLoading();
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+						uni.hideLoading();
+					})
+
+				} else {
+					callback(recommend);
+				}
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcTreeHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty, detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			showSelect() {
+				// if (this.editPosition) {
+				this.show = true
+				// }
+			},
+
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} 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.detailSource.forEach(item=>{
+					item.subList.forEach(detail => {
+						detail.toLocationCode = toLocationCode
+					})
+				})
+				
+			},
+
+
+
+			updateData() {
+				this.calcTreeHandleQty();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = {...this.setRecordParams()}
+						console.log("提交参数", JSON.stringify(params));
+
+						repleinshRecordSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成直接补料记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+			},
+
+
+			getItemAndLocationRelations() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									res.locationCode == detail.toLocationCode &&
+									res.batch == detail.batch &&
+									res.inventoryStatus == detail.inventoryStatus) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode,
+									batch: detail.batch,
+									inventoryStatus: detail.inventoryStatus,
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setRecordParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							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
+								}
+							]
+							subList.push(submitItem)
+						}
+					})
+				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+
+			updateData() {
+				// this.calcTreeHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clearData() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
\ No newline at end of file