From f6841e5e9fd14200022ad722f6da5e0dbfede1da Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Mon, 21 Aug 2023 11:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9D=90=E6=96=99=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=E5=8F=8A=E4=BC=98=E5=8C=96=E6=9D=90=E6=96=99=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=E9=A1=B5=E9=9D=A2=E5=8F=8A=E6=96=B0=E5=A2=9E=E6=8B=89?= =?UTF-8?q?=E4=BC=B8=E5=BC=BA=E5=BA=A6=EF=BC=8C=E7=A1=AC=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E7=B2=97=E5=8A=A0=E5=B7=A5=EF=BC=8C=E7=B2=BE=E5=8A=A0=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/common.py | 4 ++ sf_base/views/common_view.xml | 64 ++++++++++++++++------------ sf_mrs_connect/models/sync_common.py | 42 +++++++++++------- 3 files changed, 66 insertions(+), 44 deletions(-) diff --git a/sf_base/models/common.py b/sf_base/models/common.py index d163a024..2e2cccf6 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -67,6 +67,10 @@ class MrsMaterialModel(models.Model): mf_materia_post = fields.Char("热处理后密度") density = fields.Float("密度(kg/m³)") materials_id = fields.Many2one('sf.production.materials', "材料名") + tensile_strength = fields.Float("拉伸强度(n/mm²)") + hardness = fields.Float("硬度(hrc)") + rough_machining = fields.Float("粗加工Vc(m/min)") + finish_machining = fields.Float("精加工Vc(m/min)") remark = fields.Text("备注") gain_way = fields.Selection( [("自加工", "自加工"), ("外协", "外协"), ("采购", "采购")], diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index 492a3b4e..afa7d88b 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -82,7 +82,7 @@ - + @@ -105,8 +105,8 @@ sf.production.process - - + + @@ -204,12 +204,15 @@ - + + + - + + @@ -242,8 +245,13 @@ - - + + + + + + + @@ -353,26 +361,26 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index cf59a5ce..b2dcd76a 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -99,25 +99,33 @@ class sfMaterialModel(models.Model): if result['status'] == 1: for item in result['materials_model_yesterday_list']: if item: - brand = self.env['sf.materials.model'].search( + materials_model = self.env['sf.materials.model'].search( [("materials_no", '=', item['materials_no'])]) - if brand: - brand.id = item['id'], - brand.name = item['name'], - brand.materials_no = item['materials_no'], - brand.remark = item['remark'], - brand.active = item['active'], - brand.mf_materia_post = item['mf_materia_post'], - brand.materials_id = self.env['sf.production.materials'].search( + if materials_model: + materials_model.id = item['id'], + materials_model.name = item['name'], + materials_model.materials_no = item['materials_no'], + materials_model.remark = item['remark'], + materials_model.tensile_strength = item['tensile_strength'], + materials_model.hardness = item['hardness'], + materials_model.materials_no = item['materials_no'], + materials_model.rough_machining = item['rough_machining'], + materials_model.finish_machining = item['finish_machining'], + materials_model.mf_materia_post = item['mf_materia_post'], + materials_model.materials_id = self.env['sf.production.materials'].search( [("materials_no", '=', item['materials_id.materials_no'])]).id, - brand.need_h = item['need_h'], - brand.density = item['density'] + materials_model.need_h = item['need_h'], + materials_model.density = item['density'] else: self.env['sf.materials.model'].create({ "id": item['id'], "name": item['name'], "materials_no": item['materials_no'], "remark": item['remark'], + "tensile_strength": item['tensile_strength'], + "hardness": item['hardness'], + "rough_machining": item['rough_machining'], + "finish_machining": item['finish_machining'], "active": item['active'], "materials_id": self.env['sf.production.materials'].search( [("materials_no", '=', item['materials_id.materials_no'])]).id, @@ -143,14 +151,18 @@ class sfMaterialModel(models.Model): if result['status'] == 1: for item in result['materials_model_all_list']: if item: - brand = self.env['sf.materials.model'].search( + materials_model = self.env['sf.materials.model'].search( [("materials_no", '=', item['materials_no'])]) - if not brand: + if not materials_model: self.env['sf.materials.model'].create({ "name": item['name'], "materials_no": item['materials_no'], "remark": item['remark'], "active": item['active'], + "tensile_strength": item['tensile_strength'], + "hardness": item['hardness'], + "rough_machining": item['rough_machining'], + "finish_machining": item['finish_machining'], "materials_id": self.env['sf.production.materials'].search( [("materials_no", '=', item['materials_id.materials_no'])]).id, "need_h": item['need_h'], @@ -576,7 +588,6 @@ class MachineBrand(models.Model): raise ValidationError("认证未通过") - class MachineToolType(models.Model): _inherit = 'sf.machine_tool.type' _description = '机床型号' @@ -2034,8 +2045,7 @@ class SfToolModel(models.Model): else: raise ValidationError("认证未通过") - - # 同步所有刀具型号列表 + # 同步所有刀具型号列表 def sync_all_tool_model(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token']