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

优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型

Browse Source
This commit is contained in:
yuxianghui
2023-07-07 14:36:27 +08:00
parent 123adcfc76
commit 5b5d41559c
12 changed files with 167 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_plan_management/views/menu_view.xml
View File

@@ -20,7 +20,7 @@
/>
<menuitem id="menu_sf_procedure_equipment_resource_setting"
name="工序设备资源设置"
name="产线设备资源设置"
parent="menu_sf_basic_setting"
action="sf_procedure_equipment_resource_setting_act"
sequence="10"

96
sf_plan_management/views/paln_base_view.xml
View File

@@ -6,6 +6,7 @@
<field name="model">sf.work.log.setting</field>
<field name="arch" type="xml">
<tree>
<field name="code"/>
<field name="name"/>
<field name="start_time"/>
<field name="end_time"/>
@@ -26,16 +27,23 @@
<form>
<sheet string-="工作日历设置">
<group string="基础信息">
<field name="name"/>
<group>
<field name="name"/>
</group>
<group>
<field name="code"/>
</group>
</group>
<group string="选择班次">
<group>
<field name="working_shift_char" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
<field name="working_shift_select" attrs="{'invisible': [('user_defined_working_shift_status', '!=', False)]}"/>
</group>
<group>
<field name="user_defined_working_shift_status"/>
<field name="working_shift" invisible="True"/>
<group>
<field name="working_shift_char" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
<field name="working_shift_select" attrs="{'invisible': [('user_defined_working_shift_status', '!=', False)]}"/>
</group>
<group>
<field name="user_defined_working_shift_status"/>
<field name="working_shift" invisible="True"/>
</group>
</group>
</group>
<group>
@@ -49,18 +57,13 @@
<field name="working_shift_end_time_M" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
</group>
</group>
<group>
<group>
<field name="working_shift_start_time_S" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
<field name="working_shift_end_time_S" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
</group>
</group>
</group>
<group string="工作时间">
<group>
<group>
<field name="start_time"/>
<field name="end_time" readonly="False"/>
<field name="end_time"/>
</group>
<group>
<field name="start_time_H"/>
@@ -72,10 +75,6 @@
<field name="start_time_M"/>
<field name="end_time_M"/>
</group>
<group>
<field name="start_time_S"/>
<field name="end_time_S"/>
</group>
</group>
</group>
<group>
@@ -101,39 +100,80 @@
</record>
<!--========================================工序设备资源设置========================================-->
<!--========================================产线设备资源设置========================================-->
<record id="sf_procedure_equipment_resource_setting_tree" model="ir.ui.view">
<field name="name">工序设备资源设置</field>
<field name="name">产线设备资源设置</field>
<field name="model">sf.procedure.equipment.resource.setting</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="machine_tool_name"/>
<tree string="产线设备资源设置">
<field name="code"/>
<field name="work_center_name"/>
<field name="equipment_code"/>
<!-- <field name="equipment_name"/>-->
<field name="brand"/>
<field name="model"/>
<field name="production_capacity"/>
<field name="working_calendar"/>
<field name="working_calendar_id"/>
<field name="working_shift"/>
<field name="create_time"/>
<field name="stale_dated_time"/>
<field name="status"/>
<field name="participate_in_scheduling"/>
</tree>
</field>
</record>
<record id="sf_procedure_equipment_resource_setting_form" model="ir.ui.view">
<field name="name">产线设备资源设置</field>
<field name="model">sf.procedure.equipment.resource.setting</field>
<field name="arch" type="xml">
<form string="产线设备资源设置">
<sheet>
<group>
<group>
<field name="work_center_name"/>
</group>
<group>
<field name="code"/>
</group>
</group>
<group>
<group>
<field name="equipment_code"/>
<!-- <field name="equipment_name"/>-->
<field name="working_procedure"/>
<field name="production_capacity"/>
</group>
<group>
<field name="brand"/>
<field name="model"/>
<field name="working_calendar_id"/>
<field name="working_shift"/>
</group>
</group>
<group>
<field name="create_time"/>
<field name="status"/>
<field name="participate_in_scheduling"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_procedure_equipment_resource_setting_search" model="ir.ui.view">
<field name="name">工序设备资源设置</field>
<field name="name">产线设备资源设置</field>
<field name="model">sf.procedure.equipment.resource.setting</field>
<field name="arch" type="xml">
<search>
<field name="name"/>
<searchpanel>
<field name="working_calendar_id" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
</record>
<record id="sf_procedure_equipment_resource_setting_act" model="ir.actions.act_window">
<field name="name">工序设备资源设置</field>
<field name="name">产线设备资源设置</field>
<field name="res_model">sf.procedure.equipment.resource.setting</field>
<field name="view_mode">tree,form,search</field>
</record>