diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 376101c9..23be7d38 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -620,12 +620,12 @@ class Manufacturing_Connect(http.Controller):
                         #                 if is_free is True:
                         #                     delivery_workpiece._delivery_avg()
                         #                     logging.info('agv下发下产线任务下发完成')
-                # if ret['IsComplete'] is True:
-                #     # 向AGV任务调度下发下产线任务
-                #     workorders = request.env['mrp.workorder'].browse(workorder_ids)
-                #     request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
-                # else:
-                #     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
+                if ret['IsComplete'] is True:
+                    # 向AGV任务调度下发下产线任务
+                    workorders = request.env['mrp.workorder'].browse(workorder_ids)
+                    request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
+                else:
+                    res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
         except RepeatTaskException as e:
             logging.info('AGVToProduct error:%s' % e)
         except Exception as e:
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 0f26a6d7..1d011dd7 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -142,13 +142,13 @@ class MrpProduction(models.Model):
 
     def action_view_remanufacture_productions(self):
         self.ensure_one()
-        mrp_production_ids = self.env['mrp.production'].search(
+        mrp_production = self.env['mrp.production'].search(
             [('id', '=', self.remanufacture_production_id.id)])
         action = {
             'res_model': 'mrp.production',
             'type': 'ir.actions.act_window',
             'view_mode': 'form',
-            'res_id': mrp_production_ids[0],
+            'res_id': mrp_production.id,
         }
         return action
 
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 095c1ab1..1b315e46 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1154,8 +1154,8 @@ class ResMrpWorkOrder(models.Model):
     def button_finish(self):
         for record in self:
             if record.routing_type == '装夹预调':
-                if not record.material_center_point or record.X_deviation_angle <= 0:
-                    raise UserError("请对前置三元检测定位参数进行计算定位")
+                # if not record.material_center_point or record.X_deviation_angle <= 0:
+                #     raise UserError("请对前置三元检测定位参数进行计算定位")
                 if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
                 record.process_state = '待加工'
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 37fa02bd..071f1167 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index a0da7ba3..27ce925a 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -151,8 +151,6 @@ class StockRule(models.Model):
                 list2.append(item)
 
         for procurement, rule in list2:
-            logging.info(rule)
-            logging.info(rule.procure_method)
             procure_method = rule.procure_method
             if rule.procure_method == 'mts_else_mto':
                 qty_needed = procurement.product_uom._compute_quantity(procurement.product_qty,
@@ -178,10 +176,8 @@ class StockRule(models.Model):
         for company_id, moves_values in moves_values_by_company.items():
             # create the move as SUPERUSER because the current user may not have the rights to do it (mto product
             # launched by a sale for example)
-            logging.info(moves_values)
             moves = self.env['stock.move'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 moves_values)
-            logging.info(moves)
             # Since action_confirm launch following procurement_group we should activate it.
             moves._action_confirm()
         return True
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 8213f483..6fa14a6f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -127,7 +127,7 @@
                             confirm="是否确认更新程序"
                             attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>
                     <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"
-                            attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>
+                            attrs="{'invisible': ['|','|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程'),('is_rework', '=', True)]}"/>
                     <button name="button_scrap_new" string="报废" type="object"
                             groups="sf_base.group_sf_mrp_user"
                             attrs="{'invisible': ['|',('is_scrap', '=', False),('state','=','cancel')]}"/>
@@ -201,18 +201,18 @@
                             data-hotkey="l"/>
                 </xpath>
 
-<!--                <xpath expr="//header//button[@name='action_view_mo_delivery']" position="after">-->
-<!--                    <button class="oe_stat_button" name="action_view_remanufacture_productions" type="object"-->
-<!--                            icon="fa-wrench" attrs="{'invisible': [('remanufacture_count', '=', 0)]}"-->
-<!--                            groups="mrp.group_mrp_user">-->
-<!--                        <div class="o_field_widget o_stat_info">-->
-<!--                            <span class="o_stat_value">-->
-<!--                                <field name="remanufacture_count"/>-->
-<!--                            </span>-->
-<!--                            <span class="o_stat_text">新的制造</span>-->
-<!--                        </div>-->
-<!--                    </button>-->
-<!--                </xpath>-->
+                <xpath expr="//button[@name='action_view_mo_delivery']" position="before">
+                    <button class="oe_stat_button" name="action_view_remanufacture_productions" type="object"
+                            icon="fa-wrench" attrs="{'invisible': [('remanufacture_count', '=', 0)]}"
+                            groups="mrp.group_mrp_user">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="remanufacture_count"/>
+                            </span>
+                            <span class="o_stat_text">新的制造</span>
+                        </div>
+                    </button>
+                </xpath>
 
                 <xpath expr="//header//button[@name='action_toggle_is_locked']" position="replace">
                     <button name="action_toggle_is_locked"
diff --git a/sf_manufacturing/wizard/production_wizard.py b/sf_manufacturing/wizard/production_wizard.py
index d9c551f6..3e1ff941 100644
--- a/sf_manufacturing/wizard/production_wizard.py
+++ b/sf_manufacturing/wizard/production_wizard.py
@@ -27,20 +27,21 @@ class ProductionWizard(models.TransientModel):
             self.is_reprogramming = False
 
     def confirm(self):
-        if self.programming_state != '已下发':
-            self.programming_state = '编程中'
-        self.production_id.action_cancel()
         self.production_id.detection_result_ids.write({'handle_result': '已处理'})
         self.production_id.write({'state': 'cancel', 'scrap_ids': [(0, 0, {
             'name': self.env['ir.sequence'].next_by_code('stock.scrap') or _('New'),
             'product_id': self.production_id.product_id.id,
             'scrap_qty': 1,
-            'lot_id': self.production_id.move_line_raw_ids.lot_id.id,
+            'origin': self.production_id.origin,
+            'date_done': fields.datetime.now(),
+            'lot_id': self.env['stock.move.line'].search(
+                [('move_id', '=', self.production_id.move_raw_ids[0].id)]).lot_id.id,
             'location_id': self.production_id.move_raw_ids.filtered(lambda x: x.state not in (
                 'done',
                 'cancel')) and self.production_id.location_src_id.id or self.production_id.location_dest_id.id,
             'scrap_location_id': self.env['stock.scrap']._get_default_scrap_location_id(),
             'state': 'done'})]})
+        self.production_id.action_cancel()
         if self.is_remanufacture is True:
             ret = {'programming_list': [], 'is_reprogramming': self.is_reprogramming}
             if self.is_reprogramming is True:
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 7b7e5c6e..56324a6b 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -29,21 +29,21 @@ class Sf_Mrs_Connect(http.Controller):
                 [('programming_no', '=', ret['programming_no'])])
             if productions:
                 # # 拉取所有加工面的程序文件
-                # for r in ret['processing_panel'].split(','):
-                #     program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                #     if os.path.exists(program_path_tmp_r):
-                #         files_r = os.listdir(program_path_tmp_r)
-                #         if files_r:
-                #             for file_name in files_r:
-                #                 file_path = os.path.join(program_path_tmp_r, file_name)
-                #                 os.remove(file_path)
-                #     download_state = request.env['sf.cnc.processing'].with_user(
-                #         request.env.ref("base.user_admin")).download_file_tmp(
-                #         ret['folder_name'], r)
-                #     if download_state is False:
-                #         res['status'] = -2
-                #         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
-                #         return json.JSONEncoder().encode(res)
+                for r in ret['processing_panel'].split(','):
+                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                    if os.path.exists(program_path_tmp_r):
+                        files_r = os.listdir(program_path_tmp_r)
+                        if files_r:
+                            for file_name in files_r:
+                                file_path = os.path.join(program_path_tmp_r, file_name)
+                                os.remove(file_path)
+                    download_state = request.env['sf.cnc.processing'].with_user(
+                        request.env.ref("base.user_admin")).download_file_tmp(
+                        ret['folder_name'], r)
+                    if download_state is False:
+                        res['status'] = -2
+                        res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
+                        return json.JSONEncoder().encode(res)
                 for production in productions:
                     if not production.workorder_ids:
                         production.product_id.model_processing_panel = ret['processing_panel']
@@ -82,32 +82,32 @@ class Sf_Mrs_Connect(http.Controller):
                     #             if pre_workorder:
                     #                 pre_workorder.write(
                     #                     {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
-                # for panel in ret['processing_panel'].split(','):
-                #     # 查询状态为进行中且工序类型为CNC加工的工单
-                #     cnc_workorder = productions.workorder_ids.filtered(
-                #         lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
-                #                                                                      'cancel'] and ac.processing_panel == panel)
-                #     if cnc_workorder:
-                #         program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
-                #                                               panel)
-                #         program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
-                #         logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
-                #         files_panel = os.listdir(program_path_tmp_panel)
-                #         if files_panel:
-                #             for file in files_panel:
-                #                 file_extension = os.path.splitext(file)[1]
-                #                 logging.info('file_extension:%s' % file_extension)
-                #                 if file_extension.lower() == '.pdf':
-                #                     panel_file_path = os.path.join(program_path_tmp_panel, file)
-                #                     logging.info('panel_file_path:%s' % panel_file_path)
-                #         cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
-                #         pre_workorder = productions.workorder_ids.filtered(
-                #             lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
-                #                                                                           'cancel'] and ap.processing_panel == panel)
-                #         if pre_workorder:
-                #             pre_workorder.write(
-                #                 {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
-                # productions.write({'programming_state': '已编程', 'work_state': '已编程'})
+                for panel in ret['processing_panel'].split(','):
+                    # 查询状态为进行中且工序类型为CNC加工的工单
+                    cnc_workorder = productions.workorder_ids.filtered(
+                        lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                                                                                     'cancel'] and ac.processing_panel == panel)
+                    if cnc_workorder:
+                        # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                        #                                       panel)
+                        program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                        logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                        files_panel = os.listdir(program_path_tmp_panel)
+                        if files_panel:
+                            for file in files_panel:
+                                file_extension = os.path.splitext(file)[1]
+                                logging.info('file_extension:%s' % file_extension)
+                                if file_extension.lower() == '.pdf':
+                                    panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                    logging.info('panel_file_path:%s' % panel_file_path)
+                        cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                        pre_workorder = productions.workorder_ids.filtered(
+                            lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                                                                                          'cancel'] and ap.processing_panel == panel)
+                        if pre_workorder:
+                            pre_workorder.write(
+                                {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                productions.write({'programming_state': '已编程', 'work_state': '已编程'})
                 # cnc_program_ids = [item.id for item in productions]
                 # workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                 #     [('production_id', 'in', cnc_program_ids)])
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index cb1886a1..081807a4 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 92f6cda2..3ae65db3 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path