Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml

sf_maintenance/models/sf_equipment_maintenance_standards.py

@@ -62,7 +62,6 @@ class SfSaintenanceStandards(models.Model):
     fault_type = fields.Selection(
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
     equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
-    maintenance_request_id = fields.Many2one('maintenance.request', string='设备维保计划')
     images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
     Period = fields.Integer('周期/频次(天)')
     remark = fields.Char('备注说明')

sf_maintenance/models/sf_maintenance.py

@@ -44,11 +44,9 @@ class SfMaintenanceEquipment(models.Model):
     overhaul_period = fields.Integer(string='预防检修频次')
     overhaul_duration = fields.Float(string='检修时长')
 
-
     overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
                                   domain="[('maintenance_type','=','检修')]")
 
-
     @api.onchange('eq_maintenance_id', 'overhaul_id')
     def _compute_equipment_maintenance_standards_ids(self):
         for record in self:
@@ -145,7 +143,6 @@ class SfMaintenanceEquipment(models.Model):
     machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志')
 
-
     def name_get(self):
         result = []
         for parameter in self:
@@ -156,7 +153,6 @@ class SfMaintenanceEquipment(models.Model):
             result.append((parameter.id, name))
         return result
 
-
     @api.constrains('rotate_speed')
     def _check_rotate_speed(self):
         if self.rotate_speed <= 0:
@@ -478,14 +474,17 @@ class SfMaintenanceEquipment(models.Model):
 
     image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')
 
+
 class MaintenanceStandardImage(models.Model):
     _name = 'maintenance.equipment.image'
-    _description = '设备图文展示'
-
+    _description = '能力特征库'
 
     active = fields.Boolean('有效', default=True)
-    name = fields.Char('加工能力')
-    image = fields.Binary(string='设备图文')
+    name = fields.Char('名称')
+    image = fields.Binary(string='图文')
+    type = fields.Selection(
+        [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'), ('冷却液', '冷却液')],
+        string='特征')
     equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
 
     @api.model
@@ -518,6 +517,3 @@ class MaintenanceStandardImage(models.Model):
             new_res.append([id, name, data_uri])
         # 返回新的结果列表
         return new_res
-
-
-

sf_maintenance/models/sf_maintenance_requests.py

@@ -25,7 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
             if not record.equipment_maintenance_id:
                 record.equipment_maintenance_id = False
 
-    maintenance_standards = fields.One2many('maintenance.standards', 'maintenance_request_id', string='维保标准')
+    maintenance_standards = fields.Many2many('maintenance.standards', string='维保标准')
 
     @api.constrains('equipment_maintenance_id')
     def _check_equipment_maintenance_id(self):

sf_maintenance/views/maintenance_views.xml

@@ -381,8 +381,9 @@
         <field name="name">maintenance.equipment.image.tree</field>
         <field name="model">maintenance.equipment.image</field>
         <field name="arch" type="xml">
-            <tree string="设备图文">
+            <tree string="能力特征库">
                 <field name="name"/>
+                <field name="type"/>
                 <field name="image" widget="image"/>
                 <field name="equipment_id" invisible="1"/>
                 <field name="active" invisible="1"/>
@@ -394,11 +395,12 @@
         <field name="name">maintenance.equipment.image.form</field>
         <field name="model">maintenance.equipment.image</field>
         <field name="arch" type="xml">
-            <form string="设备图文">
+            <form string="能力特征库">
                 <sheet>
                     <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
+                        <field name="name" required="1"/>
+                        <field name="type" required="1"/>
+                        <field name="image" widget="image" required="1"/>
                         <field name="equipment_id" invisible="1"/>
                         <field name="active" invisible="1"/>
                     </group>
@@ -408,14 +410,14 @@
     </record>
 
     <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
-        <field name="name">设备图文图文</field>
+        <field name="name">能力特征库</field>
         <field name="res_model">maintenance.equipment.image</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[]</field>
     </record>
-        <menuitem
+    <menuitem
             id="maintenance_equipment_image_form"
-            name="设备图文展示"
+            name="能力特征库"
             parent="maintenance.menu_m_request"
             action="action_maintenance_equipment_image"
             groups="maintenance.group_equipment_manager,base.group_user"