diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index db773bf..6363d81 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -118,6 +118,14 @@
 						<input type="number" v-model="num" class="filter_input">
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">机台编码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2"></uni-data-select>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
@@ -125,6 +133,24 @@
 			<button class="zd-col-9 button-primary" :class="{'button-info': !vehicleCode || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled" @tap="_confirmBox">确认组箱</button>
 			<button class="zd-col-9 button-primary" :class="{'button-info': !vehicleCode || JSON.stringify(materialData) === '{}' || JSON.stringify(suppData) === '{}'}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
 		</view>
+		<!-- 自定义弹窗遮罩 -->
+		<view v-if="showCustomDialog" class="custom-dialog-mask" @click="showCustomDialog = false">
+			<view class="custom-dialog" @click.stop>
+				<view class="dialog-title">打印次数</view>
+				<view class="dialog-body">
+					<input 
+						type="number" 
+						v-model="printCount"
+						class="dialog-input"
+						focus
+					/>
+				</view>
+				<view class="dialog-footer">
+					<button @click="showCustomDialog = false">取消</button>
+					<button @click="handlePrintConfirm" type="primary">确定</button>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -136,7 +162,7 @@
 	import {getDate} from '@/utils/utils.js'
 	const currentDate = getDate({format: true})
 	// import {queryGroupQuality, queryNowVehicle} from '@/utils/mork2.js'
-	import {queryGroupQuality, queryNowVehicle, confirmBox, printDelete, queryPcsn} from '@/utils/getData2.js'
+	import {queryGroupQuality, queryNowVehicle, confirmBox, printDelete, queryPcsn, queryDevice} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -145,11 +171,15 @@
 		},
 		data() {
 			return {
+				showCustomDialog: false,
+				printCount: 1,
 				title: '',
 				vehicleCode: '',
 				date: currentDate,
 				options1: [],
 				index1: '',
+				options2: [],
+				index2: '',
 				boxType: null,
 				materialData: {},
 				suppData: {},
@@ -179,6 +209,7 @@
 			this.title = options.title
 			this._queryGroupQuality()
 			this._queryPcsn()
+			this._queryDevice()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
@@ -191,6 +222,12 @@
 			}
 		},
 		methods: {
+			handlePrintConfirm() {
+				// 处理打印逻辑
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.showCustomDialog = false
+				this.toPrint(data)
+			},
 			onInput(e) {
 				// console.log('输入内容:', e.detail.value)
 			},
@@ -253,6 +290,19 @@
 					this.options1 = []
 				}
 			},
+			/** 机台编码下拉框*/
+			async _queryDevice () {
+				try {
+					let res = await queryDevice()
+					if (res && res.data) {
+						this.options2 = [...res.data]
+					} else {
+						this.options2 = []
+					}
+				} catch (e) {
+					this.options2 = []
+				}
+			},
 			toEmpty () {
 				this.vehicleCode = ''
 				this.date = currentDate
@@ -271,7 +321,7 @@
 					return
 				}
 				try {
-					let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num)
+					let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num, this.index2)
 					if (res) {
 						uni.showToast({
 							title: res.message,
@@ -302,8 +352,9 @@
 					this.disabled1 = false
 					return
 				}
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
-				this.toPrint(data)
+				this.showCustomDialog = true
+				// let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				// this.toPrint(data)
 			},
 			toPrint (data) {
 				let iparr = this.$store.getters.printUrl.split(":")
@@ -318,35 +369,38 @@
 					this.disabled1 = false
 				    return
 				}
-				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
-				// 更换为打印服务器ip 不需要加前缀
-				LODOP.PRINT_INIT(null, printUrl);
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
-				LODOP.SET_PRINTER_INDEX(-1);
-				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-				LODOP.SET_PRINT_STYLE('FontSize', 8)
-				LODOP.SET_PRINT_STYLE('Bold', 1)
-				LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
-					data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
-					data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
-				)
-				LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
-				LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
-				LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
-				LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
-				LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
-				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
-				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
+				// 按次打印
+				for (let i = 0; i < this.printCount; i++) {
+					LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+					LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+					// 更换为打印服务器ip 不需要加前缀
+					LODOP.PRINT_INIT(null, printUrl);
+					// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
+					LODOP.SET_PRINTER_INDEX(-1);
+					// 设置打印纸大小
+					LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+					LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+					LODOP.SET_PRINT_STYLE('FontSize', 8)
+					LODOP.SET_PRINT_STYLE('Bold', 1)
+					LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
+						data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
+						data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
+					)
+					LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
+					LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
+					LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
+					LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
+					LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
+					LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
+					LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
 
-				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
-				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
-				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
-				LODOP.PRINT();
-				// LODOP.PREVIEW()
-				// 调用删除
+					LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
+					LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
+					LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
+					LODOP.PRINT();
+					// LODOP.PREVIEW()
+				}
+				// 烘干出库且需要删除的 调用删除接口
 				if (data.out_type === '1004' && data.is_need_delete === '1') {
 					this.printDelete(data)
 				}
@@ -417,4 +471,55 @@
   font-size: 24rpx;
   color: #666;
 }
+
+.custom-dialog-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+}
+
+.custom-dialog {
+  width: 600rpx;
+  background: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.dialog-title {
+  padding: 30rpx;
+  font-size: 32rpx;
+  text-align: center;
+  border-bottom: 1rpx solid #eee;
+}
+
+.dialog-body {
+  padding: 40rpx;
+}
+
+.dialog-input {
+  width: 100%;
+  height: 80rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  padding: 0 20rpx;
+  text-align: center;
+}
+
+.dialog-footer {
+  display: flex;
+  border-top: 1rpx solid #eee;
+}
+
+.dialog-footer button {
+  flex: 1;
+  border-radius: 0;
+  margin: 0;
+}
 </style>
diff --git a/pages/Material/hw-out-store.vue b/pages/Material/hw-out-store.vue
index 55bf887..911f52b 100644
--- a/pages/Material/hw-out-store.vue
+++ b/pages/Material/hw-out-store.vue
@@ -82,6 +82,24 @@
 			<button class="zd-col-9 button-primary" :class="{'button-info': !val1}" :disabled="disabled1" @tap="labelPrint">标签打印</button>
 		<button class="zd-col-9 button-primary" :class="{'button-info': !val1 || kcqty === ''}" :disabled="disabled" @tap="_materialBoxOutConfirm">确认出库</button>
 		</view>
+		<!-- 自定义弹窗遮罩 -->
+		<view v-if="showCustomDialog" class="custom-dialog-mask" @click="showCustomDialog = false">
+			<view class="custom-dialog" @click.stop>
+				<view class="dialog-title">打印次数</view>
+				<view class="dialog-body">
+					<input 
+						type="number" 
+						v-model="printCount"
+						class="dialog-input"
+						focus
+					/>
+				</view>
+				<view class="dialog-footer">
+					<button @click="showCustomDialog = false">取消</button>
+					<button @click="handlePrintConfirm" type="primary">确定</button>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -97,6 +115,8 @@
 		},
 		data() {
 			return {
+				showCustomDialog: false,
+				printCount: 1,
 				title: '',
 				val1: '',
 				val2: '',
@@ -117,6 +137,12 @@
 			}
 		},
 		methods: {
+			handlePrintConfirm() {
+				// 处理打印逻辑
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				this.showCustomDialog = false
+				this.toPrint(data)
+			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
@@ -170,8 +196,13 @@
 			},
 			labelPrint () {
 				this.disabled1 = true
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
-				this.toPrint(data)
+				if (!this.vehicleCode || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				this.showCustomDialog = true
+				// let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				// this.toPrint(data)
 			},
 			toPrint (data) {
 				let iparr = this.$store.getters.printUrl.split(":")
@@ -186,35 +217,38 @@
 					this.disabled1 = false
 				    return
 				}
-				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
-				// 更换为打印服务器ip 不需要加前缀
-				LODOP.PRINT_INIT(null, printUrl);
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
-				LODOP.SET_PRINTER_INDEX(-1);
-				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-				LODOP.SET_PRINT_STYLE('FontSize', 8)
-				LODOP.SET_PRINT_STYLE('Bold', 1)
-				LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
-					data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
-					data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
-				)
-				LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
-				LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
-				LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
-				LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
-				LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
-				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
-				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
+				// 按次打印
+				for (let i = 0; i < this.printCount; i++) {
+					LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+					LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+					// 更换为打印服务器ip 不需要加前缀
+					LODOP.PRINT_INIT(null, printUrl);
+					// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
+					LODOP.SET_PRINTER_INDEX(-1);
+					// 设置打印纸大小
+					LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+					LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+					LODOP.SET_PRINT_STYLE('FontSize', 8)
+					LODOP.SET_PRINT_STYLE('Bold', 1)
+					LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', data.material_code + '##' + data.material_name + '##' +
+						data.material_spec + '##' + data.material_model + '##' + data.quality_time + '##' + data.produce_time + '##' +
+						data.supp_name + '##' + data.bake_num + '##' + data.supp_code + '##' + data.pcsn + '##' + data.execution_stand
+					)
+					LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + data.material_code)
+					LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + data.material_name)
+					LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + data.material_spec)
+					LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + data.material_model)
+					LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + data.quality_time)
+					LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
+					LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + data.supp_name)
 
-				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
-				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
-				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
-				LODOP.PRINT();
-				// LODOP.PREVIEW()
-				// 调用删除
+					LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
+					LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
+					LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
+					LODOP.PRINT();
+					// LODOP.PREVIEW()
+				}
+				// 烘干出库且需要删除的 调用删除接口
 				if (data.out_type === '1004' && data.is_need_delete === '1') {
 					this.printDelete(data)
 				}
diff --git a/pages/Material/xlx-in-store.vue b/pages/Material/xlx-in-store.vue
index 5ccf5eb..761dfcd 100644
--- a/pages/Material/xlx-in-store.vue
+++ b/pages/Material/xlx-in-store.vue
@@ -39,6 +39,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
+								<th>载具号</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>批次</th>
@@ -55,8 +56,9 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.storagevehicle_code === pkId}" @tap="toCheck(e)">
 								<td>{{i+1}}</td>
+								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
@@ -99,6 +101,8 @@
 				index: '',
 				val1: '',
 				val2: '',
+				pkId: '',
+				pkObj: {},
 				dataList: [],
 				disabled: false
 			};
@@ -108,11 +112,18 @@
 			this._queryInBillType()
 		},
 		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.storagevehicle_code ? '' : e.storagevehicle_code
+				this.pkObj = this.pkId === e.storagevehicle_code ? e : {}
+				this.val1 = e.storagevehicle_code
+				this.searchList()
+			},
 			async _queryInBillType () {
 				try {
 					let res = await queryInBillType()
 					if (res) {
 						this.options = res.data
+						this.index = this.options[0].value
 					} else {
 						this.options = []
 					}
@@ -141,8 +152,6 @@
 			},
 			clearUp () {
 				this.val1 = ''
-				this.val2 = ''
-				this.index = ''
 				this.dataList = []
 				this.disabled = false
 			},
diff --git a/utils/getData2.js b/utils/getData2.js
index 3f26687..836cb8e 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -69,7 +69,7 @@ export const queryNowVehicle = (code) => request({
 })
 
 // 确认组箱(入库组箱)
-export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time, qty, quality, type, num) => request({
+export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time, qty, quality, type, num, dcode) => request({
 	url:'api/pdaInGroupBox/confirmBox',
 	data: {
 		storagevehicle_code:scode,
@@ -83,7 +83,8 @@ export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time,
 		qty:qty,
 		quality_type: quality,
 		box_type: type,
-		bake_num: num
+		bake_num: num,
+		device_code: dcode
 	}
 })
 // 批次下拉框
@@ -91,6 +92,11 @@ export const queryPcsn = () => request({
 	url:'api/pdaInGroupBox/queryPcsn',
 	data: {}
 })
+// 机台编码下拉框
+export const queryDevice = () => request({
+	url:'api/pdaInGroupBox/queryDevice',
+	data: {}
+})
 // 确认组箱(组箱配送)
 export const deliveryBox = (code, id, bcode, info, qty, rows) => request({
 	url:'api/pdaInGroupBox/deliveryBox',