From 123adcfc76c5220923d0a53ae126992ae5d8369e Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Thu, 6 Jul 2023 17:38:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8sf=5Fbase=E4=B8=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=A8=A1=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 1 + sf_base/models/__init__.py | 1 + sf_base/models/production_line_base.py | 30 +++++++ sf_base/security/ir.model.access.csv | 3 + sf_base/views/menu_view.xml | 7 ++ sf_base/views/production_line_view.xml | 75 ++++++++++++++++ sf_plan_management/__manifest__.py | 3 +- sf_plan_management/models/base.py | 18 ---- sf_plan_management/models/calendar_base.py | 90 ++++++++++++++----- .../security/ir.model.access.csv | 2 - sf_plan_management/views/paln_base_view.xml | 67 ++++++++++---- 11 files changed, 241 insertions(+), 56 deletions(-) create mode 100644 sf_base/models/production_line_base.py create mode 100644 sf_base/views/production_line_view.xml diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index d6f8a88a..41de851f 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -18,6 +18,7 @@ '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", diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index cc906ab8..12823af1 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -3,6 +3,7 @@ from . import common from . import tool_base_new from . import fixture from . import functional_fixture +from . import production_line_base diff --git a/sf_base/models/production_line_base.py b/sf_base/models/production_line_base.py new file mode 100644 index 00000000..9dfeabe2 --- /dev/null +++ b/sf_base/models/production_line_base.py @@ -0,0 +1,30 @@ +from odoo import models,fields,api + + +class ProductionLine(models.Model): + _name = 'sf.production.line' + _description = '生产线' + + def _get_code(self): + """ + 自动生成编码 + :return: + """ + fixture_material = self.env['sf.production.line'].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 + + name = fields.Char('生产线') + code = fields.Char('编码', default=_get_code, readonly=True) + remark = fields.Char('备注') + + + + diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 175e4589..7b3ef980 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -30,4 +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 + + diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index cd32e960..9f250a87 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -143,5 +143,12 @@ sequence="1" action="action_sf_machine_control_system"/> + + \ No newline at end of file diff --git a/sf_base/views/production_line_view.xml b/sf_base/views/production_line_view.xml new file mode 100644 index 00000000..17de359d --- /dev/null +++ b/sf_base/views/production_line_view.xml @@ -0,0 +1,75 @@ + + + + 生产线 + sf.production.line + + + + + + + + + + + 生产线 + sf.production.line + +
+ + + + + + + + + + + +
+ + + + + 生产线 + sf.production.line + + + + + + + + + 生产线看板 + sf.production.line + + + + + +
+ +
+ +
+ +
+ +
+
+ + + + + + + + + 生产线 + sf.production.line + kanban,tree,form + + \ No newline at end of file diff --git a/sf_plan_management/__manifest__.py b/sf_plan_management/__manifest__.py index 9a8af0cd..5f82e7b4 100644 --- a/sf_plan_management/__manifest__.py +++ b/sf_plan_management/__manifest__.py @@ -13,8 +13,9 @@ 'depends': [], 'data': [ 'security/ir.model.access.csv', + # 'security/ir.model.access.csv', 'views/paln_base_view.xml', - 'views/menu_view.xml' + 'views/menu_view.xml', ], 'demo': [ ], diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py index 76b1c0fc..57fcfb59 100644 --- a/sf_plan_management/models/base.py +++ b/sf_plan_management/models/base.py @@ -1,28 +1,10 @@ from odoo import models, fields -class ProductionLine(models.Model): - _name = 'sf.production.line' - _description = '生产线' - - name = fields.Char(string='生产线名称') - - -class WorkingProcedure(models.Model): - _name = 'sf.working.procedure' - _description = '工序' - - name = fields.Char(string='工序名称') - content = fields.Char(string='主要加工内容') - - WorkingProcedure_to_ProductionLine_id = fields.Many2one('sf.production.line') - - class ProcedureEquipmentResourceSetting(models.Model): _name = 'sf.procedure.equipment.resource.setting' _description = '工序设备资源设置' - equipment_to_working_procedure_id = fields.Many2one('sf.working.procedure', string='工序') name = fields.Char(string='设备名称') machine_tool_name = fields.Char(string='机台号') brand = fields.Char(string='品牌') diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index dc22b92f..ad48a7b2 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -2,49 +2,99 @@ from odoo import models, fields, api import re +def time_H_selection(): + return [('00', '00'), ('01', '01'), ('02', '02'), ('03', '03'), ('04', '04'), ('05', '05'), + ('06', '06'), ('07', '07'), ('08', '08'), ('09', '09'), ('10', '10'), ('11', '11'), + ('12', '12'), ('13', '13'), ('14', '14'), ('15', '15'), ('16', '16'), ('17', '17'), + ('18', '18'), ('19', '19'), ('20', '20'), ('21', '21'), ('22', '22'), ('23', '23')] + + +def time_M_or_S_selection(): + return [('00', '00'), ('05', '05'), ('10', '10'), ('15', '15'), ('20', '20'), ('25', '25'), + ('30', '30'), ('35', '35'), ('40', '40'), ('45', '45'), ('50', '50'), ('55', '55')] + + class WorkLogSetting(models.Model): _name = 'sf.work.log.setting' _description = '工作日历设置' name = fields.Char(string='工作日历名称') - # start_time = fields.Char(string='日开始时间') - start_time = fields.Datetime(string='日开始时间') - end_time = fields.Char(string='日结束时间') + + 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') + duration = fields.Char(string='时长') day_off = fields.Char(string='休息日') user_defined_working_shift_status = fields.Boolean(string='自定义班次', default=False) working_shift = fields.Char(string='班次') working_shift_char = fields.Char(string='班次') - working_shift_select = fields.Selection([('0', '早班00:00-08:00'), - ('1', '白班08:00-16:00'), - ('2', '晚班16:00-24:00'), - ('3', '长白班08:00-20:00'), - ('4', '长晚班20:00-08:00')], string='班次') + 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') 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): + """ + 设置输入日开始时间 + :return: + """ + self.start_time = f"{self.start_time_H}:{self.start_time_M}:{self.start_time_S}" + + @api.onchange('end_time_H', 'end_time_M', 'end_time_S') + def _onchange_end_time(self): + """ + 设置输入日结束时间 + :return: + """ + self.end_time = f"{self.end_time_H}:{self.end_time_M}:{self.end_time_S}" + @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.onchange('start_time') - # def _onchange_start_time(self): - # pattern = re.compile(r'^(([0-9]|1[0-9]|2[0-3]):[0-5][0-9])|24:00$') - # if self.start_time and not pattern.match(self.start_time): - # raise models.ValidationError('输入的日开始时间不正确，请重新输入！') - - @api.onchange('end_time') - def _onchange_end_time(self): - pattern = re.compile(r'^(([0-9]|1[0-9]|2[0-3]):[0-5][0-9])|24:00$') - for record in self: - if record.end_time and not pattern.match(record.end_time): - raise models.ValidationError('输入的日结束时间不正确，请重新输入！') + @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}" + self.working_shift_char = f"自定义班次{start_time}-{end_time}" + @api.onchange('start_time', 'end_time') + def _onchange_duration(self): + """ + 根据日开始时间和日结束时间计算每日工作时长 + :return: + """ + diff --git a/sf_plan_management/security/ir.model.access.csv b/sf_plan_management/security/ir.model.access.csv index 1103d658..98cf2ae7 100644 --- a/sf_plan_management/security/ir.model.access.csv +++ b/sf_plan_management/security/ir.model.access.csv @@ -1,7 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sf_work_log_setting,sf.work.log.setting,model_sf_work_log_setting,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 -access_sf_working_procedure,sf.working.procedure,model_sf_working_procedure,base.group_user,1,1,1,1 access_sf_procedure_equipment_resource_setting,sf.procedure.equipment.resource.setting,model_sf_procedure_equipment_resource_setting,base.group_user,1,1,1,1 diff --git a/sf_plan_management/views/paln_base_view.xml b/sf_plan_management/views/paln_base_view.xml index b8b63cb3..f33057bd 100644 --- a/sf_plan_management/views/paln_base_view.xml +++ b/sf_plan_management/views/paln_base_view.xml @@ -29,23 +29,60 @@ + + + + + + - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - @@ -85,19 +122,19 @@ - - - - - - - - - + + 工序设备资源设置 + sf.procedure.equipment.resource.setting + + + + + + 工序设备资源设置 sf.procedure.equipment.resource.setting - tree,form + tree,form,search \ No newline at end of file From 5b5d41559cfcbd93e98344a8f5263124363332e7 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Fri, 7 Jul 2023 14:36:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=8E=86=E6=97=B6=E9=97=B4=E8=BE=93=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=A8=A1=E5=9E=8B=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=88=E7=A7=BB=E8=87=B3sf=5Fmaintenance=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=8B=EF=BC=89=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E4=BA=A7=E7=BA=BF=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 1 - sf_base/models/__init__.py | 1 - sf_base/security/ir.model.access.csv | 2 +- sf_base/views/menu_view.xml | 7 -- sf_maintenance/models/__init__.py | 3 +- .../models/production_line_base.py | 2 +- sf_maintenance/security/ir.model.access.csv | 2 + .../views/production_line_view.xml | 6 ++ sf_plan_management/models/base.py | 31 ++++-- sf_plan_management/models/calendar_base.py | 98 ++++++++++++------- sf_plan_management/views/menu_view.xml | 2 +- sf_plan_management/views/paln_base_view.xml | 96 ++++++++++++------ 12 files changed, 167 insertions(+), 84 deletions(-) rename {sf_base => sf_maintenance}/models/production_line_base.py (95%) rename {sf_base => sf_maintenance}/views/production_line_view.xml (92%) diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index 41de851f..d6f8a88a 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -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", diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index 12823af1..cc906ab8 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -3,7 +3,6 @@ from . import common from . import tool_base_new from . import fixture from . import functional_fixture -from . import production_line_base diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 7b3ef980..e5c4093c 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -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 + diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index 9f250a87..cd32e960 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -143,12 +143,5 @@ sequence="1" action="action_sf_machine_control_system"/> - - \ No newline at end of file diff --git a/sf_maintenance/models/__init__.py b/sf_maintenance/models/__init__.py index 1e93b68d..98f9d12c 100644 --- a/sf_maintenance/models/__init__.py +++ b/sf_maintenance/models/__init__.py @@ -2,4 +2,5 @@ from . import sf_maintenance from . import sf_maintenance_logs from . import sf_equipment_maintenance_standards -from . import sf_maintenance_requests \ No newline at end of file +from . import sf_maintenance_requests +from . import production_line_base diff --git a/sf_base/models/production_line_base.py b/sf_maintenance/models/production_line_base.py similarity index 95% rename from sf_base/models/production_line_base.py rename to sf_maintenance/models/production_line_base.py index 9dfeabe2..f9a30d36 100644 --- a/sf_base/models/production_line_base.py +++ b/sf_maintenance/models/production_line_base.py @@ -1,4 +1,4 @@ -from odoo import models,fields,api +from odoo import models,fields class ProductionLine(models.Model): diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 05ee33a2..809ed5b6 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -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 + diff --git a/sf_base/views/production_line_view.xml b/sf_maintenance/views/production_line_view.xml similarity index 92% rename from sf_base/views/production_line_view.xml rename to sf_maintenance/views/production_line_view.xml index 17de359d..0772d116 100644 --- a/sf_base/views/production_line_view.xml +++ b/sf_maintenance/views/production_line_view.xml @@ -72,4 +72,10 @@ sf.production.line kanban,tree,form + + \ No newline at end of file diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py index 57fcfb59..0bda7291 100644 --- a/sf_plan_management/models/base.py +++ b/sf_plan_management/models/base.py @@ -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) diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index ad48a7b2..0bc1ba56 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -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)) diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml index 1641947c..2bf4569d 100644 --- a/sf_plan_management/views/menu_view.xml +++ b/sf_plan_management/views/menu_view.xml @@ -20,7 +20,7 @@ /> sf.work.log.setting + @@ -26,16 +27,23 @@
- + + + + + + - - - - - - + + + + + + + + @@ -49,18 +57,13 @@ - - - - - - + - + @@ -72,10 +75,6 @@ - - - - @@ -101,39 +100,80 @@ - + - 工序设备资源设置 + 产线设备资源设置 sf.procedure.equipment.resource.setting - - - + + + + + - + - + + 产线设备资源设置 + sf.procedure.equipment.resource.setting + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 工序设备资源设置 + 产线设备资源设置 sf.procedure.equipment.resource.setting - + + + - 工序设备资源设置 + 产线设备资源设置 sf.procedure.equipment.resource.setting tree,form,search From e711ff0ab3070097dc10285adecc63606b5571e5 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Fri, 7 Jul 2023 17:36:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=AE=BE=E5=A4=87=E8=B5=84=E6=BA=90=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E9=80=89=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E8=AE=BE=E5=A4=87=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E7=8F=AD=E6=AC=A1=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/__manifest__.py | 1 + sf_plan_management/__manifest__.py | 2 +- sf_plan_management/models/base.py | 74 ++++++++++++--------- sf_plan_management/views/paln_base_view.xml | 63 ++++++++++++------ 4 files changed, 87 insertions(+), 53 deletions(-) diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py index 529c62fc..6e644ebc 100644 --- a/sf_maintenance/__manifest__.py +++ b/sf_maintenance/__manifest__.py @@ -12,6 +12,7 @@ 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', + 'views/production_line_base.py', 'views/maintenance_views.xml', 'views/maintenance_logs_views.xml', 'views/equipment_maintenance_standards_views.xml', diff --git a/sf_plan_management/__manifest__.py b/sf_plan_management/__manifest__.py index 5f82e7b4..44be0987 100644 --- a/sf_plan_management/__manifest__.py +++ b/sf_plan_management/__manifest__.py @@ -10,7 +10,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': [], + 'depends': ['sf_maintenance'], 'data': [ 'security/ir.model.access.csv', # 'security/ir.model.access.csv', diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py index 0bda7291..1a8d1e27 100644 --- a/sf_plan_management/models/base.py +++ b/sf_plan_management/models/base.py @@ -1,43 +1,55 @@ -from odoo import models, fields +from odoo import models, fields, api +from odoo.exceptions import UserError class ProcedureEquipmentResourceSetting(models.Model): _name = 'sf.procedure.equipment.resource.setting' _description = '产线设备资源设置' - 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='型号') - working_procedure = fields.Char(string='工序') - production_capacity = fields.Char(string='产能', required=True) + production_line_id = 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_name_id = fields.Many2one('maintenance.equipment', + string='设备名称', + readonly=True, + compute='_onchange_work_center_name_id') + brand = fields.Char(string='品牌', readonly=True, compute='_onchange_equipment_name_id') + model = fields.Char(string='型号', readonly=True, compute='_onchange_equipment_name_id') + # todo 传入工序数据 + 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='班次') - create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now()) - status = fields.Selection([('0', '正常'), ('1', '故障停机'), ('2', '计划停机')], string='设备状态', default='0') + working_shift = fields.Char(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='设备状态', + readonly=True, + compute='_onchange_equipment_name_id') participate_in_scheduling = fields.Boolean(string='参与排程', default=True) - - + @api.onchange('production_capacity') + def _onchange_production_capacity(self): + for record in self: + if record.production_capacity < 0: + raise UserError("输入的产能值不正确，请重新输入！") + + @api.depends('work_center_name_id') + def _onchange_work_center_name_id(self): + for record in self: + record.equipment_name_id = record.work_center_name_id.equipment_ids + + @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.status = record.equipment_name_id.state + + @api.depends('working_calendar_id') + def _onchange_working_calendar_id(self): + for record in self: + record.working_shift = record.working_calendar_id.working_shift diff --git a/sf_plan_management/views/paln_base_view.xml b/sf_plan_management/views/paln_base_view.xml index b029a6e0..645aa45d 100644 --- a/sf_plan_management/views/paln_base_view.xml +++ b/sf_plan_management/views/paln_base_view.xml @@ -106,18 +106,19 @@ sf.procedure.equipment.resource.setting - - + - + + + @@ -128,32 +129,40 @@
- + - - - - + - + - - - + - - - - + + - - - - + ` + + + + + + + + + + + + + + + + + +
@@ -165,8 +174,20 @@ sf.procedure.equipment.resource.setting + + + + + + + + + + + + - +