diff --git a/sf_plan_management/models/__init__.py b/sf_plan_management/models/__init__.py
index cf50d1cc..9a2c9000 100644
--- a/sf_plan_management/models/__init__.py
+++ b/sf_plan_management/models/__init__.py
@@ -1 +1,2 @@
+from . import calendar_base
from . import base
\ No newline at end of file
diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index 242a67bc..76b1c0fc 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -1,59 +1,43 @@
-from odoo import models, fields, api
-import re
+from odoo import models, fields
-class WorkLogSetting(models.Model):
- _name = 'sf.work.log.setting'
- _description = '工作日历设置'
+class ProductionLine(models.Model):
+ _name = 'sf.production.line'
+ _description = '生产线'
- input1 = fields.Char(string='Input 1')
- input2 = fields.Char(string='Input 2')
+ name = fields.Char(string='生产线名称')
- name = fields.Char(string='工作日历名称')
- # start_time = fields.Char(string='日开始时间')
- start_time = fields.Datetime(string='日开始时间')
- end_time = fields.Char(string='日结束时间')
- duration = fields.Char(string='时长')
- day_off = fields.Char(string='休息日')
- user_defined_working_shift_status = fields.Boolean(string='自定义班次', default=False)
+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='品牌')
+ model = fields.Char(string='型号')
+ production_capacity = fields.Char(string='产能')
+ working_calendar = fields.Many2one('sf.work.log.setting', string='工作日历')
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='班次')
-
- 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('working_shift_char')
- # def _onchange_working_shift_char(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('working_shift_char', 'working_shift_select')
- def _onchange_working_shift(self):
- 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('输入的日结束时间不正确，请重新输入！')
+ 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
new file mode 100644
index 00000000..dc22b92f
--- /dev/null
+++ b/sf_plan_management/models/calendar_base.py
@@ -0,0 +1,50 @@
+from odoo import models, fields, api
+import re
+
+
+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='日结束时间')
+ 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='班次')
+
+ 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('working_shift_char', 'working_shift_select')
+ def _onchange_working_shift(self):
+ 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('输入的日结束时间不正确，请重新输入！')
+
+
diff --git a/sf_plan_management/security/ir.model.access.csv b/sf_plan_management/security/ir.model.access.csv
index d2e97991..1103d658 100644
--- a/sf_plan_management/security/ir.model.access.csv
+++ b/sf_plan_management/security/ir.model.access.csv
@@ -1,5 +1,8 @@
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/menu_view.xml b/sf_plan_management/views/menu_view.xml
index 3c1345f3..1641947c 100644
--- a/sf_plan_management/views/menu_view.xml
+++ b/sf_plan_management/views/menu_view.xml
@@ -18,4 +18,11 @@
action="sf_work_log_setting_act"
sequence="0"
/>
+
+
\ No newline at end of file
diff --git a/sf_plan_management/views/paln_base_view.xml b/sf_plan_management/views/paln_base_view.xml
index 0d8ea30b..b8b63cb3 100644
--- a/sf_plan_management/views/paln_base_view.xml
+++ b/sf_plan_management/views/paln_base_view.xml
@@ -25,19 +25,23 @@