Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工-工件配送

sf_machine_connect/models/ftp_client.py

@@ -245,32 +245,32 @@ class Machine_ftp(models.Model):
     program_status = fields.Char('程序运行状态', readonly=True)
     current_program = fields.Char('机床当前执行指令', readonly=True)
     current_program_seq = fields.Char('机床当前执行语句号', readonly=True)
-    x_abs_pos = fields.Char('机床X轴当前位置', readonly=True)
+    x_abs_pos = fields.Char('机床X轴当前位置(mm)', readonly=True)
-    y_abs_pos = fields.Char('机床Y轴当前位置', readonly=True)
+    y_abs_pos = fields.Char('机床Y轴当前位置(mm)', readonly=True)
-    z_abs_pos = fields.Char('机床Z轴当前位置', readonly=True)
+    z_abs_pos = fields.Char('机床Z轴当前位置(mm)', readonly=True)
 
     # 机床设定进给速度, 机床实际进给速度, 机床设定主轴转速, 机床实际主轴转速, 机床主轴负载, 机床X轴伺服轴负载, 机床Y轴伺服轴负载
     # 机床Z轴伺服轴负载, 机床快速移动倍率, 机床进给倍率, 机床X轴机械坐标, 机床Y轴机械坐标, 机床Z轴机械坐标, 机床X轴相对工件坐标
     # 机床Y轴相对工件坐标, 机床Z轴相对工件坐标, 机床X轴目标距离, 机床Y轴目标距离, 机床Z轴目标距离
-    feed_speed_set = fields.Char('机床设定进给速度', readonly=True)
+    feed_speed_set = fields.Char('机床设定进给速度(mm/min)', readonly=True)
-    act_feed_speed = fields.Char('机床实际进给速度', readonly=True)
+    act_feed_speed = fields.Char('机床实际进给速度(mm/min)', readonly=True)
-    spindle_speed_set = fields.Char('机床设定主轴转速', readonly=True)
+    spindle_speed_set = fields.Char('机床设定主轴转速(r/min)', readonly=True)
-    act_spindle_speed = fields.Char('机床实际主轴转速', readonly=True)
+    act_spindle_speed = fields.Char('机床实际主轴转速(r/min)', readonly=True)
-    spindle_load = fields.Char('机床主轴负载', readonly=True)
+    spindle_load = fields.Char('机床主轴负载(%)', readonly=True)
-    x_axis_load = fields.Char('机床X轴伺服轴负载', readonly=True)
+    x_axis_load = fields.Char('机床X轴伺服轴负载(%)', readonly=True)
-    y_axis_load = fields.Char('机床Y轴伺服轴负载', readonly=True)
+    y_axis_load = fields.Char('机床Y轴伺服轴负载(%)', readonly=True)
-    z_axis_load = fields.Char('机床Z轴伺服轴负载', readonly=True)
+    z_axis_load = fields.Char('机床Z轴伺服轴负载(%)', readonly=True)
-    rapid_feed = fields.Char('机床快速移动倍率', readonly=True)
+    rapid_feed = fields.Char('机床快速移动倍率(%)', readonly=True)
-    feed_rate = fields.Char('机床进给倍率', readonly=True)
+    feed_rate = fields.Char('机床进给倍率(%)', readonly=True)
-    x_mach_coord = fields.Char('机床X轴机械坐标', readonly=True)
+    x_mach_coord = fields.Char('机床X轴机械坐标(mm)', readonly=True)
-    y_mach_coord = fields.Char('机床Y轴机械坐标', readonly=True)
+    y_mach_coord = fields.Char('机床Y轴机械坐标(mm)', readonly=True)
-    z_mach_coord = fields.Char('机床Z轴机械坐标', readonly=True)
+    z_mach_coord = fields.Char('机床Z轴机械坐标(mm)', readonly=True)
-    x_rel_coord = fields.Char('机床X轴相对工件坐标', readonly=True)
+    x_rel_coord = fields.Char('机床X轴相对工件坐标(mm)', readonly=True)
-    y_rel_coord = fields.Char('机床Y轴相对工件坐标', readonly=True)
+    y_rel_coord = fields.Char('机床Y轴相对工件坐标(mm)', readonly=True)
-    z_rel_coord = fields.Char('机床Z轴相对工件坐标', readonly=True)
+    z_rel_coord = fields.Char('机床Z轴相对工件坐标(mm)', readonly=True)
-    x_dis_coord = fields.Char('机床X轴目标距离', readonly=True)
+    x_dis_coord = fields.Char('机床X轴目标距离(mm)', readonly=True)
-    y_dis_coord = fields.Char('机床Y轴目标距离', readonly=True)
+    y_dis_coord = fields.Char('机床Y轴目标距离(mm)', readonly=True)
-    z_dis_coord = fields.Char('机床Z轴目标距离', readonly=True)
+    z_dis_coord = fields.Char('机床Z轴目标距离(mm)', readonly=True)
 
     # 故障报警时间, 故障报警信息, 故障消除时间(复原时间)
     alarm_time = fields.Char('故障报警时间', readonly=True)

sf_maintenance/models/sf_maintenance_logs.py

@@ -10,21 +10,21 @@ class SfMaintenanceLogs(models.Model):
     name = fields.Char(string='名称')
     type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型')
     brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌')
-    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='设备')
+    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='机台号')
     maintenance_equipment_oee_id = fields.Many2one('maintenance.equipment.oee', string='设备oee')
     code_location = fields.Char(string='编码位置')
     fault_type = fields.Selection(
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型')
     fault_code = fields.Char(string='故障代码')
-    fault_alarm_info = fields.Char(string='故障报警信息')
+    fault_alarm_info = fields.Text(string='故障报警信息')
     alarm_level = fields.Selection([('一级', '一级(严重)'), ('二级', '二级(中等)'), ('三级', '三级(轻微)')],
                                    string='报警级别')
-    alarm_time = fields.Datetime(string='报警时间')
+    alarm_time = fields.Datetime(string='故障报警时间')
     alarm_way = fields.Selection([('文本提示报警', '文本提示报警'), ('声光报警', '声光报警'), ('图文报警', '图文报警')],
                                  string='报警方式')
     fault_process = fields.Text(string='故障处理方法')
     operator = fields.Many2one('res.users', string='处理人')
-    recovery_time = fields.Datetime(string='复原时间')
+    recovery_time = fields.Datetime(string='故障消除时间')
     fault_duration = fields.Float(string='故障时长')
     note = fields.Text(string='备注')
     active = fields.Boolean('Active', default=True)

sf_maintenance/models/sf_maintenance_oee.py

@@ -7,20 +7,23 @@ class SfMaintenanceEquipmentOEE(models.Model):
     _description = '设备OEE'
 
     name = fields.Char('设备oee')
-    equipment_id = fields.Many2one('maintenance.equipment', '设备',
+    equipment_id = fields.Many2one('maintenance.equipment', '机台号',
                                    domain="[('category_id.equipment_type', '=', '机床'),('state_zc', '=', '已注册')]")
     type_id = fields.Many2one('sf.machine_tool.type', '型号', related='equipment_id.type_id')
-    machine_tool_picture = fields.Binary('设备图片',  related='equipment_id.machine_tool_picture')
+    machine_tool_picture = fields.Binary('设备图片', related='equipment_id.machine_tool_picture')
     state = fields.Selection(
         [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
          ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态", related='equipment_id.state')
-    run_time = fields.Float('正常运行总时长(h)')
+    run_time = fields.Float('加工时长(h)')
-    equipment_time = fields.Float('总时长(h)')
+    equipment_time = fields.Float('开机时长(h)')
-    done_nums = fields.Integer('累计加工总件数')
+    done_nums = fields.Integer('加工件数')
-    utilization_rate = fields.Char('开动率')
+    utilization_rate = fields.Char('可用率')
-    fault_time = fields.Float('故障停机总时长(h)')
+    fault_time = fields.Float('故障时长')
     fault_nums = fields.Integer('故障次数')
+    # 故障率
+    fault_rate = fields.Char('故障率')
+    # 设备故障日志
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志',
                                               related='equipment_id.sf_maintenance_logs_ids')
     oee_logs = fields.One2many('maintenance.equipment.oee.logs', 'equipment_oee_id', string='运行日志')
@@ -38,12 +41,46 @@ class SfMaintenanceEquipmentOEELog(models.Model):
     _name = 'maintenance.equipment.oee.logs'
     _description = '设备运行日志'
 
-    name = fields.Char('运行日志')
+    equipment_id = fields.Many2one('maintenance.equipment', '机台号')
-    run_time = fields.Datetime('时间')
+    name = fields.Char('设备名称')
-    state = fields.Selection([("开机", "开机"), ("关机", "关机"), ("等待", "等待"), ("开始加工", "开始加工"),
+    machine_tool_picture = fields.Binary('设备图片')
-                              ("结束加工", "结束加工"), ("故障", "故障"),
+    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号')
-                              ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
+    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
-    workorder_id = fields.Char('加工订单')
+                              ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
-    time = fields.Char('持续时长')
+    online_time = fields.Char('开机时长')
-    color = fields.Char('颜色', default=1)
+
+    offline_time = fields.Char('关机时长')
+    offline_nums = fields.Integer('关机次数')
+    # 待机时长
+
+    idle_time = fields.Char('待机时长')
+
+    # 待机率
+    idle_rate = fields.Char('待机率')
+
+    work_time = fields.Char('加工时长')
+    work_rate = fields.Char('可用率')
+    fault_time = fields.Char('故障时长')
+    fault_rate = fields.Char('故障率')
+    fault_nums = fields.Integer('故障次数')
+
+    detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情')
+
+    # maintenance_time = fields.Char('维保时长')
+    # work_nums = fields.Integer('加工件数')
     equipment_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE')
+
+
+# 设备运行日志详情
+class SfMaintenanceEquipmentOEELogDetail(models.Model):
+    _name = 'maintenance.equipment.oee.log.detail'
+    _description = '设备运行日志详情'
+
+    sequence = fields.Integer('序号')
+    time = fields.Datetime('时间')
+    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
+                              ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
+    production_id = fields.Many2one('mrp.production', '加工工单')
+
+    log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
+

sf_maintenance/security/ir.model.access.csv

@@ -67,3 +67,6 @@ access_sf_cutting_tool_type_admin_sf_group_equipment_user,sf_cutting_tool_type_a
 access_sf_cutting_tool_type_group_purchase_director_sf_group_equipment_user,sf_cutting_tool_type_group_purchase_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_cutting_tool_type_group_sale_director_sf_group_equipment_user,sf_cutting_tool_type_group_sale_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_cutting_tool_type_group_plan_director_sf_group_equipment_user,sf_cutting_tool_type_group_plan_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
+
+access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,0
+access_maintenance_equipment_oee_log_detail,maintenance_equipment_oee_log_detail,model_maintenance_equipment_oee_log_detail,sf_maintenance.sf_group_equipment_manager,1,1,1,0

sf_maintenance/views/maintenance_equipment_oee_views.xml

@@ -14,6 +14,7 @@
                     <field name="utilization_rate"/>
                     <field name="fault_time"/>
                     <field name="fault_nums"/>
+                    <field name="fault_rate"/>
                 </tree>
             </field>
         </record>
@@ -49,19 +50,19 @@
                             </group>
 
                         </group>
-                        <notebook>
+<!--                         <notebook> -->
-                        <page string="运行日志">
+<!--                         <page string="运行日志"> -->
-                            <field name="oee_logs">
+<!--                             <field name="oee_logs"> -->
-                                <tree create="1" edit="1" delete="1" editable="bottom">
+<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
-                                    <field name = 'run_time'/>
+<!--                                     <field name = 'run_time'/> -->
-                                    <field name = 'state'/>
+<!--                                     <field name = 'state'/> -->
-                                    <field name = 'workorder_id'/>
+<!--                                     <field name = 'workorder_id'/> -->
-                                    <field name = 'time'/>
+<!--                                     <field name = 'time'/> -->
-                                    <field name = 'color' widget="color"/>
+<!--                                     <field name = 'color' widget="color"/> -->
-                                </tree>
+<!--                                 </tree> -->
-                            </field>
+<!--                             </field> -->
-                        </page>
+<!--                         </page> -->
-                        </notebook>
+<!--                         </notebook> -->
                     </sheet>
                 </form>
             </field>

sf_maintenance/views/maintenance_logs_views.xml

@@ -7,22 +7,20 @@
             <field name="model">sf.maintenance.logs</field>
             <field name="arch" type="xml">
                 <tree>
-                    <field name="code"/>
                     <field name="type" optional="hide"/>
                     <field name="brand"/>
                     <field name="maintenance_equipment_id"/>
                     <field name="code_location" optional="hide"/>
-                    <field name="fault_type"/>
                     <field name="fault_code" optional="hide"/>
+                    <field name="alarm_time"/>
                     <field name="fault_alarm_info"/>
                     <field name="alarm_level" optional="hide"/>
-                    <field name="alarm_time"/>
                     <field name="alarm_way" optional="hide"/>
-                    <field name="fault_process"/>
+                    <field name="fault_process" optional="hide"/>
-                    <field name="operator"/>
+                    <field name="operator" optional="hide"/>
                     <field name="recovery_time"/>
                     <field name="fault_duration"/>
-                    <field name="note"/>
+                    <field name="note" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -45,25 +43,32 @@
                         <group>
                             <group>
 
-                                <field name="name"/>
+<!--                                 <field name="name"/> -->
-                                <field name="type" required="1" widget="radio" options="{'horizontal': true}"/>
+<!--                                 <field name="type" required="1" widget="radio" options="{'horizontal': true}"/> -->
-                                <field name="brand"/>
                                 <field name="maintenance_equipment_id"/>
-                                <field name="code_location"/>
+                                <field name="brand"/>
-                                <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="fault_code"/>
-                                <field name="fault_process"/>
-                            </group>
-                            <group>
-                                <field name="fault_alarm_info"/>
                                 <field name="alarm_time"/>
-                                <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/>
+                                <field name="fault_alarm_info"/>
-                                <field name="operator"/>
+
-                                <field name="recovery_time"/>
+<!--                                 <field name="code_location"/> -->
-                                <field name="fault_duration"/>
+<!--                                 <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/> -->
-                                <field name="note"/>
+<!--                                 <field name="fault_code"/> -->
 
                             </group>
+                            <group>
+                                <field name="operator"/>
+
+                                <field name="fault_process"/>
+<!--                                 <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/> -->
+                                <field name="recovery_time"/>
+                                <field name="fault_duration"/>
+
+
+                            </group>
+
+                        </group>
+                        <group>
+                        <field name="note"/>
                         </group>
                     </sheet>
                 </form>
@@ -100,6 +105,233 @@
             </field>
         </record>
 
+<!--         设备运行日志 -->
+        <record id="view_maintenance_logs_run_tree" model="ir.ui.view">
+            <field name="name">maintenance.logs.run.tree</field>
+            <field name="model">maintenance.equipment.oee.logs</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="equipment_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_maintenance_logs_run_form" model="ir.ui.view">
+            <field name="name">maintenance.logs.run.form</field>
+            <field name="model">maintenance.equipment.oee.logs</field>
+            <field name="arch" type="xml">
+<!--                 <form string="设备运行日志"> -->
+<!--                     <header> -->
+<!--                         <field name="equipment_id" readonly="1"/> -->
+<!--                     </header> -->
+<!--                     <sheet> -->
+<!--                         <div class="oe_title"> -->
+<!--                             <h1> -->
+<!--                                 <field name="start_time" readonly="1"/> -->
+<!--                             </h1> -->
+<!--                         </div> -->
+<!--                         <group> -->
+<!--                             <group> -->
+<!--                                 <field name="stop_time" readonly="1"/> -->
+<!--                                 <field name="duration" readonly="1"/> -->
+<!--                                 <field name="oee" readonly="1"/> -->
+<!--                             </group> -->
+<!--                             <group> -->
+<!--                                 <field name="note"/> -->
+<!--                             </group> -->
+
+<!--                         </group> -->
+<!--                     </sheet> -->
+<!--                 </form>                 -->
+                <form string="设备运行日志">
+<!--                     <header> -->
+<!--                         <field name="name" readonly="1"/> -->
+<!--                     </header> -->
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <group>
+                                    <field name="type_id"/>
+                                    <field name="state"/>
+                                </group>
+                            </group>
+                            <group>
+                                <group>
+<!--                                     <field name="state" nolabel="1"/> -->
+                                    <field name="state" string=""/>
+                                </group>
+                                <group>
+                                    <field name="machine_tool_picture" widget="image" nolabel="1"/>
+                                </group>
+                            </group>
+                        </group>
+                        <group>
+                            <group>
+                                <group>
+                                    <field name="online_time" readonly="1"/>
+                                    <field name="offline_time" readonly="1"/>
+                                    <field name="fault_rate" readonly="1"/>
+                                </group>
+                                <group>
+                                    <field name="offline_nums" readonly="1"/>
+                                    <field name="fault_time" readonly="1"/>
+                                    <field name="fault_nums" readonly="1"/>
+                                </group>
+                            </group>
+                            <group>
+                                <group>
+                                    <field name="idle_time"/>
+                                    <field name="idle_rate"/>
+                                </group>
+                                <group>
+                                    <field name="work_time"/>
+                                    <field name="work_rate"/>
+                                </group>
+                            </group>
+
+                        </group>
+                                            <notebook>
+                        <page string="日志详情">
+                            <field name="detail_ids">
+                                <tree>
+                                    <field name="sequence"/>
+                                    <field name="time"/>
+                                    <field name="state"/>
+                                    <field name="production_id"/>
+                                </tree>
+<!--                                 <form> -->
+<!--                                     <field name="sequence"/> -->
+<!--                                     <field name="time"/> -->
+<!--                                     <field name="state"/> -->
+<!--                                     <field name="production_id"/> -->
+<!--                                 </form> -->
+
+                            </field>
+                        </page>
+                    </notebook>
+                    </sheet>
+
+                </form>
+            </field>
+        </record>
+
+
+<!--         <record id="view_maintenance_logs_run_search" model="ir.ui.view"> -->
+<!--             <field name="name">maintenance.logs.run.search</field> -->
+<!--             <field name="model">maintenance.equipment.oee.logs</field> -->
+<!--             <field name="arch" type="xml"> -->
+<!--                 <search> -->
+<!--                     <field name="equipment_id"/> -->
+<!--                     <field name="start_time"/> -->
+<!--                     <field name="stop_time"/> -->
+<!--                     <field name="duration"/> -->
+<!--                     <field name="oee"/> -->
+<!--                     <field name="note"/> -->
+<!--                 </search> -->
+
+<!--             </field> -->
+<!--         </record> -->
+
+<!--         设备运行日志详情 -->
+         <record id="view_maintenance_logs_run_detail_tree" model="ir.ui.view">
+            <field name="name">maintenance.logs.run.detail.tree</field>
+            <field name="model">maintenance.equipment.oee.log.detail</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="sequence"/>
+                    <field name="time"/>
+                    <field name="state"/>
+                    <field name="production_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_maintenance_logs_run_detail_form" model="ir.ui.view">
+            <field name="name">maintenance.logs.run.detail.form</field>
+            <field name="model">maintenance.equipment.oee.log.detail</field>
+            <field name="arch" type="xml">
+                <form string="设备运行日志详情">
+                    <header>
+                        <field name="sequence" readonly="1"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="time" readonly="1"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="state" readonly="1"/>
+                                <field name="production_id" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="log_id"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+<!--         <record id="view_maintenance_logs_run_detail_search" model="ir.ui.view"> -->
+<!--             <field name="name">maintenance.logs.run.detail.search</field> -->
+<!--             <field name="model">maintenance.equipment.oee.logs.detail</field> -->
+<!--             <field name="arch" type="xml"> -->
+<!--                 <search> -->
+<!--                     <field name="equipment_id"/> -->
+<!--                     <field name="start_time"/> -->
+<!--                     <field name="stop_time"/> -->
+<!--                     <field name="duration"/> -->
+<!--                     <field name="oee"/> -->
+<!--                     <field name="note"/> -->
+<!--                 </search> -->
+<!--             </field> -->
+<!--         </record> -->
+
+<!--         设备运行日志详情action -->
+<!--         <record id="action_maintenance_logs_run_detail" model="ir.actions.act_window"> -->
+<!--             <field name="name">设备运行日志详情</field> -->
+<!--             <field name="type">ir.actions.act_window</field> -->
+<!--             <field name="res_model">maintenance.equipment.oee.logs.detail</field> -->
+<!--             <field name="view_mode">tree,form</field> -->
+<!--             <field name="view_id" ref="view_maintenance_logs_run_detail_tree"/> -->
+<!--             <field name="help" type="html"> -->
+<!--                 <p class="oe_view_nocontent_create"> -->
+<!--                     设备运行日志详情 -->
+<!--                 </p> -->
+<!--             </field> -->
+<!--                  -->
+<!--         </record> -->
+
+
+
+
+
+        <record id="action_maintenance_logs_run" model="ir.actions.act_window">
+            <field name="name">设备运行日志</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">maintenance.equipment.oee.logs</field>
+<!--             <field name="search_view_id" ref="view_maintenance_logs_run_search"/> -->
+            <field name="view_mode">tree,form</field>
+<!--             <field name="view_mode">form</field> -->
+            <field name="view_id" ref="view_maintenance_logs_run_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    设备运行日志
+                </p>
+            </field>
+        </record>
+
+
+        <menuitem name="设备运行日志" id="menu_maintenance_logs_run" parent="maintenance.menu_m_request"
+                  sequence="10" action="action_maintenance_logs_run"/>
+
 
         <!-- Action -->
 

sf_manufacturing/views/production_line_view.xml

@@ -100,7 +100,7 @@
         <field name="model">sf.maintenance.logs</field>
         <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
          <field name="arch" type="xml">
-             <xpath expr="//field[@name='code']" position="after">
+             <xpath expr="//field[@name='type']" position="after">
                  <field name="production_line_id" optional="hide"/>
              </xpath>
          </field>