diff --git a/sf_message/models/sf_message_template.py b/sf_message/models/sf_message_template.py
index 5f695a52..ea6e4222 100644
--- a/sf_message/models/sf_message_template.py
+++ b/sf_message/models/sf_message_template.py
@@ -8,30 +8,6 @@ class SfMessageTemplate(models.Model):
_description = u'消息模板'
name = fields.Char(string=u"名称", required=True)
- # type = fields.Selection([
- # ('待接单', '待接单'),
- # ('待排程', '待排程'),
- # ('坯料采购', '坯料采购'),
- # ('坯料发料', '坯料发料'),
- # ('待编程', '待编程'),
- # ('调拨入库', '调拨入库'),
- # ('功能刀具组装', '功能刀具组装'),
- # ('功能刀具寿命到期', '功能刀具寿命到期'),
- # ('程序用刀计划异常', '程序用刀计划异常'),
- # ('工单无CNC程序', '工单无CNC程序'),
- # ('生产线无功能刀具', '生产线无功能刀具'),
- # ('工单无定位数据', '工单无定位数据'),
- # ('工单FTP无文件', '工单FTP无文件'),
- # ('工单加工失败', '工单加工失败'),
- # ('设备故障及异常', '设备故障及异常'),
- # ('工单逾期预警', '工单逾期预警'),
- # ('工单已逾期', '工单已逾期'),
- # ('销售订单逾期', '销售订单逾期'),
- # ('销售订单已逾期', '销售订单已逾期'),
- # ('待质量判定', '待质量判定'),
- # ('生产完工待入库', '生产完工待入库'),
- # ('订单发货', '订单发货')
- # ], string='类型', required=True)
description = fields.Char(string=u"描述")
content = fields.Html(string=u"内容", render_engine='qweb', translate=True, prefetch=True, sanitize=False)
msgtype = fields.Selection(
@@ -41,6 +17,9 @@ class SfMessageTemplate(models.Model):
notification_employee_ids = fields.Many2many('hr.employee', string=u'员工',
domain="[('department_id', '=',notification_department_id)]",
required=True)
+ is_send_time = fields.Boolean(string=u"定时发送", default=False)
+ send_time_1 = fields.Integer('发送时间点1')
+ send_time_2 = fields.Integer('发送时间点2')
active = fields.Boolean(string=u"是否有效", default=True)
@api.onchange('notification_department_id')
diff --git a/sf_message/views/sf_message_template_view.xml b/sf_message/views/sf_message_template_view.xml
index 9680507a..ff1bb74e 100644
--- a/sf_message/views/sf_message_template_view.xml
+++ b/sf_message/views/sf_message_template_view.xml
@@ -18,11 +18,14 @@
-
+
+
+
+
@@ -37,9 +40,12 @@
-
+
+
+
+