jikimo/jikimo_sf
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

1
sf_base/__manifest__.py
View File

@@ -18,7 +18,6 @@
'views/common_view.xml',
'views/fixture_view.xml',
'views/functional_fixture_view.xml',
'views/production_line_view.xml',
'views/menu_view.xml',
"views/tool_views.xml",
"views/tool_menu.xml",

1
sf_base/models/__init__.py
View File

@@ -3,7 +3,6 @@ from . import common
from . import tool_base_new
from . import fixture
from . import functional_fixture
from . import production_line_base

2
sf_base/security/ir.model.access.csv
View File

@@ -30,7 +30,7 @@ access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional
access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,base.group_user,1,1,1,1
access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
30
31
32
33
34
35
36

7
sf_base/views/menu_view.xml
View File

@@ -143,12 +143,5 @@
sequence="1"
action="action_sf_machine_control_system"/>
<menuitem
id="menu_sf_production_line"
parent="menu_sf_base"
name="生产线"
sequence="20"
action="sf_production_line_act"/>
</data>
</odoo>

3
sf_maintenance/models/__init__.py
View File

@@ -2,4 +2,5 @@
from . import sf_maintenance
from . import sf_maintenance_logs
from . import sf_equipment_maintenance_standards
from . import sf_maintenance_requests
from . import sf_maintenance_requests
from . import production_line_base

2
sf_base/models/production_line_base.py → sf_maintenance/models/production_line_base.py
View File

@@ -1,4 +1,4 @@
from odoo import models,fields,api
from odoo import models,fields
class ProductionLine(models.Model):

2
sf_maintenance/security/ir.model.access.csv
View File

@@ -4,4 +4,6 @@ access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.gr
access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
4 access_maintenance_equipment maintenance_equipment model_maintenance_equipment base.group_user 1 1 1 1
5 access_maintenance_standards maintenance_standards model_maintenance_standards base.group_user 1 1 1 1
6 access_sf_production_line sf.production.line model_sf_production_line base.group_user 1 1 1 1
7
8
9

6
sf_base/views/production_line_view.xml → sf_maintenance/views/production_line_view.xml
View File

@@ -72,4 +72,10 @@
<field name="res_model">sf.production.line</field>
<field name="view_mode">kanban,tree,form</field>
</record>
<menuitem id="menu_sf_production_line"
parent="menu_sf_base"
name="生产线"
sequence="20"
action="sf_production_line_act"/>
</odoo>

31
sf_plan_management/models/base.py
View File

@@ -3,17 +3,36 @@ from odoo import models, fields
class ProcedureEquipmentResourceSetting(models.Model):
_name = 'sf.procedure.equipment.resource.setting'
_description = '工序设备资源设置'
_description = '产线设备资源设置'
name = fields.Char(string='设备名称')
machine_tool_name = fields.Char(string='机台号')
def _get_code(self):
"""
自动生成编码
:return:
"""
fixture_material = self.env['sf.procedure.equipment.resource.setting'].sudo().search(
[('code', '!=', '')],
limit=1,
order="id desc")
if not fixture_material:
num = "%03d" % 1
else:
m = int(fixture_material.code) + 1
num = "%03d" % m
return num
code = fields.Char(string='序号', readonly=True, default=_get_code)
work_center_name = fields.Char(string='工作中心名称')
equipment_code = fields.Char(string='机台号')
# todo 绑定设备
# equipment_name = fields.Many2one('', string='设备名称')
brand = fields.Char(string='品牌')
model = fields.Char(string='型号')
production_capacity = fields.Char(string='产能')
working_calendar = fields.Many2one('sf.work.log.setting', string='工作日历')
working_procedure = fields.Char(string='工序')
production_capacity = fields.Char(string='产能', required=True)
working_calendar_id = fields.Many2one('sf.work.log.setting', string='工作日历')
working_shift = fields.Char(string='班次')
create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now())
stale_dated_time = fields.Datetime(string='过期时间')
status = fields.Selection([('0', '正常'), ('1', '故障停机'), ('2', '计划停机')], string='设备状态', default='0')
participate_in_scheduling = fields.Boolean(string='参与排程', default=True)

98
sf_plan_management/models/calendar_base.py
View File

@@ -18,54 +18,73 @@ class WorkLogSetting(models.Model):
_name = 'sf.work.log.setting'
_description = '工作日历设置'
name = fields.Char(string='工作日历名称')
def _get_code(self):
"""
自动生成编码
:return:
"""
fixture_material = self.env['sf.work.log.setting'].sudo().search(
[('code', '!=', '')],
limit=1,
order="id desc")
if not fixture_material:
num = "%03d" % 1
else:
m = int(fixture_material.code) + 1
num = "%03d" % m
return num
start_time = fields.Char(string='日开始时间', default="00:00:00")
start_time_H = fields.Selection(time_H_selection(), '时', default='00')
start_time_M = fields.Selection(time_M_or_S_selection(), '分', default='00')
start_time_S = fields.Selection(time_M_or_S_selection(), '秒', default='00')
end_time = fields.Char(string='日结束时间', default="00:00:00")
end_time_H = fields.Selection(time_H_selection(), '时', default='00')
end_time_M = fields.Selection(time_M_or_S_selection(), '分', default='00')
end_time_S = fields.Selection(time_M_or_S_selection(), '秒', default='00')
code = fields.Char(string='序号', default=_get_code, readonly=True)
name = fields.Char(string='工作日历名称', required=True)
duration = fields.Char(string='时长')
day_off = fields.Char(string='休息日')
start_time = fields.Char(string='日开始时间', readonly=True, compute='_compute_start_time')
start_time_H = fields.Selection(time_H_selection(), '时', required=True)
start_time_M = fields.Selection(time_M_or_S_selection(), '分', required=True)
end_time = fields.Char(string='日结束时间', readonly=True, compute='_compute_end_time')
end_time_H = fields.Selection(time_H_selection(), '时', required=True)
end_time_M = fields.Selection(time_M_or_S_selection(), '分', required=True)
duration = fields.Char(string='时长', readonly=True, compute='_compute_duration')
day_off = fields.Char(string='休息日', required=True)
user_defined_working_shift_status = fields.Boolean(string='自定义班次', default=False)
working_shift = fields.Char(string='班次')
working_shift_char = fields.Char(string='班次')
working_shift_char = fields.Char(string='班次', readonly=True, compute='_compute_working_shift_time')
working_shift_select = fields.Selection([('早班00:00-08:00', '早班00:00-08:00'),
('白班08:00-16:00', '白班08:00-16:00'),
('晚班16:00-24:00', '晚班16:00-24:00'),
('长白班08:00-20:00', '长白班08:00-20:00'),
('长晚班20:00-08:00', '长晚班20:00-08:00')], string='班次')
working_shift_start_time_H = fields.Selection(time_H_selection(), '班次开始时间：时', default='00')
working_shift_start_time_M = fields.Selection(time_M_or_S_selection(), '分', default='00')
working_shift_start_time_S = fields.Selection(time_M_or_S_selection(), '秒', default='00')
working_shift_end_time_H = fields.Selection(time_H_selection(), '班次结束时间：时', default='00')
working_shift_end_time_M = fields.Selection(time_M_or_S_selection(), '分', default='00')
working_shift_end_time_S = fields.Selection(time_M_or_S_selection(), '秒', default='00')
working_shift_start_time_H = fields.Selection(time_H_selection(), '班次开始时间：时',
attr={'required': [('user_defined_working_shift_status', '=', 'True')]})
working_shift_start_time_M = fields.Selection(time_M_or_S_selection(), '分',
attr={'required': [('user_defined_working_shift_status', '=', 'True')]})
working_shift_end_time_H = fields.Selection(time_H_selection(), '班次结束时间：时',
attr={'required': [('user_defined_working_shift_status', '=', 'True')]})
working_shift_end_time_M = fields.Selection(time_M_or_S_selection(), '分',
attr={'required': [('user_defined_working_shift_status', '=', 'True')]})
status = fields.Boolean(string='状态', default=True)
update_person = fields.Char(string='更新人', default=lambda self: self.env.user.name)
update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())
@api.onchange('start_time_H', 'start_time_M', 'start_time_S')
def _onchange_start_time(self):
@api.depends('start_time_H', 'start_time_M')
def _compute_start_time(self):
"""
设置输入日开始时间
:return:
"""
self.start_time = f"{self.start_time_H}:{self.start_time_M}:{self.start_time_S}"
for record in self:
record.start_time = f"{record.start_time_H}:{record.start_time_M}:00"
@api.onchange('end_time_H', 'end_time_M', 'end_time_S')
def _onchange_end_time(self):
@api.depends('end_time_H', 'end_time_M')
def _compute_end_time(self):
"""
设置输入日结束时间
:return:
"""
self.end_time = f"{self.end_time_H}:{self.end_time_M}:{self.end_time_S}"
for record in self:
record.end_time = f"{record.end_time_H}:{record.end_time_M}:00"
@api.onchange('working_shift_char', 'working_shift_select')
def _onchange_working_shift(self):
@@ -79,22 +98,27 @@ class WorkLogSetting(models.Model):
else:
record.working_shift = record.working_shift_char
@api.onchange('working_shift_start_time_H',
'working_shift_start_time_M',
'working_shift_start_time_S',
'working_shift_end_time_H',
'working_shift_end_time_M',
'working_shift_end_time_S')
def _onchange_working_shift_time(self):
start_time = f"{self.working_shift_start_time_H}:{self.working_shift_start_time_M}:{self.working_shift_start_time_S}"
end_time = f"{self.working_shift_end_time_H}:{self.working_shift_end_time_M}:{self.working_shift_end_time_S}"
@api.depends(
'working_shift_start_time_H', 'working_shift_start_time_M',
'working_shift_end_time_H', 'working_shift_end_time_M')
def _compute_working_shift_time(self):
start_time = f"{self.working_shift_start_time_H}:{self.working_shift_start_time_M}:00"
end_time = f"{self.working_shift_end_time_H}:{self.working_shift_end_time_M}:00"
self.working_shift_char = f"自定义班次{start_time}-{end_time}"
@api.onchange('start_time', 'end_time')
def _onchange_duration(self):
@api.depends('start_time_H', 'start_time_M', 'end_time_H', 'end_time_M')
def _compute_duration(self):
"""
根据日开始时间和日结束时间计算每日工作时长
:return:
"""
for record in self:
st_h = float(record.start_time_H)
st_m = float(record.start_time_M)
end_h = float(record.end_time_H)
end_m = float(record.end_time_M)
# 日开始时间小于日结束时间
if st_h < end_h:
record.duration = str(round(end_h-st_h+(end_m-st_m)/60, 2))
else:
record.duration = str(round(end_h-st_h+(end_m-st_m)/60+24, 2))

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>