From 17a29b7b295e10262afd5bbc3b1c2c79ae0f08f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Tue, 29 Apr 2025 10:09:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=85=88=E6=89=BE=E9=BB=98=E8=AE=A4=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=9C=BA=EF=BC=8C=E6=9C=AA=E6=89=BE=E5=88=B0=E5=88=99?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_printing/models/jikimo_printing.py | 13 +++++++------ jikimo_printing/models/workorder_printing.py | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jikimo_printing/models/jikimo_printing.py b/jikimo_printing/models/jikimo_printing.py index 0f518488..587aeb35 100644 --- a/jikimo_printing/models/jikimo_printing.py +++ b/jikimo_printing/models/jikimo_printing.py @@ -20,7 +20,7 @@ class JikimoPrinting(models.AbstractModel): printer = self.env['printing.printer'].get_default() if not printer: _logger.error("未找到默认打印机") - return + return False # 生成二维码 qr = qrcode.QRCode(version=1, box_size=10, border=5) @@ -57,6 +57,8 @@ class JikimoPrinting(models.AbstractModel): pdf_buffer.close() temp_image.close() + return True + def print_pdf(self, pdf_data): """ 打印PDF @@ -64,9 +66,7 @@ class JikimoPrinting(models.AbstractModel): printer = self.env['printing.printer'].get_default() if not printer: _logger.error("未找到默认打印机") - return - - _logger.info("PDF打印开始") + return False pdf_data_str = pdf_data.decode('ascii', errors='ignore') decoded_data = base64.b64decode(pdf_data_str) @@ -78,9 +78,10 @@ class JikimoPrinting(models.AbstractModel): # 获取PDF内容 pdf_content = pdf_buffer.getvalue() - _logger.info(f"处理后的内容前20字节: {pdf_content[:20]}") printer.print_document(report=None, content=pdf_content, doc_format='pdf') # 清理资源 pdf_buffer.close() - _logger.info("PDF打印结束") \ No newline at end of file + + _logger.info("成功打印PDF") + return True \ No newline at end of file diff --git a/jikimo_printing/models/workorder_printing.py b/jikimo_printing/models/workorder_printing.py index 97c857ca..aedcffd9 100644 --- a/jikimo_printing/models/workorder_printing.py +++ b/jikimo_printing/models/workorder_printing.py @@ -21,8 +21,6 @@ class MrpWorkorder(models.Model): # 执行打印 self.env['jikimo.printing'].print_pdf(pdf_data) wo.production_id.product_id.is_print_program = True - _logger.info(f"工单 {wo.name} 的PDF已成功打印") - except Exception as e: _logger.error(f"工单 {wo.name} 的PDF打印失败: {str(e)}")