采购上架任务

src/api/request2.js

@@ -377,6 +377,24 @@ export function getPackageByNumber(number) {
 	});
 }
 
+/**包装
+ * 获取包装信息
+ * @param {*} 
+ *  
+ */
+export function getPackageListByNumber(number) {
+	var params = {
+		number: number,
+		pageNo: 1,
+		pageSize: 100
+	}
+	return request({
+		url: baseApi + "/wms/package/queryPackageInfo",
+		method: "get",
+		data: params,
+	});
+}
+
 
 
 /**

src/common/directory.js

@@ -6,6 +6,7 @@ let uomList = [];
 let inventoryStatusList = [];
 let containerTypeList = [];
 let packUnitList = [];
+let packUnitInfoList = [];
 let requestStatusList = [];
 let unplannedReceiptReasonList = [];
 let unplannedIssueReasonList = [];
@@ -43,6 +44,7 @@ export function clearCacheData() {
 	inventoryStatusList = [];
 	containerTypeList = [];
 	packUnitList = [];
+	packUnitInfoList = [];
 	requestStatusList = [];
 	unplannedReceiptReasonList = [];
 	unplannedIssueReasonList = [];
@@ -515,11 +517,11 @@ export function getCountStageName(value) {
 //获取包装规格
 export function getPackUnitName(value) {
 	var resultInfo = "";
-	if (packUnitList.length == 0) {
+	if (packUnitInfoList.length == 0) {
-		packUnitList = uni.getStorageSync('packunit');
+		packUnitInfoList = uni.getStorageSync('packunit');
 	}
-	if (packUnitList.length > 0) {
+	if (packUnitInfoList.length > 0) {
-		for (let item of packUnitList) {
+		for (let item of packUnitInfoList) {
 			if (item.code == value) {
 				resultInfo = item.name
 				break;

src/common/label.js

@@ -2,7 +2,7 @@ let labelDic = [];
 
 import {
 	getLabelByHeader,
-	getPackageByNumber
+	getPackageListByNumber
 } from '../api/request2.js';
 
 import {
@@ -106,13 +106,15 @@ export function getLabelItems(labelItem, scanMsg, callBack) {
 		//查询包装信息
 		let packingNumber = labelResult.label.packingNumber
 		if (packingNumber != undefined) {
-			getPackageByNumber(packingNumber).then(pack => {
+			getPackageListByNumber(packingNumber).then(pack => {
-				if (pack.data.list.length == 0) {
+				if (pack.data.reqPackage) {
+					labelResult.package = pack.data.reqPackage;
+					labelResult.package.subList = pack.data.subList;
+					console.log('包装信息', JSON.stringify(labelResult.package))
+					
+				} else {
 					labelResult.success = false;
 					labelResult.message = '包装号[' + packingNumber + ']没有包装信息';
-				} else {
-					labelResult.package = pack.data.list[0];
-					console.log('包装信息', JSON.stringify(labelResult.package))
 				}
 				callBack(labelResult);
 			}).catch(err => {

src/common/record.js

@@ -56,6 +56,24 @@ export function calcHandleQty(detailSource) {
 	}
 }
 
+export function calcTreeHandleQty(detailSource) {
+	for (let item of detailSource) {
+		item.handleQty = new Decimal(0).toNumber();
+		
+		for (let detail of item.subList) {
+			if (detail != undefined && detail.scaned) {
+				detail.handleQty = new Decimal(0).toNumber();
+				for (let pack of detail.packList){
+					if(pack!=undefined&&pack.scaned){
+						detail.handleQty = calc.add(detail.handleQty, pack.handleQty); 
+					}
+				}
+				item.handleQty = calc.add(item.handleQty, detail.handleQty);
+			}
+		}
+	}
+}
+
 export function getBusinessType(typeCode, callback) {
 	let result = {
 		success: true,

src/mycomponents/detail/comJobDetailCard.vue

@@ -0,0 +1,175 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse"  style="height: 500px;">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+						:isShowPackUnit="false"></itemCompareQty>
+				</template>
+				<package-list :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"  :settingParam="settingParam"   @collapseChange="collapseChange"></package-list>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref=" receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import pack from '@/mycomponents/balance/pack.vue'
+	import detailList from '@/mycomponents/detail/detailList.vue'
+	import packageList from '@/mycomponents/package/packageList.vue'
+
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			receiptDetailInfoPopup,
+			winScanLocation,
+			detailList,
+			packageList
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: null
+			},
+			settingParam: {
+				type: Object,
+				default: null
+			},
+			locationTypeList: {
+				type: Object,
+				default: null
+			},
+
+
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
+			
+
+		},
+
+		updated() {
+			console.log('updated')
+		},
+
+		methods: {	
+			collapseChange(){
+				setTimeout(() => {
+					this.resizeCollapse();
+				}, 500)
+			},
+			
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.resize()
+				});
+				this.$forceUpdate();
+			},
+
+
+			refreshCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+				this.$forceUpdate();
+			},
+
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem = item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode = code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/mycomponents/package/packageCard.vue

@@ -59,7 +59,7 @@
 		props: {
 			dataContent: {
 				type: Object,
-				default: {}
+				default: null
 			},
 			isShowContainer: {
 				type: Boolean,

src/mycomponents/package/packageList.vue

@@ -5,8 +5,8 @@
 			<uni-collapse ref="collapse2" @change="collapseChange">
 				<uni-collapse-item :disabled="false">
 					<template v-slot:title>
-						<package-card :dataContent="item" :isShowLocation="false"
+						<package-card :dataContent="item" :isShowLocation="false" :isShowFromLocation ="isShowFromLocation"
-							:isShowFromLocation="false"></package-card>
+							></package-card>
 					</template>
 					<view v-for="(pack,index) in item.packList" :key="pack.id" style=" width: 100%; background-color: antiquewhite;">
 						<uni-swipe-action-item :right-options="(pack.scaned&&isEdit)?editAndRemoveOptions:removeOptions"
@@ -182,6 +182,7 @@
 			},
 			confirm(qty){
 				this.editItem.handleQty =qty;
+				this.$emit("updateData")
 			}
 			
 		}

src/mycomponents/package/packageRecordCard.vue

@@ -0,0 +1,168 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
+		<!-- border-bottom: 1upx solid #EEEEEE; -->
+		<view class="uni-flex uni-row space-between" style="align-items: center">
+			<!-- uni-inline-item 暂时拿掉-->
+			<view style="word-break: break-all;">
+			<!-- 	<container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
+				</container> -->
+				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
+				<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
+				</location>
+				<!-- 	<to-location></to-location> -->
+				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
+				</to-location>
+			</view>
+			<view class="uni-flex uni-row"  style="word-break: break-all;">
+				<qty v-if="true" :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+					:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowPack="isShowPack">
+				</compare-qty>
+
+				<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
+					<text style="font-size: 25rpx;color: #2979ff; width: 45rpx; " @click="copy">复制</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import qty from '@/mycomponents/qty/qty.vue'
+	import container from '@/mycomponents/container/container.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 recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import config from '@/static/config.js'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+
+	export default {
+		components: {
+			container,
+			pack,
+			location,
+			toLocation,
+			batch,
+			recommendQty,
+			compareQty,
+			balanceQty,
+			qty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+
+			locationTitle: {
+				type: String,
+				default: '库位'
+			},
+			isShowBalanceQty: {
+				type: Boolean,
+				default: true
+			},
+			showPack: {
+				type: Boolean,
+				default: false
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" + this.dataContent
+					.batch + ";Q" + this.dataContent.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
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" + this.dataContent
+					.batch + ";Q" + this.dataContent.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
+			},
+			isDevlement() {
+				return config.isDevelopment;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/mycomponents/package/packageRecordList.vue

@@ -0,0 +1,195 @@
+<template>
+	<view class="">
+		<view class="" v-for="(item,index) in dataContent" :key="item.id">
+			<uni-collapse ref="collapse2" @change="collapseChange">
+				<uni-collapse-item :disabled="false">
+					<template v-slot:title>
+						<packageRecordCard :dataContent="item" :isShowLocation="false"
+							:isShowFromLocation="false"></packageRecordCard>
+					</template>
+					<view v-for="(pack,index) in item.packList" :key="pack.id" style=" width: 100%; background-color: antiquewhite;">
+						<uni-swipe-action-item :right-options="editAndRemoveOptions"
+							@click="swipeClick($event,pack)">
+							<packageRecordCard :dataContent="pack" :isShowLocation="false" :isShowFromLocation="false"
+								:isShowToLocation="false" :isShowBatch="false"></packageRecordCard>
+						</uni-swipe-action-item>
+
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm"></balance-qty-edit>
+	</view>
+</template>
+
+
+<script>
+	import config from '@/static/config.js'
+	import packageRecordCard from '@/mycomponents/package/packageRecordCard.vue'
+		import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+		
+	import {
+		getRemoveOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+	export default {
+		emits: ["collapseChange"],
+		components: {
+			packageRecordCard,
+			balanceQtyEdit
+		},
+
+		data() {
+			return {
+				editItem: {},
+				options: [],
+				removeOptions: [],
+				editAndRemoveOptions:[]
+			}
+		},
+		mounted() {
+			this.removeOptions = getRemoveOption();
+			this.editAndRemoveOptions =getEditRemoveOption()
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: null
+			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+
+			locationTitle: {
+				type: String,
+				default: '库位'
+			},
+			settingParam: {
+				type: Object,
+				default: null
+			},
+			isEdit:{
+				type: Boolean,
+				default: false
+			}
+
+		},
+		watch: {
+
+		},
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "编辑") {
+					// this.edit(item)
+				}
+			},
+			// edit(item) {
+			// 	this.editItem = item;
+			// 	this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
+			// },
+			collapseChange() {
+				this.$emit("collapseChange");
+				this.resizeCollapse();
+			},
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse2.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+
+				});
+				this.$forceUpdate();
+			},
+
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.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
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.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
+			},
+			isDevlement() {
+				return config.isDevelopment;
+			},
+			confirm(qty){
+				this.editItem.qty =qty;
+				this.$emit('updateData')
+			}
+			
+		}
+	}
+</script>
+
+<style>
+	.open {
+		/* background-color: green !important; */
+		padding-top: 0px !important;
+	}
+</style>

src/mycomponents/qty/balanceQty.vue

@@ -9,7 +9,7 @@
 			<uom v-if="dataContent.packQty==undefined" :uom="dataContent.uom"></uom>
 		</view>
 		<view class="uni-flex uni-row center">
-			<packQty :dataContent="dataContent"></packQty>
+			<pack-unit :dataContent="dataContent"></pack-unit>
 		</view>
 	</view>
 </template>
@@ -18,12 +18,14 @@
 	import packQty from '@/mycomponents/qty/packQty.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
+	import packUnit from '@/mycomponents/qty/packUnit.vue'
 
 	export default {
 		components: {
 			packQty,
 			uom,
-			status
+			status,
+			packUnit
 		},
 		data() {
 			return {

src/mycomponents/qty/packQty.vue

@@ -7,7 +7,6 @@
 </template>
 <script>
 	import {
-		// getPackUnitInfo,
 		getPackUnitInfo
 	} from "@/common/directory.js"
 	export default {

src/mycomponents/qty/qty.vue

@@ -5,11 +5,11 @@
 			<view class="text_default center">
 				{{Number(dataContent.qty)}}
 			</view>
-			<uom v-show="!isShowStdPack" :uom="dataContent.uom"></uom>
+			<uom  :uom="dataContent.uom"></uom>
 		</view>
 		
 		<view>
-			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+			<pack-unit  v-show="isShowPackUnit"  :dataContent="dataContent"></pack-unit>
 		</view>
 	</view>
 </template>
@@ -18,12 +18,14 @@
 	import packQty from '@/mycomponents/qty/packQty.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
+	import packUnit from '@/mycomponents/qty/packUnit.vue'
 
 	export default {
 		components: {
 			packQty,
 			status,
-			uom
+			uom,
+			packUnit
 		},
 		data() {
 			return {
@@ -34,16 +36,20 @@
 		props: {
 			dataContent: {
 				type: Object,
-				default: {}
+				default: null
 			},
 			isShowStatus: {
 				type: Boolean,
 				default: true
 			},
-			isShowStdPack: {
+			isShowPack: {
 				type: Boolean,
 				default: true
-			}
+			},
+			isShowPackUnit: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 

src/mycomponents/record/recordDetailCard.vue

@@ -0,0 +1,173 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse"  style="height: 500px;">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<itemQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+						:isShowPackUnit="false"></itemQty>
+				</template>
+				<packageRecordList :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"  :settingParam="settingParam"   @collapseChange="collapseChange"></packageRecordList>
+			</uni-collapse-item>
+		</uni-collapse>
+
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		</recommend-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
+	import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import pack from '@/mycomponents/balance/pack.vue'
+	import packageRecordList from '@/mycomponents/package/packageRecordList.vue'
+
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			recommendQtyEdit,
+			jobDetailPopup,
+			receiptDetailInfoPopup,
+			winScanLocation,
+			packageRecordList
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: null
+			},
+			settingParam: {
+				type: Object,
+				default: null
+			},
+			locationTypeList: {
+				type: Object,
+				default: null
+			},
+
+
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				locatonItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
+			
+
+		},
+
+		updated() {
+			console.log('updated')
+		},
+
+		methods: {	
+			collapseChange(){
+				setTimeout(() => {
+					this.resizeCollapse();
+				}, 500)
+			},
+			
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.resize()
+				});
+				this.$forceUpdate();
+			},
+
+
+			refreshCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+				this.$forceUpdate();
+			},
+
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
+			},
+			showLocation(item) {
+				this.locatonItem = item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode = code;
+				this.$emit('updateData')
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.handleQty = null
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/mycomponents/scan/winScanPackAndLocationNoBalance.vue

@@ -0,0 +1,454 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="uni-flex uni-row" style="align-items: center;
+					background-color: #fff; 
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+					border-radius: 8rpx;
+					height: 30px;">
+					<view class="uni-center" style="width: 25%; ">
+						来源库位
+					</view>
+					<!-- style="width: 75%;padding: 8rpx" -->
+					<view class="">
+						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
+							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
+
+						<view v-if='allowModifyLocation'>
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
+								@confirm="" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
+						</view>
+						<view v-else>
+							<text style="padding: 5px">
+								{{fromLocationCode}}
+							</text>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import {
+		getBalanceByManagementPrecision,
+	} from '@/common/balance.js';
+
+	import {
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getListLocationTypeDesc,
+		checkDirectoryItemExist,
+		getDirectoryItemArray,
+		getLocationTypeName,
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+	export default {
+		name: 'winScanPack',
+		emits: ["getResult", "close", "getCountScanResult"],
+		components: {
+			winComScan,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			allowNullBalance: {
+				type: Boolean,
+				default: false
+			},
+			//不提示库存
+			noShowBalanceMessage: {
+				type: Boolean,
+				default: false
+			},
+			//是否允许修改库位
+			allowModifyLocation: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+		},
+		data() {
+			return {
+				scanResult: {},
+				show: false,
+				scanList: [],
+				expand: false,
+				showScanResult: {},
+				expendIcon: 'arrow-down',
+				fromLocationCode: '',
+				fromLocation: '',
+				fromLocationList: [],
+				fromLocationTypeArray: [],
+				locationOnFocus: false,
+				businessType: {},
+				inventoryStatus: [],
+				managementPrecision: '',
+				fromInventoryStatuses: "",
+				isCheck:false
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//直接扫描
+			openScanPopupForType(fromLocationCode, businessType) {
+				this.businessType = businessType;
+				this.fromLocationCode = fromLocationCode;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					this.locationGetFocus();
+				}
+				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			//在任务中扫描
+			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
+				this.fromLocationCode = fromLocationCode;
+				this.fromLocationList = fromLocationList;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					if (this.fromLocationList.length == 0) {
+						this.locationGetFocus();
+					} else {
+						this.fromLocationCode = this.fromLocationList[0];
+					}
+				}
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				this.fromInventoryStatuses = jobContent.outInventoryStatuses
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
+			},
+
+			closeScanPopup(content) {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+
+			scanLocation(scanResult) {
+				var isCheck = false;
+				if (this.fromLocationCode == '') {
+					this.showErrorMessage('来源库位不能为空', callback => {
+						this.locationGetFocus();
+					})
+					return;
+				}
+				
+				if(this.fromLocationList.length>0){
+					if(!this.isInLocationList(this.fromLocationCode)){
+						this.showErrorMessage("扫描库位【"+this.fromLocationCode+'】不在任务来源库位中', callback => {
+							this.locationGetFocus();
+						})
+						return;
+					}
+				}
+
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				getBasicLocationByCode(this.fromLocationCode).then(res => {
+					if (res.data.total > 0) {
+						let result = res.data.list[0];
+						var type = result.type;
+						var available = result.available;
+						if (available == "TRUE") {
+							if (checkDirectoryItemExist(this.fromLocationTypeArray, type)) {
+								this.location = result;
+								// this.packGetFocus();
+								this.checkPackage(scanResult);
+							} else {
+								uni.hideLoading();
+								var hint = getListLocationTypeDesc(this.fromLocationTypeArray);
+								this.showErrorMessage("库位[" + this.fromLocationCode + "]是" +
+									getLocationTypeName(type) + ",<br>需要的库位类型是[" + hint + "]", callback => {
+										this.locationGetFocus();
+									})
+							}
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {
+								this.locationGetFocus();
+							})
+						}
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']', res => {
+							this.locationGetFocus();
+						})
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, res => {
+						this.locationGetFocus();
+					})
+				})
+			},
+
+			 getScanResult(result) {
+				// console.log("扫描", result)
+				// if (this.fromLocationCode == '' || this.fromLocationCode == null) {
+				// 	this.showMessage('请先扫描来源库位', callback => {
+				// 		this.locationGetFocus();
+				// 	})
+				// 	return;
+				// } else
+				this.scanLocation(result);
+				// debugger
+				// if(this.isCheck){
+				// 	this.checkPackage(result);
+				// }
+			},
+			
+			checkPackage(result){
+				if (result.label != null) {
+					this.scanResult = result;
+					// uni.showLoading({
+					// 	title: '查询中...',
+					// 	mask: true
+					// })
+					getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+						res => {
+							uni.hideLoading();
+							if (res.success) {
+								this.managementPrecision = res.managementPrecision
+								this.afterQueryBalance(res.data.list);
+							} else {
+								this.showErrorMessage(res.message, res => {
+									this.packGetFocus();
+								})
+							}
+							// uni.hideLoading();
+						});
+				}
+			},
+
+
+			afterQueryBalance(datas) {
+				if (this.allowNullBalance) {
+					this.allowNoneBalance(datas);
+				} else if (this.noShowBalanceMessage) {
+					this.countCallBack(datas);
+				} else {
+					this.mustHavaBalance(datas);
+				}
+				uni.hideLoading();
+			},
+
+			//允许无库存
+			allowNoneBalance(datas) {
+				this.packCallBack(null);
+				// if (datas.length == 0) {
+				// 	this.packCallBack(null);
+				// } else {
+				// 	this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],已经查找到该包装的库存记录,请重新扫描', res => {
+				// 		this.packGetFocus();
+				// 	})
+				// }
+			},
+
+			//必须有库存
+			mustHavaBalance(datas) {
+				if (datas.length == 0) {
+					this.showErrorMessage(this.getQueryCondition() + '<br>未查找到库存记录', res => {
+						this.packGetFocus();
+					})
+				} else if (datas.length == 1) {
+					let balance = datas[0];
+					this.packCallBack(balance);
+
+					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+
+					// if (balance.qty > 0) {
+					// 	this.packCallBack(balance);
+					// } else {
+					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+					// 		res => {
+					// 			this.packGetFocus();
+					// 		})
+					// }
+				} else {
+					this.showBalanceSelect(datas);
+				}
+			},
+
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			selectBalanceItem(balance) {
+				this.packCallBack(balance);
+				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+				// if (balance.qty > 0) {
+				// 	this.packCallBack(balance);
+				// } else {
+				// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
+				// 		res => {
+				// 			this.packGetFocus();
+				// 		})
+				// }
+			},
+
+			//盘点回调
+			countCallBack(datas) {
+				this.$refs.comscan.clear();
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: datas,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getCountScanResult", data);
+			},
+
+			packCallBack(item) {
+				this.$refs.comscan.clear();
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: item,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getResult", data);
+			},
+
+			packGetFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			packLoseFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			locationGetFocus() {
+				this.fromLocationCode = '';
+				this.locationOnFocus = true;
+			},
+
+			getQueryCondition() {
+				let condition = '按照以下条件:<br>';
+				let label = this.scanResult.label;
+				let status = getInventoryStatusDesc(this.inventoryStatus);
+				switch (this.managementPrecision) {
+					case 'BY_PACKAGING':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber +
+							']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+
+						break;
+					case 'BY_BATCH':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_QUANTITY':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_UNIQUEID':
+						condition = condition + '物料号=[' + label.itemCode + ']'
+						break;
+				}
+				if (this.inventoryStatus.length > 0) {
+					condition = condition + '<br>库存状态=[' + status + ']'
+				}
+				return condition;
+			},
+
+
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback)
+				})
+			},
+
+			change(e) {
+				this.show = e.show
+			},
+			isInLocationList(location) {
+				
+				var item = this.fromLocationList.find(res => res == location)
+				
+				if (item = undefined) {
+					return false
+				}
+				return true
+			},
+			addLocationCode(code) {
+				if (!this.isInLocationList(code)) {
+					this.fromLocationList.push(code)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>

src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@@ -6,7 +6,7 @@
 					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
 						:isShowPackUnit="false"></itemCompareQty>
 				</template>
-				<package-list :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"  :settingParam="settingParam"   @collapseChange="collapseChange"></package-list>
+				<package-list :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"  :settingParam="settingParam"   @collapseChange="collapseChange" @updateData="updateData" :isShowFromLocation="false"></package-list>
 			</uni-collapse-item>
 		</uni-collapse>
 

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -254,7 +254,6 @@
 							this.showMessage("物料号【" + itemCode + "】不在列表中")
 						} else {
 							//物料在列表中
-
 							var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch ==
 								batch);
 							if (itemDetail == undefined) {

src/pages/putaway/job/putawayDetail.vue

@@ -14,10 +14,9 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
-							:locationTypeList='tolocationTypeList'>
+						</comJobDetailCard>
-						</com-detail-card>
 					</view>
 				</view>
 			</scroll-view>
@@ -38,7 +37,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance ="true"></winScanPackAndLocationNoBalance>
 
 		<putaway-detail-info-popup ref="jobDetailPopup"></putaway-detail-info-popup>
 		<comMessage ref="comMessage"></comMessage>
@@ -61,7 +60,8 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
-		navigateBack
+		navigateBack,
+		compareAsc
 	} from '@/common/basic.js';
 
 	import {
@@ -70,14 +70,15 @@
 	} from '@/common/directory.js';
 
 	import {
-		getDataSource,
+		getTreeDataSource,
 		calcHandleQty,
+		calcTreeHandleQty,
 		getScanCount
 	} from '@/common/detail.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import winScanPackAndLocationNoBalance from "@/mycomponents/scan/winScanPackAndLocationNoBalance.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue"
 	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 
@@ -85,9 +86,9 @@
 	export default {
 		components: {
 			winScanButton,
-			winScanPackAndLocation,
+			winScanPackAndLocationNoBalance,
 			locationCompare,
-			comDetailCard,
+			comJobDetailCard,
 			jobTop
 		},
 		data() {
@@ -178,7 +179,7 @@
 							that.jobContent = res.data;
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
-							that.detailSource = getDataSource(that.subList)
+							that.detailSource = getTreeDataSource(that.subList)
 
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.jobToLocationCode = that.subList[0].toLocationCode;
@@ -207,7 +208,7 @@
 			},
 
 			calcHandleQty() {
-				calcHandleQty(this.detailSource);
+				calcTreeHandleQty(this.detailSource);
 				this.continueScan()
 				this.$forceUpdate();
 			},
@@ -254,12 +255,12 @@
 
 			getScanResult(result) {
 				try {
-					var packingNumber = result.balance.packingNumber;
+					var packingNumber = result.label.packingNumber;
-					var batch = result.balance.batch;
+					var batch = result.label.batch;
-					var qty = result.balance.qty;
+					var qty = result.label.qty;
-					var itemCode = result.balance.itemCode;
+					var itemCode = result.label.itemCode;
-					var locationCode = result.balance.locationCode;
+					var locationCode = result.fromLocationCode;
-					var inventoryStatus = result.balance.inventoryStatus;
+					var inventoryStatus = "OK";
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
 
 					if (detail == undefined) {
@@ -270,53 +271,63 @@
 								r.batch == batch &&
 								r.fromLocationCode == result.fromLocationCode
 						})
+						
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+							var isExit;
-								.fromLocationCode + "】不在列表中")
+							for (let subItem of detail.subList) {
-						} else {
+								var item;
-							if (itemDetail.scaned) {
+								for (let pack of subItem.packList) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									if (pack.packingNumber == packingNumber &&
-									.fromLocationCode + "】已经扫描")
+										pack.batch == batch) {
-							} else {
+										item = pack;
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+										isExit = pack;
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+										break;
-								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.balance.qty);
-													itemDetail.toInventoryStatus = 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();
-											});
 									}
-
+								}
+								if (item != undefined) {
+									subItem.scaned = true
+									subItem.handleQty = 0;
+									item=undefined
+								}
+							}
+							if(isExit == undefined){
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】不在列表中")
+							}else {
+								if (isExit.scaned) {
+									this.showMessage("箱码【" + packingNumber + "】已经扫描")
 								} else {
-									itemDetail.scaned = true;
+									isExit.scaned = true
-									itemDetail.handleQty = Number(result.balance.qty);
+									isExit.handleQty = Number(result.label.qty);
-									itemDetail.toInventoryStatus = itemDetail.inventoryStatus
+									isExit.toLocationCode = this.toLocationCode;
-									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();
 								}
 							}
+							calcTreeHandleQty(this.detailSource);
+							this.$forceUpdate()
+						} else {
+							var scanedLength =0;
+							itemDetail.packList.forEach(res=>{
+								if(res.scaned){
+									scanedLength++;
+								}
+							})
+							if (itemDetail.scaned&&scanedLength==itemDetail.packList.length) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+								itemDetail.handleQty = result.label.qty;
+								itemDetail.toInventoryStatus = "OK"
+								itemDetail.packList.forEach(pac => {
+									pac.scaned = true
+									pac.handleQty = Number(pac.qty);
+									pac.toLocationCode = this.toLocationCode;
+								})
+							
+								calcTreeHandleQty(this.detailSource);
+								this.continueScan()
+								this.$forceUpdate()
+							}
 						}
 					}
 				} catch (e) {
@@ -437,12 +448,19 @@
 							detail.toBatch = info.batch;
 							detail.toContainerNumber = '';
 							
-							detail.singlePrice = detail.balance.singlePrice;
+							detail.singlePrice = 1;
-							detail.amount = detail.balance.singlePrice * detail.handleQty;
+							detail.amount = 11;
+							
+							detail.arriveDate = getCurrDateTime();
+							detail.produceDate = getCurrDateTime();
+							detail.expireDate = getCurrDateTime();
+							
+							// detail.singlePrice = detail.balance.singlePrice;
+							// detail.amount = detail.balance.singlePrice * detail.handleQty;
 
-							detail.arriveDate = detail.balance.arriveDate;
+							// detail.arriveDate = detail.balance.arriveDate;
-							detail.produceDate = detail.balance.produceDate;
+							// detail.produceDate = detail.balance.produceDate;
-							detail.expireDate = detail.balance.expireDate;
+							// detail.expireDate = detail.balance.expireDate;
 							subList.push(detail)
 						}
 					})

src/pages/putaway/record/putawayRecord.vue

@@ -15,10 +15,10 @@
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+							<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
 								@updateData="updateData" @removePack="removePack">
-							</record-com-detail-card>
+							</recordDetailCard>
 						</view>
 
 					</view>
@@ -76,7 +76,7 @@
 		getBusinessType,
 		createItemInfo,
 		createDetailInfo,
-		calcHandleQty
+		calcTreeHandleQty
 	} from '@/common/record.js';
 
 	import {
@@ -92,6 +92,7 @@
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
 	
 	export default {
 		components: {
@@ -101,7 +102,8 @@
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,
-			recordComDetailCard
+			recordComDetailCard,
+			recordDetailCard
 		},
 		data() {
 			return {
@@ -168,32 +170,29 @@
 						newDetail.toLocationCode = toLocation.code;
 						newDetail.toWarehouseCode = toLocation.warehouseCode;
 						itemp.subList.push(newDetail);
+						var dataList = pack.subList
 						this.detailSource.push(itemp)
+						this.detailSource.forEach(res=>{
+							res.subList.forEach(pack=>{
+								pack.packList = dataList.filter(c=>c.parentNumber==pack.packingNumber)
+								pack.packList.forEach(pac=>{
+									pac.parentPackingNumber =pac.parentNumber;
+									pac.packingNumber =pac.number;
+									pac.inventoryStatus="OK";
+									pac.scaned=true;
+								})
+							})
+						})
 					})
 
 				} else {
-					var detail = item.subList.find(r => {
+					var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
-						if (r.packingNumber == balance.packingNumber &&
+						balance.batch);
-							r.batch == balance.batch &&
+						if(itemDetail!=undefined){
-							r.locationCode == balance.locationCode &&
-							r.inventoryStatus == balance.inventoryStatus) {
-							return r;
-						}
-					})
-					if (detail == undefined) {
-						this.getRecommendLocation(balance, pack, toLocation => {
-							let newDetail = createDetailInfo(balance, pack);
-							newDetail.toLocationCode = toLocation.code;
-							newDetail.toWarehouseCode = toLocation.warehouseCode;
-							item.subList.push(newDetail);
-						});
-					} else {
-						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
 						}
-					}
 				}
-				this.calcHandleQty();
+				// calcTreeHandleQty(this.detailSource);
 			},
 
 			//获取推荐库位
@@ -235,7 +234,7 @@
 				});
 			},
 
-			calcHandleQty() {
+			calcTreeHandleQty() {
 				for (let item of this.detailSource) {
 					item.qty = 0;
 					for (let detail of item.subList) {
@@ -248,7 +247,7 @@
 			},
 
 			updateData() {
-				this.calcHandleQty();
+				this.calcTreeHandleQty();
 			},
 
 			removeItem(index, item) {
@@ -449,7 +448,7 @@
 			},
 
 			updateData() {
-				this.calcHandleQty();
+				// this.calcTreeHandleQty();
 				for (var i = 0; i < this.detailSource.length; i++) {
 					let item = this.detailSource[i];
 					if (item.qty == 0) {