diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index c29de92..9cfb294 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -263,24 +263,26 @@
 				// 打印机序号 规则为打印服务器打印机列表倒数从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.SET_PRINT_STYLE('WordWrap', 0);
-				LODOP.SET_PRINT_STYLEA(0, 'FitContent', 1);
-				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.material_code + '##' + data.supp_code);
-				LODOP.ADD_PRINT_TEXT('5mm', '34mm', '80mm', '15mm', '物料编码：' + data.material_code);
-				LODOP.ADD_PRINT_TEXT('12mm', '34mm', '160mm', '15mm', '物料名称：' + data.material_name);
-				LODOP.ADD_PRINT_TEXT('19mm', '34mm', '50mm', '15mm', '    规格：' + data.material_spec);
-				LODOP.ADD_PRINT_TEXT('26mm', '34mm', '50mm', '15mm', '    型号：' + data.material_model);
-				LODOP.ADD_PRINT_TEXT('34mm', '4mm', '50mm', '15mm', '  执行标准：' + data.execution_stand)
-				LODOP.ADD_PRINT_TEXT('34mm', '41mm', '50mm', '15mm', '有效期(天)：' + data.quality_time)
-				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '40mm', '15mm', '供应商编码：' + data.supp_code)
-				LODOP.ADD_PRINT_TEXT('41mm', '41mm', '40mm', '15mm', '供应商名称：' + data.supp_name)
-				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '50mm', '15mm', '批次：' + data.pcsn)
-				LODOP.ADD_PRINT_TEXT('48mm', '28mm', '60mm', '15mm', '生产日期：' + data.produce_time)
-				LODOP.ADD_PRINT_TEXT('48mm', '58mm', '40mm', '15mm', '烘干次数：' + data.bake_num)
+				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', row.material_code + '##' + row.material_name + '##' +
+					row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
+					row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
+				)
+				LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + row.material_code + '')
+				LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + row.material_name + '')
+				LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + row.material_spec + '')
+				LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + row.material_model + '')
+				LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + row.quality_time_day + '')
+				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + row.produce_time + '')
+				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商名称：' + row.supp_name + '')
+
+				LODOP.ADD_PRINT_TEXT('26mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '')
+				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '供应商编码：' + row.supp_code + '')
+				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + row.execution_stand + '')
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
 				uni.showToast({
diff --git a/pages/Material/hw-out-store.vue b/pages/Material/hw-out-store.vue
index d451608..61ff8fc 100644
--- a/pages/Material/hw-out-store.vue
+++ b/pages/Material/hw-out-store.vue
@@ -182,24 +182,28 @@
 				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
 				LODOP.SET_PRINTER_INDEX(-1);
 				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '130mm', '67mm', '');
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '124mm', '61mm', 0, 1);
-				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.material_code + '##' + data.supp_code);
-				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '80mm', '15mm', '物料编码：' + data.material_code);
-				LODOP.ADD_PRINT_TEXT('12mm', '35mm', '80mm', '15mm', '物料名称：' + data.material_name);
-				LODOP.ADD_PRINT_TEXT('19mm', '35mm', '80mm', '15mm', '    规格：' + data.material_spec);
-				LODOP.ADD_PRINT_TEXT('26mm', '35mm', '80mm', '15mm', '    型号：' + data.material_model);
-				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '  执行标准：' + data.execution_stand)
-				LODOP.ADD_PRINT_TEXT('34mm', '59mm', '80mm', '15mm', '有效期(天)：' + data.quality_time)
-				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '      批次：' + data.pcsn)
-				LODOP.ADD_PRINT_TEXT('41mm', '59mm', '80mm', '15mm', '  生产日期：' + data.produce_time)
-				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '供应商编码：' + data.supp_code)
-				LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '供应商名称：' + data.supp_name)
-				LODOP.ADD_PRINT_TEXT('55mm', '5mm', '80mm', '15mm', '  烘干次数：' + data.bake_num)
-				// LODOP.PRINT();
-				LODOP.PREVIEW()
+				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', row.material_code + '##' + row.material_name + '##' +
+					row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
+					row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
+				)
+				LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + row.material_code + '')
+				LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + row.material_name + '')
+				LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + row.material_spec + '')
+				LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + row.material_model + '')
+				LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + row.quality_time_day + '')
+				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + row.produce_time + '')
+				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商名称：' + row.supp_name + '')
+
+				LODOP.ADD_PRINT_TEXT('26mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '')
+				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '供应商编码：' + row.supp_code + '')
+				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + row.execution_stand + '')
+				LODOP.PRINT();
+				// LODOP.PREVIEW()
 				uni.showToast({
 					title: '打印成功',
 					icon: 'none'