diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue
index 05d4be77..9b61b156 100644
--- a/src/mycomponents/balance/pack.vue
+++ b/src/mycomponents/balance/pack.vue
@@ -1,19 +1,22 @@
 <template>
-	<view class="card_view">
+	<view class="card_view" v-if="ShowPackingNumber">
 		<text class="card_packing_code ">{{title}}</text>
 		<text class="card_content ">{{packingCode}}</text>
 	</view>
 </template>
 
 <script> 
+import {
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
 	export default {
 		components: {
 		},
 
 		data() {
 			return {
-				 
-			}
+				ShowPackingNumber:true
+			};
 		},
 		props: {
 			packingCode: {
@@ -26,8 +29,8 @@
 				default: '包装'
 			}
 		},
-		watch: {
-			 
+		mounted() {
+			this.ShowPackingNumber=getSwitchInfoByCode('ShowPackingNumber')
 		},
 		methods: {
 			 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index bde4f960..78afe347 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -388,7 +388,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="EnableQms,FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated,EnableQms,ShowPackingNumber";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index adec98a1..e4713524 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -72,6 +72,10 @@
 		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+	
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
@@ -81,6 +85,7 @@
 	import winScanPackage from '@/mycomponents/scan/winScanPackage.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	
 	import {
 		updateTitle
 	} from '@/common/basic.js';
@@ -149,7 +154,21 @@
 
 		methods: {
 			getScanResult(result) {
-				this.setData(result);
+				console.log(result)
+				//获取管理模式，封装参数
+				getManagementPrecisions([result.label.itemCode], result.balance.locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.managementType = this.managementList.some(item => item.ManagementPrecision ==
+							'BY_BATCH') ? 'BY_BATCH' : ''
+							this.managementType = 'BY_BATCH'
+						if(this.managementType == 'BY_BATCH'){
+							this.setDataBatch(result)
+						}else{
+							this.setData(result);
+						}
+					}
+				})
 			},
 			
 			setData(result) {
@@ -271,6 +290,126 @@
 				}
 				calcHandleQty(this.detailSource);
 			},
+			setDataBatch(result) {
+				debugger
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+			
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					// itemp.containerNumber=""
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.fromLocationCode=balance.locationCode
+					
+					newDetail.parentNumber = pack.parentNumber;
+					newDetail.packingNumber = pack.number
+					newDetail.packUnit = pack.packUnit;
+					newDetail.packQty = pack.packQty;
+					if (balance.lableQty) {
+						newDetail.handleQty = balance.lableQty
+					}
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					this.itemCode = balance.itemCode;
+					this.fromLocationCode = balance.locationCode
+					this.getRecommendLocation(balance)
+					this.scanPopupGetFocus()
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == balance.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						//如果最开始扫父，在扫子，提示已经扫描父包装
+						//如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装
+						//扫描的是子包装,
+						if (pack.parentNumber) {
+							var checkData = item.subList.find(r => {
+								if (r.packingNumber == pack.parentNumber &&
+									r.batch == balance.batch&&
+									r.fromLocationCode == balance.locationCode) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//提示已经扫描
+								this.showErrorMessage("扫描箱码[" + pack.number + "]批次[" + balance.batch +
+									"]的父包装已经扫描")
+								console.log("父包装已经扫描")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								newDetail.fromLocationCode=balance.locationCode
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
+						} else {
+							//扫描的是父包装
+							var checkData = item.subList.find(r => {
+								if (r.parentNumber == pack.number &&
+									r.batch == balance.batch&&
+									r.fromLocationCode == balance.locationCode) {
+									return r;
+								}
+							})
+							if (checkData) {
+								//是否移除
+								this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance
+									.batch + "]是父包装，是否移除子包装", res => {
+										if (res) {
+											item.subList = [];
+											let newDetail = createDetailInfo(balance, pack);
+											newDetail.parentNumber = pack.parentNumber;
+											newDetail.packingNumber = pack.number
+											newDetail.packUnit = pack.packUnit;
+											newDetail.packQty = pack.packQty;
+											newDetail.fromLocationCode=balance.locationCode
+											if (balance.lableQty) {
+												newDetail.handleQty = balance.lableQty
+											}
+											item.subList.push(newDetail);
+											calcHandleQty(this.detailSource);
+										}
+									})
+								console.log("扫描的是父包装，是否移除子包装")
+							} else {
+								let newDetail = createDetailInfo(balance, pack);
+								newDetail.fromLocationCode=balance.locationCode
+								newDetail.parentNumber = pack.parentNumber;
+								newDetail.packingNumber = pack.number
+								newDetail.packUnit = pack.packUnit;
+								newDetail.packQty = pack.packQty;
+								if (balance.lableQty) {
+									newDetail.handleQty = balance.lableQty
+								}
+								item.subList.push(newDetail);
+							}
+						}
+			
+						this.scanPopupGetFocus()
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描")
+						}
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
 
 			getRecommendLocation(balance) {
 				uni.showLoading({