diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index b33dbeee..2cc1ee5d 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -543,7 +543,7 @@ class WorkCenterBarcode(models.Model):
# 如果没有附件,直接返回
if not self.cnc_ids:
- return
+ return None
# 处理第一个附件的文件名
first_attachment = self.cnc_ids[0].cnc_id
diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index d1eff04a..1bf1e599 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -23,6 +23,21 @@ class ProcedureEquipmentResourceSetting(models.Model):
create_time = fields.Datetime(string='新增时间', default=lambda self: fields.Datetime.now(), readonly=True)
participate_in_scheduling = fields.Boolean(string='参与排程', default=True)
+ # check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked')
+ check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+ def action_check(self):
+ """
+ 审核启用
+ """
+ self.check_status = True
+
+ def action_uncheck(self):
+ """
+ 审核禁用
+ """
+ self.check_status = False
+
@api.depends('work_center_name_id')
def _compute_equipment_name_id(self):
for record in self:
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index b493053d..cc1d395e 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -38,6 +38,19 @@ class WorkLogSetting(models.Model):
update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())
setting_to_calendar_ids = fields.One2many('sf.work.schedule.calendar', 'name_id', '工作日历')
+ check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+ def action_check(self):
+ """
+ 审核启用
+ """
+ self.check_status = True
+
+ def action_uncheck(self):
+ """
+ 审核禁用
+ """
+ self.check_status = False
@api.depends('working_shift_ids')
def _compute_working_shift_ids(self):
@@ -157,13 +170,13 @@ class WorkLogSetting(models.Model):
:return:
"""
weekdays = {
- '星期一': 'Monday', 'Monday': 'Monday',
- '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
+ '星期一': 'Monday', 'Monday': 'Monday',
+ '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
'星期三': 'Wednesday', 'Wednesday': 'Wednesday',
- '星期四': 'Thursday', 'Thursday': 'Thursday',
- '星期五': 'Friday', 'Friday': 'Friday',
- '星期六': 'Saturday', 'Saturday': 'Saturday',
- '星期日': 'Sunday', 'Sunday': 'Sunday',
+ '星期四': 'Thursday', 'Thursday': 'Thursday',
+ '星期五': 'Friday', 'Friday': 'Friday',
+ '星期六': 'Saturday', 'Saturday': 'Saturday',
+ '星期日': 'Sunday', 'Sunday': 'Sunday',
}
english_weekdays = []
for chinese_weekday in chinese_weekdays:
@@ -179,13 +192,13 @@ class WorkLogSetting(models.Model):
:return:
"""
weekdays = {
- '星期一': 'Monday', 'Monday': 'Monday',
- '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
+ '星期一': 'Monday', 'Monday': 'Monday',
+ '星期二': 'Tuesday', 'Tuesday': 'Tuesday',
'星期三': 'Wednesday', 'Wednesday': 'Wednesday',
- '星期四': 'Thursday', 'Thursday': 'Thursday',
- '星期五': 'Friday', 'Friday': 'Friday',
- '星期六': 'Saturday', 'Saturday': 'Saturday',
- '星期日': 'Sunday', 'Sunday': 'Sunday',
+ '星期四': 'Thursday', 'Thursday': 'Thursday',
+ '星期五': 'Friday', 'Friday': 'Friday',
+ '星期六': 'Saturday', 'Saturday': 'Saturday',
+ '星期日': 'Sunday', 'Sunday': 'Sunday',
}
weekday = weekdays.get(chinese_weekday)
if weekday:
@@ -233,6 +246,19 @@ class WorkingShift(models.Model):
start_time = fields.Datetime('班次开始时间')
end_time = fields.Datetime('班次结束时间')
remark = fields.Char('备注')
+ check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+ def action_check(self):
+ """
+ 审核启用
+ """
+ self.check_status = True
+
+ def action_uncheck(self):
+ """
+ 审核禁用
+ """
+ self.check_status = False
class DayOff(models.Model):
@@ -247,6 +273,19 @@ class DayOff(models.Model):
('Friday ', '星期五'),
('Saturday ', '星期六'),
('Sunday ', '星期日')], '休息日名称')
+ check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
+
+ def action_check(self):
+ """
+ 审核启用
+ """
+ self.check_status = True
+
+ def action_uncheck(self):
+ """
+ 审核禁用
+ """
+ self.check_status = False
class WorkScheduleCalendar(models.Model):
diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml
index 06464b98..f9606303 100644
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -16,6 +16,10 @@
+
+
+
+