diff --git a/jikimo_purchase_tier_validation/__init__.py b/jikimo_purchase_tier_validation/__init__.py
new file mode 100644
index 00000000..511a0ca3
--- /dev/null
+++ b/jikimo_purchase_tier_validation/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
new file mode 100644
index 00000000..99945b9e
--- /dev/null
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "机企猫 采购审批流程",
+
+    'summary': """
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
+
+    'description': """
+        Long description of module's purpose
+    """,
+
+    'author': "My Company",
+    'website': "https://www.yourcompany.com",
+
+    # Categories can be used to filter modules in modules listing
+    # Check https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/data/ir_module_category_data.xml
+    # for the full list
+    'category': 'Uncategorized',
+    'version': '0.1',
+
+    # any module necessary for this one to work correctly
+    'depends': ['purchase', 'base_tier_validation'],
+
+    # always loaded
+    'data': [
+        # 'security/ir.model.access.csv',
+        'views/views.xml',
+        'views/templates.xml',
+    ],
+    # only loaded in demonstration mode
+    'demo': [
+        'demo/demo.xml',
+    ],
+}
diff --git a/jikimo_purchase_tier_validation/controllers/__init__.py b/jikimo_purchase_tier_validation/controllers/__init__.py
new file mode 100644
index 00000000..457bae27
--- /dev/null
+++ b/jikimo_purchase_tier_validation/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/controllers/controllers.py b/jikimo_purchase_tier_validation/controllers/controllers.py
new file mode 100644
index 00000000..6bbe5e40
--- /dev/null
+++ b/jikimo_purchase_tier_validation/controllers/controllers.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# from odoo import http
+
+
+# class JikimoPurchaseTierValidation(http.Controller):
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation', auth='public')
+#     def index(self, **kw):
+#         return "Hello, world"
+
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation/objects', auth='public')
+#     def list(self, **kw):
+#         return http.request.render('jikimo_purchase_tier_validation.listing', {
+#             'root': '/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation',
+#             'objects': http.request.env['jikimo_purchase_tier_validation.jikimo_purchase_tier_validation'].search([]),
+#         })
+
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation/objects/<model("jikimo_purchase_tier_validation.jikimo_purchase_tier_validation"):obj>', auth='public')
+#     def object(self, obj, **kw):
+#         return http.request.render('jikimo_purchase_tier_validation.object', {
+#             'object': obj
+#         })
diff --git a/jikimo_purchase_tier_validation/demo/demo.xml b/jikimo_purchase_tier_validation/demo/demo.xml
new file mode 100644
index 00000000..cbba42ce
--- /dev/null
+++ b/jikimo_purchase_tier_validation/demo/demo.xml
@@ -0,0 +1,30 @@
+<odoo>
+    <data>
+<!--
+          <record id="object0" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 0</field>
+            <field name="value">0</field>
+          </record>
+
+          <record id="object1" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 1</field>
+            <field name="value">10</field>
+          </record>
+
+          <record id="object2" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 2</field>
+            <field name="value">20</field>
+          </record>
+
+          <record id="object3" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 3</field>
+            <field name="value">30</field>
+          </record>
+
+          <record id="object4" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 4</field>
+            <field name="value">40</field>
+          </record>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/models/__init__.py b/jikimo_purchase_tier_validation/models/__init__.py
new file mode 100644
index 00000000..5305644d
--- /dev/null
+++ b/jikimo_purchase_tier_validation/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
new file mode 100644
index 00000000..bb61cd5b
--- /dev/null
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -0,0 +1,19 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+class jikimo_purchase_tier_validation(models.Model):
+    _name = 'purchase.order'
+    _inherit = ['purchase.order', 'tier.validation']
+
+    def request_validation(self):
+        for record in self:
+            missing_fields = []
+            if not record.partner_ref:
+                missing_fields.append('合同名称')
+            if not record.contract_number:
+                missing_fields.append('合同编号')
+            
+            if missing_fields:
+                raise ValidationError(_('如下字段要求必须填写：%s') % '、'.join(missing_fields))
+                
+        return super(jikimo_purchase_tier_validation, self).request_validation()
diff --git a/jikimo_purchase_tier_validation/security/ir.model.access.csv b/jikimo_purchase_tier_validation/security/ir.model.access.csv
new file mode 100644
index 00000000..ccd753fc
--- /dev/null
+++ b/jikimo_purchase_tier_validation/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,jikimo_purchase_tier_validation.jikimo_purchase_tier_validation,model_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/views/templates.xml b/jikimo_purchase_tier_validation/views/templates.xml
new file mode 100644
index 00000000..cea6b39a
--- /dev/null
+++ b/jikimo_purchase_tier_validation/views/templates.xml
@@ -0,0 +1,24 @@
+<odoo>
+    <data>
+<!--
+        <template id="listing">
+          <ul>
+            <li t-foreach="objects" t-as="object">
+              <a t-attf-href="#{ root }/objects/#{ object.id }">
+                <t t-esc="object.display_name"/>
+              </a>
+            </li>
+          </ul>
+        </template>
+        <template id="object">
+          <h1><t t-esc="object.display_name"/></h1>
+          <dl>
+            <t t-foreach="object._fields" t-as="field">
+              <dt><t t-esc="field"/></dt>
+              <dd><t t-esc="object[field]"/></dd>
+            </t>
+          </dl>
+        </template>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
new file mode 100644
index 00000000..5c87a811
--- /dev/null
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -0,0 +1,60 @@
+<odoo>
+  <data>
+    <!-- explicit list view definition -->
+<!--
+    <record model="ir.ui.view" id="jikimo_purchase_tier_validation.list">
+      <field name="name">jikimo_purchase_tier_validation list</field>
+      <field name="model">jikimo_purchase_tier_validation.jikimo_purchase_tier_validation</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="value"/>
+          <field name="value2"/>
+        </tree>
+      </field>
+    </record>
+-->
+
+    <!-- actions opening views on models -->
+<!--
+    <record model="ir.actions.act_window" id="jikimo_purchase_tier_validation.action_window">
+      <field name="name">jikimo_purchase_tier_validation window</field>
+      <field name="res_model">jikimo_purchase_tier_validation.jikimo_purchase_tier_validation</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+-->
+
+    <!-- server action to the one above -->
+<!--
+    <record model="ir.actions.server" id="jikimo_purchase_tier_validation.action_server">
+      <field name="name">jikimo_purchase_tier_validation server</field>
+      <field name="model_id" ref="model_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation"/>
+      <field name="state">code</field>
+      <field name="code">
+        action = {
+          "type": "ir.actions.act_window",
+          "view_mode": "tree,form",
+          "res_model": model._name,
+        }
+      </field>
+    </record>
+-->
+
+    <!-- Top menu item -->
+<!--
+    <menuitem name="jikimo_purchase_tier_validation" id="jikimo_purchase_tier_validation.menu_root"/>
+-->
+    <!-- menu categories -->
+<!--
+    <menuitem name="Menu 1" id="jikimo_purchase_tier_validation.menu_1" parent="jikimo_purchase_tier_validation.menu_root"/>
+    <menuitem name="Menu 2" id="jikimo_purchase_tier_validation.menu_2" parent="jikimo_purchase_tier_validation.menu_root"/>
+-->
+    <!-- actions -->
+<!--
+    <menuitem name="List" id="jikimo_purchase_tier_validation.menu_1_list" parent="jikimo_purchase_tier_validation.menu_1"
+              action="jikimo_purchase_tier_validation.action_window"/>
+    <menuitem name="Server to list" id="jikimo_purchase_tier_validation" parent="jikimo_purchase_tier_validation.menu_2"
+              action="jikimo_purchase_tier_validation.action_server"/>
+-->
+  </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 8c2ffada..ed117589 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -363,15 +363,9 @@ class MrpProduction(models.Model):
             # if production.state == 'pending_cam':
             #     if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):
             #         production.state = 'done'
-            if any(
-                    (
-                            wo.test_results == '返工' and wo.state == 'done' and production.programming_state in [
-                        '已编程']) or (
-                            wo.state == 'rework' and production.programming_state == '编程中') or (
-                            wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中',
-                                                                                                             '已编程'])
-                    for wo in
-                    production.workorder_ids):
+            if any((wo.test_results == '返工' and wo.state == 'done' and production.programming_state in ['已编程'])
+                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
+                    for wo in production.workorder_ids):
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
                 production.state = 'scrap'
@@ -381,6 +375,10 @@ class MrpProduction(models.Model):
             # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
             if production.tool_state == '2':
                 production.state = 'rework'
+            if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
+                if production.state not in ['scrap', 'rework', 'cancel']:
+                    production.state = 'done'
+
 
     # 退回调整
     def technology_back_adjust(self):
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 567930dd..8a44b621 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -131,11 +131,6 @@
                     <field name="deadline_of_delivery" readonly="1"/>
                     <field name="tool_state_remark2" invisible="1"/>
                 </xpath>
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
-                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', True)]}"
-                            groups="sf_base.group_sf_mrp_user"/>
-                </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[1]" position="replace">
                     <button name="button_mark_done"
                             attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '!=', [])]}"
@@ -260,13 +255,6 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
-                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
-                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
-                            groups="sf_base.group_sf_mrp_user"/>
-                </xpath>
-
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
                             attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
@@ -310,12 +298,14 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                <xpath expr="//header//button[@name='action_cancel'][2]" position="replace">
                     <button name="action_cancel" type="object" string="取消" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
+                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'rework', 'cancel')), ('confirm_cancel', '=', False)]}"
                             confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
                             groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
+                <xpath expr="//header//button[@name='action_cancel'][1]" position="replace"></xpath>
+
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
                             attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 7fc2e8c5..1e47b873 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -174,8 +174,6 @@
                 <!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
                         attrs="{'invisible': [('state', '!=', 'ready')]}"/>
-                <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index fcafd490..148967be 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -287,6 +287,8 @@ class ReworkWizard(models.TransientModel):
                     self.production_id.update_programming_state()
                     self.production_id.write(
                         {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
+                # ================= 返工完成，制造订单状态置为加工中 ==============
+                self.production_id.write({'state': 'progress', 'is_rework': False})
 
     @api.onchange('production_id')
     def onchange_processing_panel_id(self):
diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index fcfcba8f..6796a50b 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -12,7 +12,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp',
-                'sf_manufacturing'],
+                'sf_manufacturing','product'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
diff --git a/sf_message/controllers/main.py b/sf_message/controllers/main.py
index 5b94f50a..dc555dc9 100644
--- a/sf_message/controllers/main.py
+++ b/sf_message/controllers/main.py
@@ -39,12 +39,6 @@ class MessageSfMrsConnect(Sf_Mrs_Connect):
                     _logger.info('无效用刀异常消息推送接口:%s' % ret)
             except Exception as e:
                 _logger.info('无效用刀异常消息推送接口:%s' % e)
-
-            try:
-                productions = request.env['mrp.production'].sudo().search([('id', '=', res.get('production_ids')[0])])
-                productions.add_queue('工单已下发通知')
-            except Exception as e:
-                _logger.info('工单已下发通知异常:%s' % e)
         return json.JSONEncoder().encode(res)
 
     @http.route('/api/maintenance_logs/notify', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index 8a95f525..e7c3b0ba 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -56,7 +56,7 @@
         <!--工单-->
         <record id="bussiness_mrp_workorder_remind" model="jikimo.message.bussiness.node">
             <field name="name">工单已下发通知</field>
-            <field name="model">mrp.production</field>
+            <field name="model">product.product</field>
         </record>
         <!--发货调拨-->
         <record id="production_completed_warehouse_reminder" model="jikimo.message.bussiness.node">
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index e1ba0a93..52b226e3 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -78,8 +78,8 @@
 
         <record id="template_mrp_workorder_remind" model="jikimo.message.template">
             <field name="name">工单已下发通知</field>
-            <field name="model_id" ref="mrp.model_mrp_production"/>
-            <field name="model">mrp.production</field>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field name="model">product.product</field>
             <field name="bussiness_node_id" ref="bussiness_mrp_workorder_remind"/>
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index 1e659c52..8c215042 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -12,3 +12,4 @@ from . import sf_message_quality_cnc_test
 from . import sf_message_maintenance_logs
 from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
+from . import sf_message_product
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index d9dd0f1b..260c591c 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -69,25 +69,16 @@ class SFMessageMrpProduction(models.Model):
                                                                                                   url_with_id).replace(
                         '{{num}}', str(stock_picking_num))
                     contents.append(content)
-            if message_queue_id.message_template_id.name == '工单已下发通知':
-                content = message_queue_id.message_template_id.content
-                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                production_num = self.env['mrp.production'].sudo().search_count(
-                    [('product_id', '=', mrp_production.product_id.id)])
-                if production_num >= 1:
-                    url = self.get_request_url()
-                    content = content.replace('{{product_id}}', mrp_production.product_id.name).replace(
-                        '{{number}}', str(production_num)).replace(
-                        '{{request_url}}', url)
-                    contents.append(content)
         if unique_products:
+            action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
             unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
-                                                                'sf_plan.sf_production_plan_action1')
+                                                                action_id)
             contents.extend(unique_products_contents)
         if technology_to_confirmed:
+            action_id = self.env.ref('mrp.mrp_production_action').id
             technology_to_confirmed_contents = self.get_production_info(content, technology_to_confirmed,
                                                                         'technology_to_confirmed',
-                                                                        'mrp.mrp_production_action')
+                                                                        action_id)
             contents.extend(technology_to_confirmed_contents)
         logging.info('生产完工入库提醒: %s' % contents)
         return contents
@@ -100,7 +91,6 @@ class SFMessageMrpProduction(models.Model):
                 [('product_id', '=', products_id), ('state', '=', state)])
             if production_num >= 1:
                 url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                action_id = self.env.ref(action_id).id
                 url_with_id = f"{url}/web#view_type=list&action={action_id}"
                 new_content = (content.replace('{{name}}', product_name)
                                .replace('{{url}}', url_with_id)
@@ -120,17 +110,3 @@ class SFMessageMrpProduction(models.Model):
         # 拼接URL
         full_url = url + "/web#" + query_string
         return full_url
-
-    def get_request_url(self):
-        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
-        menu_id = self.env.ref('mrp.menu_mrp_root').id
-        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
-        # 查询参数
-        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
-                  'view_type': 'list', 'active_id': active_id}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url
diff --git a/sf_message/models/sf_message_mrp_production_wizard.py b/sf_message/models/sf_message_mrp_production_wizard.py
index 0defae7e..990bdd49 100644
--- a/sf_message/models/sf_message_mrp_production_wizard.py
+++ b/sf_message/models/sf_message_mrp_production_wizard.py
@@ -11,7 +11,7 @@ class SFMessageMrpProductionWizard(models.TransientModel):
         productions = super(SFMessageMrpProductionWizard, self).confirm()
         try:
             for production_info in self.production_id:
-                if production_info.state == 'confirmed':
+                if production_info.state == 'confirmed' and production_info.product_id.categ_id.type == '成品':
                     production_info.add_queue('待排程')
             for production_id in productions:
                 workorder_ids = production_id.workorder_ids.filtered(
diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py
new file mode 100644
index 00000000..4f983e49
--- /dev/null
+++ b/sf_message/models/sf_message_product.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+from urllib.parse import urlencode
+
+
+class SFMessagePlan(models.Model):
+    _name = 'product.product'
+    _inherit = ['product.product', 'jikimo.message.dispatch']
+
+    def _get_message(self, message_queue_ids):
+        contents = []
+        for message_queue_id in message_queue_ids:
+            if message_queue_id.message_template_id.name == '工单已下发通知':
+                content = message_queue_id.message_template_id.content
+                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                production_num = self.env['mrp.production'].sudo().search_count(
+                    [('product_id', '=', product_product.id)])
+                if production_num >= 1:
+                    url = self.get_request_url()
+                    content = content.replace('{{product_id}}', product_product.name).replace(
+                        '{{number}}', str(production_num)).replace(
+                        '{{request_url}}', url)
+                    contents.append(content)
+        return contents
+
+    def get_request_url(self):
+        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
+        menu_id = self.env.ref('mrp.menu_mrp_root').id
+        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
+                  'view_type': 'list', 'active_id': active_id}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = url + "/web#" + query_string
+        return full_url
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 5d15d34a..05bd6f3e 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -25,7 +25,8 @@ class SFMessageStockPicking(models.Model):
         super(SFMessageStockPicking, self)._compute_state()
         try:
             for record in self:
-                if record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC':
+                if (record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC'
+                        and record.product_id.categ_id.type == '坯料'):
                     record.add_queue('坯料发料提醒')
 
                 if record.picking_type_id.sequence_code == 'SFP' and record.state == 'done':
diff --git a/sf_message/models/sf_message_template.py b/sf_message/models/sf_message_template.py
index 87328849..d97c5467 100644
--- a/sf_message/models/sf_message_template.py
+++ b/sf_message/models/sf_message_template.py
@@ -17,4 +17,5 @@ class SfMessageTemplate(models.Model):
         res.append('sf.maintenance.logs')
         res.append('quality.cnc.test')
         res.append('mrp.production')
+        res.append('product.product')
         return res
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index c604534d..ee8f6c00 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -12,6 +12,23 @@ class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
     _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
 
+    @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
+                 'production_id.tool_state', 'production_id.schedule_state', 'sequence',
+                 'production_id.programming_state')
+    def _compute_state(self):
+        super(SFMessageWork, self)._compute_state()
+        for workorder in self:
+            work_ids = workorder.production_id.workorder_ids.filtered(lambda w: w.routing_type == '装夹预调')
+            if work_ids:
+                min_sequence_wk = work_ids.sorted(key=lambda w: w.sequence)[0]
+                if workorder.state == 'ready' and workorder.routing_type == '装夹预调' and workorder.id == min_sequence_wk.id:
+                    message_template = self.env["jikimo.message.template"].sudo().search([("name", "=", '工单已下发通知')], limit=1)
+                    jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+                        [('res_id', '=', workorder.production_id.product_id.id), ("message_status", "in", ("pending", "sent")),
+                         ('message_template_id', '=', message_template.id)])
+                    if not jikimo_message_queue:
+                        workorder.production_id.product_id.add_queue('工单已下发通知')
+
     def _get_message(self, message_queue_ids):
         contents = []
         bussiness_node = None
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index a68e9417..a8c20456 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -287,6 +287,11 @@ class RePurchaseOrder(models.Model):
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
 
+    # 合同编号
+    contract_number = fields.Char(string='合同编号', size=20)
+    # 合同概况
+    contract_summary = fields.Text(string='合同概况')
+
     @api.depends('origin')
     def _compute_purchase_type(self):
         for purchase in self:
@@ -395,11 +400,12 @@ class RePurchaseOrder(models.Model):
                             move_id.put_move_line()
             for line in item.order_line:
                 if line.product_id.categ_type == '表面工艺':
-                    for production_name in item.origin.split(','):
-                        production = self.env['mrp.production'].search([('name', '=', production_name)])
-                        for workorder in production.workorder_ids.filtered(
-                                lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
-                            workorder.state = 'ready'
+                    if item.origin:
+                        for production_name in item.origin.split(','):
+                            production = self.env['mrp.production'].search([('name', '=', production_name)])
+                            for workorder in production.workorder_ids.filtered(
+                                    lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
+                                workorder.state = 'ready'
 
         return result
 
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index be35d8a2..76cd4c74 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -36,13 +36,13 @@
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
                 </field>
                 <field name="currency_id" position="after">
-                    <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}"/>
+                    <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}" string="订单备注"/>
                 </field>
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
                             string="确认订单" id="draft_confirm"
                             groups="sf_base.group_purchase,sf_base.group_purchase_director"
-                            attrs="{'invisible': [('state', 'in', ['purchase'])]}"
+                            attrs="{'invisible': [('state', 'in', ['purchase', 'cancel'])]}"
                     />
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="replace">
@@ -139,7 +139,14 @@
 <!--                    <field name="part_number" optional="show"/>-->
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
-                    <attribute name="string">报价截止日期</attribute>
+                    <attribute name="string">签约日期</attribute>
+                </xpath>
+                <field name="payment_term_id" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
+                    <field name="contract_summary"/>
                 </xpath>
                 <field name="partner_ref" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
@@ -171,13 +178,49 @@
                 </field>
 
                 <!--                 添加采购类型字段 -->
-                <field name="partner_ref" position="after">
+                <field name="partner_id" position="after">
                     <field name="purchase_type" string="采购类型" readonly="1"/>
+                    <field name="picking_type_id" string="作业类型" domain="[('code','=','incoming'), '|', ('warehouse_id', '=', False), ('warehouse_id.company_id', '=', company_id)]" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
+                    <label for="date_planned" string="最近交货日期"/>
+                    <div name="date_planned_div" class="o_row">
+                        <field name="date_planned" attrs="{'readonly': [('state', 'not in', ('draft', 'sent', 'to approve', 'purchase'))]}"/>
+                        <field name="mail_reminder_confirmed" invisible="1"/>
+                        <span class="text-muted" attrs="{'invisible': [('mail_reminder_confirmed', '=', False)]}">(confirmed by vendor)</span>
+                    </div>
+                    <field name="effective_date" attrs="{'invisible': [('effective_date', '=', False)]}" string="到货时间"/>
                 </field>
+                <field name="partner_ref" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
+                <xpath expr="//sheet/group/group[2]/field[1]" position="before">
+                    <field name="partner_ref" string="合同名称"/>
+                    <field name="contract_number"/>
+                </xpath>
                 <!--                添加销售订单号字段-->
-                <field name="effective_date" position="after">
-                    <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}"/>
-                </field>
+                <xpath expr="//sheet/group/group[2]/div[@name='date_approve']" position="after">
+<!--                     <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}" string="参考销售订单"/> -->
+                    <field name="origin_sale_id" readonly="1" string="参考销售订单"/>
+                </xpath>
+                <xpath expr="//sheet/group/group[2]/field[@name='effective_date']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <!-- 隐藏 label -->
+                <xpath expr="//label[@for='receipt_reminder_email']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <!-- 隐藏整个 reminder div -->
+                <xpath expr="//div[@name='reminder']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <!-- 使用更精确的路径定位原始元素 -->
+                <xpath expr="//sheet/group/group[2]/label[@for='date_planned']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//sheet/group/group[2]/div[@name='date_planned_div']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
             </field>
         </record>
 
@@ -196,7 +239,7 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
-                    <attribute name="string">报价截止日期</attribute>
+                    <attribute name="string">签约日期</attribute>
                     <attribute name="widget">''</attribute>
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="after">
@@ -224,6 +267,8 @@
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
                     </attribute>
                 </field>
+                <xpath expr="//field[@name='picking_type_id'][1]" position="replace">
+                </xpath>
             </field>
         </record>