From c538711e415f9bc4128ed92a49644bfef7d0b45d Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 14 Jan 2026 14:30:15 +0800
Subject: [PATCH] change

---
 pages/hdyy/scgl/point-quhuo.vue  |  79 ++++--------------
 pages/hdyy/scgl/yjg-chuliao.vue  |   1 +
 pages/hdyy/tygn/agv-manage.vue   |   2 +-
 pages/hdyy/zpgl/mater-zudai.vue  | 135 ++++++++++++++++++++++---------
 pages/hdyy/zpgl/mater-zutong.vue | 119 ++++++++++++++++++---------
 utils/getData3.js                |  19 +++++
 6 files changed, 213 insertions(+), 142 deletions(-)

diff --git a/pages/hdyy/scgl/point-quhuo.vue b/pages/hdyy/scgl/point-quhuo.vue
index 0578e0d..d04d531 100644
--- a/pages/hdyy/scgl/point-quhuo.vue
+++ b/pages/hdyy/scgl/point-quhuo.vue
@@ -11,7 +11,16 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
-						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">袋码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="bagCode"
 						/>
 					</view>
 				</view>
@@ -91,6 +100,7 @@
 			return {
 				title: '',
 				val1: '',
+				bagCode: '',
 				num: null,
 				dataList: [],
 				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
@@ -102,65 +112,9 @@
 		},
 		methods: {
 			toScanAdd () {
-				uni.scanCode({
-					success: (res) => {
-						// console.log('扫码成功:', res.result);
-						if (res.result.includes(';')) {
-							const parts = res.result.split(';')
-							if (parts.length !== 5) {
-								uni.showToast({
-									title: '二维码格式不正确，请扫描符合格式的二维码',
-									icon: 'none'
-								})
-								return
-							}
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: parts[0],
-								material_code: parts[1],
-								material_name: parts[2],
-								qty: parts[3],
-								measure_unit_id: parts[4],
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						} else {
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: res.result,
-								material_code: '',
-								material_name: '',
-								qty: '',
-								measure_unit_id: ''
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						}
-					},
-					fail: (err) => {
-						console.log('扫码失败:', err)
-						// uni.showToast({
-						// 	title: err + '扫码失败',
-						// 	icon: 'none'
-						// })
-					}
-				})
+				if (this.bagCode) {
+					this._getPalletAssemblyOK(this.bagCode)
+				}
 			},
 			toDel () {
 				if (!this.pkId) {
@@ -192,11 +146,6 @@
 					// })
 				}
 			},
-			handleChange (e) {
-				if (e) {
-					this._getPalletAssemblyOK()
-				}
-			},
 			async _getPalletAssemblyOK () {
 				try {
 					let res = await getPalletAssemblyOK(this.val1)
diff --git a/pages/hdyy/scgl/yjg-chuliao.vue b/pages/hdyy/scgl/yjg-chuliao.vue
index 12aca7b..0bac12b 100644
--- a/pages/hdyy/scgl/yjg-chuliao.vue
+++ b/pages/hdyy/scgl/yjg-chuliao.vue
@@ -114,6 +114,7 @@
 					workshop_code:"1"
 					}
 				],	
+				options: [],
 				index: '',
 				val1: '',
 				val2: '',
diff --git a/pages/hdyy/tygn/agv-manage.vue b/pages/hdyy/tygn/agv-manage.vue
index 9e39e49..b7b93fa 100644
--- a/pages/hdyy/tygn/agv-manage.vue
+++ b/pages/hdyy/tygn/agv-manage.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_container">
 		<!-- AGV管理 -->
-		<nav-bar :title="title" :inner="true"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
diff --git a/pages/hdyy/zpgl/mater-zudai.vue b/pages/hdyy/zpgl/mater-zudai.vue
index a9fe678..2ad8c8e 100644
--- a/pages/hdyy/zpgl/mater-zudai.vue
+++ b/pages/hdyy/zpgl/mater-zudai.vue
@@ -8,9 +8,11 @@
 					<view class="zd-col-6">
 						<span class="filter_label">袋号</span>
 					</view>
-					<view class="zd-col-18">
-						<search-box v-model="val1"/>
+					<view class="zd-col-10">
+						<!-- <search-box v-model="val1"/> -->
+						<input type="text" class="filter_input" v-model="val1" disabled>
 					</view>
+						<button class="mini-btn" type="primary" @tap="_byBagCodeInfo">获取袋码</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
@@ -95,7 +97,7 @@
 	import SearchBox from '@/components/SearchBox.vue'
 	import {getDate} from '@/utils/utils.js'
 	const currentDate = getDate({format: true})
-	import {confirmBagAssembly} from '@/utils/getData3.js'
+	import {queryRecordNo, byBagCodeInfo, confirmBagAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -105,6 +107,7 @@
 			return {
 				title: '',
 				val1: '',
+				recordNo: '',
 				date: currentDate,
 				materialData: {},
 				suppData: {},
@@ -117,6 +120,7 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryRecordNo()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
@@ -129,6 +133,24 @@
 			}
 		},
 		methods: {
+			async _queryRecordNo () {
+				try {
+					let res = await queryRecordNo()
+					if (res) {
+						this.recordNo = res.data.recordNo
+					}
+				} catch (e) {
+				}
+			},
+			async _byBagCodeInfo () {
+				try {
+					let res = await byBagCodeInfo(this.materialData.material_id)
+					if (res) {
+						this.val1 = res.data.bag_code
+					}
+				} catch (e) {
+				}
+			},
 			handlePrintConfirm() {
 				// 处理打印逻辑
 				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
@@ -158,6 +180,7 @@
 			},
 			toZdPrint () {
 				this._confirmBagAssembly()
+				this.labelPrint()
 			},
 			async _confirmBagAssembly () {
 				this.disabled = true
@@ -196,10 +219,10 @@
 					return
 				}
 				// this.showCustomDialog = true
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				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)
 			},
-			toPrint (data) {
+			toPrint (row) {
 				let iparr = this.$store.getters.printUrl.split(":")
 				let printUrl = iparr[1].slice(2)
 				let LODOP = getCLodop();
@@ -212,41 +235,75 @@
 					this.disabled1 = false
 				    return
 				}
-				// 按次打印
-				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.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_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.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.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
+				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.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.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.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.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.bag_code + '')
 
-					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)
-				}
+				LODOP.PRINT()// 打印
+				// LODOP.PREVIEW()// 预览
+				// LODOP.PRINT_DESIGN()
 				uni.showToast({
 					title: '操作成功',
 					icon: 'none'
diff --git a/pages/hdyy/zpgl/mater-zutong.vue b/pages/hdyy/zpgl/mater-zutong.vue
index 60f9a0d..a925bb5 100644
--- a/pages/hdyy/zpgl/mater-zutong.vue
+++ b/pages/hdyy/zpgl/mater-zutong.vue
@@ -88,7 +88,7 @@
 	import NumberInput from '@/components/NumberInput.vue'
 	import {getDate} from '@/utils/utils.js'
 	const currentDate = getDate({format: true})
-	import {confirmBucketAssembly} from '@/utils/getData3.js'
+	import {queryRecordNoBucked, confirmBucketAssembly} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -99,6 +99,7 @@
 			return {
 				title: '',
 				val1: '',
+				recordNo: '',
 				date: currentDate,
 				materialData: {},
 				weight: '',
@@ -111,6 +112,7 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryRecordNoBucked()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
@@ -119,6 +121,15 @@
 			}
 		},
 		methods: {
+			async _queryRecordNoBucked () {
+				try {
+					let res = await queryRecordNoBucked()
+					if (res) {
+						this.recordNo = res.data.recordNo
+					}
+				} catch (e) {
+				}
+			},
 			handlePrintConfirm() {
 				// 处理打印逻辑
 				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
@@ -180,10 +191,10 @@
 					return
 				}
 				// this.showCustomDialog = true
-				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
+				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bucket_code: this.val1})
 				this.toPrint(data)
 			},
-			toPrint (data) {
+			toPrint (row) {
 				let iparr = this.$store.getters.printUrl.split(":")
 				let printUrl = iparr[1].slice(2)
 				let LODOP = getCLodop();
@@ -196,41 +207,75 @@
 					this.disabled1 = false
 				    return
 				}
-				// 按次打印
-				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.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_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.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.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
+				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.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.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.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.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_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)
-				}
+				LODOP.PRINT()// 打印
+				// LODOP.PREVIEW()// 预览
+				// LODOP.PRINT_DESIGN()
 				uni.showToast({
 					title: '操作成功',
 					icon: 'none'
diff --git a/utils/getData3.js b/utils/getData3.js
index 48658bc..7dc8ce6 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -131,11 +131,23 @@ export const callStackPlates = (pcode, row) => request({
 /**
  * 组盘管理
  */
+// 物料组袋（组盘管理）共 (2) 个
+// 查询证书编号
+export const queryRecordNo = () => request({
+	url:'api/pdaCommon/queryRecordNo',
+	data: {}
+})
+// 获取袋码
+export const byBagCodeInfo = (mid) => request({
+	url:'api/pdaCommon/byBagCodeInfo',
+	data: {material_id: mid}
+})
 // 物料组袋
 export const confirmBagAssembly = (bagNo, mid, suppCode, qty, pcsn) => request({
 	url:'api/pdaCommon/confirmBagAssembly',
 	data: {bagNo: bagNo, materialId: mid, suppCode: suppCode, qty: qty, pcsn: pcsn}
 })
+
 // 物料组盘
 // 获取组盘信息
 export const getBagAssembly = (bno) => request({
@@ -147,6 +159,13 @@ export const confirmPalletAssembly = (vcode, arr) => request({
 	url:'api/pdaCommon/confirmPalletAssembly',
 	data: {vehicle_code: vcode, group_plates: arr}
 })
+
+// 物料组桶（组盘管理）共 (1) 个
+// 查询证书编号
+export const queryRecordNoBucked = () => request({
+	url:'api/pdaCommon/queryRecordNoBucked',
+	data: {}
+})
 // 物料组桶
 export const confirmBucketAssembly = (bcode, bweight, qty, pcsn, mid) => request({
 	url:'api/pdaCommon/confirmBucketAssembly',