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

1、优化了产线设备资源设置和工作日历设置界面布局；删除工作日历、班次、休息日模型的form视图，新增tree视图修改功能；2、修复产线设备资源设置的设备信息显示问题，修改了机台号字段名称；3、新增工作日历设置班次字段必填；4、调整产线设备资源设置和工作日历设置菜单位置

Browse Source
This commit is contained in:
yuxianghui
2023-08-22 11:40:35 +08:00
parent 16de3e40df
commit e781bce27e
4 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_plan_management/models/base.py
View File

@@ -8,7 +8,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
name = fields.Many2one('sf.production.line', string='生产线', required=True)
work_center_name_id = fields.Many2one('mrp.workcenter', string='工作中心名称')
equipment_code = fields.Char(string='机台号(原设备编码)', readonly=True, compute='_onchange_equipment_name_id')
equipment_code = fields.Char(string='机台号', readonly=True, compute='_onchange_equipment_name_id')
equipment_name_id = fields.Many2one('maintenance.equipment',
string='设备名称',
readonly=True,
@@ -41,9 +41,9 @@ class ProcedureEquipmentResourceSetting(models.Model):
@api.onchange('equipment_name_id')
def _onchange_equipment_name_id(self):
for record in self:
record.equipment_code = record.equipment_name_id.code,
record.brand = record.equipment_name_id.brand_id.name,
record.model = record.equipment_name_id.type_id.name,
record.equipment_code = record.equipment_name_id.code
record.brand = record.equipment_name_id.brand_id.name
record.model = record.equipment_name_id.type_id.name
record.status = record.equipment_name_id.state
@api.depends('working_calendar_id')

4
sf_plan_management/models/calendar_base.py
View File

@@ -26,14 +26,14 @@ class WorkLogSetting(models.Model):
code = fields.Char(string='序号', default=_get_code)
name = fields.Char(string='工作日历名称', required=True, size=15, length=30)
working_shift_ids = fields.Many2many('sf.working.shift', string='班次')
working_shift_ids = fields.Many2many('sf.working.shift', string='班次', required=True)
start_time = fields.Datetime(string='日开始时间', readonly=True, compute='_compute_working_shift_ids')
end_time = fields.Datetime(string='日结束时间', readonly=True, compute='_compute_working_shift_ids')
duration = fields.Char(string='时长', readonly=True, compute='_compute_working_shift_ids')
day_off_ids = fields.Many2many('sf.day.off', string='休息日', required=True)
status = fields.Boolean(string='状态', default=True)
status = fields.Selection([('正常', '正常'), ('禁用', '禁用')], string='状态', default='正常')
update_person = fields.Char(string='更新人', default=lambda self: self.env.user.name)
update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())