diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index dd7dbd3c..12d7505b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -409,6 +409,7 @@ class ResMrpWorkOrder(models.Model):
             work.compensation_value_y = eval(self.material_center_point)[1]
             work.process_state = '待加工'
             self.sudo().production_id.state = 'pending_processing'
+            self.date_finished = datetime.now()
             workorder.button_finish()
 
         except Exception as e:
@@ -700,6 +701,12 @@ class ResMrpWorkOrder(models.Model):
     def button_start(self):
         if self.routing_type == '装夹预调' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
+
+        if self.routing_type == '解除装夹':
+            '''
+            记录开始时间
+            '''
+            self.date_start = datetime.now()
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:
             picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
@@ -771,6 +778,13 @@ class ResMrpWorkOrder(models.Model):
             if not self.rfid_code:
                 raise UserError("请扫RFID码进行绑定")
             self.workpiece_delivery_ids[0].write({'status': '待下发'})
+
+        if self.routing_type == '解除装夹':
+            '''
+            记录结束时间
+            '''
+            self.date_finished = datetime.now()
+
         if self.picking_out_id:
             picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
             if picking_out.workorder_out_id:
@@ -1021,6 +1035,7 @@ class SfWorkOrderBarcodes(models.Model):
                                     item.write({'rfid_code': barcode})
                             logging.info("Rfid绑定成功！！！")
                     self.process_state = '待检测'
+                    self.date_start = datetime.now()
                 else:
                     raise UserError('该托盘信息不存在！！！')
                 # stock_move_line = self.env['stock.move.line'].search([('lot_name', '=', barcode)])
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 0611e1e3..b3164055 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -43,7 +43,7 @@
                 <attribute name="attrs">{'invisible':
                     ['|',("user_permissions","=",False),("name","=","获取CNC加工程序")]}
                 </attribute>
-                <attribute name="string">停工</attribute>
+<!--                 <attribute name="string">停工</attribute> -->
             </xpath>
             <xpath expr="//button[@name='action_open_wizard']" position="attributes">
                 <attribute name="invisible">1</attribute>
@@ -111,23 +111,36 @@
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
+<!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
+<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+<!--                         groups="sf_base.group_sf_mrp_user"/> -->
+<!--                 <button name="button_pending" type="object" string="暂停" class="btn-warning" -->
+<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+<!--                         groups="sf_base.group_sf_mrp_user"/> -->
+<!--                 <button name="button_finish" type="object" string="完成" class="btn-success" -->
+<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+<!--                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/> -->
+
                 <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','ready')]}"
-                        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)]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
-                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"
-                        groups="sf_base.group_sf_mrp_user"/>
+                  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"
-                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"
-                        groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/>
-                <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工"
-                        context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                        groups="sf_base.group_sf_mrp_user"
-                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"/>
-                <button name="button_unblock" type="object" string="Unblock"
-                        context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                        groups="sf_base.group_sf_mrp_user"
-                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/>
+                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+
+                <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
+                <button name="button_unblock" type="object" string="取消阻塞" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
+
+<!--                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工" -->
+<!--                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger" -->
+<!--                         groups="sf_base.group_sf_mrp_user" -->
+<!--                         attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"/> -->
+<!--                 <button name="button_unblock" type="object" string="Unblock" -->
+<!--                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger" -->
+<!--                         groups="sf_base.group_sf_mrp_user" -->
+<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
                         attrs="{'invisible': ['|',('routing_type','!=','装夹预调'),('is_delivery','=',True)]}"/>