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

隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。

Browse Source
This commit is contained in:
yuxianghui
2023-09-11 17:21:32 +08:00
parent 49d41539b0
commit cf7e6ea33d
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sf_plan_management/models/calendar_base.py
View File

@@ -135,8 +135,10 @@ class WorkLogSetting(models.Model):
# 获取本年第一天和最后一天
start_date = datetime.now().replace(month=1, day=1).date()
end_date = datetime.now().replace(month=12, day=31).date()
print(self.day_off_ids.mapped('name'))
# 休息日列表
rest_days = self.chinese_weekdays_to_english(self.day_off_ids.mapped('name'))
print(rest_days)
for single_date in self.daterange(start_date, end_date):
is_workday = self.chinese_weekday_to_english(single_date.strftime("%A"))
logging.info(f"每天的星期：{is_workday}")
@@ -155,13 +157,13 @@ class WorkLogSetting(models.Model):
:return:
"""
weekdays = {
'星期一': 'Monday',
'星期二': 'Tuesday',
'星期三': 'Wednesday',
'星期四': 'Thursday',
'星期五': 'Friday',
'星期六': 'Saturday',
'星期日': 'Sunday'
'星期一': 'Monday', 'Monday': 'Monday',
'星期二': 'Tuesday', 'Tuesday': 'Tuesday',
'星期三': 'Wednesday', 'Wednesday': 'Wednesday',
'星期四': 'Thursday', 'Thursday': 'Thursday',
'星期五': 'Friday', 'Friday': 'Friday',
'星期六': 'Saturday', 'Saturday': 'Saturday',
'星期日': 'Sunday', 'Sunday': 'Sunday',
}
english_weekdays = []
for chinese_weekday in chinese_weekdays:
@@ -177,13 +179,13 @@ class WorkLogSetting(models.Model):
:return:
"""
weekdays = {
'星期一': 'Monday',
'星期二': 'Tuesday',
'星期三': 'Wednesday',
'星期四': 'Thursday',
'星期五': 'Friday',
'星期六': 'Saturday',
'星期日': 'Sunday'
'星期一': 'Monday', 'Monday': 'Monday',
'星期二': 'Tuesday', 'Tuesday': 'Tuesday',
'星期三': 'Wednesday', 'Wednesday': 'Wednesday',
'星期四': 'Thursday', 'Thursday': 'Thursday',
'星期五': 'Friday', 'Friday': 'Friday',
'星期六': 'Saturday', 'Saturday': 'Saturday',
'星期日': 'Sunday', 'Sunday': 'Sunday',
}
weekday = weekdays.get(chinese_weekday)
if weekday: