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

新增班次对象，新增工作日对象，修改了工作日历设置的班次、工作日字段类型；新增工作日历表对象

Browse Source
This commit is contained in:
yuxianghui
2023-07-10 17:26:43 +08:00
parent 1d970712e3
commit 6dfced8541
8 changed files with 245 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sf_plan_management/views/menu_view.xml
View File

@@ -25,4 +25,25 @@
action="sf_procedure_equipment_resource_setting_act"
sequence="10"
/>
<menuitem id="menu_sf_working_shift"
name="班次"
parent="menu_sf_basic_setting"
action="sf_working_shift_act"
sequence="12"
/>
<menuitem id="menu_sf_day_off"
name="休息日"
parent="menu_sf_basic_setting"
action="sf_day_off_act"
sequence="15"
/>
<menuitem id="menu_sf_work_schedule_calendar"
name="工作安排日历"
parent="menu_sf_basic_setting"
action="sf_work_schedule_calendar_act"
sequence="15"
/>
</odoo>

174
sf_plan_management/views/paln_base_view.xml → sf_plan_management/views/plan_base_view.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!--========================================工作日历设置========================================-->
<!--================================================工作日历设置================================================-->
<record id="sf_work_log_setting_tree" model="ir.ui.view">
<field name="name">工作日历设置</field>
<field name="model">sf.work.log.setting</field>
@@ -11,8 +11,8 @@
<field name="start_time"/>
<field name="end_time"/>
<field name="duration"/>
<field name="day_off"/>
<field name="working_shift"/>
<field name="day_off_id" widget="many2many_tags"/>
<field name="working_shift_id" widget="many2many_tags"/>
<field name="status"/>
<field name="update_person"/>
<field name="update_time"/>
@@ -35,29 +35,7 @@
</group>
</group>
<group string="选择班次">
<group>
<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>
<group>
<group>
<field name="working_shift_start_time_H" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
<field name="working_shift_end_time_H" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
</group>
<group>
<field name="working_shift_start_time_M" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
<field name="working_shift_end_time_M" attrs="{'invisible': [('user_defined_working_shift_status', '=', False)]}"/>
</group>
</group>
<field name="working_shift_id"/>
</group>
<group string="工作时间">
<group>
@@ -80,9 +58,9 @@
<group>
<group>
<field name="duration"/>
</group>
<group>
<field name="day_off"/>
<field name="day_off_id"
widget="many2many_tags"
options="{'no_create': True, 'no_quick_create': True}"/>
</group>
</group>
<group string="日历状态">
@@ -100,7 +78,137 @@
</record>
<!--========================================产线设备资源设置========================================-->
<!--================================================休息日================================================-->
<record id="sf_day_off_tree" model="ir.ui.view">
<field name="name">休息日</field>
<field name="model">sf.day.off</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
</tree>
</field>
</record>
<record id="sf_day_off_act" model="ir.actions.act_window">
<field name="name">休息日</field>
<field name="res_model">sf.day.off</field>
<field name="view_mode">tree,form</field>
</record>
<!--================================================班次================================================-->
<record id="sf_working_shift_tree" model="ir.ui.view">
<field name="name">班次</field>
<field name="model">sf.working.shift</field>
<field name="arch" type="xml">
<tree>
<field name="code"/>
<field name="name"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="remark"/>
</tree>
</field>
</record>
<record id="sf_working_shift_form" model="ir.ui.view">
<field name="name">班次</field>
<field name="model">sf.working.shift</field>
<field name="arch" type="xml">
<form>
<sheet>
<group>
<group>
<field name="name"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="remark"/>
</group>
<group>
<field name="code"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_working_shift_act" model="ir.actions.act_window">
<field name="name">班次</field>
<field name="res_model">sf.working.shift</field>
<field name="view_mode">tree,form</field>
</record>
<!--================================================工作安排日历================================================-->
<record id="sf_work_schedule_calendar_tree" model="ir.ui.view">
<field name="name">工作安排日历</field>
<field name="model">sf.work.schedule.calendar</field>
<field name="arch" type="xml">
<tree>
<field name="name_id" invisible="True"/>
<field name="name"/>
<field name="date_time"/>
</tree>
</field>
</record>
<record id="sf_work_schedule_calendar_form" model="ir.ui.view">
<field name="name">工作安排日历</field>
<field name="model">sf.work.schedule.calendar</field>
<field name="arch" type="xml">
<form>
<sheet>
<group string="日历基本信息">
<group>
<field name="name"/>
<field name="date_time"/>
</group>
<group>
<field name="name_id"/>
</group>
</group>
<group string="其他">
<field name="monthly_rest_days"/>
<field name="annual_rest_days"/>
<field name="monthly_planned_downtime"/>
<field name="annual_planned_downtime"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="sf_work_schedule_calendar_search" model="ir.ui.view">
<field name="name">工作安排日历</field>
<field name="model">sf.work.schedule.calendar</field>
<field name="arch" type="xml">
<search>
<searchpanel>
<field name="name_id" icon="fa-building" enable_counters="1"/>
</searchpanel>
</search>
</field>
</record>
<record id="sf_work_schedule_calendar_calendar" model="ir.ui.view">
<field name="name">工作安排日历</field>
<field name="model">sf.work.schedule.calendar</field>
<field name="arch" type="xml">
<calendar string="工作日历" mode="year" date_start="date_time">
<field name="name"/>
</calendar>
</field>
</record>
<record id="sf_work_schedule_calendar_act" model="ir.actions.act_window">
<field name="name">工作安排日历</field>
<field name="res_model">sf.work.schedule.calendar</field>
<field name="view_mode">calendar,search,tree,form</field>
</record>
<!--================================================产线设备资源设置================================================-->
<record id="sf_procedure_equipment_resource_setting_tree" model="ir.ui.view">
<field name="name">产线设备资源设置</field>
<field name="model">sf.procedure.equipment.resource.setting</field>
@@ -114,7 +222,7 @@
<field name="working_procedure"/>
<field name="production_capacity"/>
<field name="working_calendar_id"/>
<field name="working_shift"/>
<field name="working_shift_id" widget="many2many_tags"/>
<field name="create_time"/>
<field name="status"/>
<field name="participate_in_scheduling"/>
@@ -161,7 +269,7 @@
<field name="create_time"/>
</group>
<group>
<field name="working_shift"/>
<field name="working_shift_id" widget="many2many_tags"/>
</group>
</group>
</sheet>
@@ -182,7 +290,7 @@
<field name="working_procedure"/>
<field name="production_capacity"/>
<field name="working_calendar_id"/>
<field name="working_shift"/>
<field name="working_shift_id"/>
<field name="create_time"/>
<field name="status"/>
<field name="participate_in_scheduling"/>