From 82f54b5d830888ac9154daa35e5afd95648a78d1 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 24 Jan 2024 14:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E7=BA=BF=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=E5=8A=A0=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  11 -
 sf_manufacturing/models/mrp_workorder.py      |   2 +-
 .../views/mrp_production_addional_change.xml  | 329 ++++++++++--------
 sf_manufacturing/views/mrp_workorder_view.xml |   9 +-
 sf_plan/models/custom_plan.py                 |  38 +-
 sf_plan/views/change_manufactuing.xml         | 110 +++---
 sf_plan/views/view.xml                        | 230 +++++-------
 7 files changed, 359 insertions(+), 370 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7bf0886f..61be5b40 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -50,18 +50,7 @@ class MrpProduction(models.Model):
     work_state = fields.Char('业务状态')
     programming_state = fields.Char('编程状态')
     glb_file = fields.Binary("glb模型文件")
-    production_line_id = fields.Many2one('sf.production.line', string='生产线', compute='_compute_production_line_id',
-                                         store=True)
-    plan_start_processing_time = fields.Datetime('计划开始加工时间')
 
-    @api.depends('name')
-    def _compute_production_line_id(self):
-        for production in self:
-            if production.name:
-                plan_production = self.env['sf.production.plan'].search([('production_id', '=', self.id)])
-                if plan_production:
-                    production.production_line_id = plan_production.production_id.id
-                    production.plan_start_processing_time = plan_production.date_planned_start
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 04f49d0a..7a77fc5c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -777,7 +777,7 @@ class WorkPieceDelivery(models.Model):
 
     workorder_id = fields.Many2one('mrp.workorder', string='工单',
                                    domain=[('name', 'in', ('装夹', '解除装夹'))])
-    name = fields.Char(related='workorder_id.production_id.name', string='工件编码/任务编码', store=True)
+    production_code = fields.Char(related='workorder_id.production_id.name', string='工件编码/任务编码', store=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
     workpiece_code = fields.Char('同运工件编码')
     feeder_station_start = fields.Char('起点接驳站')
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 5c7f9cc0..e45f4a6e 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -18,19 +18,21 @@
                     <field name="product_qty" sum="Total Qty" string="数量" readonly="1" optional="show"/>
                 </xpath>
                 <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"/>
+                    <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="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"/> -->
+                    <!--                     <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'"/>
+                    <field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'"
+                           decoration-success="reservation_state == 'assigned'"/>
                 </xpath>
-<!--                 <xpath expr="//field[@name='state']" position="before"> -->
-<!--                     <field name="schedule_state" optional="show"/> -->
-<!--                 </xpath> -->
+                <!--                 <xpath expr="//field[@name='state']" position="before"> -->
+                <!--                     <field name="schedule_state" optional="show"/> -->
+                <!--                 </xpath> -->
                 <xpath expr="//field[@name='activity_ids']" position="replace">
                     <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
                 </xpath>
@@ -39,44 +41,52 @@
                 </xpath>
                 <xpath expr="//field[@name='components_availability']" position="replace">
                     <field name="components_availability" options='{"lazy": true}'
-                        attrs="{'invisible': [('state', 'not in', ['confirmed', 'progress'])]}"
-                        optional="hide"
-                        decoration-success="reservation_state == 'assigned' or components_availability_state == 'available'"
-                        decoration-warning="reservation_state != 'assigned' and components_availability_state in ('expected', 'available')"
-                        decoration-danger="reservation_state != 'assigned' and components_availability_state == 'late'"/>
+                           attrs="{'invisible': [('state', 'not in', ['confirmed', 'progress'])]}"
+                           optional="hide"
+                           decoration-success="reservation_state == 'assigned' or components_availability_state == 'available'"
+                           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> -->
+                <!--                 <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="//field[@name='state']" position="attributes">
-                    <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done</attribute>
+                    <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done
+                    </attribute>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="programming_no"/>
+                    <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
-                    <field name="programming_state"/>
+                    <field name="programming_state" readonly="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"/>
+                            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', '!=', [])]}" string="验证" type="object" class="oe_highlight"
-                            confirm="There are no components to consume. Are you still sure you want to continue?" data-hotkey="g" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_mark_done"
+                            attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '!=', [])]}"
+                            string="验证" type="object" class="oe_highlight"
+                            confirm="There are no components to consume. Are you still sure you want to continue?"
+                            data-hotkey="g" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[2]" position="replace">
-                    <button name="button_mark_done" attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '=', [])]}" string="Validate" type="object" class="oe_highlight" data-hotkey="g" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_mark_done"
+                            attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '=', [])]}"
+                            string="Validate" type="object" class="oe_highlight" data-hotkey="g"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[3]" position="replace">
                     <button name="button_mark_done" attrs="{'invisible': [
@@ -86,7 +96,8 @@
                         '|',
                         ('state', 'not in', ('confirmed', 'progress')),
                         ('qty_producing', '!=', 0),
-                        ('state', '!=', 'to_close')]}" string="Mark as Done" type="object" class="oe_highlight" data-hotkey="g" groups="sf_base.group_sf_mrp_user"/>
+                        ('state', '!=', 'to_close')]}" string="Mark as Done" type="object" class="oe_highlight"
+                            data-hotkey="g" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[4]" position="replace">
                     <button name="button_mark_done" attrs="{'invisible': [
@@ -96,61 +107,88 @@
                         '|',
                         ('state', 'not in', ('confirmed', 'progress')),
                         ('qty_producing', '!=', 0),
-                        ('state', '!=', 'to_close')]}" string="Mark as Done" type="object" class="oe_highlight" data-hotkey="g"
-                            confirm="There are no components to consume. Are you still sure you want to continue?" groups="sf_base.group_sf_mrp_user"/>
+                        ('state', '!=', 'to_close')]}" string="Mark as Done" type="object" class="oe_highlight"
+                            data-hotkey="g"
+                            confirm="There are no components to consume. Are you still sure you want to continue?"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//header//button[@name='button_unplan']" position="replace">
-                    <button name="button_unplan" type="object" string="取消安排" attrs="{'invisible': ['|', ('is_planned', '=', False), ('state', '=', 'cancel')]}" data-hotkey="x" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_unplan" type="object" string="取消安排"
+                            attrs="{'invisible': ['|', ('is_planned', '=', False), ('state', '=', 'cancel')]}"
+                            data-hotkey="x" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//header//button[@name='button_scrap']" position="replace">
-                    <button name="button_scrap" type="object" string="报废" attrs="{'invisible': [('state', 'in', ('cancel', 'draft'))]}" data-hotkey="y" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_scrap" type="object" string="报废"
+                            attrs="{'invisible': [('state', 'in', ('cancel', 'draft'))]}" data-hotkey="y"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
 
                 <xpath expr="//header//button[@name='action_confirm']" position="replace">
-                  <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Confirm" type="object" class="oe_highlight" data-hotkey="v" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Confirm"
+                            type="object" class="oe_highlight" data-hotkey="v" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='button_plan']" position="replace">
-                  <button name="button_plan" attrs="{'invisible': ['|', '|', ('state', 'not in', ('confirmed', 'progress', 'to_close')), ('workorder_ids', '=', []), ('is_planned', '=', True)]}" type="object" string="Plan" class="oe_highlight" data-hotkey="x" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_plan"
+                            attrs="{'invisible': ['|', '|', ('state', 'not in', ('confirmed', 'progress', 'to_close')), ('workorder_ids', '=', []), ('is_planned', '=', True)]}"
+                            type="object" string="Plan" class="oe_highlight" data-hotkey="x"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='action_assign']" position="replace">
-                  <button name="action_assign" attrs="{'invisible': ['|', ('state', 'in', ('draft', 'done', 'cancel')), ('reserve_visible', '=', False)]}" string="Check availability" type="object" data-hotkey="q" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="action_assign"
+                            attrs="{'invisible': ['|', ('state', 'in', ('draft', 'done', 'cancel')), ('reserve_visible', '=', False)]}"
+                            string="Check availability" type="object" data-hotkey="q"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='do_unreserve']" position="replace">
-                  <button name="do_unreserve" type="object" string="Unreserve" attrs="{'invisible': [('unreserve_visible', '=', False)]}" data-hotkey="w" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="do_unreserve" type="object" string="Unreserve"
+                            attrs="{'invisible': [('unreserve_visible', '=', False)]}" data-hotkey="w"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='action_toggle_is_locked']" position="replace">
-                  <button name="action_toggle_is_locked" attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', False)]}" string="Unlock" groups="sf_base.group_sf_mrp_user" type="object" help="Unlock the manufacturing order to adjust what has been consumed or produced." data-hotkey="l"/>
+                    <button name="action_toggle_is_locked"
+                            attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', False)]}"
+                            string="Unlock" groups="sf_base.group_sf_mrp_user" type="object"
+                            help="Unlock the manufacturing order to adjust what has been consumed or produced."
+                            data-hotkey="l"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='action_toggle_is_locked']" position="replace">
-                  <button name="action_toggle_is_locked" attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', True)]}" string="Lock" groups="sf_base.group_sf_mrp_user" type="object" help="Lock the manufacturing order to prevent changes to what has been consumed or produced." data-hotkey="l"/>
+                    <button name="action_toggle_is_locked"
+                            attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', True)]}"
+                            string="Lock" groups="sf_base.group_sf_mrp_user" type="object"
+                            help="Lock the manufacturing order to prevent changes to what has been consumed or produced."
+                            data-hotkey="l"/>
                 </xpath>
 
                 <xpath expr="//header//button[@name='action_serial_mass_produce_wizard']" position="replace">
-                  <button name="action_serial_mass_produce_wizard" attrs="{'invisible': [('show_serial_mass_produce', '=', False)]}" string="Mass Produce" type="object" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="action_serial_mass_produce_wizard"
+                            attrs="{'invisible': [('show_serial_mass_produce', '=', False)]}" string="Mass Produce"
+                            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"/>
+                    <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="Unbuild" attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_unbuild" type="object" string="Unbuild"
+                            attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
 
-
             </field>
         </record>
 
-<!-- 工单的操作按钮只让制造用户可见 -->
+        <!-- 工单的操作按钮只让制造用户可见 -->
         <record id="sf_mrp_production_workorder_tree_editable_view" model="ir.ui.view">
             <field name="name">sf.mrp.production.workorder.tree.editable</field>
             <field name="model">mrp.workorder</field>
@@ -158,76 +196,81 @@
             <field name="arch" type="xml">
                 <xpath expr="//tree//button[@name='button_start']" position="replace">
                     <button name="button_start" type="object" string="Start" class="btn-success"
-                      attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" groups="sf_base.group_sf_mrp_user"/>
+                            attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="Pause" class="btn-warning"
-                      attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}" groups="sf_base.group_sf_mrp_user"/>
+                            attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_finish']" position="replace">
                     <button name="button_finish" type="object" string="Done" class="btn-success"
-                      attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}" groups="sf_base.group_sf_mrp_user"/>
+                            attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="replace">
-                    <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                      attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="Block"
+                            context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                            attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_unblock']" position="replace">
-                    <button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                      attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}" groups="sf_base.group_sf_mrp_user"/>
+                    <button name="button_unblock" type="object" string="Unblock"
+                            context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                            attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='action_open_wizard']" position="replace">
                     <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only"
                             title="Open Work Order"
-                        context="{'default_workcenter_id': workcenter_id}" groups="sf_base.group_sf_mrp_user"/>
+                            context="{'default_workcenter_id': workcenter_id}" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
             </field>
         </record>
 
-<!-- 制造订单列表视图header内的按钮只让制造用户可见 -->
+        <!-- 制造订单列表视图header内的按钮只让制造用户可见 -->
         <record id="sf_mrp_production_tree_view" model="ir.ui.view">
-        <field name="name">sf.mrp.production.tree</field>
-        <field name="model">mrp.production</field>
-        <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//header//button[@name='button_plan']" position="replace">
-<!--                 <button name="button_plan" type="object" string="安排" groups="sf_base.group_sf_mrp_user"/> -->
-            </xpath>
-            <xpath expr="//header//button[@name='do_unreserve']" position="replace">
-                <button name="do_unreserve" type="object" string="取消保留" groups="sf_base.group_sf_mrp_user"/>
-            </xpath>
-            <xpath expr="//header//button[@name='action_cancel']" position="replace">
-                <button name="action_cancel" type="object" string="取消" groups="sf_base.group_sf_mrp_user"/>
-            </xpath>
+            <field name="name">sf.mrp.production.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//header//button[@name='button_plan']" position="replace">
+                    <!--                 <button name="button_plan" type="object" string="安排" groups="sf_base.group_sf_mrp_user"/> -->
+                </xpath>
+                <xpath expr="//header//button[@name='do_unreserve']" position="replace">
+                    <button name="do_unreserve" type="object" string="取消保留" groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
+                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                    <button name="action_cancel" type="object" string="取消" groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
 
-        </field>
-    </record>
+            </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_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>
@@ -243,24 +286,24 @@
             </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> -->
+        <!--                 <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> -->
 
 
-<!--         产品模板修改>>>增加“规格”字段specification_id -->
+        <!--         产品模板修改>>>增加“规格”字段specification_id -->
         <record id="custom_product_template_kanban_view" model="ir.ui.view">
             <field name="name">custom.Product.template.product.kanban</field>
             <field name="model">product.template</field>
@@ -268,44 +311,52 @@
             <field name="arch" type="xml">
                 <xpath expr="//kanban" position="replace">
                     <kanban sample="1" class="o_kanban_product_template">
-                    <field name="id"/>
-                    <field name="product_variant_count"/>
-                    <field name="currency_id"/>
-                    <field name="activity_state"/>
-                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}'/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_kanban_global_click">
-                                <div class="o_kanban_image me-1">
-                                    <img t-att-src="kanban_image('product.template', 'image_128', record.id.raw_value)" alt="Product" class="o_image_64_contain"/>
-                                </div>
-                                <div class="oe_kanban_details">
-                                    <div class="o_kanban_record_top mb-0">
-                                        <div class="o_kanban_record_headings">
-                                            <strong class="o_kanban_record_title">
-                                                <field name="name"/>
+                        <field name="id"/>
+                        <field name="product_variant_count"/>
+                        <field name="currency_id"/>
+                        <field name="activity_state"/>
+                        <progressbar field="activity_state"
+                                     colors='{"planned": "success", "today": "warning", "overdue": "danger"}'/>
+                        <templates>
+                            <t t-name="kanban-box">
+                                <div class="oe_kanban_card oe_kanban_global_click">
+                                    <div class="o_kanban_image me-1">
+                                        <img t-att-src="kanban_image('product.template', 'image_128', record.id.raw_value)"
+                                             alt="Product" class="o_image_64_contain"/>
+                                    </div>
+                                    <div class="oe_kanban_details">
+                                        <div class="o_kanban_record_top mb-0">
+                                            <div class="o_kanban_record_headings">
+                                                <strong class="o_kanban_record_title">
+                                                    <field name="name"/>
+                                                </strong>
+                                            </div>
+                                            <field name="priority" widget="priority"/>
+                                        </div>
+
+                                        <div name="product_specification_id" class="mt-1">
+                                            规格:
+                                            <field name="specification_id"></field>
+                                        </div>
+                                        <t t-if="record.default_code.value">[<field name="default_code"/>]
+                                        </t>
+                                        <div t-if="record.product_variant_count.value &gt; 1"
+                                             groups="product.group_product_variant">
+                                            <strong>
+                                                <t t-esc="record.product_variant_count.value"/>
+                                                Variants
                                             </strong>
                                         </div>
-                                        <field name="priority" widget="priority"/>
-                                    </div>
-
-                                    <div name="product_specification_id" class="mt-1">
-                                        规格: <field name="specification_id"></field>
-                                    </div>
-                                    <t t-if="record.default_code.value">[<field name="default_code"/>]</t>
-                                    <div t-if="record.product_variant_count.value &gt; 1" groups="product.group_product_variant">
-                                        <strong>
-                                            <t t-esc="record.product_variant_count.value"/> Variants
-                                        </strong>
-                                    </div>
-                                    <div name="product_lst_price" class="mt-1">
-                                        价格: <field name="list_price" widget="monetary" options="{'currency_field': 'currency_id', 'field_digits': True}"></field>
+                                        <div name="product_lst_price" class="mt-1">
+                                            价格:
+                                            <field name="list_price" widget="monetary"
+                                                   options="{'currency_field': 'currency_id', 'field_digits': True}"></field>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
+                            </t>
+                        </templates>
+                    </kanban>
                 </xpath>
             </field>
         </record>
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index c096f7bf..38c25a11 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -402,14 +402,13 @@
                 <page string="工件配送" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <field name="workpiece_delivery_id" widget="one2many">
                         <tree>
-                           <field name="name"/>
+                            <field name="production_code" invisible="1"/>
                             <field name="workpiece_code"/>
                             <field name="feeder_station_start"/>
                             <field name="feeder_station_destination"/>
                             <field name="production_line_id"/>
-                             <field name="task_delivery_time"/>
+                            <field name="task_delivery_time"/>
                             <field name="task_completion_time"/>
-                            <field name="production_line_id"/>
                         </tree>
                     </field>
                 </page>
@@ -514,7 +513,7 @@
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <tree string="工件配送单列表" editable="bottom">
-                <field name="name"/>
+                <field name="production_code"/>
                 <field name="workpiece_code"/>
                 <field name="feeder_station_start"/>
                 <field name="production_line_id"/>
@@ -532,7 +531,7 @@
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <search string="工件配送单列表">
-                <field name="name"/>
+                <field name="production_code"/>
                 <field name="workpiece_code"/>
                 <field name="feeder_station_start"/>
                 <field name="production_line_id"/>
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 1944f82a..28bf18df 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -324,32 +324,22 @@ class sf_production_plan(models.Model):
             raise UserError(e)
 
 
-# # sf生产排程
-# class sf_produce_plan(models.Model):
-#     _name = 'sf.produce.plan'
-#     _description = 'sf生产排程'
+class ReMrpProduction(models.Model):
+    _inherit = 'mrp.production'
 
-# # 重写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)
+    production_line_id = fields.Many2one('sf.production.line', string='生产线', compute='_compute_production_line_id',
+                                         store=True)
+    plan_start_processing_time = fields.Datetime('计划开始加工时间')
+
+    @api.depends('name')
+    def _compute_production_line_id(self):
+        for production in self:
+            if production.name:
+                plan_production = self.env['sf.production.plan'].search([('production_id', '=', production.id)])
+                if plan_production:
+                    production.production_line_id = plan_production.production_line_id
+                    production.plan_start_processing_time = plan_production.date_planned_start
 
-# # 当不设置计划结束时间时，增加计算计划结束时间的方法
-# @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
-#
 
 # 机台作业计划
 class machine_work_schedule(models.Model):
diff --git a/sf_plan/views/change_manufactuing.xml b/sf_plan/views/change_manufactuing.xml
index d1500bbd..d6d01ce9 100644
--- a/sf_plan/views/change_manufactuing.xml
+++ b/sf_plan/views/change_manufactuing.xml
@@ -10,10 +10,11 @@
                 <xpath expr="//form//header//button[@name='action_validate']" position="after">
                     <field name="active" invisible="1"/>
                     <field name="check_status" invisible="1"/>
-<!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                    <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                    <!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                    <!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                    <button name="action_check" string="审核" type="object" class="oe_highlight"
+                            attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                    <!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                 </xpath>
             </field>
         </record>
@@ -27,32 +28,33 @@
                 <xpath expr="//form//header//button[@name='action_validate']" position="after">
                     <field name="active" invisible="1"/>
                     <field name="check_status" invisible="1"/>
-<!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                    <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                    <!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                    <!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                    <button name="action_check" string="审核" type="object" class="oe_highlight"
+                            attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
+                    <!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                 </xpath>
             </field>
         </record>
 
         <!--         增加权限相关的按钮 -->
-<!--         <record id="custom_product_template_form_view" model="ir.ui.view"> -->
-<!--             <field name="name">custom.product.template.form</field> -->
-<!--             <field name="model">product.template</field> -->
-<!--             <field name="inherit_id" ref="product.product_template_form_view"/> -->
-<!--             <field name="arch" type="xml"> -->
-<!--                 <xpath expr="//form//header" position="inside"> -->
-<!--                     <field name="active" invisible="1"/> -->
-<!--                     <field name="check_status" invisible="1"/> -->
-<!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-<!--                     <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/> -->
-<!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
-<!--                 </xpath> -->
-<!--             </field> -->
-<!--         </record> -->
+        <!--         <record id="custom_product_template_form_view" model="ir.ui.view"> -->
+        <!--             <field name="name">custom.product.template.form</field> -->
+        <!--             <field name="model">product.template</field> -->
+        <!--             <field name="inherit_id" ref="product.product_template_form_view"/> -->
+        <!--             <field name="arch" type="xml"> -->
+        <!--                 <xpath expr="//form//header" position="inside"> -->
+        <!--                     <field name="active" invisible="1"/> -->
+        <!--                     <field name="check_status" invisible="1"/> -->
+        <!--                     <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+        <!--                     <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+        <!--                     <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/> -->
+        <!--                     <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+        <!--                 </xpath> -->
+        <!--             </field> -->
+        <!--         </record> -->
 
-<!--                 增加权限相关的按钮 -->
+        <!--                 增加权限相关的按钮 -->
         <record id="custom_mrp_bom_form_view" model="ir.ui.view">
             <field name="name">custom.mrp.bom.form</field>
             <field name="model">mrp.bom</field>
@@ -62,10 +64,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
@@ -81,10 +85,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
@@ -100,10 +106,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
@@ -119,10 +127,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
@@ -138,10 +148,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
@@ -157,10 +169,12 @@
                     <header>
                         <field name="active" invisible="1"/>
                         <field name="check_status" invisible="1"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
-                        <button name="action_check" string="审核" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', True)]}" groups="sf_base.group_plan_director"/>
-<!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <button name="action_check" string="审核" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('check_status', '=', True)]}"
+                                groups="sf_base.group_plan_director"/>
+                        <!--                         <button name="action_uncheck" string="禁用" type="object" class="oe_highlight" attrs="{'invisible': [('check_status', '=', False)]}" groups="sf_base.group_plan_director"/> -->
                     </header>
                 </xpath>
             </field>
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 869c3082..32a7512e 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -5,13 +5,16 @@
             <field name="name">sf.production.plan.tree</field>
             <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
-<!--                 <tree string="订单计划" editable="bottom"> -->
+                <!--                 <tree string="订单计划" editable="bottom"> -->
                 <tree string="订单计划">
                     <header>
-<!--                         <button name="do_production_schedule" type="object" string="批量排程"/> -->
-                        <button string="批量排程" name="%(sf_plan.action_plan_some)d" type="action" class="btn-primary"/>
+                        <!--                         <button name="do_production_schedule" type="object" string="批量排程"/> -->
+                        <button string="批量排程" name="%(sf_plan.action_plan_some)d" type="action"
+                                class="btn-primary"/>
                     </header>
-                    <field name="state" widget="badge" decoration-warning="state == 'draft'" decoration-success="state == 'done'" decoration-info="state == 'processing'" decoration-danger="state == 'finished'"/>
+                    <field name="state" widget="badge" decoration-warning="state == 'draft'"
+                           decoration-success="state == 'done'" decoration-info="state == 'processing'"
+                           decoration-danger="state == 'finished'"/>
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="order_deadline"/>
@@ -20,8 +23,12 @@
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
                     <field name="schedule_setting"/>
-                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" attrs="{'invisible': [('state', 'not in', ['draft'])]}" groups="sf_base.group_plan_dispatch"/>
-                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object" attrs="{'invisible': [('state', 'not in', ['done'])]}" groups="sf_base.group_plan_dispatch"/>
+                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object"
+                            attrs="{'invisible': [('state', 'not in', ['draft'])]}"
+                            groups="sf_base.group_plan_dispatch"/>
+                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程"
+                            type="object" attrs="{'invisible': [('state', 'not in', ['done'])]}"
+                            groups="sf_base.group_plan_dispatch"/>
                 </tree>
             </field>
         </record>
@@ -32,14 +39,17 @@
             <field name="arch" type="xml">
                 <form string="订单计划">
                     <header>
-<!--                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/> -->
-                        <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}' groups="sf_base.group_plan_dispatch" attrs="{'invisible': [('state', '=', 'done')]}"/>
-                        <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight" groups="sf_base.group_plan_dispatch" attrs="{'invisible': [('state', '=', 'draft')]}"/>
-<!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
-<!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
+                        <!--                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/> -->
+                        <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight"
+                                options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}'
+                                groups="sf_base.group_plan_dispatch" attrs="{'invisible': [('state', '=', 'done')]}"/>
+                        <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight"
+                                groups="sf_base.group_plan_dispatch" attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                        <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
+                        <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
 
-<!--                         <button string="销售单" name="test_sale_order" type="object" class="oe_highlight"/> -->
-<!--                         <button string="测试流程" name="liucheng_cs" type="object" class="oe_highlight"/> -->
+                        <!--                         <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,done,processing,finished"/>
                     </header>
                     <sheet>
@@ -68,54 +78,54 @@
                                 <field name="shift" widget="time"/>
 
                                 <!-- Chatter -->
-<!--                                 <div class="oe_chatter"> -->
-<!--                                     <field name="message_follower_ids" widget="mail_followers"/> -->
-<!--                                     <field name="message_ids" widget="mail_thread"/> -->
-<!--                                     <field name="activity_ids"/> -->
-<!--                                 </div> -->
+                                <!--                                 <div class="oe_chatter"> -->
+                                <!--                                     <field name="message_follower_ids" widget="mail_followers"/> -->
+                                <!--                                     <field name="message_ids" widget="mail_thread"/> -->
+                                <!--                                     <field name="activity_ids"/> -->
+                                <!--                                 </div> -->
                                 <div class="oe_chatter">
                                     <field name="message_follower_ids"/>
                                     <field name="message_ids"/>
                                 </div>
                             </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 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>
                     </sheet>
                 </form>
             </field>
         </record>
 
-<!--         搜索视图 -->
+        <!--         搜索视图 -->
         <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>
@@ -151,7 +161,7 @@
                        default_scale="day"
                        scales="day,week,month,year"
                        precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day', 'year': 'month:quarter'}">
-                        <field name="shift"/>
+                    <field name="shift"/>
                     <field name="name"/>
                     <field name="product_qty"/>
                     <field name="date_planned_start"/>
@@ -191,65 +201,6 @@
             </field>
         </record>
 
-
-<!--         <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_machine_schedule_tree" model="ir.ui.view">
             <field name="name">sf.machine.schedule.tree</field>
             <field name="model">sf.machine.schedule</field>
@@ -268,7 +219,7 @@
             <field name="view_mode">gantt,tree,form</field>
         </record>
 
-<!--         这个也是制造订单生产计划，只是把tree视图放在了默认位置 -->
+        <!--         这个也是制造订单生产计划，只是把tree视图放在了默认位置 -->
         <record id="sf_production_plan_action1" model="ir.actions.act_window">
             <field name="name">制造订单生产计划</field>
             <field name="type">ir.actions.act_window</field>
@@ -284,11 +235,11 @@
                 groups="sf_base.group_plan_dispatch"
         />
 
-<!--         <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.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>
@@ -305,17 +256,17 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_machine_work_schedule">
-<!--             自定义额外的动作 -->
+            <!--             自定义额外的动作 -->
             <field name="name">机台作业计划</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.machine.schedule</field>
             <field name="view_mode">tree</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
-                   暂无机台作业计划
+                    暂无机台作业计划
                 </p>
                 <p>
-                   跟进请求的处理，并且和合作者沟通。
+                    跟进请求的处理，并且和合作者沟通。
                 </p>
             </field>
         </record>
@@ -335,13 +286,13 @@
                 action="sf_manufacturing.sf_workpiece_delivery_act"
                 parent="mrp.menu_mrp_manufacturing"
         />
-<!--         <menuitem -->
-<!--                 id="sale_custom_menu" -->
-<!--                 name="报价单" -->
-<!--                 sequence="50" -->
-<!--                 action="sale_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="排程单"
@@ -349,22 +300,17 @@
                 action="sf_production_plan_action1"
                 parent="sf_production_plan_menu"
         />
-<!--         <menuitem -->
-<!--                 id="machine_work_schedule" -->
-<!--                 name="机台作业计划" -->
-<!--                 sequence="200" -->
-<!--                 action="action_machine_work_schedule" -->
-<!--                 parent="sf_production_plan_menu" -->
-<!--         /> -->
 
-
-<!--          --><!-- 在现有菜单结构后面加入自定义的动作 -->
-<!--         <menuitem  -->
-<!--                 id="mrp_custom_menuitem"  -->
-<!--                 name="My Custom Menuitem"  -->
-<!--                 sequence="20"  -->
-<!--                 action="mrp_custom_action"/>  -->
-<!--                  --><!-- 自定义额外的菜单项 --><!--   -->
-<!--          </field> -->
+        <record id="plan_mrp_production_form_view_inherit_sf" model="ir.ui.view">
+            <field name="name">plan.mrp.production.form.inherit.sf</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="sf_manufacturing.custom_mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='programming_state']" position="after">
+                    <field name="production_line_id" readonly="1"/>
+                    <field name="plan_start_processing_time" readonly="1"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </odoo>