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

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

sf_base/models/common.py

@@ -68,7 +68,7 @@ class MrsMaterialModel(models.Model):
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")
     tensile_strength = fields.Char("拉伸强度(n/mm²)")
-    standards_id = fields.Many2one('sf.international.standards', '制造标准')
+    standards_id = fields.Many2one('sf.international.standards', '执行标准')
     alloy_code = fields.Char('合金牌号')
     price = fields.Float('单价/kg')
     apply = fields.Many2many('material.apply', string='材料应用')

sf_base/views/common_view.xml

@@ -269,6 +269,7 @@
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
                         <field name="materials_id" icon="fa-filter"/>
+                        <field name="standards_id" icon="fa-filter"/>
                     </searchpanel>
                 </search>
             </field>

sf_maintenance/views/maintenance_views.xml

@@ -286,7 +286,7 @@
                                 </div>
                                 <span>&amp;nbsp;</span>
                                 <div>
-                                    <label for="AGV_goods_H" string="宽"/>
+                                    <label for="AGV_goods_H" string="高"/>
                                     <field name="AGV_goods_H" class="o_address_zip"
                                            attrs="{'required': [('equipment_type', '=', 'AGV小车')]}"
                                            options="{'format': false}"/>
@@ -636,7 +636,7 @@
                             </div>
                             <field name='robot_axis_num' attrs="{'required': [('equipment_type', '=', '机器人')]}"/>
 
-                            <field name='axis_ids' widget="One2many">
+                            <field name='axis_ids'>
                                 <tree editable='bottom'>
                                     <field name="name"/>
                                     <field name="angle_min"/>
@@ -647,6 +647,7 @@
                                     <field name="permissible_inertial_torque"/>
                                 </tree>
                             </field>
+
                             <label for="robot_track_dimensions_L" string="轨道尺寸"/>
                             <div class="test_model">
                                 <div>
@@ -1136,4 +1137,57 @@
     <!--    sequence="1"/-->
     <!--    设备图文展示-->
 
+    <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
+        <field name="name">maintenance.equipment.image.tree</field>
+        <field name="model">maintenance.equipment.image</field>
+        <field name="arch" type="xml">
+            <tree string="能力特征库" editable="bottom" delete="0" create="0">
+                <field name="name" readonly="1"/>
+                <field name="type" readonly="1"/>
+                <field name="image" widget="image" readonly="1"/>
+                <field name="equipment_id"/>
+                <field name="active" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="view_maintenance_equipment_image_search">
+        <field name="name">maintenance.equipment.image.search</field>
+        <field name="model">maintenance.equipment.image</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <searchpanel class="account_root">
+                    <field name="type" icon="fa-filter" enable_counters="1"/>
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
+        <field name="name">能力特征库</field>
+        <field name="res_model">maintenance.equipment.image</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[]</field>
+    </record>
+
+    <menuitem
+            id="maintenance_equipment_image_form"
+            name="能力特征库"
+            parent="maintenance.menu_m_request"
+            action="action_maintenance_equipment_image"
+            groups="maintenance.group_equipment_manager,base.group_user"
+            sequence="2"/>
+
+    <menuitem
+        id="maintenance.menu_m_dashboard"
+        name="设备清单"
+        parent="maintenance.menu_maintenance_title"
+        groups="maintenance.group_equipment_manager,base.group_user"
+        action="hr_equipment_action1"
+        sequence="0"/>
+
+
+
 </odoo>

sf_manufacturing/models/mrp_workorder.py

@@ -401,7 +401,7 @@ class ResMrpWorkOrder(models.Model):
                 [('routing_type', '=', 'CNC加工'), ('production_id', '=', self.production_id.id)], limit=1)
             res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code,
                    'production_no': self.production_id.name,
-                   'machine_tool_code': cnc.workcenter_id.machine_tool_id.code,
+                   'machine_tool_code': cnc.workcenter_id.equipment_id.code,
                    'material_code': cnc.env['sf.production.materials'].search(
                        [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
                    'material_type_code': cnc.env['sf.materials.model'].search(