From e52ec3982fe67f0fa5ce00a76ffbf8ba90d676bc Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 26 Jun 2025 10:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AF=B9=E6=B2=A1=E6=9C=89=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E8=B4=A8=E6=A3=80=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=87=BA=E5=8E=82=E6=A3=80=E9=AA=8C=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 4 ++-- sf_quality/models/stock.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 4062814e..7bc3791f 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -33,7 +33,7 @@ class ResProductMo(models.Model): model_volume = fields.Float('模型体积(m³)') model_area = fields.Float('模型表面积(m²)') model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度') - model_processing_panel = fields.Char('模型加工面板') + model_processing_panel = fields.Char('模型加工面板', default='') model_remark = fields.Char('模型备注说明') length = fields.Float('长(mm)', digits=(16, 3)) width = fields.Float('宽(mm)', digits=(16, 3)) @@ -909,7 +909,7 @@ class ResProductMo(models.Model): (item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else ( item.get('blank_length') * item.get('blank_width') * item.get('blank_height')), 'product_model_type_id': model_type.id, - 'model_processing_panel': item['processing_panel_detail'], + 'model_processing_panel': item['processing_panel_detail'] if item['processing_panel_detail'] else '', 'model_machining_precision': item['model_machining_precision'], 'model_code': item['barcode'], 'length': item['model_long'], diff --git a/sf_quality/models/stock.py b/sf_quality/models/stock.py index 3de28c7c..7b70b77a 100644 --- a/sf_quality/models/stock.py +++ b/sf_quality/models/stock.py @@ -40,7 +40,8 @@ class StockPicking(models.Model): """ out_quality_checks = self.env['quality.check'].search( - [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告')]) + [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告'), + ('quality_state', '=', 'pass')]) # out_quality_checks 可能存在多个 if out_quality_checks: for out_quality_check in out_quality_checks: