解决冲突

2025-06-09 10:01:57 +08:00
parent f164488e48 484fab85be
commit 23dd88b7ba
72 changed files with 1311 additions and 360 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -48,6 +48,7 @@
        'views/mrp_workorder_batch_replan.xml',
        'views/purchase_order_view.xml',
        'views/product_template_views.xml',
+        # 'views/stock_warehouse_orderpoint.xml',
    ],
    'assets': {

--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -6,12 +6,14 @@ from datetime import datetime
 from odoo.addons.sf_manufacturing.models.agv_scheduling import RepeatTaskException
 from odoo import http
 from odoo.http import request
+from odoo.addons.sf_base.decorators.api_log import api_log


 class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('获取工单', requester='中控系统')
    def get_Work_Info(self, **kw):
        """
        自动化传递工单号获取工单信息
@@ -54,6 +56,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('获取日计划', requester='中控系统')
    def get_ShiftPlan(self, **kw):
        """
        自动化每天获取机台日计划
@@ -107,6 +110,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('工件预调(前置三元检测)', requester='中控系统')
    def get_qcCheck(self, **kw):
        """
        工件预调(前置三元检测)
@@ -149,6 +153,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('工单开始', requester='中控系统')
    def button_Work_START(self, **kw):
        """
        工单任务开始
@@ -198,6 +203,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('工单结束', requester='中控系统')
    def button_Work_End(self, **kw):
        """
        工单任务结束
@@ -249,6 +255,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/PartQualityInspect', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('零件检测(后置三元检测)', requester='中控系统')
    def PartQualityInspect(self, **kw):
        """
        零件质检
@@ -295,6 +302,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/CMMProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('CMM测量程序下载', requester='中控系统')
    def CMMProgDolod(self, **kw):
        """
        中控系统传递RFID编号给MES，获取测量程序文件。Ftp下载文件
@@ -335,6 +343,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/NCProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('CAM加工程序下载', requester='中控系统')
    def NCProgDolod(self, **kw):
        """
        中控系统传递RFID编号给MES，获取程序单及程序文件。Ftp下载文件
@@ -376,6 +385,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/LocationChange', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('库位变更', requester='中控系统')
    def LocationChange(self, **kw):
        """
        库位变更
@@ -480,6 +490,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('AGV运送上产线', requester='中控系统')
    def AGVToProduct(self, **kw):
        """
        AGV运送上产线（完成）
@@ -552,6 +563,7 @@ class Manufacturing_Connect(http.Controller):

    @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                cors="*")
+    @api_log('AGV运送下产线', requester='中控系统')
    def AGVDownProduct(self, **kw):
        """
        MES调度AGV，搬运零件AGV托盘到产线接驳站。
--- a/sf_manufacturing/controllers/main.py
+++ b/sf_manufacturing/controllers/main.py
@@ -45,6 +45,9 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
                order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                i += 1
+            if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
+                order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
+                order_id.write({'contract_code': kw.get('contract_code')})
            res['factory_order_no'] = order_id.name
            order_id.confirm_to_supply_method()
        except Exception as e:
--- a/sf_manufacturing/models/init.py
+++ b/sf_manufacturing/models/init.py
@@ -18,3 +18,4 @@ from . import quick_easy_order
 from . import purchase_order
 from . import quality_check
 from . import purchase_request_line
+# from . import stock_warehouse_orderpoint
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -279,7 +279,7 @@ class MrpProduction(models.Model):
                    production_id.part_name = production_id.product_id.part_name
                elif production_id.product_id.categ_id.type == '坯料':
                    product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                    # 如果匹配成功，提取结果
                    if match:
                        product_name = match.group(0)
@@ -636,13 +636,17 @@ class MrpProduction(models.Model):
    # 增加触发时间参数
    def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
        try:
+            reason = ""
            manufacturing_type = None
            if self.is_scrap:
                manufacturing_type = 'scrap'
+                reason = "报废"
            elif self.tool_state == '2':
                manufacturing_type = 'invalid_tool_rework'
+                reason = "无效功能刀具"
            elif self.is_rework:
                manufacturing_type = 'rework'
+                reason = "返工"
            res = {'programming_no': self.programming_no,
                   'manufacturing_type': manufacturing_type,
                   'trigger_time': trigger_time,
@@ -657,6 +661,16 @@ class MrpProduction(models.Model):
            result = json.loads(ret['result'])
            logging.info('update_programming_state-ret:%s' % result)
            if result['status'] == 1:
+                self.programming_record_ids.create({
+                    'number': len(self.programming_record_ids) + 1,
+                    'production_id': self.id,
+                    'reason': reason,
+                    'programming_method': False,
+                    'current_programming_count': False,
+                    'target_production_id': False,
+                    'apply_time': fields.Datetime.now(),
+                    'send_time': False,
+                })
                self.write({'is_rework': True})
            else:
                raise UserError(ret['message'])
@@ -787,6 +801,17 @@ class MrpProduction(models.Model):
            if ret['status'] == 1:
                self.write(
                    {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
+                # 生成编程记录
+                self.programming_record_ids.create({
+                    'number': len(self.programming_record_ids) + 1,
+                    'production_id': self.id,
+                    'reason': '首次下发',
+                    'programming_method': False,
+                    'current_programming_count': False,
+                    'target_production_id': False,
+                    'apply_time': fields.Datetime.now(),
+                    'send_time': False,
+                })
            else:
                raise UserError(ret['message'])
        except Exception as e:
@@ -928,12 +953,13 @@ class MrpProduction(models.Model):
    #                         'sf_stock.stock_route_process_outsourcing').id)]
    #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
    #             cur_request_line = request_line_list[0]
-    #             cur_request_line['product_qty'] = len(request_line_list)
+    #             # cur_request_line['product_qty'] = cur_request_line['product_qty']
    #             cur_request_line['request_id'] = pr.id
    #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
    #             cur_request_line.pop('group_id', None)
    #             cur_request_line.pop('production_name', None)
    #             self.env["purchase.request.line"].create(cur_request_line)
+    #         pr.button_approved()

    # 外协出入库单处理
    def get_subcontract_pick_purchase(self):
@@ -1771,7 +1797,6 @@ class MrpProduction(models.Model):
        """
            检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
        """
-        print('申请编程')
        if len(self) > 1:
            raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
        for production in self:
@@ -1840,6 +1865,7 @@ class sf_programming_record(models.Model):
    target_production_id = fields.Char('目标制造单号')
    apply_time = fields.Datetime('申请时间')
    send_time = fields.Datetime('下发时间')
+    apply_uid = fields.Many2one('res.users', '申请人', default=lambda self: self.env.user)


 class sf_detection_result(models.Model):
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -71,7 +71,7 @@ class ResMrpWorkOrder(models.Model):
                                        tracking=True)
    back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
    # pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
-    #
+
    # @api.depends('state')
    # def _compute_pr_mp_count(self):
    #     for item in self:
@@ -85,6 +85,7 @@ class ResMrpWorkOrder(models.Model):
    #             item.pr_mp_count = len(pr_ids)
    #         else:
    #             item.pr_mp_count = 0
+
    @api.depends('state')
    def _compute_back_button_display(self):
        for record in self:
@@ -129,8 +130,14 @@ class ResMrpWorkOrder(models.Model):
                    record.back_button_display = False
            else:
                next_workorder = sorted_workorders[position + 1]
-                next_state = next_workorder.state
-                if (next_state == 'ready' or (
+                # 持续获取下一个工单，直到找到一个不是返工的工单
+                while next_workorder and next_workorder.state == 'rework':
+                    position += 1
+                    if position + 1 < len(sorted_workorders):
+                        next_workorder = sorted_workorders[position + 1]
+                    else:
+                        next_workorder = None
+                if next_workorder and (next_workorder.state == 'ready' or (
                        next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
                    record.back_button_display = True
                else:
@@ -439,7 +446,6 @@ class ResMrpWorkOrder(models.Model):
        action['context'] = dict(self._context, default_origin=self.name)
        return action

-    @api.depends('state', 'production_id.name')
    def _compute_surface_technics_purchase_ids(self):
        for order in self:
            if order.routing_type == '表面工艺' and order.state not in ['cancel']:
@@ -485,6 +491,7 @@ class ResMrpWorkOrder(models.Model):
    #             'view_mode': 'tree,form',
    #         })
    #     return action
+
    def action_view_surface_technics_purchase(self):
        self.ensure_one()
        # if self.routing_type == '表面工艺':
@@ -513,7 +520,8 @@ class ResMrpWorkOrder(models.Model):
        return result

    def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
        # domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
        # domain = [('group_id', '=', self.production_id.procurement_group_id.id), ('purchase_type', '=', 'consignment')]
        purchase_orders = self.env['purchase.order'].search(domain, order='id desc')
@@ -736,21 +744,25 @@ class ResMrpWorkOrder(models.Model):
    #         self.workpiece_delivery_ids[0].write({'rfid_code': self.rfid_code})

    def get_plan_workorder(self, production_line):
-        tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
-        tomorrow_start = tomorrow + ' 00:00:00'
-        tomorrow_end = tomorrow + ' 23:59:59'
+        tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+        tomorrow_start = f"{tomorrow} 00:00:00"
+        tomorrow_end = f"{tomorrow} 23:59:59"
        logging.info('tomorrow:%s' % tomorrow)
        sql = """
          SELECT *
          FROM mrp_workorder
          WHERE state!='rework'
-          to_char(date_planned_start::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')>= %s
-          AND to_char(date_planned_finished::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')<= %s
+          AND (date_planned_start + interval '8 hours') >= %s::timestamp
+          AND (date_planned_finished + interval '8 hours') <= %s::timestamp
          """
        params = [tomorrow_start, tomorrow_end]
        if production_line:
+            line = self.env['sf.production.line'].search(
+                [('name', '=', production_line)], limit=1)
+            if not line:
+                raise ValueError(f"生产线'{production_line}'不存在")
            sql += "AND production_line_id = %s"
-            params.append(production_line)
+            params.append(line.id)
        self.env.cr.execute(sql, params)
        ids = [t[0] for t in self.env.cr.fetchall()]
        return [('id', 'in', ids)]
@@ -1243,6 +1255,13 @@ class ResMrpWorkOrder(models.Model):
        }]
        return workorders_values_str

+    # def check_lot_exists(self, picking_id, lot_id):
+    #     return bool(
+    #         picking_id.move_ids.move_line_ids.filtered(
+    #             lambda line: line.lot_id.id == lot_id
+    #         )
+    #     )
+
    def _process_compute_state(self):
        sorted_workorders = sorted(self, key=lambda x: x.sequence)
        for workorder in sorted_workorders:
@@ -1264,10 +1283,17 @@ class ResMrpWorkOrder(models.Model):
                        workorder.state = 'pending'
                    continue
            # ================= 如果制造订单制造类型为【人工线下加工】==========================
+            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+            # picking_ids = workorder.production_id.picking_ids.filtered(
+            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+            # exists = any(
+            #     move_line.lot_id == lot_id
+            #     for picking in picking_ids
+            #     for move in picking.move_ids
+            #     for move_line in move.move_line_ids
+            # )
            if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'
-                    and len(workorder.production_id.picking_ids.filtered(
-                        lambda w: w.state not in ['done', 'cancel'])) == 0):
+                    and workorder.production_id.schedule_state == '已排'):
                # and workorder.production_id.programming_state == '已编程'
                if workorder.is_subcontract is True:
                    if workorder.production_id.state == 'rework':
@@ -1276,6 +1302,9 @@ class ResMrpWorkOrder(models.Model):
                    purchase_orders_id = self._get_surface_technics_purchase_ids()
                    if purchase_orders_id.state == 'purchase':
                        workorder.state = 'ready'
+                        # picking_id = workorder.production_id.picking_ids.filtered(
+                        #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                        # move_out = picking_id.move_ids
                        move_out = workorder.move_subcontract_workorder_ids[1]
                        for mo in move_out:
                            if mo.state != 'done':
@@ -1316,6 +1345,10 @@ class ResMrpWorkOrder(models.Model):
                            if purchase_orders_id.state == 'purchase':
                                workorder.state = 'ready'
                                move_out = workorder.move_subcontract_workorder_ids[1]
+                                # picking_id = workorder.production_id.picking_ids.filtered(
+                                #     lambda
+                                #         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                                # move_out = picking_id.move_ids
                                for mo in move_out:
                                    if mo.state != 'done':
                                        mo.write({'state': 'assigned', 'production_id': False})
@@ -1325,7 +1358,6 @@ class ResMrpWorkOrder(models.Model):
                            else:
                                workorder.state = 'waiting'

-
    @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
                 'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                 'production_id.programming_state')
@@ -1357,7 +1389,8 @@ class ResMrpWorkOrder(models.Model):
            # 判断是否有坯料的序列号信息
            boolean = False
            if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
+                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and \
+                        self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
                    if self.production_id.move_raw_ids[0].move_line_ids:
                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
                            boolean = True
@@ -1390,6 +1423,10 @@ class ResMrpWorkOrder(models.Model):
        if self.routing_type == '表面工艺':
            if self.is_subcontract is True:
                move_out = self.move_subcontract_workorder_ids[1]
+                # picking_id = self.production_id.picking_ids.filtered(
+                #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                # move_out = picking_id.move_ids
+                # move_out = self.move_subcontract_workorder_ids[1]
                # move_out = self.env['stock.move'].search(
                #     [('location_id', '=', self.env['stock.location'].search(
                #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
@@ -1555,25 +1592,17 @@ class ResMrpWorkOrder(models.Model):
                    len(done_workorder) == len(
                record.production_id.workorder_ids.filtered(lambda wo: wo.state != 'cancel'))):
                is_production_id = True
-            if record.routing_type in ['解除装夹'] or (
-                    record.is_rework is True and record.routing_type in ['装夹预调']):
-                for workorder in record.production_id.workorder_ids:
-                    if workorder.processing_panel == record.processing_panel:
-                        rfid_code = workorder.rfid_code
-                        if record.is_rework is not True:
-                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                        elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
-                            workorder.write({'rfid_code_old': False, 'rfid_code': False})
-                        elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
-                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                        self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
-                            {'tool_material_status': '可用'})
-                        if workorder.rfid_code:
-                            raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
-                        # workorder.rfid_code_old = rfid_code
-                        # workorder.rfid_code = False
-                        logging.info('workorder.rfid_code:%s' % workorder.rfid_code)

+            if record.routing_type in ['解除装夹']:
+                rfid_code = record.rfid_code
+                work_ids = record.production_id.workorder_ids.filtered(
+                    lambda wo: wo.processing_panel == record.processing_panel and wo.state != 'rework')
+                work_ids.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
+                    {'tool_material_status': '可用'})
+                if any(wo.rfid_code for wo in work_ids):
+                    raise ValidationError(f'【{record.name}】工单解绑失败，请重新点击完成按钮！！！')
+                logging.info('work_ids.rfid_code:%s' % [wo.rfid_code for wo in work_ids])
            if is_production_id is True:
                logging.info('product_qty:%s' % record.production_id.product_qty)
                for move_raw_id in record.production_id.move_raw_ids:
@@ -1808,7 +1837,7 @@ class ResMrpWorkOrder(models.Model):
            orderby=orderby,
            lazy=lazy
        )
-    
+
    model_id = fields.Char('模型ID', related='production_id.model_id')


--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -795,7 +795,7 @@ class ResProductMo(models.Model):
        for record in self:
            if record.categ_id.name == '坯料':
                product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.name)
+                match = re.search(r'(S\d{5}-\d+)', record.name)
                # 如果匹配成功，提取结果
                if match:
                    product_name = match.group(0)
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -59,6 +59,86 @@ class PurchaseOrder(models.Model):
            production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
            purchase.production_count = len(production_id)

+    # def process_replenish(self,production,total_qty):
+    #     record = self
+    #     bom_line_id = production.bom_id.bom_line_ids
+    #     replenish = self.env['stock.warehouse.orderpoint'].search([
+    #         ('product_id', '=', bom_line_id.product_id.id),
+    #         (
+    #             'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
+    #         # ('state', 'in', ['draft', 'confirmed'])
+    #     ], limit=1)
+    #     if not replenish:
+    #         replenish_model = self.env['stock.warehouse.orderpoint']
+    #         replenish = replenish_model.create({
+    #             'product_id': bom_line_id.product_id.id,
+    #             'location_id': self.env.ref(
+    #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+    #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+    #             'group_id': record.group_id.id,
+    #             'qty_to_order': total_qty,
+    #             'origin': record.name,
+    #         })
+    #     else:
+    #         replenish.write({
+    #             'product_id': bom_line_id.product_id.id,
+    #             'location_id': self.env.ref(
+    #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+    #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+    #             'group_id': record.group_id.id,
+    #             'qty_to_order': total_qty + replenish.qty_to_order,
+    #             'origin': record.name + ',' + replenish.origin,
+    #         })
+    #     replenish.action_replenish()
+
+    # def outsourcing_service_replenishment(self):
+    #     record = self
+    #     if record.purchase_type != 'consignment':
+    #         return
+    #     grouped_lines = {}
+    #     for line in record.order_line:
+    #         if line.related_product.id not in grouped_lines:
+    #             grouped_lines[line.related_product.id] = []
+    #         grouped_lines[line.related_product.id].append(line)
+    #     for product_id,lines in grouped_lines.items():
+    #         production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+    #         if not production:
+    #             continue
+    #         total_qty = sum(line.product_qty for line in lines)
+    #         record.process_replenish(production,total_qty)
+    #     for product_id,lines in grouped_lines.items():
+    #         productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+    #         if not productions:
+    #             continue
+    #         # production.bom_id.bom_line_ids.product_id
+    #         location_id = self.env['stock.location'].search([('name', '=', '制造前')])
+    #         quants = self.env['stock.quant'].search([
+    #             ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
+    #             ('location_id', '=', location_id.id)
+    #         ])
+    #         total_qty = sum(quants.mapped('quantity'))  # 计算该位置的总库存量
+    #         is_available = total_qty > 0
+    #         if not is_available:
+    #             raise UserError('请先完成坯料入库')
+    #         for production_id in productions:
+    #             work_ids = production_id.workorder_ids.filtered(
+    #                 lambda wk: wk.state not in ['done', 'rework', 'cancel'])
+    #             if not work_ids:
+    #                 continue
+    #             min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
+    #             if min_sequence_wk.is_subcontract:
+    #                 picking_id = production_id.picking_ids.filtered(
+    #                 lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+    #                 move_out = picking_id.move_ids
+    #                 for mo in move_out:
+    #                     if mo.state != 'done':
+    #                         mo.write({'state': 'assigned', 'production_id': False})
+    #                         if not mo.move_line_ids:
+    #                             self.env['stock.move.line'].create(
+    #                                 mo.get_move_line(production_id, min_sequence_wk))
+            # product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            # match = re.search(r'(S\d{5}-\d)',product.name)
+            # pass
    def button_confirm(self):
        for record in self:
            for line in record.order_line:
@@ -66,37 +146,10 @@ class PurchaseOrder(models.Model):
                    raise UserError('请对【产品】中的【数量】进行输入')
                if line.price_unit <= 0:
                    raise UserError('请对【产品】中的【单价】进行输入')
-            # if record.purchase_type == 'consignment':
-            #     bom_line_id = record.order_line[0].purchase_request_lines.request_id.bom_id.bom_line_ids
-            #     replenish = self.env['stock.warehouse.orderpoint'].search([
-            #         ('product_id', '=', bom_line_id.product_id.id),
-            #         (
-            #         'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
-            #         # ('state', 'in', ['draft', 'confirmed'])
-            #     ], limit=1)
-            #     if not replenish:
-            #         replenish_model = self.env['stock.warehouse.orderpoint']
-            #         replenish = replenish_model.create({
-            #             'product_id': bom_line_id.product_id.id,
-            #             'location_id': self.env.ref(
-            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-            #             'group_id': record.group_id.id,
-            #             'qty_to_order': 1,
-            #             'origin': record.name,
-            #         })
-            #     else:
-            #         replenish.write({
-            #             'product_id': bom_line_id.product_id.id,
-            #             'location_id': self.env.ref(
-            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-            #             'group_id': record.group_id.id,
-            #             'qty_to_order': 1 + replenish.qty_to_order,
-            #             'origin': record.name + ',' + replenish.origin,
-            #         })
-            #     replenish.action_replenish()
+            # record.outsourcing_service_replenishment()        
+        
        res = super(PurchaseOrder, self).button_confirm()
+
        for line in self.order_line:
            # 将产品不追踪序列号的行项目设置qty_done
            if line.move_ids and line.move_ids[0].product_id.tracking == 'none':
@@ -155,7 +208,7 @@ class PurchaseOrderLine(models.Model):
                continue
            if record.product_id.categ_id.name == '坯料':
                product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
                # 如果匹配成功，提取结果
                if match:
                    product_name = match.group(0)
--- a/sf_manufacturing/models/purchase_request_line.py
+++ b/sf_manufacturing/models/purchase_request_line.py
@@ -1,4 +1,4 @@
-# # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # import base64
 # import datetime
 # import logging
@@ -7,24 +7,24 @@
 # import re
 # import traceback
 # from operator import itemgetter
-#
+
 # import requests
 # from itertools import groupby
 # from collections import defaultdict, namedtuple
-#
+
 # from odoo import api, fields, models, SUPERUSER_ID, _
 # from odoo.exceptions import UserError, ValidationError
 # from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
-#
-#
+
+
 # class PurchaseRequestLine(models.Model):
 #     _inherit = 'purchase.request'
 #     is_subcontract = fields.Boolean(string='是否外协',default=False)
 # class PurchaseRequestLine(models.Model):
 #     _inherit = 'purchase.request.line'
 #     is_subcontract = fields.Boolean(string='是否外协')
-#
-#
+
+
 # class PurchaseRequest(models.Model):
 #     _inherit = 'purchase.request'
 #     bom_id = fields.Many2one('mrp.bom')
--- a/sf_manufacturing/models/sale_order.py
+++ b/sf_manufacturing/models/sale_order.py
@@ -58,8 +58,8 @@ class SaleOrder(models.Model):
            # 复制成品模板上的属性
            line.product_id.product_tmpl_id.copy_template(product_template_id)
            # 将模板上的single_manufacturing属性复制到成品上
-            line.product_id.single_manufacturing = product_template_id.single_manufacturing
-            line.product_id.tracking = product_template_id.tracking
+            # line.product_id.single_manufacturing = product_template_id.single_manufacturing
+            # line.product_id.tracking = product_template_id.tracking

            order_id = self
            product = line.product_id
@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
                'embryo_redundancy_id': line.embryo_redundancy_id,
            }
            product_name = ''
-            match = re.search(r'(S\d{5}-\d)', product.name)
+            match = re.search(r'(S\d{5}-\d+)', product.name)
            # 如果匹配成功，提取结果
            if match:
                product_name = match.group(0)
@@ -190,7 +190,30 @@ class SaleOrder(models.Model):
            'target': 'new',
            'res_id': wizard.id,
        }
+    def create_sale_documents(self, contract_file_name, contract_file):
+        # 创建ir.attachment记录
+        attachment = self.env['ir.attachment'].sudo().create({
+            'name': contract_file_name,
+            'type': 'binary',
+            'datas': contract_file,
+            'res_model': 'sale.order',
+        })

+        # 获取默认的文档文件夹
+        workspace = self.env.ref('sf_sale.documents_sales_contracts_folder_1').id
+
+        # 创建 documents.document 记录
+        document = self.env['documents.document'].sudo().create({
+            'name': contract_file_name,
+            'attachment_id': attachment.id,
+            'folder_id': workspace,
+            'res_model': 'sale.order',
+            'res_id': self.id,
+        })
+
+        self.write({
+            'contract_document_id': document.id
+        })

 class SaleOrderLine(models.Model):
    _inherit = 'sale.order.line'
--- a/sf_manufacturing/models/sf_production_common.py
+++ b/sf_manufacturing/models/sf_production_common.py
@@ -20,13 +20,13 @@ class SfProductionProcessParameter(models.Model):
    # is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
    # is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
    # routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
-    #
+
    # @api.depends('outsourced_service_products')
    # def _compute_service_products(self):
    #     for record in self:
    #         # 假设取第一条作为主明细
-    #         record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
-    #
+    #         record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
+
    # def _inverse_service_products(self):
    #     for record in self:
    #         if record.service_products:
@@ -45,7 +45,7 @@ class SfProductionProcessParameter(models.Model):
    #     for record in self:
    #         if len(record.outsourced_service_products) > 1:
    #             raise ValidationError("工艺参数不能与多个产品关联")
-    #
+
    # @api.onchange('outsourced_service_products')
    # def _onchange_validate_partner_limit(self):
    #     for record in self:
@@ -58,7 +58,7 @@ class SfProductionProcessParameter(models.Model):
    #             record.is_product_button = True
    #         else:
    #             record.is_product_button = False
-    #
+
    # def has_wksp_prefix(self):
    #     """
    #     判断字符串是否以WKSP开头（不区分大小写）
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -564,6 +564,13 @@ class StockPicking(models.Model):

    part_numbers = fields.Char(string="零件图号", compute='_compute_part_info', store=True, index=True)
    part_names = fields.Char(string="零件名称", compute='_compute_part_info', store=True, index=True)
+    model_id = fields.Char('模型ID', compute='_compute_model_id', store=True, index=True)
+
+    @api.depends('move_ids_without_package.model_id')
+    def _compute_model_id(self):
+        for picking in self:
+            model_id = picking.move_ids_without_package.mapped('model_id')
+            picking.model_id = ','.join(filter(None, model_id))

    @api.depends('move_ids_without_package.part_number', 'move_ids_without_package.part_name')
    def _compute_part_info(self):
@@ -631,6 +638,62 @@ class StockPicking(models.Model):
                        move.action_clear_lines_show_details()
                        move.action_show_details()
        res = super().button_validate()
+        # lot_ids = None
+        # product_ids = self.move_ids.mapped('product_id')
+        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+        #     lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
+        # production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
+        # if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
+        #     # 如果是最后一张外协入库单，则设置库存位置的预留数量
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_finish()
+        #     # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+        #     # picking_ids = workorder.production_id.picking_ids.filtered(
+        #     #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+
+        #     # if move_in:
+        #     #     workorder = move_in.subcontract_workorder_id
+        #     #     workorders = workorder.production_id.workorder_ids
+        #     #     subcontract_workorders = workorders.filtered(
+        #     #         lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+        #     #     # if workorder == subcontract_workorders[-1]:
+        #     #     #     self.env['stock.quant']._update_reserved_quantity(
+        #     #     #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+        #     #     #         lot_id=move_in.move_line_ids.lot_id,
+        #     #     #         package_id=False, owner_id=False, strict=False
+        #     #     #     )
+        #     #     workorder.button_finish()
+        # if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_start()
        picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
        if res is True and self.picking_type_id.id == picking_type_in:
            # 如果是最后一张外协入库单，则设置库存位置的预留数量
@@ -783,6 +846,7 @@ class ReStockMove(models.Model):
    materiel_height = fields.Float(string='物料高度', digits=(16, 4))
    part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
    part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')

    @api.depends('product_id')
    def _compute_part_info(self):
@@ -793,7 +857,7 @@ class ReStockMove(models.Model):
                    move.part_name = move.product_id.part_name
                elif move.product_id.categ_id.type == '坯料':
                    product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
                    # 如果匹配成功，提取结果
                    if match:
                        product_name = match.group(0)
@@ -825,7 +889,7 @@ class ReStockMove(models.Model):
                            continue
                    product_name = ''
                    logging.info('制造订单的产品 %s', production_id.product_id.name)
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                    # 如果匹配成功，提取结果
                    if match:
                        product_name = match.group(0)
--- a/sf_manufacturing/models/stock_warehouse_orderpoint.py
+++ b/sf_manufacturing/models/stock_warehouse_orderpoint.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of SmartGo. See LICENSE file for full copyright and licensing details.
+import base64
+from io import BytesIO
+from odoo import api, fields, models, SUPERUSER_ID, _
+
+
+class StockWarehouseOrderpoint(models.Model):
+    _inherit = 'stock.warehouse.orderpoint'
+    origin = fields.Char(string='来源')
+    _order = 'create_date DESC'
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -427,6 +427,7 @@
                                <field name="programming_method"/>
                                <field name="current_programming_count"/>
                                <field name="target_production_id"/>
+                                <field name="apply_uid"/>
                                <field name="apply_time"/>
                                <field name="send_time"/>
                            </tree>
@@ -602,6 +603,7 @@
                    <field name="part_number"/>
                    <field name="sale_order_id"/>
                    <field name="deadline_of_delivery" icon="fa-calendar" enable_counters="1" filter_domain="[('deadline_of_delivery', 'ilike', self)]"/>
+                    <field name="model_id"/>
                </xpath>
                <xpath expr="//field[@name='product_variant_attributes']" position="attributes">
                    <attribute name="invisible">1</attribute>
--- a/sf_manufacturing/views/mrp_routing_workcenter_view.xml
+++ b/sf_manufacturing/views/mrp_routing_workcenter_view.xml
@@ -22,26 +22,26 @@
                    <field name="is_repeat"/>
                    <field name="reserved_duration"/>
                </field>
-<!--                <xpath expr="//notebook/page[1]" position="before">-->
-<!--                    <page string="可选工艺参数">-->
-<!--                        <field name="optional_process_parameters">-->
-<!--                            <tree editable="bottom">-->
-<!--                                <field name="is_product_button" invisible="1"/>-->
-<!--                                <field name="is_delete_button" invisible="1"/>-->
-<!--                                <field name="code" attrs="{'readonly': True}"/>-->
-<!--                                <field name="name"  required="1"/>-->
-<!--                                <field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/>-->
-<!--                                &lt;!&ndash; 按钮列 &ndash;&gt;-->
-<!--                                <button name="action_create_service_product" string="创建服务产品" type="object"-->
-<!--                                        class="btn-primary"-->
-<!--                                        attrs="{'invisible': [('is_product_button', '=', True)]}" context="{'default_process_parameter_id':id}"/>-->
-<!--                                <button name="action_hide_service_products" string="删除" type="object"-->
-<!--                                        class="oe_highlight"-->
-<!--                                        attrs="{'invisible': [('is_delete_button', '=', True)]}"/>-->
-<!--                            </tree>-->
-<!--                        </field>-->
-<!--                    </page>-->
-<!--                </xpath>-->
+                <!-- <xpath expr="//notebook/page[1]" position="before">
+                    <page string="可选工艺参数">
+                        <field name="optional_process_parameters">
+                            <tree editable="bottom">
+                                <field name="is_product_button" invisible="1"/>
+                                <field name="is_delete_button" invisible="1"/>
+                                <field name="code" attrs="{'readonly': True}"/>
+                                <field name="name"  required="1"/>
+                                <field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/> -->
+                                <!-- 按钮列 -->
+                                <!-- <button name="action_create_service_product" string="创建服务产品" type="object"
+                                        class="btn-primary"
+                                        attrs="{'invisible': [('is_product_button', '=', True)]}" context="{'default_process_parameter_id':id}"/>
+                                <button name="action_hide_service_products" string="删除" type="object"
+                                        class="oe_highlight"
+                                        attrs="{'invisible': [('is_delete_button', '=', True)]}"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath> -->
            </field>
        </record>
    </data>
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -144,17 +144,17 @@
                       statusbar_visible="pending,waiting,ready,progress,to be detected,done,rework"/>
            </xpath>
            <xpath expr="//div[@name='button_box']" position="inside">
-<!--                <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"-->
-<!--                        icon="fa-credit-card"-->
-<!--                        groups="base.group_user,sf_base.group_sf_order_user"-->
-<!--                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">-->
-<!--                    <div class="o_field_widget o_stat_info">-->
-<!--                        <span class="o_stat_value">-->
-<!--                            <field name="pr_mp_count"/>-->
-<!--                        </span>-->
-<!--                        <span class="o_stat_text">采购申请</span>-->
-<!--                    </div>-->
-<!--                </button>-->
+                <!-- <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
+                        icon="fa-credit-card"
+                        groups="base.group_user,sf_base.group_sf_order_user"
+                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="pr_mp_count"/>
+                        </span>
+                        <span class="o_stat_text">采购申请</span>
+                    </div>
+                </button> -->
                <button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
                        icon="fa-credit-card"
                        groups="base.group_user,sf_base.group_sf_order_user"
@@ -677,8 +677,9 @@
        <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
        <field name="arch" type="xml">
            <field name="product_id" position="after">
-                <field name="part_number" string="成品零件图号"/>
-                <field name="model_id" string="模型id"/>
+                <field name="part_number" string="零件图号"/>
+                <field name="part_name" string="零件名称"/>
+                <field name="model_id" string="模型ID"/>
            </field>
            <xpath expr="//filter[@name='progress']" position="after">
                <filter string="待检测" name="state" domain="[('state','=','to be detected')]"/>
--- a/sf_manufacturing/views/product_template_views.xml
+++ b/sf_manufacturing/views/product_template_views.xml
@@ -12,5 +12,18 @@
                </xpath>
            </field>
        </record>
+
+        <record id="product_template_search_inherit_sf_manufacturing" model="ir.ui.view">
+            <field name="name">product.template.search</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='categ_id']" position="after">
+                    <field name="part_number" string="零件图号"/>
+                    <field name="part_name" string="零件名称"/>
+                    <field name="model_id" string="模型ID"/>
+                </xpath>
+            </field>
+        </record>
    </data>
 </odoo>
--- a/sf_manufacturing/views/stock_picking_view.xml
+++ b/sf_manufacturing/views/stock_picking_view.xml
@@ -73,6 +73,7 @@
                <xpath expr="//field[@name='picking_type_id']" position="after">
                    <field name="part_numbers" string="零件图号" filter_domain="[('part_numbers', 'ilike', self)]"/>
                    <field name="part_names" string="零件名称" filter_domain="[('part_names', 'ilike', self)]"/>
+                    <field name="model_id" string="模型ID" filter_domain="[('model_id', 'ilike', self)]"/>
                </xpath>
            </field>
        </record>
--- a/sf_manufacturing/views/stock_warehouse_orderpoint.xml
+++ b/sf_manufacturing/views/stock_warehouse_orderpoint.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_warehouse_orderpoint_tree_editable_inherit" model="ir.ui.view">
+            <field name="name">补货</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree_editable"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='qty_to_order']" position="after">
+                    <field name="origin"/>
+                </xpath>
+            </field>
+        </record>
+        <!-- 继承补货单的搜索视图 -->
+    </data>
+</odoo>
--- a/sf_manufacturing/wizard/production_wizard.py
+++ b/sf_manufacturing/wizard/production_wizard.py
@@ -46,10 +46,10 @@ class ProductionWizard(models.TransientModel):
        mrp_workorder_list = self.mrp_production_id.workorder_ids.filtered(lambda kw: kw.rfid_code)
        for workorder in mrp_workorder_list:
            rfid_code = workorder.rfid_code
-            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code is not False).write(
+            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code and wo.state != 'rework').write(
                {'rfid_code_old': rfid_code, 'rfid_code': False})
            workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
-                                           (wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
+                                           (wo.rfid_code_old or wo.rfid_code) and wo.state != 'rework')).write(
                {'rfid_code_old': False, 'rfid_code': False})

        if self.is_remanufacture is True:
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -125,13 +125,28 @@ class ReworkWizard(models.TransientModel):
                # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
                # 2、返工CNC工单和装夹预调工单则自动解绑RFID
                clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
-                if clamp_workorder_ids:
-                    for clamp_workorder_id in clamp_workorder_ids:
-                        self.production_id.workorder_ids.filtered(
-                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                            {'rfid_code': None})
+
+                # for order in rework_workorder_ids:
+                #     order.write({
+                #         'rfid_code_old': order.rfid_code,
+                #         'rfid_code': False
+                #     })
                # 返工工单状态设置为【返工】
                rework_workorder_ids.write({'state': 'rework'})
+                if clamp_workorder_ids:
+                    for clamp_workorder_id in clamp_workorder_ids:
+                        # 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录
+                        self.production_id.workorder_ids.filtered(lambda wk: (
+                                wk.processing_panel == clamp_workorder_id.processing_panel
+                                and wk.state == 'rework' and wk.rfid_code)).write(
+                            {'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None})
+                        # 清除返工的装夹预调工单同面的非返工工单的RFID
+                        self.production_id.workorder_ids.filtered(lambda wk: (
+                                wk.processing_panel == clamp_workorder_id.processing_panel and wk.state != 'rework')).write(
+                            {'rfid_code_old': None, 'rfid_code': None})
+                # 清除其他返工工单的RFID
+                for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code):
+                    work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None})
                # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                workorders_values = []
                for work in rework_workorder_ids:
@@ -158,8 +173,12 @@ class ReworkWizard(models.TransientModel):
                    # ====新工单绑定rfid===
                    for new_work_id in new_work_ids:
                        if new_work_id.routing_type in ['CNC加工', '解除装夹']:
-                            new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
-                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
+                            # 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
+                            work_id = self.production_id.workorder_ids.filtered(
+                                lambda wk: (wk.processing_panel == new_work_id.processing_panel and wk.rfid_code
+                                            and wk.routing_type == '装夹预调' and wk.state != 'rework'))
+                            if work_id:
+                                new_work_id.write({'rfid_code': work_id.rfid_code})
                    self.production_id.detection_result_ids.filtered(
                        lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
                    panels = []  # 返工的加工面
@@ -213,11 +232,13 @@ class ReworkWizard(models.TransientModel):
                                    self.production_id.get_new_program(panel_name)
                            if self.reprogramming_num >= 0 and self.programming_state == '已下发':
                                # ============= 处理CNC加工加工工单的 CNC程序和cmm程序 信息=============
-                                for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
+                                for cnc_work in new_work_ids.filtered(
+                                        lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
                                    ret = {'programming_list': []}
                                    old_cnc_rework = max(self.production_id.workorder_ids.filtered(
                                        lambda crw: crw.processing_panel == cnc_work.processing_panel
-                                                    and crw.state == 'rework' and (crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
+                                                    and crw.state == 'rework' and (
+                                                            crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
                                        key=lambda w: w.create_date
                                    )
                                    # 获取当前工单的CNC程序和cmm程序
@@ -259,7 +280,8 @@ class ReworkWizard(models.TransientModel):
                                    new_cnc_workorder = self.production_id.workorder_ids.filtered(
                                        lambda ap1: ap1.processing_panel == cnc_work.processing_panel
                                                    and ap1.state not in (
-                                                        'rework', 'done') and (ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
+                                                        'rework', 'done') and (
+                                                            ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
                                    )
                                    if not new_cnc_workorder.cnc_ids:
                                        new_cnc_workorder.write({
@@ -296,7 +318,8 @@ class ReworkWizard(models.TransientModel):
                                 'is_rework': False})
                # ==================申请重新编程=======================
                if self.is_reprogramming is True:
-                    self.production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
+                    self.production_id.update_programming_state(
+                        trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
                    self.production_id.write(
                        {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
                # ================= 返工完成，制造订单状态置为加工中 ==============
@@ -317,7 +340,7 @@ class ReworkWizard(models.TransientModel):
                    for p in production_id.detection_result_ids.filtered(
                            lambda ap1: ap1.handle_result == '待处理'):
                        if p.processing_panel is not False and p.processing_panel not in panel_arr:
-                            if len(panel_arr)>0:
+                            if len(panel_arr) > 0:
                                panel_arr += ','.join(p.processing_panel)
                            else:
                                panel_arr = p.processing_panel