From cf7e6ea33dd2e0fb65497f4c37e245b4956761de Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Mon, 11 Sep 2023 17:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=BB=84=E8=A3=85=E7=9A=84=E5=88=9B=E5=BB=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=9B=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=AF=8F=E9=BD=BF=E8=B5=B0=E5=88=80=E9=87=8F=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=B7=A5=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=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=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_dlm/views/product_template_view.xml | 4 ++- .../models/tool_other_features.py | 3 +- .../views/tool_other_features_view.xml | 1 + sf_plan_management/models/calendar_base.py | 30 ++++++++++--------- sf_tool_management/views/tool_base_views.xml | 4 +-- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index f36e1816..19327a82 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -382,7 +382,9 @@ - + diff --git a/sf_manufacturing/models/tool_other_features.py b/sf_manufacturing/models/tool_other_features.py index 198faa09..7e8f04b7 100644 --- a/sf_manufacturing/models/tool_other_features.py +++ b/sf_manufacturing/models/tool_other_features.py @@ -82,6 +82,7 @@ class FeedPerTooth(models.Model): product_template_id = fields.Many2one('product.template', string='产品') cutting_speed = fields.Char('径向切宽 ae(mm)') + machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式') materials_type_id = fields.Many2one('sf.materials.model', string='材料型号') blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True, compute='_compute_product_template_id') feed_per_tooth = fields.Char('每齿走刀量 (mm/z)') @@ -90,4 +91,4 @@ class FeedPerTooth(models.Model): @api.depends('product_template_id') def _compute_product_template_id(self): if self.product_template_id is not None: - self.blade_diameter = self.product_template_id.integral_blade_diameter + self.blade_diameter = self.product_template_id.cutting_tool_blade_diameter diff --git a/sf_manufacturing/views/tool_other_features_view.xml b/sf_manufacturing/views/tool_other_features_view.xml index 897ff785..3af6d0e8 100644 --- a/sf_manufacturing/views/tool_other_features_view.xml +++ b/sf_manufacturing/views/tool_other_features_view.xml @@ -140,6 +140,7 @@ + diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index 6ac7772c..95fb6342 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -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: diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 35338eac..7192c8f0 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -1080,7 +1080,7 @@ 功能刀具组装 sf.functional.tool.assembly - + @@ -1133,7 +1133,7 @@ 功能刀具组装 sf.functional.tool.assembly -
+