jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整日志顺序;增加订单名返回

Browse Source
This commit is contained in:
mgw
2024-08-16 17:19:54 +08:00
parent a07a1ba268
commit 29c1c7a54d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_machine_connect/controllers/controllers.py
View File

@@ -238,7 +238,8 @@ class Sf_Dashboard_Connect(http.Controller):
for log_data in log_datas: for log_data in log_datas:
res['data'][item].append({ res['data'][item].append({
'time': log_data.time.strftime('%Y-%m-%d %H:%M:%S'), 'time': log_data.time.strftime('%Y-%m-%d %H:%M:%S'),
'state': log_data.state 'state': log_data.state,
'production_name': log_data.production_name,
}) })
return json.dumps(res) # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode() return json.dumps(res) # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode()

3
sf_maintenance/models/sf_maintenance_oee.py
View File

@@ -84,12 +84,13 @@ class SfMaintenanceEquipmentOEELog(models.Model):
class SfMaintenanceEquipmentOEELogDetail(models.Model): class SfMaintenanceEquipmentOEELogDetail(models.Model):
_name = 'maintenance.equipment.oee.log.detail' _name = 'maintenance.equipment.oee.log.detail'
_description = '设备运行日志详情' _description = '设备运行日志详情'
_order = 'time desc'
# sequence = fields.Integer('序号', related='id') # sequence = fields.Integer('序号', related='id')
time = fields.Datetime('时间') time = fields.Datetime('时间')
state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"), state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
("检修", "检修"), ("保养", "保养")], default="", string="事件/状态") ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
production_id = fields.Many2one('mrp.production', '加工工单') production_name = fields.Char('加工工单')
log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志') log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
# equipment_code = fields.Char('设备编码', related='log_id.equipment_code') # equipment_code = fields.Char('设备编码', related='log_id.equipment_code')

8
sf_maintenance/views/maintenance_logs_views.xml
View File

@@ -207,7 +207,7 @@
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->
<field name="time"/> <field name="time"/>
<field name="state"/> <field name="state"/>
<field name="production_id"/> <field name="production_name"/>
</tree> </tree>
<!-- <form> --> <!-- <form> -->
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->
@@ -224,7 +224,7 @@
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->
<field name="time"/> <field name="time"/>
<field name="state"/> <field name="state"/>
<field name="production_id"/> <field name="production_name"/>
</tree> </tree>
<!-- <form> --> <!-- <form> -->
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->
@@ -268,7 +268,7 @@
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->
<field name="time"/> <field name="time"/>
<field name="state"/> <field name="state"/>
<field name="production_id"/> <field name="production_name"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -282,7 +282,7 @@
<group> <group>
<group> <group>
<field name="state"/> <field name="state"/>
<field name="production_id"/> <!-- <field name="production_id"/> -->
</group> </group>
<group> <group>
<!-- <field name="sequence"/> --> <!-- <field name="sequence"/> -->