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

修改获取CNC程序从工单到制造订单

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2024-01-05 11:23:27 +08:00
parent 583f6503ec
commit c81dc99aef
13 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_maintenance/models/sf_maintenance.py
View File

@@ -160,8 +160,9 @@ class SfMaintenanceEquipment(models.Model):
type_id = fields.Many2one('sf.machine_tool.type', '型号')
state = fields.Selection(
[("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
[("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")],
default='正常', string="机床状态")
run_time = fields.Char('总运行时长')
# 0606新增字段
machine_tool_picture = fields.Binary('图片')
heightened_way = fields.Selection([

1
sf_maintenance/models/sf_maintenance_logs.py
View File

@@ -26,3 +26,4 @@ class SfMaintenanceLogs(models.Model):
recovery_time = fields.Datetime(string='复原时间')
fault_duration = fields.Float(string='故障时长')
note = fields.Text(string='备注')
active = fields.Boolean('Active', default=True)

20
sf_maintenance/views/maintenance_logs_views.xml
View File

@@ -105,9 +105,10 @@
<!-- Action -->
<record id="action_maintenance_logs" model="ir.actions.act_window">
<field name="name">设备故障日志</field>
<field name="name">设备故障日志</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.maintenance.logs</field>
<field name="search_view_id" ref="view_maintenance_logs_search"/>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_maintenance_logs_tree"/>
<field name="help" type="html">
@@ -117,6 +118,23 @@
</field>
</record>
<!-- <record id="action_maintenance_logs_button" model="ir.actions.act_window">-->
<!-- <field name="name">设备故障日志</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
<!-- <field name="res_model">sf.maintenance.logs</field>-->
<!-- <field name="search_view_id" ref="view_maintenance_logs_search"/>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="view_id" ref="view_maintenance_logs_tree"/>-->
<!-- <field name="context">{-->
<!-- 'default_maintenance_equipment_id': active_id-->
<!-- }</field>-->
<!-- <field name="help" type="html">-->
<!-- <p class="oe_view_nocontent_create">-->
<!-- 设备故障日志-->
<!-- </p>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record id="action_maintenance_logs" model="ir.actions.act_window">-->
<!-- <field name="name">设备故障日志</field>-->
<!-- <field name="res_model">sf.maintenance.logs</field>-->

3
sf_maintenance/views/maintenance_views.xml
View File

@@ -27,7 +27,7 @@
<button name="%(action_maintenance_logs)d"
type="action"
class="oe_stat_button"
context="{'default_sf_maintenance_logs_ids': sf_maintenance_logs_ids}"
context="{'search_default_maintenance_equipment_id': [active_id]}"
icon="fa-wrench">
<field string="设备故障日志" name="sf_maintenance_logs_ids" widget="statinfo"/>
</button>
@@ -56,6 +56,7 @@
domain="[('brand_id', '=', brand_id)]"/>
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
force_save="1"/>
<field name="run_time" force_save="1"/>
</xpath>
<xpath expr="//page[@name='description']" position="before">
<page string="设备参数" name="sf_equipment"