diff --git a/pages/hdyy/scgl/yjg-chuliao.vue b/pages/hdyy/scgl/yjg-chuliao.vue
index 0bac12b..b26fa7d 100644
--- a/pages/hdyy/scgl/yjg-chuliao.vue
+++ b/pages/hdyy/scgl/yjg-chuliao.vue
@@ -11,6 +11,7 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -57,7 +58,6 @@
 								<th>类别</th>
 								<th>规格</th>
 								<th>型号</th>
-								<th>点位</th>
 								<th>载具</th>
 							</tr>
 						</thead>
@@ -71,10 +71,9 @@
 								<td>{{e.qty}}</td>
 								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.supp_name}}</td>
-								<td>{{e.material_type_id}}</td>
+								<td>{{e.class_name}}</td>
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
-								<td>{{e.struct_code}}</td>
 								<td>{{e.vehicle_code}}</td>
 							</tr>
 						</tbody>
@@ -101,20 +100,12 @@
 		data() {
 			return {
 				title: '',
-				// options: [],
-				// options: [{text:'原粉区', value: '1'}, {text:'批料室', value: '1'}, {text:'粉碎室1', value: 'f1'}, {text:'粉碎室2', value: 'f2'}],
-				// options: [{text:'原粉区', value: '1', aaa:'n1'}, {text:'批料室', value: '1', aaa:'n1'}],
-				options: [{
-					forder_seg: 4,
-					updateid: 1,
-					text:"AGy对接区",
-					updatename:"管理员",
-					update_time: "2026-01-07 10:28:48",
-					value:"AGVDTO1",
-					workshop_code:"1"
-					}
-				],	
-				options: [],
+				options: [
+					{text: '物料室原料区', value: 'WYL01'},
+					{text: '批料室主存区', value: 'PZC01'},
+					{text: '粉碎室1区', value: 'FSSQ01'},
+					{text: '粉碎室2区', value: 'FSSQ02'}
+				],
 				index: '',
 				val1: '',
 				val2: '',
@@ -151,6 +142,11 @@
 			selectChange (e) {
 				this.index = e
 			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupInfo()
+				}
+			},
 			async _getGroupInfo () {
 				try {
 					let res = await getGroupInfo(this.val1)
diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index 2ad8c8e..9e80c39 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -151,12 +151,6 @@
 				} catch (e) {
 				}
 			},
-			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)
-			},
 			toJump (name) {
 				uni.navigateTo({
 					url: `/pages/hdyy/wbc/${name}`
@@ -218,11 +212,17 @@
 					this.disabled1 = false
 					return
 				}
-				// this.showCustomDialog = true
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bag_code: this.val1})
-				this.toPrint(data)
+				let row = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bag_code: this.val1})
+				const class_code = row.class_code
+				if (class_code === 'YL001' || class_code === 'FL001' || class_code === 'NBC001') {
+					// 原料、辅料、内包材
+					this.printOne(row)
+				} else {
+					this.printTwo(row)
+				}
+				// this.toPrint(row)
 			},
-			toPrint (row) {
+			printOne (row) {
 				let iparr = this.$store.getters.printUrl.split(":")
 				let printUrl = iparr[1].slice(2)
 				let LODOP = getCLodop();
@@ -301,6 +301,88 @@
 				LODOP.ADD_PRINT_LINE(320, 265, 254, 265, 0, 1)
 				LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bag_code + '')
 
+				LODOP.PRINT()// 打印
+				// LODOP.PREVIEW()// 预览
+				// LODOP.PRINT_DESIGN()
+				uni.showToast({
+					title: '操作成功',
+					icon: 'none'
+				})
+				this.disabled1 = false
+			},
+			printTwo (row) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+					this.disabled1 = false
+				    return
+				}
+				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+				// 打印纸张大小设置https://www.it610.com/article/2094844.html
+				LODOP.PRINT_INIT('')
+				LODOP.SET_PRINT_PAGESIZE(1, '94mm', '119mm', '')
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '92mm', '117mm', 0, 1)
+				LODOP.ADD_PRINT_TEXT('2.88mm', '35.4mm', '32.65mm', '5.95mm', '中 美 华 东 制 药')
+				LODOP.ADD_PRINT_TEXT('6.56mm', '22.33mm', '62.02mm', '5.69mm', 'Zhongmei Huadong Pharmaceutical')
+				LODOP.ADD_PRINT_TEXT('10.45mm', '13.86mm', '98mm', '7.01mm', '周 转 物 料 卡 Turnover Material Card')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 11)
+				LODOP.ADD_PRINT_TEXT('15.48mm', '5.13mm', '93.24mm', '5.69mm', '依据《状态标识牌的有关规定》（QA-SMP-B005）制定此记录')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('19.45mm', '5.13mm', '128.69mm', '7.01mm', 'Establish this record according to “SMP for status signboard”')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('22.89mm', '5.13mm', '27.62mm', '4.37mm', '(QA-SMP-B005)')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('26.86mm', '5.13mm', '66.78mm', '4.37mm', '记录编号 Record No.: ' + this.recordNo + '')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
+				LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ')
+				LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '4.47mm', '41.65mm', '5.69mm', '净 重 Net Weight: ')
+				LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '操 作 日 期 Operation Date: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '有 效 期 至 Expiry Date: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('69.22mm', '5mm', '22.07mm', '5.69mm', '用 于 产 品')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('73.71mm', '5mm', '11.22mm', '5.69mm', 'Used')
+				LODOP.ADD_PRINT_TEXT('73.71mm', '17.44mm', '8.57mm', '5.69mm', 'in')
+				LODOP.ADD_PRINT_TEXT('77.68mm', '5mm', '16.77mm', '5.69mm', 'Product')
+				LODOP.ADD_PRINT_TEXT('69.45mm', '28.28mm', '23.65mm', '5.69mm', '名 称 Name: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('76.23mm', '28.28mm', '31.86mm', '5.69mm', '规 格 Strength: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('83.98mm', '5.27mm', '51.17mm', '5.69mm', '操 作 人 Operator: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('92.21mm', '5.27mm', '48mm', '5.69mm', '复 核 人 Reviewer: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('99.7mm', '5.27mm', '39.26mm', '5.69mm', '备 注 Remarks:')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_LINE(114, 11, 114, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(136, 11, 136, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(171, 11, 171, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(209, 11, 209, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(231, 11, 231, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(254, 11, 254, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(282, 97, 282, 360, 0, 0)
+
+				LODOP.ADD_PRINT_LINE(309, 11, 309, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(339, 11, 339, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(370, 11, 370, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(397, 11, 397, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(309, 96, 254, 96, 0, 1)
+				LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bag_code)
+
 				LODOP.PRINT()// 打印
 				// LODOP.PREVIEW()// 预览
 				// LODOP.PRINT_DESIGN()
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index a925bb5..6f65683 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -130,12 +130,6 @@
 				} catch (e) {
 				}
 			},
-			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)
-			},
 			toJump (name) {
 				uni.navigateTo({
 					url: `/pages/hdyy/wbc/${name}`
@@ -153,6 +147,7 @@
 			},
 			toZtPrint () {
 				this._confirmBucketAssembly()
+				this.labelPrint()
 			},
 			async _confirmBucketAssembly () {
 				this.disabled = true
@@ -190,8 +185,7 @@
 					this.disabled1 = false
 					return
 				}
-				// this.showCustomDialog = true
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bucket_code: this.val1})
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bucket_code: this.val1, bucket_weight: this.weight})
 				this.toPrint(data)
 			},
 			toPrint (row) {
@@ -212,13 +206,9 @@
 				LODOP.PRINT_INIT('')
 				LODOP.SET_PRINT_PAGESIZE(1, '94mm', '119mm', '')
 				LODOP.ADD_PRINT_RECT('1mm', '3mm', '92mm', '117mm', 0, 1)
-				LODOP.ADD_PRINT_RECT('1.01mm', '2.99mm', '92mm', '117mm', 0, 1)
-				LODOP.ADD_PRINT_RECT('1.01mm', '2.99mm', '92mm', '117mm', 0, 1)
-				LODOP.ADD_PRINT_RECT('1.01mm', '2.99mm', '92mm', '117mm', 0, 1)
-				LODOP.ADD_PRINT_RECT('1.01mm', '2.99mm', '92mm', '117mm', 0, 1)
 				LODOP.ADD_PRINT_TEXT('2.88mm', '35.4mm', '32.65mm', '5.95mm', '中 美 华 东 制 药')
 				LODOP.ADD_PRINT_TEXT('6.56mm', '22.33mm', '62.02mm', '5.69mm', 'Zhongmei Huadong Pharmaceutical')
-				LODOP.ADD_PRINT_TEXT('10.45mm', '26.83mm', '56.73mm', '7.01mm', '物 料 卡 Material Card')
+				LODOP.ADD_PRINT_TEXT('10.45mm', '13.86mm', '98mm', '7.01mm', '周 转 物 料 卡 Turnover Material Card')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 11)
 				LODOP.ADD_PRINT_TEXT('15.48mm', '5.13mm', '93.24mm', '5.69mm', '依据《状态标识牌的有关规定》（QA-SMP-B005）制定此记录')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
@@ -229,49 +219,47 @@
 				LODOP.ADD_PRINT_TEXT('26.86mm', '5.13mm', '66.78mm', '4.37mm', '记录编号 Record No.: ' + this.recordNo + '')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
 				LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
 				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
 				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '')
-				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '27.09mm', '5.69mm', '有 效 期 至 口')
-				LODOP.ADD_PRINT_TEXT('46.78mm', '47.33mm', '27.62mm', '5.69mm', '复 验 期 至 口')
-				LODOP.ADD_PRINT_TEXT('51.01mm', '47.33mm', '21.54mm', '5.69mm', 'Expory Date')
-				LODOP.ADD_PRINT_TEXT('51.01mm', '4.47mm', '27.09mm', '5.69mm', 'Retest Date')
-				LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '经 销 商 Distributor:')
-				LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '生 产 商 Manufacturer:')
-				LODOP.ADD_PRINT_TEXT('69.74mm', '9.5mm', '11.22mm', '5.69mm', '日 期')
+				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ' + row.bucket_code + '')
+				LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ' + row.bucket_weight + '')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ')
+				LODOP.ADD_PRINT_TEXT('51.81mm', '4.47mm', '41.65mm', '5.69mm', '净 重 Net Weight: ')
+				LODOP.ADD_PRINT_TEXT('56.83mm', '4.47mm', '86.62mm', '7.01mm', '操 作 日 期 Operation Date: ')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('73.42mm', '10.82mm', '9.63mm', '5.69mm', 'Date')
-				LODOP.ADD_PRINT_TEXT('69.61mm', '28.55mm', '20.48mm', '5.69mm', '重量(数量)')
+				LODOP.ADD_PRINT_TEXT('62.92mm', '4.47mm', '85.3mm', '7.01mm', '有 效 期 至 Expiry Date: ')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('73.53mm', '31.46mm', '13.6mm', '4.37mm', 'Weight')
-				LODOP.ADD_PRINT_TEXT('69.69mm', '54.48mm', '14.92mm', '5.69mm', '经手人')
+				LODOP.ADD_PRINT_TEXT('69.22mm', '5mm', '22.07mm', '5.69mm', '用 于 产 品')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('73.03mm', '53.95mm', '15.72mm', '4.37mm', 'Operator')
-				LODOP.ADD_PRINT_TEXT('69.72mm', '75.38mm', '14.13mm', '5.69mm', '复核人')
+				LODOP.ADD_PRINT_TEXT('73.71mm', '5mm', '11.22mm', '5.69mm', 'Used')
+				LODOP.ADD_PRINT_TEXT('73.71mm', '17.44mm', '8.57mm', '5.69mm', 'in')
+				LODOP.ADD_PRINT_TEXT('77.68mm', '5mm', '16.77mm', '5.69mm', 'Product')
+				LODOP.ADD_PRINT_TEXT('69.45mm', '28.28mm', '23.65mm', '5.69mm', '名 称 Name: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('76.23mm', '28.28mm', '31.86mm', '5.69mm', '规 格 Strength: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('83.98mm', '5.27mm', '51.17mm', '5.69mm', '操 作 人 Operator: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('92.21mm', '5.27mm', '48mm', '5.69mm', '复 核 人 Reviewer: ')
+				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
+				LODOP.ADD_PRINT_TEXT('99.7mm', '5.27mm', '39.26mm', '5.69mm', '备 注 Remarks:')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('72.79mm', '74.59mm', '16.25mm', '4.37mm', 'Reviewer')
-				LODOP.ADD_PRINT_TEXT('79.27mm', '5mm', '19.16mm', '5.69mm', row.create_time.slice(0, 10) + '')
-				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
-				LODOP.ADD_PRINT_TEXT('79.27mm', '31.46mm', '15mm', '5.69mm', row.qty + '')
-				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
-				LODOP.ADD_PRINT_TEXT('86.47mm', '5.27mm', '35.03mm', '5.69mm', '合 格 Qualified 口')
-				LODOP.ADD_PRINT_TEXT('86.47mm', '45.22mm', '40.06mm', '5.69mm', '不 合 格 Unqualified 口')
-				LODOP.ADD_PRINT_TEXT('91.49mm', '5.27mm', '27.09mm', '5.69mm', '储 存 条 件：')
-				LODOP.ADD_PRINT_TEXT('95.73mm', '5.27mm', '36.35mm', '5.69mm', 'Stroage conditions')
-				LODOP.ADD_PRINT_TEXT('101.28mm', '5.27mm', '27.09mm', '5.69mm', '备 注 Remarks:')
 				LODOP.ADD_PRINT_LINE(114, 11, 114, 360, 0, 0)
 				LODOP.ADD_PRINT_LINE(136, 11, 136, 360, 0, 0)
 				LODOP.ADD_PRINT_LINE(171, 11, 171, 360, 0, 0)
 				LODOP.ADD_PRINT_LINE(209, 11, 209, 360, 0, 0)
 				LODOP.ADD_PRINT_LINE(231, 11, 231, 360, 0, 0)
 				LODOP.ADD_PRINT_LINE(254, 11, 254, 360, 0, 0)
-				LODOP.ADD_PRINT_LINE(291, 11, 291, 360, 0, 0)
-				LODOP.ADD_PRINT_LINE(320, 11, 320, 360, 0, 0)
-				LODOP.ADD_PRINT_LINE(378, 11, 378, 360, 0, 0)
-				LODOP.ADD_PRINT_LINE(401, 11, 401, 360, 0, 0)
-				LODOP.ADD_PRINT_LINE(320, 96, 254, 96, 0, 1)
-				LODOP.ADD_PRINT_LINE(320, 182, 254, 182, 0, 1)
-				LODOP.ADD_PRINT_LINE(320, 265, 254, 265, 0, 1)
-				LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bucket_code + '')
+				LODOP.ADD_PRINT_LINE(282, 97, 282, 360, 0, 0)
+
+				LODOP.ADD_PRINT_LINE(309, 11, 309, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(339, 11, 339, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(370, 11, 370, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(397, 11, 397, 360, 0, 0)
+				LODOP.ADD_PRINT_LINE(309, 96, 254, 96, 0, 1)
+				LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bucket_code)
 
 				LODOP.PRINT()// 打印
 				// LODOP.PREVIEW()// 预览