Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

# Conflicts:
#	sf_mrs_connect/models/sync_common.py

sf_base/models/common.py

@@ -67,7 +67,12 @@ 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²)")
+    tensile_strength = fields.Char("拉伸强度(n/mm²)")
+    standards_id = fields.Many2one('sf.international.standards', '制造标准')
+    alloy_code = fields.Char('合金牌号')
+    price = fields.Float('单价/kg')
+    apply = fields.Many2many('material.apply', string='材料应用')
+    materials_code = fields.Char('材料代号')
     hardness = fields.Float("硬度(hrc)")
     rough_machining = fields.Float("粗加工Vc(m/min)")
     finish_machining = fields.Float("精加工Vc(m/min)")
@@ -97,7 +102,7 @@ class MrsProductionProcess(models.Model):
     _name = 'sf.production.process'
     _description = '表面工艺'
 
-    process_encode = fields.Char("编码")
+    code = fields.Char("编码")
     name = fields.Char('名称')
     remark = fields.Text("备注")
     processing_order_ids = fields.One2many('sf.processing.order', 'production_process_id', string='工序')
@@ -114,7 +119,7 @@ class MrsProcessingTechnology(models.Model):
 
     name = fields.Char('名称', index=True)
     remark = fields.Text('备注', index=True)
-    process_encode = fields.Char("编码")
+    code = fields.Char("编码")
     processing_order_ids = fields.Many2many('sf.processing.order', 'sf_associated_processes',
                                             index=True, string='工序')
     active = fields.Boolean('有效', default=True)
@@ -173,3 +178,20 @@ class MrsProductionProcessParameter(models.Model):
         for i in item.parameter_ids:
             code_arr.append(i.code)
         return code_arr
+
+
+class ModelInternationalStandards(models.Model):
+    _name = 'sf.international.standards'
+    _description = '制造标准'
+
+    code = fields.Char('编码')
+    name = fields.Char('名称')
+    active = fields.Boolean('有效', default=True)
+
+
+class MrsMaterialApply(models.Model):
+    _name = 'material.apply'
+    _description = '材料应用'
+
+    name = fields.Char('名称', default=True)
+    active = fields.Boolean('有效', default=True)

sf_base/security/ir.model.access.csv

@@ -24,6 +24,8 @@ access_sf_fixture_model,sf_fixture_model,model_sf_fixture_model,base.group_user,
 access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional_fixture_type,base.group_user,1,1,1,1
 access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,base.group_user,1,1,1,1
 access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,1
+access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
+access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
 
 
 

sf_base/views/common_view.xml

@@ -24,7 +24,7 @@
             <field name="model">sf.processing.technology</field>
             <field name="arch" type="xml">
                 <tree string="加工工艺" create="0" edit="0" delete="1">
-                    <field name="process_encode"/>
+                    <field name="code"/>
                     <field name="name"/>
                 </tree>
             </field>
@@ -35,7 +35,7 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
@@ -64,7 +64,7 @@
                             <page string="表面工艺">
                                 <field name='production_process_ids' widget="ony2many">
                                     <tree editable="bottom">
-                                        <field name="process_encode" string="编码号" readonly="1" force_save="1"/>
+                                        <field name="code" string="编码号" readonly="1" force_save="1"/>
                                         <field name="name" string="名称" required="1"/>
                                         <field name='category_id' default="default" invisible="1"/>
                                         <field name="remark"/>
@@ -105,7 +105,7 @@
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
                 <tree string="表面工艺" create="0" edit="0" delete="1">
-                    <field name="process_encode"/>
+                    <field name="code"/>
                     <field name="name" string="名称"/>
                     <field name="remark"/>
                 </tree>
@@ -124,7 +124,7 @@
                         </div>
                         <group>
                             <group>
-                                <field name="process_encode"/>
+                                <field name="code"/>
                             </group>
                             <notebook>
                                 <page string="可选参数">
@@ -186,7 +186,7 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
@@ -241,17 +241,20 @@
         <record model="ir.ui.view" id="sf_materials_model_tree">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <tree string="材料型号" create="0" delete="1">
-                    <field name="materials_no" readonly="1"/>
-                    <field name="name" readonly="1"/>
-                    <field name="gain_way"/>
+               <tree string="材料型号" delete="0">
+                    <field name="materials_no"/>
+                    <field name="materials_code"/>
+                    <field name="name"/>
+                    <field name="standards_id" optional="hide"/>
+                    <field name="alloy_code"/>
                     <field name="tensile_strength"/>
-                    <field name="hardness"/>
+                    <field name="hardness" optional="show"/>
                     <field name="need_h"/>
-                    <field name="density"/>
-                    <field name="rough_machining"/>
-                    <field name="finish_machining"/>
-                    <field name="remark"/>
+                    <field name="apply" widget="many2many_tags" optional="show"/>
+                    <field name="density" optional="show"/>
+                    <field name="rough_machining" optional="hide"/>
+                    <field name="finish_machining" optional="hide"/>
+                    <field name="remark" optional="hide"/>
                     <field name='materials_id' invisible="1"/>
                 </tree>
             </field>