diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index fc4ccbeb..4470235c 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -406,20 +406,20 @@ class MrpProduction(models.Model):
 
     # 工单排序
     def _reset_work_order_sequence1(self, k):
-        sequen = 0
         for rec in self:
-            current_sequence = 10
+            cnc_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工")
+            cnc_back_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工(返工)")
             for work in rec.workorder_ids:
-                work.sequence = current_sequence
-                current_sequence += 10
-                if work.name == '后置三元质量检测' and work.processing_panel == k:
-                    sequen = work.sequence
-
-            for work in rec.workorder_ids:
-                if work.name == '后置三元质量检测(返工)' and work.processing_panel == k:
-                    work.sequence = sequen + 2
-                if work.name == 'CNC加工(返工)' and work.processing_panel == k:
-                    work.sequence = sequen + 1
+                if work.name == cnc_workorder.name and work.processing_panel == k:
+                    cnc_back_workorder.write({'sequence': work.sequence + 1, 'state': 'ready', 'cnc_ids': work.cnc_ids,
+                                              'cmm_ids': work.cmm_ids})
+                    print(cnc_back_workorder.sequence)
+                elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder:
+                    work.sequence += 1
+                    print(work.sequence)
+                    if work.routing_type == '解除装夹':
+                        work.write({'state': 'pending'})
+                    print(work.state)
 
     # 在制造订单上新增工单
     def _create_workorder1(self, k):
@@ -459,13 +459,7 @@ class MrpProduction(models.Model):
                     order='sequence asc'
                 )
                 i += 1
-
                 for route in routingworkcenter:
-
-                    # if route.routing_type == '后置三元质量检测':
-                    #     workorders_values.append(
-                    #         self.env['mrp.workorder'].json_workorder_str1(k, production, route)
-                    #     )
                     if route.routing_type == 'CNC加工':
                         workorders_values.append(
                             self.env['mrp.workorder'].json_workorder_str1(k, production, route))
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 522c8c02..6b92fe25 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -895,6 +895,8 @@ class ResMrpWorkOrder(models.Model):
                 record.write({
                     'date_planned_finished': tem_date_planned_finished  # 保持原值
                 })
+            if record.routing_type == 'CNC加工' and record.test_results in ['返工', '报废']:
+                record.recreateManufacturingOrWorkerOrder()
             is_production_id = True
             for workorder in record.production_id.workorder_ids:
                 if workorder.state != 'done':
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 7d9bbac5..49a7e483 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 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/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 94f469ea..30801086 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -80,7 +80,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>
-<!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
+        <!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
@@ -477,7 +477,7 @@
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
                         <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
-                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","=","合格")]}'/>
+                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>
                         <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py
index 3a09a305..8b547bb3 100644
--- a/sf_mrs_connect/models/ftp_operate.py
+++ b/sf_mrs_connect/models/ftp_operate.py
@@ -32,6 +32,9 @@ class FtpController():
             logging.error(f"Error checking file: {e}")
             return False
 
+
+
+
     # # 检测字符串的编码
     # def detect_encoding(self, s):
     #     result = chardet.detect(s)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 259655ee..775b901a 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 dc4c588f..f26b6f4a 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