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

4
sf_plan_management/models/base.py
View File

@@ -19,7 +19,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
working_procedure = fields.Char(string='工序', readonly=True)
production_capacity = fields.Float(string='产能', required=True, digits=(4, 1))
working_calendar_id = fields.Many2one('sf.work.log.setting', string='工作日历')
working_shift = fields.Char(string='班次', readonly=True, compute='_onchange_working_calendar_id')
working_shift_id = fields.Many2many('sf.working.shift', string='班次', readonly=True, compute='_onchange_working_calendar_id')
create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True)
status = fields.Selection([('正常', '正常'), ('1', '故障停机'), ('2', '计划停机')],
string='设备状态',
@@ -49,7 +49,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
@api.depends('working_calendar_id')
def _onchange_working_calendar_id(self):
for record in self:
record.working_shift = record.working_calendar_id.working_shift
record.working_shift_id = record.working_calendar_id.working_shift_id

114
sf_plan_management/models/calendar_base.py
View File

@@ -45,24 +45,9 @@ class WorkLogSetting(models.Model):
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)
day_off_id = fields.Many2many('sf.day.off', string='休息日', required=True)
user_defined_working_shift_status = fields.Boolean(string='自定义班次', default=False)
working_shift = 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(), '班次开始时间：时',
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')]})
working_shift_id = fields.Many2many('sf.working.shift', string='班次')
status = fields.Boolean(string='状态', default=True)
update_person = fields.Char(string='更新人', default=lambda self: self.env.user.name)
@@ -86,27 +71,7 @@ class WorkLogSetting(models.Model):
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):
"""
对班次是否手动输入是进行不同的展示
:return:
"""
for record in self:
if record.working_shift_select:
record.working_shift = record.working_shift_select
else:
record.working_shift = record.working_shift_char
@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.depends('start_time_H', 'start_time_M', 'end_time_H', 'end_time_M')
@api.depends('start_time_H', 'start_time_M', 'end_time_H', 'end_time_M')
def _compute_duration(self):
"""
根据日开始时间和日结束时间计算每日工作时长
@@ -119,6 +84,75 @@ class WorkLogSetting(models.Model):
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))
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))
record.duration = str(round(end_h - st_h + (end_m - st_m) / 60 + 24, 2))
# @api.model
# def create(self, vals_list):
# """
# 创建新工作日历设置记录时，同时根据所选的休息日新建工作日历的休息日记录
# :param vals_list:
# :return:
# """
#
#
# return super(WorkLogSetting, self).create(vals_list)
class WorkingShift(models.Model):
_name = 'sf.working.shift'
_description = '班次'
def _get_code(self):
"""
自动生成编码
:return:
"""
fixture_material = self.env['sf.working.shift'].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('编码', default=_get_code, readonly=True)
name = fields.Char('名称', required=True)
start_time = fields.Datetime('班次开始时间')
end_time = fields.Datetime('班次结束时间')
remark = fields.Char('备注')
class DayOff(models.Model):
_name = 'sf.day.off'
_description = '休息日'
name = fields.Selection([
('周一', '周一'),
('周二', '周二'),
('周三', '周三'),
('周四', '周四'),
('周五', '周五'),
('周六', '周六'),
('周日', '周日')], '休息日名称')
class WorkScheduleCalendar(models.Model):
_name = 'sf.work.schedule.calendar'
_description = '工作安排日历'
name_id = fields.Many2one('sf.work.log.setting', '工作日历名称')
day_off_id = fields.Many2many('sf.day.off', string='休息日')
scheduled_outage = fields.Char('计划停机')
monthly_rest_days = fields.Char('月休息天数', readonly=True)
annual_rest_days = fields.Char('年休息天数', readonly=True)
monthly_planned_downtime = fields.Char('月计划停机时长', readonly=True)
annual_planned_downtime = fields.Char('年计划停机时长', readonly=True)
name = fields.Selection([('休息日', '休息日'),('计划停机', '计划停机')], '名称')
date_time = fields.Datetime('休息时间')