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 @@
                                         <tree editable="bottom">
                                             <field name="cutting_speed"
                                                    attrs="{'readonly': [('materials_type_id','!=',False)]}"/>
-                                            <field name="materials_type_id"
+                                            <field name="machining_method" placeholder="请选择"
+                                                   attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
+                                            <field name="materials_type_id" placeholder="请选择"
                                                    attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
                                             <field name="blade_diameter"/>
                                             <field name="feed_per_tooth"/>
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 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="cutting_speed" attrs="{'readonly': [('materials_type_id','!=',False)]}"/>
+                <field name="machining_method" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
                 <field name="materials_type_id" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
                 <field name="blade_diameter"/>
                 <field name="feed_per_tooth"/>
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 @@
             <field name="name">功能刀具组装</field>
             <field name="model">sf.functional.tool.assembly</field>
             <field name="arch" type="xml">
-                <tree>
+                <tree create="0">
                     <field name="functional_tool_code"/>
                     <field name="name"/>
                     <field name="functional_tool_type_id"/>
@@ -1133,7 +1133,7 @@
             <field name="name">功能刀具组装</field>
             <field name="model">sf.functional.tool.assembly</field>
             <field name="arch" type="xml">
-                <form>
+                <form create="0">
                     <header>
                        <button string="组装"
                                name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"