材料型号增加是否磁吸

Merge Request: 去掉多余的js

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2292?initial=true

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', "材料名")

sf_base/views/common_view.xml

@@ -263,6 +263,7 @@
                                 <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="0"/>
                                 <field name="density" readonly="1" required="1"  class="custom_required"/>
+                                <field name="need_m" default="false" readonly="1"/>
                             </group>
                             <group>
                                 <field name="rough_machining" required="1"/>
@@ -306,6 +307,7 @@
                     <field name="tensile_strength"/>
                     <field name="hardness" optional="show"/>
                     <field name="need_h"/>
+                    <field name="need_m"/>
                     <field name="apply" widget="many2many_tags" optional="show"/>
                     <field name="density" optional="show"/>
                     <field name="rough_machining" optional="hide"/>
@@ -352,6 +354,7 @@
                                             <field name="materials_no"/>
                                             <field name="name"/>
                                             <field name="need_h"/>
+                                            <field name="need_m"/>
                                             <field name="mf_materia_post"/>
                                             <field name="density"/>
                                             <field name='materials_id' default="default" invisible="1"/>

sf_manufacturing/__manifest__.py

@@ -59,7 +59,7 @@
             'sf_manufacturing/static/src/xml/kanban_change.xml',
             'sf_manufacturing/static/src/js/kanban_change.js',
             'sf_manufacturing/static/src/scss/kanban_change.scss',
-            # 'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
+            'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
             'sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js',
             'sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js',

sf_mrs_connect/models/sync_common.py

@@ -178,6 +178,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:
@@ -192,6 +193,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'],
                         })
@@ -228,6 +230,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'],
@@ -248,6 +251,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']

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 "热处理后密度"