From 98644a4b57e6e55f347a230ff4e1804f2ad9a50e Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 20 Mar 2025 15:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A0=E5=B7=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8C=B9=E9=85=8D=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/models/quality.py | 14 ++++++++++---- .../src/binary/出厂检验报告上传模版.xlsx | Bin 11607 -> 11740 bytes 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index 8670005d..df4a11b2 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -477,8 +477,8 @@ class QualityCheck(models.Model): if not self.report_content: raise UserError(_('当前质检单没有出厂检验报告,请先发布报告')) - if not self.part_number: - raise UserError(_('零件图号不能为空')) + if not self.product_id.model_name: + raise UserError(_('产品模型名称为空')) if not self.picking_id or not self.picking_id.origin: raise UserError(_('无法找到相关的调拨单或来源单据')) @@ -490,7 +490,7 @@ class QualityCheck(models.Model): # 准备请求数据 payload = { "order_ref": order_ref, - "part_number": self.part_number, + "model_name": self.product_id.model_name, "report_file": self.report_content.decode('utf-8') if isinstance(self.report_content, bytes) else self.report_content } @@ -541,12 +541,18 @@ class QualityCheck(models.Model): """ # 获取订单号(从调拨单的来源字段获取) order_ref = self.picking_id.retrospect_ref + + if not order_ref: + raise UserError(_('无法找到相关的调拨单或来源单据')) + if not self.product_id.model_name: + raise UserError(_('产品模型名称为空')) + try: # 准备请求数据 payload = { "order_ref": order_ref, - "part_number": self.part_number + "model_name": self.product_id.model_name } # 将Python字典转换为JSON字符串 diff --git a/quality_control/static/src/binary/出厂检验报告上传模版.xlsx b/quality_control/static/src/binary/出厂检验报告上传模版.xlsx index cd43894ac6440cb8e49dfb074a89117339b9f6bf..181e921f32604ae8b99090e25c60d1e3d0cf8f54 100644 GIT binary patch delta 3583 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 delta 3399 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