diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 5abe2ce3..1c785bfc 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -42,6 +42,7 @@ class MrsMaterialModel(models.Model): materials_num = fields.Char("编码号") name = fields.Char('型号名') need_h = fields.Boolean("热处理", default="false") + need_m = fields.Boolean("是否磁吸", default="false") mf_materia_post = fields.Char("热处理后密度") density = fields.Float("密度(kg/m³)") materials_id = fields.Many2one('sf.production.materials', "材料名") diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index dbdfec49..e47ce8ce 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -263,6 +263,7 @@ + @@ -306,6 +307,7 @@ + @@ -352,6 +354,7 @@ + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 2dd8cfff..631abc57 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -179,6 +179,7 @@ class sfMaterialModel(models.Model): materials_model.mf_materia_post = item['mf_materia_post'] materials_model.materials_id = materials.id materials_model.need_h = item['need_h'] + materials_model.need_m = item['need_m'] materials_model.density = item['density'] materials_model.active = item['active'] else: @@ -193,6 +194,7 @@ class sfMaterialModel(models.Model): "active": item['active'], "materials_id": materials.id, "need_h": item['need_h'], + "need_m": item['need_m'], "mf_materia_post": item['mf_materia_post'], "density": item['density'], }) @@ -229,6 +231,7 @@ class sfMaterialModel(models.Model): "standards_id": self.env['sf.international.standards'].search( [("name", '=', item['standards_id'])]).id, "need_h": item['need_h'], + "need_m": item['need_m'], "alloy_code": item['alloy_code'], "mf_materia_post": item['mf_materia_post'], "density": item['density'], @@ -249,6 +252,7 @@ class sfMaterialModel(models.Model): materials_model.mf_materia_post = item['mf_materia_post'] materials_model.materials_id = materials.id materials_model.need_h = item['need_h'] + materials_model.need_m = item['need_m'] materials_model.density = item['density'] materials_model.active = item['active'] materials_model.materials_code= item['materials_code'] diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po index dde8ccfd..12bc055d 100644 --- a/sf_plan_management/i18n/zh_CN.po +++ b/sf_plan_management/i18n/zh_CN.po @@ -45759,6 +45759,11 @@ msgstr "" msgid "热处理" msgstr "" +#. module: sf_base +#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__need_m +msgid "是否磁吸" +msgstr "" + #. module: sf_base #: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__mf_materia_post msgid "热处理后密度"