From 529b470e43b0d857cea20aa7d1ebeea1e0a3a1df Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 31 Oct 2024 19:58:27 +0800
Subject: [PATCH] =?UTF-8?q?YT-575=E6=89=80=E6=9C=89pda=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=AE=8C=E6=88=90=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=AB=E6=8F=8F=E8=83=8C=E6=99=AF=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=AB=E6=8F=8F=E7=9A=84=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=92=8C=E5=8D=95=E4=BD=8D=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/comJobDetailCardBatch.vue          |   73 +-
 .../coms/comDeliverDetailCardBatch.vue        |  128 +-
 .../deliver/coms/comScanDeliverPackBatch.vue  |  785 +++++++---
 src/pages/deliver/job/deliverDetailBatch.vue  | 1322 ++++++++++-------
 .../inventoryMove/job/inventoryMoveDetail.vue |   87 +-
 src/pages/issue/job/issueDetailBatch.vue      |    1 -
 src/pages/issue/job/issueJob.vue              |    2 +-
 .../coms/comProductDetailCardBatch.vue        |  117 +-
 .../job/productReceiptDetail.vue              |    5 +-
 src/pages/putaway/job/putawayDetail.vue       |   14 +-
 10 files changed, 1630 insertions(+), 904 deletions(-)

diff --git a/src/mycomponents/detail/comJobDetailCardBatch.vue b/src/mycomponents/detail/comJobDetailCardBatch.vue
index 1a6be7a4..bb2be74f 100644
--- a/src/mycomponents/detail/comJobDetailCardBatch.vue
+++ b/src/mycomponents/detail/comJobDetailCardBatch.vue
@@ -1,22 +1,23 @@
-<!-- 采购上架任务详情按批次显示详情的组件 -->
 <template>
 	<view class="" style="background-color: #fff;">
-		<uni-swipe-action>
-			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="true"></itemCompareQty>
-			<uni-swipe-action-item
-				:right-options="(dataContent.scaned&&isEdit)?editAndRemoveOptions : dataContent.scaned? removeOptions:options"
-				@click="swipeClick($event,dataContent,'parent')">
-				<view class="" :class="dataContent.scaned?'scan_view':''">
-					<batch v-if="dataContent.subList[0].batch" :batch="dataContent.subList[0].batch"></batch>
-					<location title="来源库位" v-if="dataContent.subList[0].fromLocationCode"
-						:locationCode="dataContent.subList[0].fromLocationCode">
-					</location>
-				</view>
-			
-			</uni-swipe-action-item>
-		</uni-swipe-action>
-
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		<uni-collapse ref="collapse">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+						:isShowPackUnit="true"></itemCompareQty>
+				</template>
+				<package-list :dataContent="dataContent.subList" 
+				:isEdit="settingParam.allowModifyQty=='TRUE'"
+				  :settingParam="settingParam" 
+					@collapseChange="collapseChange"
+					@updateData="updateData"
+					 :isShowStatus="isShowStatus"
+					 :isShowPackListStatus="isShowPackListStatus"
+					></package-list>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref=" receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -31,13 +32,7 @@
 	import pack from '@/mycomponents/balance/pack.vue'
 	import detailList from '@/mycomponents/detail/detailList.vue'
 	import packageList from '@/mycomponents/package/packageList.vue'
-	import location from '@/mycomponents/balance/location.vue'
-	import toLocation from '@/mycomponents/balance/toLocation.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-	import {
-		getRemoveOption,
-		getEditRemoveOption
-	} from '@/common/array.js';
+
 	import {
 		getDetailOption,
 		getPurchaseReceiptOption
@@ -52,10 +47,7 @@
 			jobDetailPopup,
 			receiptDetailInfoPopup,
 			detailList,
-			packageList,
-			location,
-			toLocation,
-			batch,
+			packageList
 		},
 		props: {
 			dataContent: {
@@ -77,10 +69,6 @@
 			isShowPackListStatus: {
 				type: Boolean,
 				default: true
-			},
-			isEdit: {
-				type: Boolean,
-				default: true
 			}
 		},
 		watch: {
@@ -97,10 +85,7 @@
 				},
 				locatonItem: {},
 				detailOptions: [],
-				scanOptions: [],
-				options: [],
-				removeOptions: [],
-				editAndRemoveOptions: []
+				scanOptions: []
 			}
 		},
 
@@ -112,9 +97,7 @@
 				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
 					.allowModifyLocation)
 			}
-			this.removeOptions = getRemoveOption();
-			this.editAndRemoveOptions = getEditRemoveOption()
-
+			
 
 		},
 
@@ -122,13 +105,13 @@
 			console.log('updated')
 		},
 
-		methods: {
-			collapseChange() {
+		methods: {	
+			collapseChange(){
 				setTimeout(() => {
 					this.resizeCollapse();
 				}, 500)
 			},
-
+			
 			resizeCollapse() {
 				this.$nextTick(r => {
 					this.$refs.collapse.resize()
@@ -149,8 +132,8 @@
 				this.$forceUpdate();
 			},
 
-			swipeClick(e, item, type) {
-				if (e.content.text == "编辑") {
+			swipeClick(e, item) {
+				 if (e.content.text == "编辑") {
 					this.edit(item)
 				} else if (e.content.text == "移除") {
 					this.remove(item)
@@ -175,7 +158,7 @@
 				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			},
-			updateData() {
+			updateData(){
 				this.$emit('updateData')
 			}
 		}
diff --git a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
index f8284f15..33de6657 100644
--- a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
+++ b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
@@ -1,23 +1,32 @@
 <template>
 	<view>
+		
 		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
 			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
-
-		<view v-for="(item,index) in dataContent.subList" style="margin-bottom: 20rpx;">
-			<uni-swipe-action ref="swipeAction" :class="item.scaned? 'scan_view':''">
-				<uni-swipe-action-item
-					:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
-					@click="swipeClick($event,item,index)" style='padding:20rpx 0px  5px 0px;align-items: center;'>
-					<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false"></item-qty>
-					<location :locationCode="item.fromLocationCode"></location>
-					<recommendBalanceBatch style='margin-left: 20px;' :detail="item" :isShowLocation="false"
-						:isShowPack="item.packingNumber"></recommendBalanceBatch>
-
-				</uni-swipe-action-item>
-			</uni-swipe-action>
+		<view>
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true"  :class="dataContent.scaned?'scan_view':''">
+					<template v-slot:title>
+						<view class="split_line"></view>
+						<!-- 物品 -->
+						<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowBalanceQty='false'></item-qty>
+					</template>
+					<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
+						    v-for="(item,index) in dataContent.subList">
+						<uni-swipe-action-item
+							:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"   @click="itemCoceClick($event,item,index)">
+							<view class="" :class="item.scaned?'scan_view':''">
+								<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+							</view>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</uni-collapse-item>
+			</uni-collapse>
 		</view>
 	</view>
-	<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true" :allowBiggerQty='allowBiggerQty'></qtyEdit>
+	<!-- <balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit> -->
+	<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+	</recommend-qty-edit>
 	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 	<comMessage ref="message"></comMessage>
 </template>
@@ -25,39 +34,42 @@
 <script>
 	import itemQty from '@/mycomponents/item/itemQty.vue'
 	import recommend from '@/mycomponents/recommend/recommend.vue'
-	import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
 	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
 	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import qtyEdit from '@/mycomponents/qty/qtyEdit.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 	import location from '@/mycomponents/balance/location.vue'
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
-
-import {
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qtyEdit from '@/mycomponents/qty/qtyEdit.vue'
+	import {
 		getDetailOption,
-		getPurchaseReceiptOption,
-		getRemoveOption,
-		getEditRemoveOption
+		getEditRemoveOption,
+		getRemoveOption
 	} from '@/common/array.js';
 
 	export default {
-		emits: ['updateData'],
+		emits: ['updateData', "removeItemCode"],
 		components: {
 			itemQty,
 			recommend,
-			recommendBalanceBatch,
+			recommendBalance,
 			handleBalance,
 			recommendQtyEdit,
 			requiredLocation,
-			qtyEdit,
+			balanceQtyEdit,
 			location,
-			detailInfoPopup
+			detailInfoPopup,
+			comIssueRequestInfo,
+			batch,
 		},
 		props: {
 			dataContent: {
-				type: Object,
-				default: {}
+				type: Array,
+				default: []
 			},
 			settingParam: {
 				type: Object,
@@ -67,10 +79,6 @@ import {
 				type: Boolean,
 				default: true
 			},
-			allowBiggerQty: {
-				type: Boolean,
-				default: false
-			},
 		},
 		watch: {
 
@@ -83,58 +91,82 @@ import {
 				editItem: {},
 				batchItem: {},
 				detailOptions: [],
-				scanOptions: []
+				scanOptions: [],
+				removeOptions: [],
+				editAndRemoveOptions:[]
 			}
 		},
 
 		mounted() {
-			
-			this.removeOptions = getRemoveOption();
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
+			this.removeOptions = getRemoveOption()
 			this.editAndRemoveOptions = getEditRemoveOption()
+			console.log(888,this.dataContent)
 		},
 
 		methods: {
 			resizeCollapse() {
 				this.$nextTick(r => {
-					this.$refs.collapse.forEach(r => {
-						r.childrens.forEach(i => {
+						this.$refs.collapse.resize()
+						this.$refs.collapse.childrens.forEach(i => {
 							i.init();
 						})
-						r.resize();
-					})
+					
 				});
 			},
+			swipeClick(e, batch,
+			 record,recordIndex,
+			 batchIndex,
+			Batchs,
+			 locatonIndex,
+			Locations) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
+				} else if (e.content.text == "移除") {
+					this.remove(batch, record, recordIndex,batchIndex,Batchs,locatonIndex,Locations)
+				}
+			},
 
-			swipeClick(e, item, index) {
+			itemCoceClick(e, item, index) {
 				if (e.content.text == "编辑") {
 					this.edit(item)
 				} else if (e.content.text == "移除") {
-					this.remove(item, index)
+					// this.dataContent.subList.splice(index, 1);
+					item.scaned = false
+					item.handleQty=0
+				this.$emit('updateData')
 				}
 			},
 
 			edit(item) {
-				let that = this;
-				that.editItem = item;
-				that.$refs.balanceQtyEdit.openEditPopup(item);
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
 			},
 
 			detail(item) {
 				this.showItem = item;
 				this.$refs.receiptHint.openScanPopup()
 			},
-			remove(item, index) {
+			remove(batch, record, recordIndex,batchIndex,Batchs,locatonIndex,Locations) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
 					res => {
 						if (res) {
-						item.handleQty = 0;
-						item.scaned = false ;
+							batch.Records.splice(recordIndex, 1);
+							if(batch.Records.length==0&&Batchs[batchIndex].isNewAdd){
+								Batchs.splice(batchIndex,1)
+							}
+							if(batch.Records.length==0&&Locations[locatonIndex].isNewAdd){
+								Locations.splice(locatonIndex,1)
+							}
+							this.resizeCollapse();
+							this.$emit('updateData', record)
 						}
 					});
 			},
 			confirm(val) {
-					this.editItem.handleQty =  Number(val);
-					this.$emit('updateData', this.editItem)
+				this.editItem.handleQty =  Number(val);
+				this.$emit('updateData', this.editItem)
 			}
 		}
 	}
diff --git a/src/pages/deliver/coms/comScanDeliverPackBatch.vue b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
index 5c0d2667..1793b008 100644
--- a/src/pages/deliver/coms/comScanDeliverPackBatch.vue
+++ b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
@@ -3,18 +3,19 @@
 		<uni-popup ref="popup" :maskClick='false'>
 			<view class="">
 				<view class="popup_box">
+
 					<view class="pop_title uni-flex space-between">
 						<view class="" style="font-size: 35rpx;">
 							扫描箱码
 						</view>
 
 						<view class="">
+
 							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
 								@click="closeScanPopup()"></image>
 						</view>
 					</view>
-
-					<!-- <view class="uni-flex uni-row" style="align-items: center;
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						margin-right: 20rpx;
@@ -32,28 +33,29 @@
 									@confirm="confirmSelect"></u-select>
 							</view>
 						</view>
-					</view>
-					<u-line class='line_color'></u-line> -->
+					</view> -->
+					<!-- <u-line class='line_color'></u-line> -->
 
-					<view class="uni-flex uni-row" style="align-items: center;
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						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>
+					</view> -->
 
 					<view class="">
 						<view class="">
 							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
-								:headerType="headerType" :isShowHistory="false">
+								headerType="HPQ,HMQ" :isShowHistory="false">
 							</win-com-scan>
 
 							<view style="width: 100%;">
@@ -76,7 +78,7 @@
 													<uni-swipe-action-item @click="swipeClick($event,record,index)"
 														:right-options="scanOptions">
 														<view style="padding: 0px 10px">
-															<balance :dataContent="record" :isShowLocation="false"
+															<balance :dataContent="record" :isShowFromLocation="false"
 																:isShowStdPack="false"></balance>
 														</view>
 													</uni-swipe-action-item>
@@ -95,6 +97,10 @@
 		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 		<comMessage ref="comMessage"></comMessage>
 		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+		<!-- 模拟扫描功能 -->
+		<!-- <win-com-scan v-show="false" ref="comscansimulate" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+		headerType="HPQ,HMQ" :isShowHistory="false">
+	</win-com-scan> -->
 	</view>
 </template>
 
@@ -108,24 +114,33 @@
 		getDetailOption,
 		getDetailEditRemoveOption
 	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation,
+		getBalanceByFilter,
+		getBalanceByParams,
+	} from '@/api/request2.js';
+	import {
+		uniqueArray
+	} from '@/common/basic.js';
 
 	import {
-		getDirectoryItemArray,
-	} from '@/common/directory.js';
+		getLabelInfo
+	} from '@/common/label.js';
 
 	import {
 		calc
 	} from '@/common/calc.js';
-	import {
-		getWorkShopLineStation
-	} from '@/api/request2.js';
 
 	import {
 		getBalanceByManagementPrecision
 	} from '@/common/balance.js';
+	import {
+		getDirectoryItemArray
+	} from '../../../common/directory.js';
 
 	export default {
 		name: 'winScanPack',
+		emits: ["afterScan", "closeScan"],
 		components: {
 			winComScan,
 			balance,
@@ -137,12 +152,6 @@
 				type: String,
 				default: ''
 			},
-			headerType: {
-				type: String,
-				default: "HPQ,HMQ"
-			},
-
-
 		},
 		data() {
 			return {
@@ -163,9 +172,14 @@
 				positionInfo: "请选择位置",
 				positionList: [],
 				defaultValueList: [],
+				fromInventoryStatuses: "",
+				packageInfo: {},
 				label: {},
-				fromInventoryStatuses: [],
-				packageInfo: {}
+				inputStyleObject: {
+					fontSize: "100rpx"
+				},
+				bussinessCode: 'Issue',
+				toLocationAreaTypeList: []
 			}
 		},
 		created() {
@@ -177,13 +191,29 @@
 			this.scanOptions = getDetailEditRemoveOption();
 		},
 		methods: {
+			openScanPopupForJobSimulate(content, jobcontent, scanMessage) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				getLabelInfo(scanMessage, "HPQ,HMQ", callback => {
+					if (callback.success) {
+						this.onScan(callback);
+					} else {
+						this.showErrorMessage(callback.message, res => {})
+					}
+
+				})
+
+			},
+
 			openScanPopup(content, jobcontent) {
 				this.issueRecord = [];
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
-					"-" + this.jobContent.subList[0].workStationCode
+				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+				// 	"-" + this.jobContent.subList[0].workStationCode
 				this.$refs.popup.open('bottom')
 				setTimeout(res => {
 					this.getfocus();
@@ -202,57 +232,58 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
-					that.toLocation =that.dataContent.subList;
-					that.toLocationCode = that.dataContent.subList[0].toLocationCode;
-					that.fromLocationList = that.getFromLocationList();
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.toLocationAreaTypeList = getDirectoryItemArray(this.jobContent.toAreaTypes)
+					// that.fromLocationList = that.getFromLocationList();
 				}
 			},
 
-			showBalanceSelect(items, packageInfo) {
-				this.packageInfo = packageInfo;
+			showBalanceSelect(items) {
 				this.$refs.balanceSelect.openPopup(items);
 			},
 
-			getFromLocationList() {
-				let list = [];
-				let location = this.dataContent.subList.find(r => r.toLocationCode == this.toLocationCode);
-				if (location != undefined) {
-					this.dataContent.subList.forEach(item => {
-						list.push(item.fromLocationCode)
-					})
-					this.fromLocationCode = list[0];
-					return list;
-				} else {
-					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
-						this.toLocationCode = '';
-					});
-				}
-			},
+			// getFromLocationList() {
+			// 	let list = [];
+			// 	this.dataContent.forEach(location => {
+			// 		location.Items.forEach(item => {
+			// 			item.Locations.forEach(f => {
+			// 				let item = list.find(l => l == f.fromLocationCode);
+			// 				if (item == undefined) {
+			// 					list.push(f.fromLocationCode)
+			// 				}
+			// 			})
+			// 		})
+			// 	});
+			// 	//去掉重复库位
+			// 	list = uniqueArray(list);
+			// 	this.fromLocationCode = list[0];
+			// 	return list;
+			// },
 
 			fromLocationUpdate(fromlocation) {
 				let location = this.fromLocationList.find(r => r == fromlocation)
-				// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
-				// if (location == undefined) {
-					this.fromLocationCode = fromlocation
-				// 	this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
-				// }
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				}
 			},
-			onScan(result) {
+
+			queryBalance(result) {
 				try {
 					let that = this;
-
-					if (that.fromLocationCode == '') {
-						that.showErrorMessage('请选择来源库位', res => {
-							that.$refs.toLocationCombox.onFocus();
-						});
-						return;
-					}
+					// 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.find(r => r.itemCode == itemCode);
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
 					if (item == undefined) {
 						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
 							res => {
@@ -261,89 +292,267 @@
 						)
 						return;
 					} else {
-						//查找库存信息
+
+						var params = {
+							itemCode: result.package.itemCode,
+							batch: result.label.batch,
+							packingNumber: result.label.packingNumber,
+							parentPackingNumber: result.package.parentNumber,
+							inventoryStatus: this.jobContent.outInventoryStatuses.split(','),
+							areaType: this.jobContent.fromAreaTypes.split(','),
+							bussinessCode: this.jobContent.businessType
+						}
 						uni.showLoading({
-							title: '加载中',
+							title: '查询中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
-							balanceRes => {
-								if (balanceRes.success) {
-									if (balanceRes.data.list.length == 0) {
-										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-											res => {
-												this.packGetFocus();
-											})
-									} else if (balanceRes.data.list.length == 1) {
-										let balance = balanceRes.data.list[0];
-										this.afterGetBalance(result.label, balance, packageInfo);
-									} else {
-										this.label = result.label;
-										this.showBalanceSelect(balanceRes.data.list, packageInfo);
-									}
+						getBalanceByParams(params).then(res => {
+							if (res.data.length == 0) {
+								var status = getInventoryStatusDesc(params.inventoryStatus)
+								var areaType = getListLocationAreaTypeDesc(params.areaType)
+								var hint =
+									"按物料号 [" + params.itemCode + "] \n" +
+									"包装号 [" + params.packingNumber + "] \n" +
+									"批次 [" + params.batch + "] \n" +
+									"状态 [" + status + "] \n" +
+									"库区 [" + areaType + "] \n" +
+									"未查找到库存余额"
+								this.showErrorMessage(hint,
+									res => {
+										that.getfocus();
+									})
+							} else if (res.data.length == 1) {
+								result.balance = res.data[0]
+
+								if (result.label.packingNumber != result.balance.packingNumber) {
+									result.balance.qty = Number(result.label.qty)
 								} else {
-									this.showErrorMessage(balanceRes.message.message);
+									result.balance.qty = Number(result.balance.qty)
 								}
-								uni.hideLoading();
-							});
+								this.afterGetBalance(result.label, result.balance, result.package);
+							} else {
+								//多条记录
+								this.$refs.balanceSelect.openPopup(res.data);
+							}
+							uni.hideLoading()
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error,
+								res => {
+									that.getfocus();
+								})
+						})
 					}
 				} catch (e) {
-					this.showErrorMessage(e.stack)
+					this.showErrorMessage(e.stack, res => {
+						that.getfocus();
+					})
 					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) {
+				if (!result.package) {
+					this.showErrorMessage('扫描数据错误[' + result.label.code + "]",
+						res => {
+							this.getfocus();
+						}
+					)
+					return;
+				}
+				if (this.toLocation && result.package.packUnit) {
+					let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
+					if (!item) {
+						this.showErrorMessage('扫描物料代码不属于该任务');
+						return
+					}
+					this.getToLocationBalance(result)
+				}
+			},
+
+			//查询到目标库位的库存余额
+			getToLocationBalance(result) {
+				uni.showLoading({
+					title: '查询中',
+					mask: true
+				})
+				var filters = []
+				if (result.package.parentNumber) {
+					var packingNumber = result.package.parentNumber + "," + result.package.number;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
+					})
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: result.package.number
+					})
+				}
+
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: result.package.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: result.package.batch
+				})
+
+				filters.push({
+					column: "areaType",
+					action: "in",
+					value: this.toLocationAreaTypeList.join(',')
+				})
+
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					uni.hideLoading()
+					if (res.data.list.length > 0) {
+						this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+					} else {
+						this.queryBalance(result);
+					}
+					// callback(res.data)
+				}).catch(err => {
+					uni.hideLoading()
+					this.showErrorMessage(err.message);
+				})
+			},
+
 			selectBalanceItem(balance) {
 				this.afterGetBalance(balance, balance, this.packageInfo);
 			},
 
-
 			afterGetBalance(label, balance, packageInfo) {
 				let that = this;
 				try {
 					let itemCode = label.itemCode;
 					let packingCode = label.packingNumber;
 					let lot = label.batch;
-					let item = that.toLocation.find(r => r.itemCode == itemCode);
-					// item.scaned =true
-					let fromLocation = that.toLocation.find(l => l.fromLocationCode == that.fromLocationCode);
-					// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
-					if(!fromLocation){
-						fromLocation = {
-							Batchs:[{
-								Recommends:[],
-								Records: [],
-								batch: label.batch,
-								detail:{
-									...packageInfo,
-									fromLocationCode: balance.locationCode,
-									toLocationCode:this.toLocationCode
-								},
-								handleQty: 0,
-								packingNumber: null,
-								// packingNumber: label.packingNumber,
-								qty: label.qty,
-								uom: label.uom
-							}],
-							toLocationCode:this.toLocationCode,
-							fromLocationCode: balance.locationCode,
-							handleQty: 0,
-							qty: label.qty,
-							uom: label.uom
-						}
-						item.Locations.push(fromLocation)
-					}
-					if (fromLocation != undefined) {
-						let batch = fromLocation.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					that.fromLocationCode = balance.locationCode;
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					//扫描的库位在列表中存在
+					if (fromLocation){
+						//不是在任务列表中的，是新加的库位
+						// if(fromLocation.isNewAdd){
+							
+						// }else {
+						// //在任务列表中。
+						
+						// }
+						
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
 						if (batch != undefined) {
-							that.addRecord(item.batch, label, balance, packageInfo)
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+						
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends != undefined && batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+													return;
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+						
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						
 						} else {
 							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance,packageInfo);
+											let batch = that.createBatchInfo(label, balance, packageInfo);
+											//新增加的批次赋值details
+											if (fromLocation.Batchs.length > 0) {
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
 											fromLocation.Batchs.unshift(batch);
+											this.getfocus();
+											that.$emit("afterScan");
 										}
 									})
 							} else {
@@ -353,13 +562,168 @@
 									});
 							}
 						}
-					} else {
-						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
-							res => {
-								that.getfocus();
-							}
-						)
+						
+					}else {
+						//扫描的不在任务列表中，询问是否可以添加，
+						if (this.jobContent.allowModifyLocation == "TRUE") {
+							this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+								"】与推荐的库位不一致,是否要继续发货?", res => {
+									if (res) {
+										let locaion = that.createLocationInfo(label, balance, packageInfo);
+										item.Locations.push(locaion);
+										this.getfocus();
+										that.$emit("afterScan");
+									}
+								})
+						
+						} else {
+							this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+								"】与推荐的库位不一致,不允许继续发货?")
+						}
 					}
+					
+					// if (fromLocation && !fromLocation.isNewAdd) {
+					// 	let batch = fromLocation.Batchs.find(r => r.batch == lot);
+					// 	if (batch != undefined) {
+					// 		if (batch.Records == undefined) {
+					// 			batch.Records = [];
+					// 		}
+
+					// 		let record = batch.Records.find(r => r.packingNumber == packingCode);
+					// 		if (record == undefined) {
+					// 			//如果有推荐箱码
+					// 			if (batch.Recommends != undefined && batch.Recommends.length > 0) {
+					// 				let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+					// 				if (recommend != undefined) {
+					// 					that.addRecord(batch, label, balance, packageInfo)
+					// 				} else {
+					// 					//允许修改箱码
+					// 					if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+					// 						that.addRecord(batch, label, balance, packageInfo);
+					// 					} else {
+					// 						that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+					// 							res => {
+					// 								that.getfocus();
+					// 								return;
+					// 							}
+					// 						)
+					// 					}
+					// 				}
+					// 			} else {
+					// 				that.addRecord(batch, label, balance, packageInfo)
+					// 			}
+
+					// 		} else {
+					// 			that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+					// 				res => {
+					// 					that.getfocus();
+					// 				}
+					// 			)
+					// 		}
+
+					// 	} else {
+					// 		if (this.jobContent.allowModifyBatch == "TRUE") {
+					// 			this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+					// 				'】的发货明细,是否要继续发货?', res => {
+					// 					if (res) {
+					// 						let batch = that.createBatchInfo(label, balance, packageInfo);
+					// 						//新增加的批次赋值details
+					// 						if (fromLocation.Batchs.length > 0) {
+					// 							batch.detail = fromLocation.Batchs[0].detail;
+					// 						}
+					// 						fromLocation.Batchs.unshift(batch);
+					// 						this.getfocus();
+					// 						that.$emit("afterScan");
+					// 					}
+					// 				})
+					// 		} else {
+					// 			that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+					// 				res => {
+					// 					that.getfocus();
+					// 				});
+					// 		}
+					// 	}
+					// } else {
+					// 	if (fromLocation&&fromLocation.isNewAdd) {
+					// 		let batch = fromLocation.Batchs.find(r => r.batch == lot);
+					// 		if (batch != undefined) {
+					// 			if (batch.Records == undefined) {
+					// 				batch.Records = [];
+					// 			}
+
+					// 			let record = batch.Records.find(r => r.packingNumber == packingCode);
+					// 			if (record == undefined) {
+					// 				//如果有推荐箱码
+					// 				if (batch.Recommends != undefined && batch.Recommends.length > 0) {
+					// 					let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+					// 					if (recommend != undefined) {
+					// 						that.addRecord(batch, label, balance, packageInfo)
+					// 					} else {
+					// 						//允许修改箱码
+					// 						if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+					// 							that.addRecord(batch, label, balance, packageInfo);
+					// 						} else {
+					// 							that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+					// 								res => {
+					// 									that.getfocus();
+					// 									return;
+					// 								}
+					// 							)
+					// 						}
+					// 					}
+					// 				} else {
+					// 					that.addRecord(batch, label, balance, packageInfo)
+					// 				}
+
+					// 			} else {
+					// 				that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+					// 					res => {
+					// 						that.getfocus();
+					// 					}
+					// 				)
+					// 			}
+
+					// 		} else {
+					// 			if (this.jobContent.allowModifyBatch == "TRUE") {
+					// 				this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+					// 					'】的发货明细,是否要继续发货?', res => {
+					// 						if (res) {
+					// 							let batch = that.createBatchInfo(label, balance, packageInfo);
+					// 							//新增加的批次赋值details
+					// 							if (fromLocation.Batchs.length > 0) {
+					// 								batch.detail = fromLocation.Batchs[0].detail;
+					// 							}
+					// 							fromLocation.Batchs.unshift(batch);
+					// 							this.getfocus();
+					// 							that.$emit("afterScan");
+					// 						}
+					// 					})
+					// 			} else {
+					// 				that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+					// 					res => {
+					// 						that.getfocus();
+					// 					});
+					// 			}
+					// 		}
+					// 	} else {
+					// 		if (this.jobContent.allowModifyLocation == "TRUE") {
+					// 			this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+					// 				"】与推荐的库位不一致,是否要继续发货?", res => {
+					// 					if (res) {
+					// 						let locaion = that.createLocationInfo(label, balance, packageInfo);
+					// 						item.Locations.push(locaion);
+					// 						this.getfocus();
+					// 						that.$emit("afterScan");
+					// 					}
+					// 				})
+
+					// 		} else {
+					// 			this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode +
+					// 				"】与推荐的库位不一致,不允许继续发货?")
+					// 		}
+					// 	}
+
+					// }
 				} catch (e) {
 					that.showErrorMessage(e.stack,
 						res => {
@@ -369,27 +733,32 @@
 				}
 			},
 
+			//增加不是任务中的库位，实际扫描的明细
+			createLocationInfo(label, balance, packageInfo) {
+				let location = {
+					fromLocationCode: balance.locationCode,
+					qty: balance.qty,
+					uom: balance.uom,
+					handleQty: 0,
+					isNewAdd: true,
+					Batchs: []
+				}
+				let batch = this.createBatchInfo(label, balance, packageInfo);
+				batch.detail = balance;
+				batch.detail.fromLocationCode = balance.locationCode;
+				location.Batchs.push(batch);
+				return location;
+			},
+
+
 			createBatchInfo(data, balance, packageInfo) {
 				let batch = {
-					batch: data.lot||data.batch,
+					isNewAdd: true,
+					batch: data.batch,
 					qty: 0,
 					uom: data.uom,
-					handleQty: Number(data.qty),
-					Records: [],
-					detail:{
-						fromLocationCode:this.fromLocationCode, //balance.locationCode
-						toLocationCode:this.toLocationCode,
-						itemCode:data.itemCode,
-						handleQty: Number(data.qty),
-						packingNumber:data.packingNumber,
-						qty: 0,
-						uom:data.uom,
-						itemName:packageInfo.itemName,
-						itemDesc1:packageInfo.itemDesc1,
-						itemDesc2:packageInfo.itemDesc2,
-						singlePrice:balance.singlePrice,
-						amount:balance.amount
-					}
+					handleQty: Number(balance.qty),
+					Records: []
 				}
 				let record = this.creatRecord(data, balance, packageInfo);
 				batch.Records.push(record);
@@ -401,53 +770,91 @@
 				balance.packQty = packageInfo.packQty
 				balance.packUnit = packageInfo.packUnit
 				let record = {
-				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),
-				qty: Number(balance.qty),
-				handleQty:0,
-				uom: balance.uom,
-				inventoryStatus: balance.inventoryStatus,
-				balance: balance,
-				toLocationCode: this.toLocationCode,
-				supplierCode: label.supplierCode,
-				packUnit: packageInfo.packUnit,
-				packQty: packageInfo.packQty,
-				fromLocationCode:balance.locationCode,
+					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),
+					qty: Number(balance.qty),
+					handleQty: Number(balance.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode,
+					packUnit: packageInfo.packUnit,
+					packQty: packageInfo.packQty
 				}
+
 				return record;
 			},
 
-			calcBatchHandleQty(batch,label,balance) {
-				this.dataContent.subList.forEach(item => {
-					if(item.itemCode == label.itemCode&&item.batch == label.batch){
-						item.handleQty = item.handleQty || 0
-						item.handleQty = calc.add(item.handleQty, label.qty);
-					}
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty, res.qty)
 				})
+				batch.handleQty = handleQty;
+
 			},
 
 			addRecord(batch, label, balance, packageInfo) {
-				var checkData = this.dataContent.subList.find(r => {
-					if (r.batch == balance.batch) {
-						return r;
+				if (packageInfo.parentNumber) {
+					var checkData = batch.Records.find(r => {
+						if (r.packingNumber == packageInfo.parentNumber &&
+							r.batch == balance.batch) {
+							return r;
+						}
+					})
+					if (checkData) {
+						//提示已经扫描
+						this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + balance.batch +
+							"]的父包装已经扫描")
+					} else {
+						let record = this.creatRecord(label, balance, packageInfo);
+						batch.Records.push(record);
+						this.issueRecord.unshift(record)
+						this.calcBatchHandleQty(batch);
+						this.getfocus();
+						this.$emit("afterScan");
 					}
-				})
-				if (checkData) {
-					checkData.scaned = true
-					this.calcBatchHandleQty(batch,label,balance);
-					this.getfocus();
 				} else {
-					let record = this.creatRecord(label, balance, packageInfo);
-					this.dataContent.subList.push(record);
-					this.calcBatchHandleQty(batch,label,balance);
-					this.getfocus();
-					this.$emit("afterScan");
+					//扫描的是父包装
+					var checkData = batch.Records.find(r => {
+						if (r.parentPackingNumber == packageInfo.number &&
+							r.batch == balance.batch) {
+							return r;
+						}
+					})
+					if (checkData) {
+						//是否移除
+						this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" +
+							balance
+							.batch + "]是父包装，是否移除子包装", res => {
+								if (res) {
+									batch.Records = [];
+									let record = this.creatRecord(label, balance, packageInfo);
+									batch.Records.push(record);
+									this.issueRecord.unshift(record)
+									this.calcBatchHandleQty(batch);
+									this.getfocus();
+									this.$emit("afterScan");
+								}
+							})
+						console.log("扫描的是父包装，是否移除子包装")
+					} else {
+						let record = this.creatRecord(label, balance, packageInfo);
+						batch.Records.push(record);
+						this.issueRecord.unshift(record)
+						this.calcBatchHandleQty(batch);
+						this.getfocus();
+						this.$emit("afterScan");
+					}
+
 				}
+
 			},
 
 			getfocus() {
@@ -496,13 +903,17 @@
 
 							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
 							if (item != undefined) {
+
 								item.Locations.forEach(l => {
 									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
 										.batch == record.batch);
-									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
-										.packingNumber && r
-										.batch == record.batch);
-									batch.Records.splice(rIndex, 1);
+
+									if (batch && batch.Records && batch.Records.length > 0) {
+										let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+											.packingNumber && r.batch == record.batch);
+										batch.Records.splice(rIndex, 1);
+									}
+
 								})
 							}
 							this.$emit('updateData', item);
@@ -511,10 +922,16 @@
 			},
 
 			packGetFocus() {
-				this.$refs.comscan.getfocus();
+				if (this.$refs.comscan) {
+					this.$refs.comscan.getfocus();
+				}
+
 			},
 			packLoseFocus() {
-				this.$refs.comscan.losefocus();
+				if (this.$refs.comscan) {
+					this.$refs.comscan.losefocus();
+				}
+
 			},
 			showMessage(message, callback) {
 				setTimeout(r => {
@@ -561,4 +978,8 @@
 		max-height: 300rpx;
 		padding: 10rpx;
 	}
-</style>
+
+	.my-combox {
+		font-size: 50px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
index 4edbeb25..fe069431 100644
--- a/src/pages/deliver/job/deliverDetailBatch.vue
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -1,540 +1,784 @@
-<template>
-	<view class="page-wraper">
-		<view class="page-header">
-			<view class="header-view">
-				<view class="header_job_top">
-					<job-top :dataContent="jobContent"></job-top>
-				</view>
-				<view class="cen_card" style="padding: 5rpx;">
-					<view class="cell_box uni-flex uni-row">
-						<view class="cell_info">
-							<view class="text_lightblue">发货类型</view>
-							<view>{{jobContent.deliverType}}</view>
-						</view>
-
-						<view class="cell_info">
-							<view class="text_lightblue">客户代码</view>
-							<view>{{jobContent.customerCode}}</view>
-						</view>
-
-						<view class="cell_info">
-							<view class="text_lightblue">目标库位</view>
-							<view>{{toLocationCode}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view>
-					<comDeliverDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent"
-						@updateData='updateData' :allowBiggerQty='allowBiggerQty'>
-					</comDeliverDetailCardBatch>
-				</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="">
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
-				</view>
-			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
-		<comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
-		</comScanDeliverPackBatch>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import {
-		getDeliverDetail,
-		takeDeliverJob,
-		cancleTakeDeliverJob,
-		deliverJobSubmit
-	} from '@/api/request2.js';
-
-
-	import {
-		calc
-	} from '@/common/calc.js';
-
-	import {
-		goHome,
-		navigateBack,
-		getRemoveOption,
-		getCurrDateTime,
-		getPackingNumberAndBatch,
-		deepCopyData
-	} from '@/common/basic.js';
-
-	import {
-		getDataSource
-	} from '@/pages/issue/js/issue.js';
-
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-
-	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import comDeliverDetailCardBatch from '@/pages/deliver/coms/comDeliverDetailCardBatch.vue'
-	import comScanDeliverPackBatch from '@/pages/deliver/coms/comScanDeliverPackBatch.vue'
-	import jobTop from '@/mycomponents/job/jobTop.vue'
-
-	export default {
-		name: 'issueDetail',
-		components: {
-			jobDetailPopup,
-			winScanButton,
-			comDeliverDetailCardBatch,
-			comScanDeliverPackBatch,
-			jobTop
-		},
-		data() {
-			return {
-				id: '',
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				detailOptions: [],
-				scanOptions: [],
-				status: "",
-				toLocationCode: "",
-				jobStatus: "",
-				allowBiggerQty:"TRUE",//开启数量校验提示
-			};
-		},
-
-		props: {
-
-		},
-
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.title + '详情'
-			})
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
-		},
-
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.jobStatus == "2") {
-					//取消承接任务	
-					cancleTakeDeliverJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
-			}
-
-		},
-
-		methods: {
-			//接收
-			receive(callback) {
-				if (this.id != null) {
-					takeDeliverJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getDeliverDetail(that.id).then(res => {
-					uni.hideLoading();
-					if (res.data && res.data.subList.length > 0) {
-						that.jobContent = res.data;
-						that.jobStatus = res.data.status;
-						that.subList = res.data.subList;
-						that.detailSource = res.data;
-						that.toLocationCode = that.subList[0].toLocationCode
-						that.allowBiggerQty = res.data.allowBiggerQty;
-						that.resizeCollapse();
-					} else {
-						that.showMessage('未获取到详情');
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			closeScan() {
-				this.resizeCollapse();
-			},
-
-			resizeCollapse() {
-
-			},
-
-
-
-			submit() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				//目前任务只到一个库位
-				var itemCodes = []
-				let locationCode = this.detailSource.subList[0].toLocationCode
-				this.detailSource.subList.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
-				//获取管理模式，封装参数
-				getManagementPrecisions(itemCodes, locationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						this.managementType = this.managementList &&  this.managementList[0] ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
-					
-						this.submitJob();
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				});
-				// //使用在途库，不查询管理模式
-				// if (locationCode == null) {
-				// 	this.submitJob();
-				// } else {
-				// 	//获取管理模式，封装参数
-				// 	getManagementPrecisions(itemCodes, locationCode, res => {
-				// 		if (res.success) {
-				// 			this.managementList = res.list;
-				// 			this.submitJob();
-				// 		} else {
-				// 			uni.hideLoading();
-				// 			this.showErrorMessage(res.message);
-				// 		}
-				// 	});
-				// }
-			},
-
-			checkCount() {
-			let str=""
-			this.detailSource.forEach(detail => {
-				detail.Items.forEach(item => {
-					var taskQty =0;
-					item.taskQty =calc.add(taskQty,item.qty)
-					var totalQty =0;
-					item.Locations.forEach(lco => {
-						lco.Batchs.forEach(batch => {
-							batch.Records.forEach(record => {
-								if(record){
-									var hanleQty =record.qty?record.qty:0
-									totalQty = calc.add(totalQty,hanleQty)
-								}
-								
-							})
-						})
-					})
-					//实际扫描的数量
-					item.totalQty =totalQty
-					
-				})
-			})
-			//如果允许部分提交任务有扫描记录就可以直接提交；如果不允许部分执行，任务数量和提交数量不一致给出提示
-			this.detailSource.forEach(detail=>{
-				detail.Items.forEach(item=>{
-					if(this.jobContent.allowPartialComplete=="FALSE"){
-						if(item.taskQty!=item.totalQty){
-							str += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致\n`
-						}
-					}
-				})
-			})
-			
-			if(str){
-				str = '不允许提交\n' + str
-				this.showErrorMessage(str)
-			}
-			
-			return str?false:true
-			},
-			checkCountBatch() {
-				let str = ""
-				let str1 = ""
-				this.detailSource.subList.forEach(item => {
-					var taskQty = 0;
-					var totalQty = 0;
-					item.taskQty = calc.add(taskQty, item.qty)
-					totalQty = calc.add(totalQty, item.handleQty)
-					//实际扫描的数量
-					item.totalQty = totalQty
-				})
-				//如果允许部分提交任务有扫描记录就可以直接提交；如果不允许部分执行，任务数量和提交数量不一致给出提示
-				this.detailSource.subList.forEach(detail => {
-					if (this.jobContent.allowPartialComplete == "FALSE") {
-						if (detail.taskQty != 	detail.totalQty) {
-							str += `物料号【${detail.itemCode}】任务数量【${detail.taskQty}】与实际提交数量【${detail.totalQty}】不一致\n`
-						}
-					}
-					if (this.allowBiggerQty == 'FALSE') {
-						if (	detail.taskQty < 	detail.totalQty) {
-							str1 += '数量[' + detail.totalQty + ']不允许大于任务数量[' + detail.taskQty + ']'
-						}
-					}
-				})
-
-				if (str) {
-					str = '不允许提交\n' + str
-					this.showErrorMessage(str)
-				}
-				if (str1) {
-					str1 = '不允许提交\n' + str1
-					this.showErrorMessage(str1)
-				}
-
-				return str || str1 ? false : true
-
-			},
-
-			submitJob() {
-				var params = this.setParams()
-				console.log("提交参数", params);
-				if (params.subList.length == 0) {
-					uni.hideLoading()
-					this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
-					return
-				}
-				if(this.managementType == "BY_BATCH" ||this.managementType == "BY_QUANTITY" ){
-					if (!this.checkCountBatch()) {
-						uni.hideLoading()
-						return;
-					}
-				}else{
-					if (!this.checkCount()) {
-						uni.hideLoading()
-						return;
-					}
-				}
-			
-				deliverJobSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						
-						this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			setParams() {
-				var subList = []
-				var createTime = getCurrDateTime();
-				var creator = this.$store.state.user.id
-				this.detailSource.subList.forEach(r => {
-					if (r.scaned) {
-						let subItem = {
-							...r
-						}
-						subItem.recordList = []
-						let record = {};
-						record.handleQty = r.handleQty;
-						record.toContainerNumber = r.ContainerNumber;
-						record.toInventoryStatus = r.inventoryStatus;
-						record.toLocationCode = subItem.toLocationCode;
-						record.supplierCode = r.supplierCode;
-						var info = getPackingNumberAndBatch(this.managementList, r.itemCode, r.packingNumber, r.batch);
-						record.toPackingNumber = info.packingNumber;
-						record.packingNumber = info.packingNumber;
-						record.fromPackingNumber = info.packingNumber;
-						record.toBatch = info.batch;
-						subItem.toPackingNumber = info.packingNumber;
-						subItem.packingNumber = info.packingNumber;
-						subItem.fromPackingNumber = info.packingNumber;
-						// //使用在途库不改变管理模式
-						// if (this.toLocationCode == null) {
-						// 	record.toPackingNumber = r.packingNumber;
-						// 	record.toBatch = r.batch;
-						// } else {
-						// 	var info = getPackingNumberAndBatch(this.managementList, r.itemCode,r.packingNumber, r.batch);
-						// 	record.toPackingNumber = info.packingNumber;
-						// 	record.toBatch = info.batch;
-						// }
-						subItem.recordList.push(record);
-						subList.push(deepCopyData(subItem));
-					}
-				})
-
-				this.jobContent.subList = subList
-				this.jobContent.createTime = createTime;
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-			cancel() {
-				let that = this;
-				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
-					if (res) {
-						that.clearInfo();
-					}
-				});
-			},
-
-			clearInfo() {
-				this.dataContent.itemCodeList.forEach(res => {
-					if (res.recommendList != null) {
-						res.recommendList.forEach(res1 => {
-							if (res1.locationCodeList != null) {
-								res1.locationCodeList.forEach(res2 => {
-									if (res2.packingCodeList != null) {
-										res2.packingCodeList.forEach(res3 => {
-											res3.itemCode = "";
-											res3.qty = 0;
-										})
-									}
-								})
-							}
-
-						})
-					}
-
-				})
-			},
-
-			updateData(record) {
-
-			},
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-						this.afterCloseMessage()
-					}
-				});
-			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						this.afterCloseMessage()
-					}
-				});
-			},
-
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
-
-			showCommitSuccess() {
-				this.$refs.comMessage.showCommitSuccess();
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-
-			showRescanMessage(message) {
-				this.$refs.comMessage.showRescanMessage(message);
-			},
-
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-
-			closeScanMessage() {
-				this.scanPopupGetFocus();
-			},
-			confirm(data) {
-				this.dataContent = data;
-			},
-			confirmResult(result) {
-				this.dataContent = result;
-				this.$forceUpdate();
-			},
-			openScanDetailPopup() {
-				var datacontent = {}
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				// Object.assign(datacontent, this.detailSource);
-				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
-			},
-			closeScanPopup() {
-				this.updateCommitBtn();
-			},
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	.uni-numbox__value {
-		width: 40px;
-	}
-
-	button[disabled] {
-		background-color: #3C9CFF;
-		color: #fff;
-		opacity: 0.7;
-	}
-
-
-	// /deep/ .input-value {
-	// 	font-size: 16px;
-	// }
-
-	// /deep/ .uni-collapse-item__title-text {
-	// 	font-size: 16px;
-	// }
-
-	// /deep/ .uni-collapse-item--border {
-	// 	border-bottom-width: 0px;
-	// 	border-bottom-color: #ebeef5;
-	// }
-
-	// /deep/ .uni-collapse-item--border {
-	// 	border-bottom-width: 1px;
-	// 	border-bottom-color: #ebeef5;
-	// }
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding: 5rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">发货类型</view>
+							<view>{{jobContent.deliverType}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">客户代码</view>
+							<view>{{jobContent.customerCode}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">目标库位</view>
+							<view>{{toLocationCode}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view>
+		
+				</view>
+				<view v-for="(toLocation, index) in detailSource">
+				<comDeliverDetailCardBatch ref='comIssueDetailCardBatch' :dataContent="toLocation" :settingParam="jobContent"
+					@updateData='updateData' :allowBiggerQty='allowBiggerQty'>
+				</comDeliverDetailCardBatch>
+					<view class="split_line"></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="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<!-- <comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanDeliverPackBatch> -->
+		
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" :toLocationCode="jobToLocationCode" ref="scanPopup"
+			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
+		</winScanPackAndLocation>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getDeliverDetail,
+		takeDeliverJob,
+		cancleTakeDeliverJob,
+		deliverJobSubmit
+	} from '@/api/request2.js';
+
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		deepCopyData,
+		compareAsc,
+	} from '@/common/basic.js';
+
+
+	import {
+		getTreeDataSource,
+		calcTreeHandleQty,
+		getScanCount,
+		getThreeDataSource,
+		getDataSource,
+		calcHandleQty,
+	} from '@/common/detail.js';
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comDeliverDetailCardBatch from '@/pages/deliver/coms/comDeliverDetailCardBatch.vue'
+	import comScanDeliverPackBatch from '@/pages/deliver/coms/comScanDeliverPackBatch.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comDeliverDetailCardBatch,
+			comScanDeliverPackBatch,
+			jobTop,
+			winScanPackAndLocation
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				status: "",
+				toLocationCode: "",
+				jobStatus: "",
+				allowBiggerQty:"TRUE",//开启数量校验提示
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeDeliverJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeDeliverJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getDeliverDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data && res.data.subList.length > 0) {
+						that.jobContent = res.data;
+						that.jobStatus = res.data.status;
+						that.subList = res.data.subList;
+						// that.detailSource = res.data;
+							that.detailSource = getThreeDataSource(that.jobContent)
+						console.log(999,that.detailSource)
+						
+						that.toLocationCode = that.subList[0].toLocationCode
+						that.allowBiggerQty = res.data.allowBiggerQty;
+						that.resizeCollapse();
+					} else {
+						that.showMessage('未获取到详情');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCardBatch.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+
+
+	getScanResult(result, managementTypeParams) {
+				console.log(222,result)
+				this.managementType = managementTypeParams
+				if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
+					this.setDataBatch(result)
+				}else{
+					this.setData(result)
+				}	
+			},
+			setDataBatch(result) {
+				try {
+					let that = this
+					this.balanceinfo =  result.balance
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var locationCode = result.fromLocationCode;
+					
+					if (!result.balance) {
+						this.showMessage("没有库存余额")
+						return;
+					}
+						console.log(9558,result)
+					// var inventoryStatus = "OK";
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+			
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						
+						var itemDetail = detail.subList.find(r => {
+								return r.batch == batch &&
+									r.fromLocationCode == result.fromLocationCode
+							})
+							if (itemDetail == undefined) {
+								var isExit;
+								for (let subItem of detail.subList) {
+									var item;
+									// for (let pack of subItem.packList) {
+									// 	if (pack.batch == batch) {
+									// 		item = pack;
+									// 		isExit = pack;
+									// 		break;
+									// 	}
+									// }
+									// if (item != undefined) {
+									// 	subItem.scaned = true
+									// 	subItem.handleQty = 0;
+									// 	item = undefined
+									// }
+								}
+								if (isExit == undefined) {
+									// this.showErrorMessage("批次【" + batch + "】库位【" + result
+									// 	.fromLocationCode + "】不在列表中")
+									
+									detail.subList.push({
+										scaned:true,
+										fromLocationCode:this.fromLocationCode,
+										batch:result.label.batch,
+										handleQty:result.label.qty,
+										qty:result.balance.qty,
+										inventoryStatus:result.balance.inventoryStatus,
+										toLocation:result.balance.toLocation,
+										balance:result.balance,
+										balanceQty:result.balance.qty,
+										packQty:result.package.packQty,
+										packUnit:result.package.packUnit,
+										uom:result.balance.uom,
+										// packList:[{
+										// 	scaned : true,
+										// 	handleQty : Number(result.label.qty),
+										// 	toLocationCode :  result.balance.toLocationCode,
+										// }]
+									})
+									console.log(999,detail)
+									detail.handleQty = 0
+									detail.qty = 0
+									detail.subList.forEach(item=>{
+										detail.handleQty = calc.add(detail.handleQty,item.handleQty)
+										detail.qty = calc.add(detail.qty,item.qty)
+										// item.packList.forEach(cur=>{
+										// 	cur.handleQty =  calc.add(detail.handleQty,item.handleQty)
+										// })
+									})
+									setTimeout(r => {
+										that.resizeCollapse();
+										that.$forceUpdate()
+									}, 100)
+								} else {
+									if (!isExit.cancleScanedHiht && isExit.scaned) {
+										// this.showMessage("批次【" + batch + "】已经扫描")
+									} else {
+										isExit.scaned = true
+										let qty = 0;
+										if (result.balance != null) {
+											qty = Number(result.balance.qty);
+										} else {
+											qty = Number(result.label.qty);
+										}
+										isExit.handleQty = Number(result.label.qty);
+										isExit.toLocationCode = this.toLocationCode;
+									}
+									itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty);
+									detail.handleQty = 0
+									detail.balance = result.balance,
+									detail.subList.forEach(item=>{
+										detail.handleQty = calc.add(detail.handleQty,item.handleQty)
+										// item.packList.forEach(cur=>{
										// 	cur.handleQty =  calc.add(detail.handleQty,item.handleQty)
										// })
+									})
+									// calcHandleQtyAdd(this.detailSource, result.label);
+								}
+								this.continueScan()
+								this.$forceUpdate()
+							} else {
+								var scanedLength = 0;
+								// itemDetail.packList.forEach(res => {
+								// 	if (res.scaned) {
+								// 		scanedLength++;
+								// 	}
+								// })
+								//大哥让加的
+								itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+						
+								if (itemDetail.scaned ) {
+									// this.showMessage("箱码【" + packingNumber + "】已经扫描")
+										// calcHandleQtyAdd(this.detailSource, result.label);
+										itemDetail.balance=result.balance
+										itemDetail.balanceQty=result.balance.qty
+										itemDetail.uom=result.balance.uom,
+										itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty);
+										detail.handleQty = 0
+										detail.subList.forEach(item=>{
+											detail.handleQty = calc.add(detail.handleQty,item.handleQty)
+										})
+								} else {
+									itemDetail.scaned = true;
+									this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+									itemDetail.handleQty = result.label.qty;
+									itemDetail.scaned = true
+									itemDetail.balance=result.balance
+									itemDetail.balanceQty=result.balance.qty
+									itemDetail.uom=result.balance.uom
+									itemDetail.packQty=result.package.packQty
+									itemDetail.packUnit=result.package.packUnit
+									// itemDetail.toInventoryStatus = "OK"
+									// itemDetail.packList.forEach(pac => {
+									// 	pac.scaned = true
+									// 	pac.handleQty = Number(result.label.qty);
+									// 	pac.toLocationCode = result.balance.toLocationCode;
+									// })
+									detail.handleQty = 0
+									detail.subList.forEach(item=>{
+										detail.handleQty = calc.add(detail.handleQty,item.handleQty)
+										// item.packList.forEach(cur=>{
										// 	cur.handleQty =  calc.add(detail.handleQty,item.handleQty)
										// })
+									})
+									// calcTreeHandleQty(this.detailSource);
+									this.continueScan()
+									this.$forceUpdate()
+								}
+							}
+					}
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.packingNumber = ''
+						})
+					})
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].subList[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					itemCodes.push(toLocation.itemCode)
+				})
+				console.log( this.detailSource)
+				
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						console.log(res)
+						this.managementType = this.managementList &&  this.managementList[0] ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
+					
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						// this.showErrorMessage(res.message);
+					}
+				});
+				// //使用在途库，不查询管理模式
+				// if (locationCode == null) {
+				// 	this.submitJob();
+				// } else {
+				// 	//获取管理模式，封装参数
+				// 	getManagementPrecisions(itemCodes, locationCode, res => {
+				// 		if (res.success) {
+				// 			this.managementList = res.list;
+				// 			this.submitJob();
+				// 		} else {
+				// 			uni.hideLoading();
+				// 			this.showErrorMessage(res.message);
+				// 		}
+				// 	});
+				// }
+			},
+
+			checkCount() {
+			let str=""
+			this.detailSource.forEach(detail => {
+				detail.Items.forEach(item => {
+					var taskQty =0;
+					item.taskQty =calc.add(taskQty,item.qty)
+					var totalQty =0;
+					item.Locations.forEach(lco => {
+						lco.Batchs.forEach(batch => {
+							batch.Records.forEach(record => {
+								if(record){
+									var hanleQty =record.qty?record.qty:0
+									totalQty = calc.add(totalQty,hanleQty)
+								}
+								
+							})
+						})
+					})
+					//实际扫描的数量
+					item.totalQty =totalQty
+					
+				})
+			})
+			//如果允许部分提交任务有扫描记录就可以直接提交；如果不允许部分执行，任务数量和提交数量不一致给出提示
+			this.detailSource.forEach(detail=>{
+				detail.Items.forEach(item=>{
+					if(this.jobContent.allowPartialComplete=="FALSE"){
+						if(item.taskQty!=item.totalQty){
+							str += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致\n`
+						}
+					}
+				})
+			})
+			
+			if(str){
+				str = '不允许提交\n' + str
+				this.showErrorMessage(str)
+			}
+			
+			return str?false:true
+			},
+			checkCountBatch() {
+				let str = ""
+				let str1 = ""
+				let str2 = ""
+				this.detailSource.forEach(detail => {
+					var taskQty = 0;
+					var totalQty = 0;
+					detail.subList.forEach(item => {
+						if(item.scaned){
+							item.taskQty=0
+							item.totalQty=0
+							item.taskQty =calc.add(item.taskQty,item.qty)
+							item.totalQty =calc.add(item.totalQty,item.handleQty)
+								if (this.jobContent.allowPartialComplete == "FALSE") {
+									if(item.handleQty!=item.taskQty){
+										str +=	`批次【${item.batch}】提交数量【${item.handleQty}】与任务物料数量【${item.taskQty}】不一致\n`
+									}
+								}
+								if (this.allowBiggerQty == 'FALSE') {
+									if (	item.taskQty < 	item.totalQty) {
+										str1 += '数量[' + item.totalQty + ']不允许大于任务数量[' + item.taskQty + ']'
+									}
+								}
+								if(item.handleQty>item.balance.qty){
+									str2 +=	`批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】`
+								}
+						}
+					
+					})
+				})
+			
+
+				if (str) {
+					str = '不允许提交\n' + str
+					this.showErrorMessage(str)
+				}
+				if (str1) {
+					str1 = '不允许提交\n' + str1
+					this.showErrorMessage(str1)
+				}
+				if (str2) {
+					str2 = '不允许提交\n' + str2
+					this.showErrorMessage(str2)
+				}
+				return str || str1 || str2 ? false : true
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", params);
+				const isTrue = params.subList.some(item=>{
+					console.log(item.recordList.some(cur=>cur.scaned))
+					return item.recordList.some(cur=>cur.scaned) == true
+				})
+				if(!isTrue){
+						uni.hideLoading()
+						this.showErrorMessage("请扫描您需要提交的发货任务")
+						return
+				}
+				// return;
+				// if (params.subList.length == 0) {
+				// 	uni.hideLoading()
+				// 	this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
+				// 	return
+				// }
+				if(this.managementType == "BY_BATCH" ||this.managementType == "BY_QUANTITY" ){
+					if (!this.checkCountBatch()) {
+						uni.hideLoading()
+						return;
+					}
+				}else{
+					if (!this.checkCount()) {
+						uni.hideLoading()
+						return;
+					}
+				}
+				debugger
+			
+				deliverJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						
+						this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				console.log(222,this.detailSource)
+				this.detailSource.forEach(toLocationCode => {
+					let obj = {...toLocationCode}
+					delete obj.subList
+					obj.recordList = []
+					let obj1 ={}
+					let arr = toLocationCode.subList.filter(item=>item.scaned)
+					arr.forEach(record=>{
+						obj1.scaned =record.scaned;
+						obj1.handleQty =record.handleQty;
+						obj1.fromLocationCode =record.fromLocationCode;
+						obj1.fromInventoryStatus =record.fromInventoryStatus;
+						obj1.copyContent =record.copyContent;
+						obj1.toContainerNumber = record.ContainerNumber;
+						obj1.toInventoryStatus =record.inventoryStatus;
+						obj1.toLocationCode = record.toLocationCode;
+						obj1.supplierCode = record.supplierCode;
+						obj1.toPackingNumber ='';
+						obj1.packingNumber = ''
+						obj1.fromPackingNumber = '';
+						obj1.toBatch = record.batch;
+						obj1.toPackingNumber = '';
+						obj1.packingNumber = '';
+						obj1.fromPackingNumber ='';
+						obj.recordList.push(obj1)
+					})
+					subList.push(obj)
+				})
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+				calcHandleQty(this.detailSource);
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			// openScanDetailPopup() {
+			// 	var datacontent = {}
+			// 	//克隆对象，深度克隆，防止双向绑定同一个变量
+			// 	// Object.assign(datacontent, this.detailSource);
+			// 	this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			// },
+			closeScanPopup() {
+				// this.updateCommitBtn();
+			},
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+			
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
 </style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index c17ae97c..eca6f03f 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -73,6 +73,10 @@
 		getPackingNumberAndBatchByList,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+	
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
@@ -316,6 +320,88 @@
 
 
 			getScanResult(result,managementPrecision) {
+				if(managementPrecision == 'BY_BATCH'){
+					this.setDataBatch(result,managementPrecision)
+				}else{
+					this.setData(result,managementPrecision)
+				}
+				
+			},
+			setDataBatch(result,managementPrecision){
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = ''
+						if(managementPrecision == 'BY_QUANTITY'){
+							itemDetail = detail.subList.find(r => {
+								return r.itemCode == result.label.itemCode
+							})
+						}else{
+							itemDetail = detail.subList.find(r => {
+								return r.batch == batch
+							})
+						}
+						
+						if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
+							this.showErrorMessage( "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								// this.showMessage("批次【" + batch + "】已经扫描")
+								itemDetail.handleQty =calc.add(itemDetail.handleQty,Number(result.label.qty));
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续转移?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.label.qty);
+													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.packQty = Number(result.package.packQty)
+													itemDetail.balance.packUnit = result.package.packUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.packQty = Number(result.package.packQty)
+									itemDetail.balance.packUnit = result.package.packUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+			
+			setData(result,managementPrecision){
 				try {
 					var packingNumber = result.label.packingNumber;
 					var batch = result.label.batch;
@@ -388,7 +474,6 @@
 				}
 			},
 
-
 			async commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 47a504d3..9785b03b 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -501,7 +501,6 @@
 				var subList = []
 				var createTime = getCurrDateTime();
 				var creator = this.$store.state.user.id
-				console.log(2343,this.detailSource)
 				this.detailSource.forEach(toLocationCode => {
 					let obj = {...toLocationCode}
 					delete obj.subList
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index bfe490a6..7afeb8c0 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -484,7 +484,7 @@
 								if (res.success) {
 									this.managementList = res.list;
 									this.managementType = this.managementList&&this.managementList[0]&&this.managementList[0].ManagementPrecision
-									if(this.managementType == 'BY_BATCH'){
+									if(this.managementType == 'BY_BATCH'||this.managementType == 'BY_QUANTITY'){
 										uni.navigateTo({
 											url: './issueDetailBatch?id=' + result.masterId + '&status=' + result.status +
 												'&scanMessage=' +
diff --git a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
index 900c0057..2617a1f9 100644
--- a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
@@ -1,31 +1,28 @@
 <template>
 	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
 					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
-		<view class="" v-for="(item,index) in dataContent.subList" :key="index" >
-			<uni-swipe-action ref="swipeAction" v-if="index==0" :class="item.scaned?'scan_view':''">
-			<uni-swipe-action-item
-				:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
-				@click="swipeClick($event,item,'parent')">
-					<!-- <div style="display: flex;">
-						<div style="flex: 1;">
-							<batch v-if="item.batch" :batch="item.batch"></batch>
-							<to-location title="目标库位" :locationCode="item.toLocationCode">
-							</to-location>
-						</div>
-						<text style="font-size: 30rpx;color: #2979ff; " @click="copy(item)" v-if="isDevlement()">复制</text>
-						</div> -->
-						<recommendBatch :detail="item" :isShowFromLocation="false"
-							:isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommendBatch>
-				</uni-swipe-action-item>
-			</uni-swipe-action>
-			<view v-if="item.fgList!=undefined && item.fgList.length>0" class="card_view " style="margin-left: 20px;"
-				v-for="(fg, index) in item.fgList" :key="index">
-				<com-fg-card :detail='fg' class="scan_view"></com-fg-card>
-			</view>
-		</view>
+				</template>
+				<view class="" v-for="(item,index) in dataContent.subList" :key="index">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :isShowFromLocation="false"
+								:isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<view v-if="item.fgList!=undefined && item.fgList.length>0" class="card_view "
+						style="margin-left: 20px;" v-for="(fg, index) in item.fgList" :key="index">
+						<com-fg-card :detail='fg' class="scan_view"></com-fg-card>
+					</view>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
 
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm" :isNumTips='false'>
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
@@ -36,36 +33,27 @@
 
 <script>
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
-	import recommendBatch from '@/mycomponents/recommend/recommendBatch.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
 	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
 	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
 	import productDetailInfoPopup from '@/pages/productReceipt/coms/productDetailInfoPopup.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
-
-	import pack from '@/mycomponents/balance/pack.vue'
-	import location from '@/mycomponents/balance/location.vue'
-	import toLocation from '@/mycomponents/balance/toLocation.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-	import config from '@/static/config.js'
 	import {
-		getRemoveOption,
-		getEditRemoveOption
+		getDetailOption,
+		getPurchaseReceiptOption
 	} from '@/common/array.js';
 
 	export default {
 		components: {
 			itemCompareQty,
-			recommendBatch,
+			recommend,
 			recommendQtyEdit,
 			jobDetailPopup,
 			productDetailInfoPopup,
 			winScanLocation,
-			comFgCard,
-			pack,
-			location,
-			toLocation,
-			batch
+			comFgCard
+
 		},
 		props: {
 			dataContent: {
@@ -80,10 +68,7 @@
 				type: Array,
 				default: null
 			},
-isEdit: {
-				type: Boolean,
-				default: true
-			},
+
 
 		},
 		watch: {
@@ -112,17 +97,18 @@ isEdit: {
 				},
 				locatonItem: {},
 				detailOptions: [],
-				scanOptions: [],
-				options: [],
-				removeOptions: [],
-				editAndRemoveOptions: []
+				scanOptions: []
 			}
 		},
 
 		mounted() {
-		
-			this.removeOptions = getRemoveOption();
-			this.editAndRemoveOptions = getEditRemoveOption()
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
 		},
 
 		methods: {
@@ -161,7 +147,7 @@ isEdit: {
 						if (res) {
 							item.scaned = false
 							item.handleQty = null
-							item.fgList = []
+							item.fgList=[]
 							this.$forceUpdate()
 							this.$emit('remove', item)
 						}
@@ -170,36 +156,7 @@ isEdit: {
 			confirm(qty) {
 				this.editItem.handleQty = qty;
 				this.$emit('updateData')
-			},
-			isDevlement() {
-				return config.isDevelopment;
-			},
-			copy(detail) {
-				console.log(detail)
-				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-				var content = "HPQ;V1.0;I" + detail.itemCode + ";P" + detail.packingNumber + ";B" + detail
-					.batch + ";Q" + detail.qty
-				// #ifdef H5
-				this.$copyText(content).then(
-					res => {
-						uni.showToast({
-							title: '复制采购标签成功',
-							icon: 'none'
-						})
-					}
-				)
-				// #endif
-				// #ifndef H5
-				uni.setClipboardData({
-					data: content,
-					success: () => {
-						uni.showToast({
-							title: '复制采购标签成功'
-						})
-					}
-				})
-				// #endif
-			},
+			}
 		}
 	}
 </script>
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 0eb850ba..087661be 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -290,17 +290,18 @@
 						this.showErrorMessage("批次[" + batch + "]不在任务列表中")
 					} else {
 						if (itemDetail.scaned) {
-							this.showErrorMessage("批次[" + batch + "]已经扫描")
+							// this.showErrorMessage("批次[" + batch + "]已经扫描")
+							itemDetail.handleQty = calc.add(Number(result.label.qty),itemDetail.handleQty);
 						} else {
 							itemDetail.scaned = true;
 							itemDetail.handleQty = Number(result.label.qty);
 							itemDetail.toLocationCode = this.toLocationCode;
 							itemDetail.labelQty = Number(result.label.qty);
-							calcHandleQty(this.detailSource);
 							this.continueScan()
 							this.$forceUpdate()
 						}
 
+							calcHandleQty(this.detailSource);
 					}
 				}
 			},
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index b298b7c0..d5af8ddb 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -87,7 +87,9 @@
 		calcTreeHandleQty,
 		getScanCount
 	} from '@/common/detail.js';
-
+	import {
+		calc
+	} from '@/common/calc'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue"
@@ -275,7 +277,7 @@
 			updateData() {
 				console.log("updateData")
 				// this.calcHandleQty();
-				// calcTreeHandleQty(this.detailSource)
+				calcTreeHandleQty(this.detailSource)
 			},
 			//模拟扫描功能
 			openScanPopupSimulate(message) {
@@ -470,7 +472,8 @@
 											.fromLocationCode + "】不在列表中")
 									} else {
 										if (!isExit.cancleScanedHiht && isExit.scaned) {
-											this.showMessage("批次【" + batch + "】已经扫描")
+											// this.showMessage("批次【" + batch + "】已经扫描")
+											isExit.handleQty = calc.add(Number(result.label.qty),isExit.handleQty)
 										} else {
 											isExit.scaned = true
 											let qty = 0;
@@ -501,7 +504,8 @@
 									if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList
 										.length) {
 										// this.showMessage("箱码【" + packingNumber + "】已经扫描")
-											this.showMessage("批次【" + batch + "】已经扫描")
+											// this.showMessage("批次【" + batch + "】已经扫描")
+										itemDetail.handleQty = calc.add(Number(result.label.qty),itemDetail.handleQty)
 									} else {
 										itemDetail.scaned = true;
 										this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
@@ -513,10 +517,10 @@
 											pac.toLocationCode = this.toLocationCode;
 										})
 							
-										calcTreeHandleQty(this.detailSource);
 										this.continueScan()
 										this.$forceUpdate()
 									}
+										calcTreeHandleQty(this.detailSource);
 								}
 							
 						},