diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index bcb25c81..5f4c6906 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -18,6 +18,7 @@
         'views/common_view.xml',
         'views/fixture_view.xml',
         'views/functional_fixture_view.xml',
+        'views/tool_other_features_view.xml',
         'views/menu_view.xml',
         "views/tool_views.xml",
         "views/tool_menu.xml",
diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py
index 483787eb..93961162 100644
--- a/sf_base/models/__init__.py
+++ b/sf_base/models/__init__.py
@@ -3,6 +3,7 @@ from . import common
 from . import tool_base_new
 from . import fixture
 from . import functional_fixture
+from . import tool_other_features
 
 
 
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
new file mode 100644
index 00000000..52acf25c
--- /dev/null
+++ b/sf_base/models/tool_other_features.py
@@ -0,0 +1,41 @@
+from odoo import fields, models
+
+
+class SuitableMachiningMethod(models.Model):
+    _name = 'sf.suitable.machining.method'
+    _description = '适合加工方式'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class BladeTipCharacteristics(models.Model):
+    _name = 'sf.blade.tip.characteristics'
+    _description = '刀尖特征'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class HandleType(models.Model):
+    _name = 'sf.handle.type'
+    _description = '柄部类型'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class CuttingDirection(models.Model):
+    _name = 'sf.cutting.direction'
+    _description = '走刀方向'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
+
+
+class SuitableCoolant(models.Model):
+    _name = 'sf.suitable.coolant'
+    _description = '适合冷却液'
+
+    name = fields.Char('名称')
+    image = fields.Image('图片')
\ No newline at end of file
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index 2cb14006..ba3fb3d0 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -24,6 +24,11 @@ access_sf_fixture_model,sf_fixture_model,model_sf_fixture_model,base.group_user,
 access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional_fixture_type,base.group_user,1,1,1,1
 access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,base.group_user,1,1,1,1
 access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,1
+access_sf_suitable_machining_method,sf_suitable_machining_method,model_sf_suitable_machining_method,base.group_user,1,1,1,1
+access_sf_blade_tip_characteristics,sf_blade_tip_characteristics,model_sf_blade_tip_characteristics,base.group_user,1,1,1,1
+access_sf_handle_type,sf_handle_type,model_sf_handle_type,base.group_user,1,1,1,1
+access_sf_cutting_direction,sf_cutting_direction,model_sf_cutting_direction,base.group_user,1,1,1,1
+access_sf_suitable_coolant,sf_suitable_coolant,model_sf_suitable_coolant,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 5c3fd3ad..8c8e1632 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -159,11 +159,11 @@
                                     <field name="feed_speed" required="1"/>
                                     <label for="precision_min" string="X轴定位精度(mm)"/>
                                     <div class="test_model">
-                                        <label for="precision_min" string="最小(min)"/>
+                                        <label for="precision_min" string="最小"/>
                                         <field name="precision_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                         <span>&amp;nbsp;</span>
-                                        <label for="precision_max" string="最大(max)"/>
+                                        <label for="precision_max" string="最大"/>
                                         <field name="precision_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
@@ -210,27 +210,28 @@
                                     <field name="motor_power" required="1"/>
                                     <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
                                     <div class="test_model">
-                                        <label for="distance_min" string="最小(min)"/>
+                                        <label for="distance_min" string="最小"/>
                                         <field name="distance_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                         <span>&amp;nbsp;</span>
-                                        <label for="distance_max" string="最大(max)"/>
+                                        <label for="distance_max" string="最大"/>
                                         <field name="distance_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
                                     <field name="guide_rail" required="1"/>
                                 </group>
+                                <group></group>
                                 <group string="刀具">
                                     <field name="knife_type" required="1"/>
                                     <field name="tool_speed" required="1"/>
                                     <field name="tool_long_max" required="1"/>
                                     <label for="tool_diameter_min" string="刀具刀径(mm)"/>
                                     <div class="test_model">
-                                        <label for="tool_diameter_min" string="最小(min)"/>
+                                        <label for="tool_diameter_min" string="最小"/>
                                         <field name="tool_diameter_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>Φ
                                         <span>&amp;nbsp;</span>
-                                        <label for="tool_diameter_max" string="最大(max)"/>
+                                        <label for="tool_diameter_max" string="最大"/>
                                         <field name="tool_diameter_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>Φ
                                     </div>
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index aab5cf1f..f0ff3a07 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -350,7 +350,7 @@
             <field name="name">加工工艺</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.processing.technology</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree</field>
         </record>
 
         <record id="sf_production_process_category" model="ir.actions.act_window">
diff --git a/sf_base/views/tool_other_features_view.xml b/sf_base/views/tool_other_features_view.xml
new file mode 100644
index 00000000..e094a376
--- /dev/null
+++ b/sf_base/views/tool_other_features_view.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <!--  ======================================== 适合加工方式========================================-->
+    <record model="ir.ui.view" id="sf_suitable_machining_method_tree">
+        <field name="name">适合加工方式</field>
+        <field name="model">sf.suitable.machining.method</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="image" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_suitable_machining_method_act" model="ir.actions.act_window">
+        <field name="name">适合加工方式</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.suitable.machining.method</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <!--  ======================================== 刀尖特征========================================-->
+    <record model="ir.ui.view" id="sf_blade_tip_characteristics_tree">
+        <field name="name">刀尖特征</field>
+        <field name="model">sf.blade.tip.characteristics</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="image" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_blade_tip_characteristics_act" model="ir.actions.act_window">
+        <field name="name">刀尖特征</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.blade.tip.characteristics</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <!--  ======================================== 柄部类型========================================-->
+    <record model="ir.ui.view" id="sf_handle_type_tree">
+        <field name="name">柄部类型</field>
+        <field name="model">sf.handle.type</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="image" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_handle_type_act" model="ir.actions.act_window">
+        <field name="name">柄部类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.handle.type</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <!--  ======================================== 走刀方向========================================-->
+    <record model="ir.ui.view" id="sf_cutting_direction_tree">
+        <field name="name">走刀方向</field>
+        <field name="model">sf.cutting.direction</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="image" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_cutting_direction_act" model="ir.actions.act_window">
+        <field name="name">走刀方向</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.cutting.direction</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <!--  ======================================== 适合冷却液========================================-->
+    <record model="ir.ui.view" id="sf_suitable_coolant_tree">
+        <field name="name">适合冷却液</field>
+        <field name="model">sf.suitable.coolant</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="image" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_suitable_coolant_act" model="ir.actions.act_window">
+        <field name="name">适合冷却液</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.suitable.coolant</field>
+        <field name="view_mode">tree</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 10eef5d6..bfe1e4d5 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -83,18 +83,77 @@
                 </xpath>
                 <xpath expr="//page[last()-1]" position="after">
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                        <!--整体式刀具-->
+                        <group attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <group>
+                                <field name="brand_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="materials_type_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_type_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="integral_code" invisible="True"/>
+                                <field name="integral_total_length" string="总长度(mm)"/>
+                                <field name="integral_shank_length" string="柄部长度(mm)"/>
+                                <field name="integral_blade_length" string="刃部长度(mm)"/>
+                                <field name="integral_neck_length" string="颈部长度(mm)"/>
+                                <field name="integral_blade_tip_taper" string="刀尖锥度(°)"/>
+                                <field name="integral_blade_helix_angle" string="刃部螺旋角(°)"/>
+                                <field name="integral_blade_type" string="刃部类型"/>
+                            </group>
+                            <group>
+                                <field name="integral_blade_number" string="刃数(个)"/>
+                                <field name="integral_shank_diameter" string="柄部直径(mm)"/>
+                                <field name="integral_blade_diameter" string="刃部直径(mm)"/>
+                                <field name="integral_neck_diameter" string="颈部直径(mm)"/>
+                                <field name="integral_blade_tip_diameter" string="刀尖直径(mm)"/>
+                                <field name="integral_hardness" string="刀具硬度(HRC)"/>
+                                <field name="integral_coarse_medium_fine" string="粗/中/精" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                <field name="integral_coating_material" string="涂层材质"/>
+                                <field name="integral_blade_material" string="刀具材质" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                <label for="integral_run_out_accuracy_min" string="端跳精度:"/>
+                                    <div class="test_model">
+                                        <label for="integral_run_out_accuracy_min" string="最小(min)"/>
+                                        <field name="integral_run_out_accuracy_min" class="o_address_zip" required="1"
+                                               options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                        <span>(mm)&amp;nbsp;</span>
+                                        <label for="integral_run_out_accuracy_max" string="最大(max)"/>
+                                        <field name="integral_run_out_accuracy_max" class="o_address_zip" required="1"
+                                               options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                        <span>(mm)&amp;nbsp;</span>
+                                    </div>
+                            </group>
+                        </group>
+                        <group string="适合加工方式(多选)" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <field name="suitable_machining_method_ids" string=""/>
+                        </group>
+                        <group string="刀尖特征(单选)" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <field name="blade_tip_characteristics_ids" string=""/>
+                        </group>
+                        <group string="柄部类型(单选)" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <field name="handle_type_ids" string=""/>
+                        </group>
+                        <group string="走刀方向(多选)" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <field name="cutting_direction_ids" string=""/>
+                        </group>
+                        <group string="适合冷却液(多选)" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                            <field name="suitable_coolant_ids" string=""/>
+                        </group>
+
                         <group>
-                            <!--整体式刀具-->
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
-                                <field name="brand_id" options="{'no_create': True}"/>
-                                <field name="materials_type_id" options="{'no_create': True}"/>
-                                <field name="cutting_tool_type_id" options="{'no_create': True}"/>
+                                <field name="brand_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '=', '整体式刀具')]}"/>
+                                <field name="materials_type_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_type_id" options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_total_length"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄'))]}"/>
-                                <field name="cutting_tool_shank_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀柄'))]}"/>
+<!--                                <field name="cutting_tool_shank_length"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>-->
+<!--                                <field name="cutting_tool_blade_length"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>-->
                                 <!--刀片-->
                                 <label for="tool_length" string="尺寸(mm)"
                                        attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'/>
@@ -111,11 +170,11 @@
                                            options="{'format': false}"/>
                                 </div>
                                 <field name="cutting_tool_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_blade_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_blade_number"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_diameter_max"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_flange_length"
@@ -143,7 +202,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_chuck_ids" widget="many2many_tags"
                                        options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄','整体式刀具'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>
                                 <field name="cutting_tool_handle_ids" widget="many2many_tags"
                                        options="{'no_create': True}"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头'))]}"/>
@@ -152,24 +211,24 @@
                                 <field name="cutting_tool_jump_accuracy"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_front_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_top_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="coating_material"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_accuracy_level"
-                                       attrs="{'invisible': [('cutting_tool_type', '=', '刀柄')]}"/>
-                                <field name="cutting_tool_working_hardness"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄', '整体式刀具'))]}"/>
+                                <field name="cutting_tool_working_hardness" attrs="{'invisible': [('cutting_tool_type', '=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_wrench"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄','刀杆','刀盘' ))]}"/>
                                 <field name="cutting_tool_screw"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
                                 <field name="cutting_tool_nut"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                             </group>
                         </group>
                     </page>
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 67c1f14c..b6d774a3 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -339,7 +339,7 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    #work.fetchCNC()
+                    # work.fetchCNC()
 
     # 创建工单并进行排序
     def _create_workorder(self):
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 8b95c5af..68e45759 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -7,7 +7,7 @@ from odoo.exceptions import ValidationError, UserError
 import requests
 import json
 from re import findall as regex_findall
-from datetime import datetime
+from datetime import datetime, timedelta
 from re import split as regex_split
 from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
@@ -154,6 +154,7 @@ class StockRule(models.Model):
             '''创建制造订单'''
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
+
             self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
             self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
             '''
@@ -188,6 +189,30 @@ class StockRule(models.Model):
                         'mail.message_origin_link',
                         values={'self': production, 'origin': origin_production},
                         subtype_id=self.env.ref('mail.mt_note').id)
+                '''
+                创建生产计划
+                '''
+                # 工单耗时
+                workorder_duration = 0
+                for workorder in production.workorder_ids:
+                    workorder_duration += workorder.duration_expected
+
+
+                sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+                if sale_order:
+                    bb = sale_order.deadline_of_delivery
+                productions = self.env['sf.production.plan'].with_user(SUPERUSER_ID).sudo().with_company(company_id).\
+                    create({
+                        'name': production.name,
+                        'production_id': production.id,
+                        'date_planned_start': production.date_planned_start,
+                        'origin': production.origin,
+                        'product_qty': production.product_qty,
+                        'product_id': production.product_id.id,
+                        'state': 'draft',
+                    })
+
+
         return True
 
 
@@ -472,3 +497,22 @@ class ReStockMove(models.Model):
                 item.product_id.write({'register_state': '注册失败'})
         except Exception as e:
             raise UserError("注册刀具到云端失败，请联系管理员！")
+
+
+class ReStockQuant(models.Model):
+    _inherit = 'stock.quant'
+
+    def action_apply_inventory(self):
+        inventory_diff_quantity = self.inventory_diff_quantity
+        super(ReStockQuant, self).action_apply_inventory()
+        if inventory_diff_quantity >= 1:
+            stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
+                                                   ('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
+                                                  limit=1, order='id desc')
+            if self.product_id.categ_type == '夹具':
+                stock._register_fixture()
+            elif self.product_id.categ_type == '刀具':
+                stock._register_cutting_tool()
+        return True
+    
+
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 716cdb76..b326f288 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -20,8 +20,10 @@
                 <xpath expr="//field[@name='product_qty']" position="after">
                     <field name="product_uom_id" string="计量单位" options="{'no_open':True,'no_create':True}" groups="uom.group_uom" optional="show"/>
                 </xpath>
-                <xpath expr="//field[@name='date_planned_start']" position="after">
-                    <field name="date_deadline" widget="remaining_days" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])]}" optional="show"/>
+                <xpath expr="//field[@name='date_planned_start']" position="replace">
+                    <field name="date_planned_start" optional="show"/>
+                    <field name="date_planned_finished" string="计划结束时间"/>
+<!--                     <field name="date_deadline" widget="remaining_days" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])]}" optional="show"/> -->
                 </xpath>
                 <xpath expr="//field[@name='production_real_duration']" position="after">
                     <field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'" decoration-success="reservation_state == 'assigned'"/>
@@ -40,7 +42,64 @@
                         decoration-warning="reservation_state != 'assigned' and components_availability_state in ('expected', 'available')"
                         decoration-danger="reservation_state != 'assigned' and components_availability_state == 'late'"/>
                 </xpath>
+<!--                 <xpath expr="//field[@name='state']" position="after"> -->
+<!--                     <button name="action_view_production_schedule" string="生产排程" type="object" attrs="{'invisible': [('state', 'in', ['draft', 'cancel','已排程','progress','done','to_close'])]}"/> -->
+<!--                     <button name="cancel_plan" string="取消排程" type="object" attrs="{'invisible': [('state', 'in', ['draft', 'cancel','progress','done','to_close','confirmed'])]}"/> -->
+<!--                 </xpath> -->
             </field>
         </record>
+
+<!--         <record id="custom_mrp_production_form_view" model="ir.ui.view"> -->
+<!--             <field name="name">custom.mrp.production.form</field> -->
+<!--             <field name="model">mrp.production</field> -->
+<!--             <field name="inherit_id" ref="mrp.mrp_production_form_view"/> -->
+<!--             <field name="arch" type="xml"> -->
+<!--                 <xpath expr="//header//field[@name='state']" position="replace"> -->
+<!--                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,已排程,progress,done"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//header" position="inside"> -->
+<!--                     <button name="action_view_production_schedule" string="生产排程" type="object" attrs="{'invisible': [('state', 'in', ['draft', 'cancel','已排程','progress','done','to_close'])]}"/> -->
+<!--                     <button name="cancel_plan" string="取消排程" type="object" attrs="{'invisible': [('state', 'in', ['draft', 'cancel','progress','done','to_close','confirmed'])]}"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//sheet//group//group//field[@name='product_id']" position="after"> -->
+<!--                     <field name="production_line_id"/> -->
+<!--                     <field name="date_planned_finished" string="计划结束时间"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//sheet//group//group//field[@name='date_planned_start']" position="after"> -->
+<!--                     <field name="date_planned_finished"/> -->
+<!--                 </xpath> -->
+<!--             </field> -->
+<!--         </record> -->
+
+        <record id="custom_view_mrp_production_filter" model="ir.ui.view">
+            <field name="name">custom.mrp.production.select</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="mrp.view_mrp_production_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//search" position="inside">
+                    <searchpanel class="account_root">
+                        <field name="state" icon="fa-filter"/>
+                    </searchpanel>
+                </xpath>
+                <filter name='todo' position="replace"/>
+            </field>
+        </record>
+
+<!--                 <xpath expr="//filter[@name='filter_draft']" position="after"> -->
+<!--                     <filter string="已完成" name="filter_done" domain="[('state', '=', 'done')]"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//filter[@name='filter_draft']" position="after"> -->
+<!--                     <filter string="已取消" name="filter_cancel" domain="[('state', '=', 'cancel')]"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//filter[@name='filter_draft']" position="after"> -->
+<!--                     <filter string="进行中" name="filter_progress" domain="[('state', '=', 'progress')]"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//filter[@name='filter_draft']" position="after"> -->
+<!--                     <filter string="已确认" name="filter_confirmed" domain="[('state', '=', 'confirmed')]"/> -->
+<!--                 </xpath> -->
+<!--                 <xpath expr="//filter[@name='filter_draft']" position="after"> -->
+<!--                     <filter string="草稿" name="filter_draft" domain="[('state', '=', 'draft')]"/> -->
+<!--                 </xpath> -->
+
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_plan/__init__.py b/sf_plan/__init__.py
index 8134f974..23795ba3 100644
--- a/sf_plan/__init__.py
+++ b/sf_plan/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import models
+from . import controllers
diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py
index 80a9d5fb..ba43169d 100644
--- a/sf_plan/__manifest__.py
+++ b/sf_plan/__manifest__.py
@@ -13,7 +13,7 @@
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
     # 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string，故需要sf_manufacturing先安装
-    'depends': ['mrp', 'mrp_workorder'],
+    'depends': ['mrp', 'mrp_workorder', 'sf_manufacturing'],
     'data': [
         'security/ir.model.access.csv',
         'views/view.xml'
@@ -24,7 +24,8 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
-            'sf_plan/static/src/scss/gannt_change.scss'
+            'sf_plan/static/src/scss/gannt_change.scss',
+            'sf_plan/static/src/css/button_color.css'
         ],
 
     },
diff --git a/sf_plan/controllers/__init__.py b/sf_plan/controllers/__init__.py
new file mode 100644
index 00000000..6d07f482
--- /dev/null
+++ b/sf_plan/controllers/__init__.py
@@ -0,0 +1,2 @@
+from .import controllers
+
diff --git a/sf_plan/controllers/controllers.py b/sf_plan/controllers/controllers.py
new file mode 100644
index 00000000..c600d76a
--- /dev/null
+++ b/sf_plan/controllers/controllers.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+import json
+import logging
+from odoo import http
+from odoo.http import request
+
+
+class ProductionPlan(http.Controller):
+
+    @http.route('/api/production/plan', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def schedule_orders(self, **kw):
+        """
+        排程订单
+        """
+        logging.info('schedule_orders', kw)
+
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index b5dad842..b07614d3 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -1,25 +1,89 @@
 # -*- coding: utf-8 -*-
+import base64
+
 from odoo import models, fields, api, _
 from datetime import datetime, timedelta
+from odoo.exceptions import UserError, ValidationError
+
+import json, requests, logging
 
 
-# sf坯料预制排程
-class sf_pl_plan(models.Model):
-    _name = 'sf.pl.plan'
-    _description = 'sf_pl_plan'
+# sf排程
+class sf_production_plan(models.Model):
+    _name = 'sf.production.plan'
+    # _inherit = 'mrp.production'
+    _description = 'sf_production_plan'
+
+    name = fields.Char(string='名称')
+    production_id = fields.Many2one('mrp.production', '关联制造订单')
+    product_qty = fields.Float(string='数量', digits='Product Unit of Measure', required=True, default=0.0)
+    date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False,
+                                         default=fields.Datetime.now)
+    date_planned_finished = fields.Datetime(string='计划结束时间')
+    state = fields.Selection([
+        ('draft', '未排程'), ('done', '已排程')], string='状态', copy=False, index=True, readonly=True,
+        store=True, tracking=True)
+    product_id = fields.Many2one('product.product', '关联产品')
+    origin = fields.Char(string='来源')
 
-    name = fields.Char(string='名称', size=64)
     # 序号、坯料编号、坯料名称、材质、数量、长度、宽度、厚度、直径、计划开始时间、计划结束时间、状态（已产出与待产出）、操作、创建人、创建时间、客户名称、订单号、行号、长度、宽度、厚度、直径、交货数量、交货日期
     # sequence = fields.Integer(string='序号', required=True, copy=False, readonly=True, index=True,
     #                           default=lambda self: self.env['ir.sequence'].sudo().next_by_code('sf.pl.plan'))
-    sequence = fields.Integer(string='序号', required=True, copy=False, readonly=True, index=True)
-    current_operation_name = fields.Char(string='当前工序名称', size=64, default='坯料预制')
+    sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True)
+    current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划')
+    production_line_id = fields.Many2one('sf.production.line', string='生产线')
+
+    # state = fields.Selection([
+    #     ('未排程', '未排程'), ('已排程', '已排程')], string='State', copy=False, index=True, readonly=True,
+    #     store=True, tracking=True)
+
+    # orderpoint_id = fields.Many2one('stock.warehouse.orderpoint', compute='_compute_orderpoint_id')
+    # location_src_id = fields.Many2one('stock.location', 'Components Location', compute='_compute_orderpoint_id', active=False)
+    # location_dest_id = fields.Many2one('stock.location', 'Finished Products Location', compute='_compute_orderpoint_id')
+    # picking_type_id = fields.Many2one('stock.picking.type', 'Operation Type', compute='_compute_orderpoint_id')
+    # move_dest_ids = fields.One2many('stock.move', 'created_production_id', compute='_compute_orderpoint_id')
 
     @api.model
-    def create(self, vals):
-        if 'sequence' not in vals:
-            vals['sequence'] = self.env['sf.pl.plan'].search_count([]) + 1
-        return super().create(vals)
+    def _compute_orderpoint_id(self):
+        pass
+
+    def test_sale_order(self):
+        company_id = self.env.ref('base.main_company').sudo()
+        date = datetime.today()
+        aaa = self.env['sale.order'].with_user(self.env.ref("base.user_admin")).sale_order_create(
+            company_id, 'delivery_name', 'delivery_telephone', 'delivery_address',
+            date)
+        print('aaa', aaa)
+
+    # 当不设置计划结束时间时，增加计算计划结束时间的方法，根据采购周期加缓冲期两个值来算就可以了
+    def action_view_production_schedule(self):
+        self.ensure_one()
+        if self.date_planned_start and self.date_planned_finished:
+            return None
+        elif self.date_planned_start and not self.date_planned_finished:
+            # 如果没有给出计划结束时间，则计划结束时间为计划开始时间+采购周期+缓冲期
+            # 采购周期
+            purchase_cycle = 3
+            # 缓冲期
+            buffer_period = 1
+            # 计划结束时间 = 计划开始时间 + 采购周期 + 缓冲期
+            self.date_planned_finished = self.date_planned_start + timedelta(days=purchase_cycle) + timedelta(
+                days=buffer_period)
+            self.state = '已排程'
+            return self.date_planned_finished
+        else:
+            return None
+
+    def cancel_plan(self):
+        self.ensure_one()
+        self.date_planned_finished = None
+        self.state = 'draft'
+
+    # @api.model
+    # def create(self, vals):
+    #     if 'sequence' not in vals:
+    #         vals['sequence'] = self.env['sf.production.plan'].search_count([]) + 1
+    #     return super().create(vals)
 
     def unlink(self):
         sequence_to_reorder = self.mapped('sequence')
@@ -31,7 +95,7 @@ class sf_pl_plan(models.Model):
 
     # 生成编码
     def _get_pl_no(self):
-        sf_pl_no = self.env['sf.pl.plan'].sudo().search(
+        sf_pl_no = self.env['sf.production.plan'].sudo().search(
             [('pl_no', '!=', '')],
             limit=1,
             order="id desc")
@@ -55,81 +119,150 @@ class sf_pl_plan(models.Model):
 
         return num
 
-    pl_no = fields.Char(string='坯料编号', required=True, default=_get_pl_no, readonly=True)
-    pl_name = fields.Char(string='坯料名称', size=64, required=True)
-    material = fields.Many2one('sf.production.materials', string='材质', required=True)
-    quantity = fields.Float(string='数量', required=True)
-    length = fields.Float(string='长度', required=True)
-    width = fields.Float(string='宽度', required=True)
-    thickness = fields.Float(string='厚度', required=True)
-    diameter = fields.Float(string='直径', required=True)
-    plan_start_time = fields.Datetime(string='计划开始时间')
-    plan_end_time = fields.Datetime(string='计划结束时间')
-    state = fields.Selection([
-        ('draft', '待产出'),
-        ('produce', '已产出'),
-    ], string='状态', copy=False, index=True, default='draft')
-    customer_name = fields.Char(string='客户名称', size=64)
-    order_no = fields.Char(string='订单号', size=64)
-    line_no = fields.Char(string='行号', size=64)
-    delivery_length = fields.Float(string='交货长度')
-    delivery_width = fields.Float(string='交货宽度')
-    delivery_thickness = fields.Float(string='交货厚度')
-    delivery_diameter = fields.Float(string='交货直径')
-    delivery_quantity = fields.Float(string='交货数量')
-    delivery_date = fields.Datetime(string='交货日期', related='plan_end_time', readonly=False, store=True)
+    # pl_no = fields.Char(string='坯料编号', required=True, default=_get_pl_no, readonly=True)
+    # pl_name = fields.Char(string='坯料名称', size=64, required=True)
+    # material = fields.Many2one('sf.production.materials', string='材质', required=True)
+    # quantity = fields.Float(string='数量', required=True)
+    # length = fields.Float(string='长度', required=True)
+    # width = fields.Float(string='宽度', required=True)
+    # thickness = fields.Float(string='厚度', required=True)
+    # diameter = fields.Float(string='直径', required=True)
+    # plan_start_time = fields.Datetime(string='计划开始时间')
+    # plan_end_time = fields.Datetime(string='计划结束时间')
+    # state = fields.Selection([
+    #     ('draft', '待排程'),
+    #     ('produce', '已排程'),
+    #     ('done', '已产出'),
+    # ], string='状态', copy=False, index=True, default='draft')
+    # customer_name = fields.Char(string='客户名称', size=64)
+    # order_no = fields.Char(string='订单号', size=64)
+    # line_no = fields.Char(string='行号', size=64)
+    # delivery_length = fields.Float(string='交货长度')
+    # delivery_width = fields.Float(string='交货宽度')
+    # delivery_thickness = fields.Float(string='交货厚度')
+    # delivery_diameter = fields.Float(string='交货直径')
+    # delivery_quantity = fields.Float(string='交货数量')
+    # delivery_date = fields.Datetime(string='交货日期', related='plan_end_time', readonly=False, store=True)
 
     # 当不设置计划结束时间时，增加计算计划结束时间的方法，根据采购周期加缓冲期两个值来算就可以了
-    def get_plan_end_time(self):
-        if self.plan_start_time and self.plan_end_time:
-            return None
-        elif self.plan_start_time and not self.plan_end_time:
-            # 如果没有给出计划结束时间，则计划结束时间为计划开始时间+采购周期+缓冲期
-            # 采购周期
-            purchase_cycle = 3
-            # 缓冲期
-            buffer_period = 1
-            # 计划结束时间 = 计划开始时间 + 采购周期 + 缓冲期
-            self.plan_end_time = self.plan_start_time + timedelta(days=purchase_cycle) + timedelta(days=buffer_period)
-            return self.plan_end_time
+    def do_production_schedule(self):
+        aa = self.env['mrp.production'].sudo().search([('name', '=', self.name)])
+        workorder_time = 0
+        print(aa.workorder_ids)
+        print(type(aa.workorder_ids))
+        if aa.workorder_ids:
+            for item in aa.workorder_ids:
+                current_workorder = self.env['mrp.workorder'].sudo().search([('id', '=', item.id)])
+                workorder_time += current_workorder.duration_expected
+            print(workorder_time)
+            self.date_planned_finished = self.date_planned_start + timedelta(minutes=workorder_time)
+            self.state = 'done'
         else:
-            return None
-            # 后面要补充计划开始时间的计算方法
-            # # 坯料预制时间
-            # # pl_time = 0.5
-            # # 采购周期
-            # purchase_cycle = 3
-            # # 缓冲期
-            # buffer_period = 1
-            # # 计划结束时间 = 计划开始时间 + 坯料预制时间 + 采购周期 + 缓冲期
-            # # plan_end_time = plan_start_time + pl_time + purchase_cycle + buffer_period
-            # # 计划结束时间 = 计划开始时间(是一个datatime) + 采购周期(Float) + 缓冲期(Float)
-            # self.plan_end_time = self.plan_start_time + timedelta(days=purchase_cycle) + timedelta(days=buffer_period)
-            # return self.plan_end_time
+            self.date_planned_finished = self.date_planned_start + timedelta(days=3)
+            self.state = 'done'
+        return {
+            'name': '排程甘特图',
+            'type': 'ir.actions.act_window',
+            'res_model': 'sf.production.plan',  # 要跳转的模型名称
+            'view_mode': 'gantt,tree,form',  # 要显示的视图类型，可以是'form', 'tree', 'kanban', 'graph', 'calendar', 'pivot'等
+            'target': 'current',  # 跳转的目标窗口，可以是'current'或'new'
+        }
+        # if self.production_line_id:
+        #     if self.plan_start_time and self.plan_end_time:
+        #         return None
+        #     elif self.plan_start_time and not self.plan_end_time:
+        #         # 如果没有给出计划结束时间，则计划结束时间为计划开始时间+采购周期+缓冲期
+        #         # 采购周期
+        #         purchase_cycle = 3
+        #         # 缓冲期
+        #         buffer_period = 1
+        #         # 计划结束时间 = 计划开始时间 + 采购周期 + 缓冲期
+        #         self.plan_end_time = self.plan_start_time + timedelta(days=purchase_cycle) + timedelta(
+        #             days=buffer_period)
+        #         self.state = 'produce'
+        #         return self.plan_end_time
+        #     else:
+        #         return None
+        #         # 后面要补充计划开始时间的计算方法
+        #         # # 坯料预制时间
+        #         # # pl_time = 0.5
+        #         # # 采购周期
+        #         # purchase_cycle = 3
+        #         # # 缓冲期
+        #         # buffer_period = 1
+        #         # # 计划结束时间 = 计划开始时间 + 坯料预制时间 + 采购周期 + 缓冲期
+        #         # # plan_end_time = plan_start_time + pl_time + purchase_cycle + buffer_period
+        #         # # 计划结束时间 = 计划开始时间(是一个datatime) + 采购周期(Float) + 缓冲期(Float)
+        #         # self.plan_end_time = self.plan_start_time + timedelta(days=purchase_cycle) + timedelta(days=buffer_period)
+        #         # return self.plan_end_time
+        # else:
+        #     raise ValidationError('生产线为空！')
+
+    def cancel_production_schedule(self):
+        self.date_planned_finished = False
+        self.state = 'draft'
+        return self.date_planned_finished
+
+    def liucheng_cs(self):
+        res = {'order_number': '123', 'delivery_end_date': str(datetime.now()),
+               'delivery_name': '机企猫', 'delivery_telephone': '18943919239',
+               'delivery_address': '新时空大厦',
+               'bfm_process_order_list': []}
+        aa = self.env['ir.attachment'].search([('id', '=', 631)])
+        temp = self.env['product.template'].search([('id', '=', 47)])
+        item = aa.datas.decode('utf-8')
+        val = {
+            'model_long': 3,
+            'model_width': 1,
+            'model_height': 1,
+            'model_volume': 3,
+            'model_machining_precision': '0.10',
+            'model_name': aa.name,
+            'model_data': base64.b64encode(aa.datas).decode('utf-8'),
+            'model_file': base64.b64encode(temp.model_file).decode('utf-8'),
+            'texture_code': '001',
+            'texture_type_code': '001001',
+            # 'surface_process_code': self.env['jikimo.surface.process']._json_surface_process_code(item),
+            'process_parameters_code': 'R',
+            'price': 20,
+            'number': 2,
+            'total_amount': 100,
+            'remark': '这只是测试',
+            'barcode': 123456789,
+        }
+        res['bfm_process_order_list'].append(val)
+        url = '/api/bfm_process_order/list'
+        res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
+        try:
+            ret = requests.post(('http://localhost:1069' + url), json={}, data=res)
+            # aa = json.loads(ret.text)
+            print(ret)
+        except Exception as e:
+            raise UserError(e)
 
 # # sf生产排程
 # class sf_produce_plan(models.Model):
 #     _name = 'sf.produce.plan'
 #     _description = 'sf生产排程'
 
-    # # 重写create方法，使得创建坯料预制排程时，如果给出了计划结束时间，则计划开始时间为计划结束时间减去坯料预制时间
-    # @api.model
-    # def create(self, vals):
-    #     # 评估结束时间
-    #     vals['plan_end_time'] = self._get_plan_end_time(vals['plan_start_time'], vals['quantity'])
-    #     return super(sf_pl_plan, self).create(vals)
+# # 重写create方法，使得创建坯料预制排程时，如果给出了计划结束时间，则计划开始时间为计划结束时间减去坯料预制时间
+# @api.model
+# def create(self, vals):
+#     # 评估结束时间
+#     vals['plan_end_time'] = self._get_plan_end_time(vals['plan_start_time'], vals['quantity'])
+#     return super(sf_pl_plan, self).create(vals)
 
-    # # 当不设置计划结束时间时，增加计算计划结束时间的方法
-    # @api.onchange('plan_start_time', 'quantity')
-    # def _onchange_plan_start_time(self):
-    #     if self.plan_start_time and self.quantity:
-    #         self.plan_end_time = self._get_plan_end_time(self.plan_start_time, self.quantity)
-    #
-    # # 计算计划结束时间
-    # def _get_plan_end_time(self, plan_start_time, quantity):
-    #     # 坯料预制时间
-    #     pl_time = 0.5
-    #     # 计划结束时间 = 计划开始时间 + 坯料预制时间
-    #     plan_end_time = plan_start_time + pl_time
-    #     return plan_end_time
-    #
+# # 当不设置计划结束时间时，增加计算计划结束时间的方法
+# @api.onchange('plan_start_time', 'quantity')
+# def _onchange_plan_start_time(self):
+#     if self.plan_start_time and self.quantity:
+#         self.plan_end_time = self._get_plan_end_time(self.plan_start_time, self.quantity)
+#
+# # 计算计划结束时间
+# def _get_plan_end_time(self, plan_start_time, quantity):
+#     # 坯料预制时间
+#     pl_time = 0.5
+#     # 计划结束时间 = 计划开始时间 + 坯料预制时间
+#     plan_end_time = plan_start_time + pl_time
+#     return plan_end_time
+#
diff --git a/sf_plan/security/ir.model.access.csv b/sf_plan/security/ir.model.access.csv
index 7effd7c3..b1578586 100644
--- a/sf_plan/security/ir.model.access.csv
+++ b/sf_plan/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sf_pl_plan,sf.pl.plan,model_sf_pl_plan,base.group_user,1,1,1,1
+access_sf_production_plan,sf.production.plan,model_sf_production_plan,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_plan/static/src/css/button_color.css b/sf_plan/static/src/css/button_color.css
new file mode 100644
index 00000000..496a94fa
--- /dev/null
+++ b/sf_plan/static/src/css/button_color.css
@@ -0,0 +1,8 @@
+.schedule_done {
+  background-color: #69c17d;
+  color: white;
+}
+.schedule_cancel {
+  background-color: #ffc54d;
+  color: black;
+}
\ No newline at end of file
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 09ba627a..d7f8c59d 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -1,103 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="sf_pl_plan_tree" model="ir.ui.view">
-            <field name="name">sf.pl.plan.tree</field>
-            <field name="model">sf.pl.plan</field>
+        <record id="sf_production_plan_tree" model="ir.ui.view">
+            <field name="name">sf.production.plan.tree</field>
+            <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
-                <tree string="坯料预制计划">
+                <tree string="订单计划">
                     <!--     sequence、pl_no、pl_name、quantity、plan_start_time、plan_end_time、actual_start_time、actual_end_time、state、create_uid、create_date -->
-                    <field name="sequence"/>
-                    <field name="pl_no"/>
-                    <field name="pl_name"/>
-                    <field name="quantity"/>
-                    <field name="plan_start_time"/>
-                    <field name="plan_end_time"/>
-                    <field name="state"/>
-                    <field name="create_uid" string="创建人"/>
-                    <field name="create_date" string="创建时间"/>
+<!--                     <field name="sequence"/> -->
+                    <field name="name"/>
+                    <field name="product_qty"/>
+                    <field name="date_planned_start"/>
+                    <field name="date_planned_finished"/>
+                    <field name="state" widget="badge" decoration-warning="state == 'draft'" decoration-success="state == 'done'"/>
+                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" attrs="{'invisible': [('state', 'not in', ['draft'])]}"/>
+                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object" attrs="{'invisible': [('state', 'not in', ['done'])]}"/>
                 </tree>
             </field>
         </record>
 
-        <record id="sf_pl_plan_form" model="ir.ui.view">
-            <field name="name">sf.pl.plan.form</field>
-            <field name="model">sf.pl.plan</field>
+        <record id="sf_production_plan_form" model="ir.ui.view">
+            <field name="name">sf.production.plan.form</field>
+            <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
-                <form string="坯料预制计划">
+                <form string="订单计划">
                     <header>
-                        <button string="执行排程" name="get_plan_end_time" type="object" class="oe_highlight"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,produce"/>
+                        <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/>
+                        <button string="销售单" name="test_sale_order" type="object" class="oe_highlight"/>
+                        <button string="测试流程" name="liucheng_cs" type="object" class="oe_highlight"/>
+<!--                         <field name="state" widget="statusbar" statusbar_visible="draft,produce"/> -->
                     </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="pl_no" readonly="1"/>
+                                <field name="name" readonly="1"/>
                             </h1>
                         </div>
                         <group>
                             <group string="基本信息">
-                                <field name="pl_no"/>
-                                <field name="pl_name"/>
-                                <field name="quantity"/>
-                                <field name="plan_start_time"/>
-                                <field name="plan_end_time"/>
+                                <field name="production_id"/>
+                                <field name="product_id"/>
+                                <field name="origin"/>
+                                <field name="product_qty"/>
+                                <field name="date_planned_start"/>
+                                <field name="date_planned_finished"/>
                                 <field name="state"/>
+                                <field name="production_line_id"/>
                             </group>
-                            <group string="规格信息" col="1">
-                                <group col="3">
-                                    <group>
-                                    <field name="length"/>
-                                    </group>
-                                    <group>
-                                    <field name="width"/>
-                                    </group>
-                                    <group>
-                                    <field name="thickness"/>
-                                    </group>
-                                </group>
+<!--                             <group string="规格信息" col="1"> -->
+<!--                                 <group col="3"> -->
+<!--                                     <group> -->
+<!--                                     <field name="length"/> -->
+<!--                                     </group> -->
+<!--                                     <group> -->
+<!--                                     <field name="width"/> -->
+<!--                                     </group> -->
+<!--                                     <group> -->
+<!--                                     <field name="thickness"/> -->
+<!--                                     </group> -->
+<!--                                 </group> -->
 <!--                                 <field name="length"/> -->
 <!--                                 <field name="width"/> -->
 <!--                                 <field name="thickness"/> -->
-                                <group>
-                                    <field name="diameter"/>
-                                    <field name="material"/>
-                                </group>
-                            </group>
-                            <group string="绑定订单">
-                                <field name="customer_name"/>
-                                <field name="order_no"/>
-                                <field name="line_no"/>
-                                <field name="delivery_length"/>
-                                <field name="delivery_width"/>
-                                <field name="delivery_thickness"/>
-                                <field name="delivery_diameter"/>
-                                <field name="delivery_quantity"/>
-                                <field name="delivery_date"/>
-                            </group>
+<!--                                 <group> -->
+<!--                                     <field name="diameter"/> -->
+<!--                                     <field name="material"/> -->
+<!--                                 </group> -->
+<!--                             </group> -->
+<!--                             <group string="绑定订单"> -->
+<!--                                 <field name="customer_name"/> -->
+<!--                                 <field name="order_no"/> -->
+<!--                                 <field name="line_no"/> -->
+<!--                                 <field name="delivery_length"/> -->
+<!--                                 <field name="delivery_width"/> -->
+<!--                                 <field name="delivery_thickness"/> -->
+<!--                                 <field name="delivery_diameter"/> -->
+<!--                                 <field name="delivery_quantity"/> -->
+<!--                                 <field name="delivery_date"/> -->
+<!--                             </group> -->
                         </group>
                     </sheet>
                 </form>
             </field>
         </record>
 
-        <record id="sf_pl_plan_gantt" model="ir.ui.view">
-            <field name="name">sf.pl.plan.gantt</field>
-            <field name="model">sf.pl.plan</field>
+<!--         搜索视图 -->
+        <record id="sf_production_plan_search" model="ir.ui.view">
+            <field name="name">sf.production.plan.search</field>
+            <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
-                <gantt class="o_mrp_workorder_gantt" date_stop="plan_end_time" date_start="plan_start_time"
-                       string="坯料预制计划" default_group_by="current_operation_name" create="0"
+                <search string="订单计划">
+                    <field name="name"/>
+                    <field name="product_qty"/>
+                    <field name="date_planned_start"/>
+                    <field name="date_planned_finished"/>
+                    <field name="state"/>
+                    <searchpanel class="account_root">
+                        <field name="state" icon="fa-filter"/>
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
+
+        <record id="sf_production_plan_gantt" model="ir.ui.view">
+            <field name="name">sf.production.plan.gantt</field>
+            <field name="model">sf.production.plan</field>
+            <field name="arch" type="xml">
+                <gantt class="o_mrp_workorder_gantt" date_stop="date_planned_finished" date_start="date_planned_start"
+                       string="制造订单生产计划" default_group_by="production_line_id" create="0"
                        delete="0" sample="1"
                        display_unavailability="1"
-                       color="state"
-                       progress_bar="pl_name"
-                       form_view_id="sf_pl_plan_form">
+                       color="production_line_id"
+                       decoration-success="state == 'done'"
+                       progress_bar="name"
+                       form_view_id="sf_production_plan_form">
 
-                    <field name="pl_no"/>
-                    <field name="pl_name"/>
-                    <field name="quantity"/>
-                    <field name="plan_start_time"/>
-                    <field name="plan_end_time"/>
+                    <field name="name"/>
+                    <field name="product_qty"/>
+                    <field name="date_planned_start"/>
+                    <field name="date_planned_finished"/>
                     <field name="state"/>
                     <templates>
                         <div t-name="gantt-popover" class="container-fluid">
@@ -113,20 +134,12 @@
                                             <t t-out="userTimezoneStopDate.format('L LTS')"/>
                                         </li>
                                         <li>
-                                            <strong>坯料编号:</strong>
-                                            <t t-out="pl_no"/>
-                                        </li>
-                                        <li>
-                                            <strong>坯料名称:</strong>
-                                            <t t-out="pl_name"/>
+                                            <strong>名称:</strong>
+                                            <t t-out="name"/>
                                         </li>
                                         <li>
                                             <strong>数量:</strong>
-                                            <t t-out="quantity"/>
-                                        </li>
-                                        <li>
-                                            <strong>材质:</strong>
-                                            <t t-out="material"/>
+                                            <t t-out="product_qty"/>
                                         </li>
                                         <li>
                                             <strong>状态:</strong>
@@ -142,19 +155,135 @@
         </record>
 
 
-        <record id="sf_pl_plan_action" model="ir.actions.act_window">
-            <field name="name">坯料预制计划</field>
+<!--         <record id="sf_pl_plan_action" model="ir.actions.act_window"> -->
+<!--             <field name="name">制造订单生产计划</field> -->
+<!--             <field name="type">ir.actions.act_window</field> -->
+<!--             <field name="res_model">sf.pl.plan</field> -->
+<!--             <field name="view_mode">tree,form,gantt</field> -->
+<!--         </record>         -->
+<!--         <record id="sf_production_gantt_view" model="ir.ui.view"> -->
+<!--             <field name="name">sf.production.plan.gantt</field> -->
+<!--             <field name="model">mrp.production</field> -->
+<!--             <field name="arch" type="xml"> -->
+<!--                 <gantt class="o_mrp_workorder_gantt" date_stop="date_planned_finished" date_start="date_planned_start" -->
+<!--                        string="制造订单生产计划" default_group_by="production_line_id" create="0" -->
+<!--                        delete="0" sample="1" plan="0" -->
+<!--                        display_unavailability="1" -->
+<!--                        decoration-success="state == 'done'" -->
+<!--                        decoration-secondary="state == 'cancel'" -->
+<!--                        color="production_line_id" -->
+<!--                        progress_bar="state" -->
+<!--                        form_view_id="mrp.mrp_production_form_view"> -->
+<!--                     <field name="name"/> -->
+<!--                     <field name="product_qty"/> -->
+<!--                     <field name="date_planned_start"/> -->
+<!--                     <field name="date_planned_finished" string="计划结束时间"/> -->
+<!--                     <field name="state"/> -->
+<!--                     <templates> -->
+<!--                         <div t-name="gantt-popover" class="container-fluid"> -->
+<!--                             <div class="row g-0"> -->
+<!--                                 <div class="col"> -->
+<!--                                     <ul class="ps-1 mb-0 list-unstyled"> -->
+<!--                                         <li> -->
+<!--                                             <strong>开始时间:</strong> -->
+<!--                                             <t t-out="userTimezoneStartDate.format('L LTS')"/> -->
+<!--                                         </li> -->
+<!--                                         <li> -->
+<!--                                             <strong>结束时间:</strong> -->
+<!--                                             <t t-out="userTimezoneStopDate.format('L LTS')"/> -->
+<!--                                         </li> -->
+<!--                                         <li> -->
+<!--                                             <strong>数量:</strong> -->
+<!--                                             <t t-out="product_qty"/> -->
+<!--                                         </li> -->
+<!--                                         <li> -->
+<!--                                             <strong>状态:</strong> -->
+<!--                                               <t t-if="state === 'cancel'">已取消</t> -->
+<!--                                               <t t-elif="state === 'done'">已完成</t> -->
+<!--                                               <t t-elif="state === '已排程'">已排程</t> -->
+<!--                                               <t t-else="">其他状态</t> -->
+<!--                                             <t t-out="state"/> -->
+<!--                                         </li> -->
+<!--                                     </ul> -->
+<!--                                 </div> -->
+<!--                             </div> -->
+<!--                         </div> -->
+<!--                     </templates> -->
+<!--                 </gantt> -->
+<!--             </field> -->
+<!--         </record> -->
+        <record id="sf_production_plan_action" model="ir.actions.act_window">
+            <field name="name">制造订单生产计划</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.pl.plan</field>
-            <field name="view_mode">tree,form,gantt</field>
+            <field name="res_model">sf.production.plan</field>
+            <field name="view_mode">gantt,tree,form</field>
+        </record>
+
+<!--         这个也是制造订单生产计划，只是把tree视图放在了默认位置 -->
+        <record id="sf_production_plan_action1" model="ir.actions.act_window">
+            <field name="name">制造订单生产计划</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.production.plan</field>
+            <field name="view_mode">tree,gantt,form</field>
         </record>
 
         <menuitem
-                id="sf_pl_plan_menu"
-                name="坯料预制计划"
-                parent="mrp_workorder.mrp_workorder_menu_planning"
-                sequence="10"
-                action="sf_pl_plan_action"
+                id="sf_production_plan_menu"
+                name="计划"
+                sequence="150"
+                action="sf_production_plan_action"
         />
+
+<!--         <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->
+<!--             <field name="name">Custom Manufacturing Orders</field>  -->
+<!--             <field name="action" ref="mrp.mrp_manufacturing_action"/>  -->
+<!--              --><!-- 扩展现有的动作 --><!--   -->
+<!--         </record>  -->
+        <record model="ir.actions.act_window" id="mrp_custom_action">
+            <!-- 自定义额外的动作 -->
+            <field name="name">制造订单</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record model="ir.actions.act_window" id="sale_custom_action">
+            <!-- 自定义额外的动作 -->
+            <field name="name">报价单</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+                id="mrp_custom_menu"
+                name="制造订单"
+                sequence="150"
+                action="mrp_custom_action"
+                parent="sf_production_plan_menu"
+        />
+        <menuitem
+                id="sale_custom_menu"
+                name="报价单"
+                sequence="50"
+                action="sale_custom_action"
+                parent="sf_production_plan_menu"
+        />
+        <menuitem
+                id="schedule_custom_menu"
+                name="排程单"
+                sequence="180"
+                action="sf_production_plan_action1"
+                parent="sf_production_plan_menu"
+        />
+
+
+<!--          --><!-- 在现有菜单结构后面加入自定义的动作 -->
+<!--         <menuitem  -->
+<!--                 id="mrp_custom_menuitem"  -->
+<!--                 name="My Custom Menuitem"  -->
+<!--                 sequence="20"  -->
+<!--                 action="mrp_custom_action"/>  -->
+<!--                  --><!-- 自定义额外的菜单项 --><!--   -->
+<!--          </field> -->
     </data>
 </odoo>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index fac229f5..eed2be57 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -37,11 +37,11 @@ class QuickEasyOrder(models.Model):
     quantity = fields.Integer('数量', default=1)
     unit_price = fields.Float('单价')
     price = fields.Float('总价')
-    model_file = fields.Binary('模型文件')
-    upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='模型文件')
+    model_file = fields.Binary('glb模型文件')
+    upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
     delivery_time = fields.Date('交货日期')
     customer_id = fields.Many2one('res.partner', string='客户', default=lambda self: self.env.user.partner_id.id)
-    state = fields.Selection([('草稿', '草稿'), ('待付款', '待付款'), ('待派单', '待派单'),
+    state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
                               ('待接单', '待接单'), ('加工中', '加工中'),
                               ('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
                              readonly=True)
@@ -82,6 +82,7 @@ class QuickEasyOrder(models.Model):
         obj = super(QuickEasyOrder, self).create(vals)
         self.model_coloring(obj)
         self.distribute_to_factory(obj)
+        obj.state = '待接单'
         return obj
 
     # 将attach的datas内容转为glb文件
diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index c140dad7..a5ce9da2 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -16,13 +16,16 @@
             <field name="model">quick.easy.order</field>
             <field name="arch" type="xml">
                 <tree string="快速订单">
-                    <field optional="show" name="name" string="订单号"/>
-                    <field optional="show" name="customer_id" string="客户"/>
-                    <field optional="show" name="material_id"/>
-                    <field optional="show" name="material_model_id"/>
-                    <field optional="show" name="parameter_ids"/>
-                    <field optional="show" name="quantity"/>
-                    <field optional="show" name="price"/>
+                    <field name="state" widget="label_selection"
+                           options="{'classes': {'待接单': 'default', '加工中':'primary','物流中':'warning','已交付': 'success'}}"/>
+                    <field name="name" string="订单号"/>
+                    <field name="customer_id" string="客户"/>
+                    <field name="material_id"/>
+                    <field name="material_model_id"/>
+                    <field name="parameter_ids" string="表面工艺参数" widget="many2many_tags"/>
+                    <field name="quantity"/>
+                    <field name="unit_price"/>
+                    <field name="price"/>
                     <field optional="hide" name="delivery_time"/>
                 </tree>
             </field>
@@ -33,6 +36,9 @@
             <field name="model">quick.easy.order</field>
             <field name="arch" type="xml">
                 <form string="快速订单">
+                    <header>
+                        <field name="state" widget="statusbar"/>
+                    </header>
                     <sheet>
                         <h1>
                             <field name="name" readonly="True"/>
@@ -42,7 +48,7 @@
                                 <field name="customer_id" readonly="1" force_save="1"/>
                                 <field name="material_id"/>
                                 <field name="material_model_id"/>
-<!--                                <field name="process_id"/>-->
+                                <!--                                <field name="process_id"/>-->
                                 <field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"/>
                                 <field name="machining_precision"/>
                                 <field name="quantity"/>
@@ -81,7 +87,7 @@
             <field name="arch" type="xml">
                 <search string="快速订单">
                     <field name="name" string="模糊搜索"
-                           filter_domain="['|', ('name', 'ilike', self), '|', ('receive_name', 'ilike', self),'|', ('receive_phone', 'ilike', self),('customer_id', 'ilike', self)]"/>
+                           filter_domain="['|', ('name', 'ilike', self), '|',('customer_id', 'ilike', self)]"/>
                     <separator/>
                     <field name="customer_id"/>
                 </search>
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index 84044f1c..f75d7e08 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import fields, models, api, SUPERUSER_ID
+from odoo.exceptions import ValidationError
 
 
 # 刀具物料搜索
@@ -9,22 +10,22 @@ class SfToolMaterialSearch(models.Model):
 
     sequence = fields.Integer('序号')
     code = fields.Char('编码')
-    name = fields.Char('名称')
+    name = fields.Char('名称', required=True)
     # 关联刀具类型
     mrs_cutting_tool_type_id = fields.Many2one(
         'sf.cutting.tool.type', '刀具类型',
-        domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]")
+        domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]", required=True)
     # 关联刀具物料名称
     mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
                                                  store=True)
     cutting_tool_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', store=True)
-    mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌', required=True)
     # 关联刀具型号
     # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
 
     # 关联刀具物料模型
     mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料',
-                                                   group_expand='_read_group_mrs_cutting_tool_material_ids')
+                                                   group_expand='_read_group_mrs_cutting_tool_material_ids', required=True)
     cutting_tool_material_name = fields.Char(string='物料名称', invisible=True)
 
     @api.onchange('mrs_cutting_tool_material_id')
@@ -74,19 +75,115 @@ class SfToolMaterialSearch(models.Model):
 
     # 整体式刀具特有字段
     integral_code = fields.Char('整体式刀具编码', readonly=True)
-    integral_total_length = fields.Float('整体式刀具总长度(mm)')
-    integral_shank_length = fields.Float('整体式刀具柄部长度(mm)')
-    integral_blade_length = fields.Float('整体式刀具刃部长度(mm)')
-    integral_diameter = fields.Float('整体式刀具直径(mm)')
-    integral_blade_number = fields.Integer('整体式刀具刃数')
-    integral_front_angle = fields.Float('整体式刀具前角(°)')
-    integral_rear_angle = fields.Float('整体式刀具后角(°)')
-    integral_main_included_angle = fields.Float('整体式刀具主偏角(°)')
-    integral_accuracy = fields.Float('整体式刀具精度等级')
-    integral_hardness = fields.Float('整体式刀具加工硬度(HRC)')
+    integral_total_length = fields.Float('整体式刀具总长度(mm)', digits=(6, 1))
+    integral_shank_length = fields.Float('整体式刀具柄部长度(mm)', digits=(6, 1))
+    integral_blade_length = fields.Float('整体式刀具刃部长度(mm)', digits=(6, 1))
+    integral_neck_length = fields.Float('整体式刀具颈部长度(mm)', digits=(6, 1))
+    integral_shank_diameter = fields.Float('整体式刀具柄部直径(mm)', digits=(6, 1))
+    integral_blade_diameter = fields.Float('整体式刀具刃部直径(mm)', digits=(6, 1))
+    integral_neck_diameter = fields.Float('整体式刀具颈部直径(mm)', digits=(6, 1))
+    integral_blade_number = fields.Integer('整体式刀具刃数(个)')
+    integral_blade_tip_diameter = fields.Float('整体式刀具刀尖直径(mm)', digits=(6, 1))
+    integral_blade_tip_taper = fields.Float('整体式刀具刀尖锥度(°)', digits=(6, 1))
+    integral_blade_helix_angle = fields.Float('整体式刀具刃部螺旋角(°)', digits=(6, 1))
+    integral_blade_type = fields.Selection([('直刃', '直刃'), ('带断屑槽', '带断屑槽')], '整体式刀具刃部类型')
+    integral_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '整体式刀具粗/中/精')
+    integral_blade_material = fields.Selection([('碳素钢', '碳素钢'), ('硬质合金', '硬质合金')], '整体式刀具刀具材质')
+    integral_hardness = fields.Integer('整体式刀具硬度(HRC)')
     integral_coating_material = fields.Char('整体式刀具涂层材质')
-    integral_nut = fields.Float('整体式刀具配对螺母(mm)')
-    integral_scope = fields.Char('整体式刀具适用范围')
+    integral_run_out_accuracy_max = fields.Float('整体式刀具端跳精度max', digits=(6,1))
+    integral_run_out_accuracy_min = fields.Float('整体式刀具端跳精度min', digits=(6, 1))
+
+    suitable_machining_method_ids = fields.Many2many('sf.suitable.machining.method',
+                                                     'rel_suitable_machining_method', '适合加工方式')
+    blade_tip_characteristics_ids = fields.Many2many('sf.blade.tip.characteristics',
+                                                     'rel_blade_tip_characteristics', '刀尖特征')
+    handle_type_ids = fields.Many2many('sf.handle.type', 'rel_handle_type', '柄部类型')
+    cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction', '走刀方向')
+    suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant', '适合冷却液')
+
+    @api.constrains('suitable_machining_method_ids')
+    def _check_suitable_machining_method_ids(self):
+        for record in self:
+            if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("适合加工方式不能为空!")
+
+    @api.constrains('blade_tip_characteristics_ids')
+    def _check_blade_tip_characteristics_ids(self):
+        for record in self:
+            if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("刀尖特征不能为空!")
+            if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("刀尖特征只能单选!")
+
+    @api.constrains('handle_type_ids')
+    def _check_handle_type_ids(self):
+        for record in self:
+            if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("柄部类型不能为空!")
+            if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("柄部类型只能单选!")
+
+    @api.constrains('cutting_direction_ids')
+    def _check_cutting_direction_ids(self):
+        for record in self:
+            if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("走刀方向不能为空!")
+
+    @api.constrains('suitable_coolant_ids')
+    def _check_suitable_coolant_ids(self):
+        for record in self:
+            if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
+                raise ValidationError("适合冷却液不能为空!")
+
+    @api.constrains('integral_total_length')
+    def _check_integral_total_length(self):
+        if self.integral_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("总长度不能为0")
+
+    @api.constrains('integral_shank_length')
+    def _check_integral_shank_length(self):
+        if self.integral_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("柄部长度不能为0")
+
+    @api.constrains('integral_blade_length')
+    def _check_integral_blade_length(self):
+        if self.integral_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("刃部长度不能为0")
+
+    @api.constrains('integral_blade_number')
+    def _check_integral_blade_number(self):
+        if self.integral_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("刃数不能为0")
+
+    @api.constrains('integral_shank_diameter')
+    def _check_integral_shank_diameter(self):
+        if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("柄部直径不能为0")
+
+    @api.constrains('integral_blade_diameter')
+    def _check_integral_blade_diameter(self):
+        if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("刃部直径不能为0")
+
+    @api.constrains('integral_run_out_accuracy_min')
+    def _check_integral_blade_diameter(self):
+        if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("端跳精度最小(min)不能为0")
+
+    @api.constrains('integral_run_out_accuracy_max')
+    def _check_integral_run_out_accuracy_max(self):
+        if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
+            raise ValidationError("端跳精度最大(max)不能为0")
+
+    # integral_front_angle = fields.Float('整体式刀具前角(°)')
+    # integral_rear_angle = fields.Float('整体式刀具后角(°)')
+    # integral_main_included_angle = fields.Float('整体式刀具主偏角(°)')
+    # integral_accuracy = fields.Float('整体式刀具精度等级')
+    # integral_hardness = fields.Float('整体式刀具加工硬度(HRC)')
+    # integral_coating_material = fields.Char('整体式刀具涂层材质')
+    # integral_nut = fields.Float('整体式刀具配对螺母(mm)')
+    # integral_scope = fields.Char('整体式刀具适用范围')
 
     # 刀杆特有字段
     bar_code = fields.Char('刀杆编码', readonly=True)
@@ -193,4 +290,3 @@ class SfToolMaterialSearch(models.Model):
     warehouse_area = fields.Char('库区')
     warehouse_location = fields.Char('库位')
     three_d_model = fields.Many2one('ir.attachment', '3D模型')
-
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index c8e0a55c..4bb4bf03 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -6,7 +6,7 @@
             <field name="model">sf.tool.material.search</field>
             <field name="arch" type="xml">
                 <tree string="刀具物料查询">
-                    <field name="sequence"/>
+                    <field name="sequence"  invisible="True"/>
                     <field name="code"/>
                     <field name="name"/>
                     <field name="mrs_cutting_tool_type_id"/>
@@ -33,19 +33,19 @@
                     <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" optional="hide"/>
 
                     <!--                     <field name="integral_code" readonly="1"/> -->
-                    <field name="integral_total_length" optional="hide"/>
-                    <field name="integral_shank_length" optional="hide"/>
-                    <field name="integral_blade_length" optional="hide"/>
-                    <field name="integral_diameter" optional="hide"/>
-                    <field name="integral_blade_number" optional="hide"/>
-                    <field name="integral_front_angle" optional="hide"/>
-                    <field name="integral_rear_angle" optional="hide"/>
-                    <field name="integral_main_included_angle" optional="hide"/>
-                    <field name="integral_accuracy" optional="hide"/>
-                    <field name="integral_hardness" optional="hide"/>
-                    <field name="integral_coating_material" optional="hide"/>
-                    <field name="integral_nut" optional="hide"/>
-                    <field name="integral_scope" optional="hide"/>
+<!--                    <field name="integral_total_length" optional="hide"/>-->
+<!--                    <field name="integral_shank_length" optional="hide"/>-->
+<!--                    <field name="integral_blade_length" optional="hide"/>-->
+<!--                    <field name="integral_diameter" optional="hide"/>-->
+<!--                    <field name="integral_blade_number" optional="hide"/>-->
+<!--                    <field name="integral_front_angle" optional="hide"/>-->
+<!--                    <field name="integral_rear_angle" optional="hide"/>-->
+<!--                    <field name="integral_main_included_angle" optional="hide"/>-->
+<!--                    <field name="integral_accuracy" optional="hide"/>-->
+<!--                    <field name="integral_hardness" optional="hide"/>-->
+<!--                    <field name="integral_coating_material" optional="hide"/>-->
+<!--                    <field name="integral_nut" optional="hide"/>-->
+<!--                    <field name="integral_scope" optional="hide"/>-->
 
                     <!--                     <field name="bar_code" readonly="1"/> -->
                     <field name="bar_c_diameter" optional="hide"/>
@@ -134,13 +134,13 @@
                         <group>
                             <group>
                                 <field name="mrs_cutting_tool_material_name" invisible="1"/>
-                                <field name="sequence"/>
+                                <field name="sequence" invisible="True"/>
                                 <field name="code"/>
+                                <field name="mrs_cutting_tool_material_id"/>
                                 <field name="mrs_cutting_tool_type_id"/>
                                 <field name="mrs_machine_brand_id"/>
-                                <!--                                 <field name="mrs_cutting_tool_model_id"/> -->
                                 <field name="mrs_materials_model_id"/>
-                                <field name="mrs_cutting_tool_material_id"/>
+                                <!--                                 <field name="mrs_cutting_tool_model_id"/> -->
                             </group>
                             <group>
                                 <field name="image" widget="image"/>
@@ -188,6 +188,7 @@
                                     </group>
                                 </group>
                             </page>
+<!--                            -->
                             <page string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
                                 <group>
                                     <group>
@@ -195,20 +196,49 @@
                                         <field name="integral_total_length" string="总长度(mm)"/>
                                         <field name="integral_shank_length" string="柄部长度(mm)"/>
                                         <field name="integral_blade_length" string="刃部长度(mm)"/>
-                                        <field name="integral_diameter" string="直径(mm)"/>
-                                        <field name="integral_blade_number" string="刃数"/>
-                                        <field name="integral_accuracy" string="精度等级"/>
+                                        <field name="integral_neck_length" string="颈部长度(mm)"/>
+                                        <field name="integral_blade_tip_taper" string="刀尖锥度(°)"/>
+                                        <field name="integral_blade_helix_angle" string="刃部螺旋角(°)"/>
+                                        <field name="integral_blade_type" string="刃部类型"/>
+                                        <field name="integral_blade_material" string="刀具材质" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                        <label for="integral_run_out_accuracy_min" string="端跳精度:"/>
+                                            <div class="test_model">
+                                                <label for="integral_run_out_accuracy_min" string="最小(min)"/>
+                                                <field name="integral_run_out_accuracy_min" class="o_address_zip" required="1"
+                                                       options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                                <span>(mm)&amp;nbsp;</span>
+                                                <label for="integral_run_out_accuracy_max" string="最大(max)"/>
+                                                <field name="integral_run_out_accuracy_max" class="o_address_zip" required="1"
+                                                       options="{'format': false}" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
+                                                <span>(mm)&amp;nbsp;</span>
+                                            </div>
                                     </group>
                                     <group>
-                                        <field name="integral_front_angle" string="前角(°)"/>
-                                        <field name="integral_rear_angle" string="后角(°)"/>
-                                        <field name="integral_main_included_angle" string="主偏角(°)"/>
-                                        <field name="integral_nut" string="配对螺母(mm)"/>
-                                        <field name="integral_hardness" string="加工硬度(HRC)"/>
+                                        <field name="integral_blade_number" string="刃数(个)"/>
+                                        <field name="integral_shank_diameter" string="柄部直径(mm)"/>
+                                        <field name="integral_blade_diameter" string="刃部直径(mm)"/>
+                                        <field name="integral_neck_diameter" string="颈部直径(mm)"/>
+                                        <field name="integral_blade_tip_diameter" string="刀尖直径(mm)"/>
+                                        <field name="integral_hardness" string="刀具硬度(HRC)"/>
+                                        <field name="integral_coarse_medium_fine" string="粗/中/精" attrs="{'required': [('cutting_tool_type','=','整体式刀具')]}"/>
                                         <field name="integral_coating_material" string="涂层材质"/>
-                                        <field name="integral_scope" string="适用范围"/>
                                     </group>
                                 </group>
+                                <group string="适合加工方式">
+                                    <field name="suitable_machining_method_ids" string=""/>
+                                </group>
+                                <group string="刀尖特征">
+                                    <field name="blade_tip_characteristics_ids" string=""/>
+                                </group>
+                                <group string="柄部类型">
+                                    <field name="handle_type_ids" string=""/>
+                                </group>
+                                <group string="走刀方向">
+                                    <field name="cutting_direction_ids" string=""/>
+                                </group>
+                                <group string="适合冷却液">
+                                    <field name="suitable_coolant_ids" string=""/>
+                                </group>
                             </page>
                             <page string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
                                 <group>
diff --git a/web_gantt/static/src/js/gantt_renderer.js b/web_gantt/static/src/js/gantt_renderer.js
index 0627dd88..4ef5b845 100644
--- a/web_gantt/static/src/js/gantt_renderer.js
+++ b/web_gantt/static/src/js/gantt_renderer.js
@@ -637,8 +637,10 @@ export default AbstractRenderer.extend(WidgetAdapterMixin, {
             case 'day':
                 return focusDate.format('dddd, MMMM DD, YYYY');
             case 'week':
-                const dateStart = focusDate.clone().startOf('week').format('DD MMMM YYYY');
-                const dateEnd = focusDate.clone().endOf('week').format('DD MMMM YYYY');
+                // const dateStart = focusDate.clone().startOf('week').format('DD MMMM YYYY');
+                const dateStart = focusDate.clone().startOf('week').format('YYYY MMMM DD ');
+                // const dateEnd = focusDate.clone().endOf('week').format('DD MMMM YYYY');
+                const dateEnd = focusDate.clone().endOf('week').format('YYYY MMMM DD ');
                 return _.str.sprintf('%s - %s', dateStart, dateEnd);
             case 'month':
                 return focusDate.format('MMMM YYYY');
diff --git a/web_gantt/static/src/js/gantt_view.js b/web_gantt/static/src/js/gantt_view.js
index 10c0fa83..5bc085b7 100644
--- a/web_gantt/static/src/js/gantt_view.js
+++ b/web_gantt/static/src/js/gantt_view.js
@@ -112,7 +112,7 @@ const GanttView = AbstractView.extend({
             allowedScales = Object.keys(this.SCALES);
         }
 
-        const scale = params.context.default_scale || arch.attrs.default_scale || 'month';
+        const scale = params.context.default_scale || arch.attrs.default_scale || 'week';
         const initialDate = moment(params.context.initialDate || params.initialDate || arch.attrs.initial_date || new Date());
         const offset = arch.attrs.offset;
         if (offset && scale) {
diff --git a/web_gantt/static/src/xml/web_gantt.xml b/web_gantt/static/src/xml/web_gantt.xml
index aa1e13bb..264a37ae 100644
--- a/web_gantt/static/src/xml/web_gantt.xml
+++ b/web_gantt/static/src/xml/web_gantt.xml
@@ -69,7 +69,7 @@
                         </div>
                     </div>
                     <div class="row g-0 o_gantt_header_scale">
-                        <t t-set="formats" t-value="{'week': 'dddd, Do', 'month': 'DD', 'year': isMobile ? 'MMM' : 'MMMM'}"/>
+                        <t t-set="formats" t-value="{'week': 'Do(dddd)', 'month': 'DD', 'year': isMobile ? 'MMM' : 'MMMM'}"/>
 
                         <t t-foreach="widget.viewInfo.slots" t-as="slot">
                             <t t-set="isToday" t-value="slot.isSame(new Date(), 'day') &amp;&amp; widget.state.scale !== 'day'"/>