bom追溯方式

Merge Request: BUG_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2285

requirements.txt

@@ -4,4 +4,4 @@ wechatpy==1.8.18
 pycryptodome==3.22.0
 openupgradelib==3.10.0
 opcua==0.98.13
-openpyxl
+openpyxl

sf_demand_plan/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_plan', 'jikimo_printing', 'purchase_request', 'purchase_request_tier_validation'],
+    'depends': ['sf_plan'], #'jikimo_printing',
     'data': [
         'security/ir.model.access.csv',
         'data/stock_route_group.xml',
@@ -20,7 +20,6 @@
         'views/sale_order_views.xml',
         'wizard/sf_demand_plan_print_wizard_view.xml',
         'wizard/sf_release_plan_wizard_views.xml',
-        'wizard/sf_demand_plan_detail_wizard_view.xml',
         'views/menu_view.xml',
     ],
     'demo': [
@@ -31,7 +30,6 @@
         'web.assets_backend': [
             'sf_demand_plan/static/src/scss/style.css',
             'sf_demand_plan/static/src/js/print_demand.js',
-            'sf_demand_plan/static/src/js/custom_button.js',
         ]
     },
     'license': 'LGPL-3',

sf_demand_plan/models/__init__.py

@@ -9,5 +9,3 @@ from . import mrp_production
 from . import stock_rule
 from . import purchase_request
 from . import purchase_order
-from . import stock_move
-from . import stock_picking

sf_demand_plan/models/purchase_order.py

@@ -36,7 +36,7 @@ class PurchaseOrderLine(models.Model):
     @api.model
     def create(self, vals):
         res = super(PurchaseOrderLine, self).create(vals)
-        if not res.demand_plan_line_id and res.order_id.origin:
+        if not res.demand_plan_line_id:
             origin = [origin.replace(' ', '') for origin in res.order_id.origin.split(',')]
             if self.env.context.get('demand_plan_line_id'):
                 res.demand_plan_line_id = self.env.context.get('demand_plan_line_id')

sf_demand_plan/models/sf_production_demand_plan.py

@@ -7,17 +7,39 @@ from odoo.tools import float_compare
 from datetime import datetime, timedelta
 from odoo.exceptions import UserError
 import re
+#本地环境问题  不加报错
+class ProductCategory(models.Model):
+    _inherit = 'product.category'
 
+    negative_inventory_allowed = fields.Boolean(string="允许负库存", default=False)
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    whether_show_quality_check = fields.Boolean(string="是否显示质检")
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    blank_type = fields.Selection([
+        ('圆料', '圆料'),
+        ('方料', '方料'),
+    ], string='坯料分类')
+
+    blank_precision = fields.Selection([
+        ('精坯', '精坯'),
+        ('粗坯', '粗坯'),
+    ], string='坯料类型')
 
 class SfProductionDemandPlan(models.Model):
     _name = 'sf.production.demand.plan'
     _description = 'sf_production_demand_plan'
 
     def get_location_id(self):
-        customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-        return customer_location_id
+        stock_location = self.env['stock.location'].sudo().search([('name', '=', '客户')], limit=1)
+        return stock_location.id
 
-    priority = fields.Selection(related='demand_plan_id.priority', string='优先级', store=True)
+    priority = fields.Selection(related='demand_plan_id.priority', string='优先级')
     status = fields.Selection([
         ('10', '草稿'),
         ('20', '待确认'),
@@ -34,7 +56,7 @@ class SfProductionDemandPlan(models.Model):
     company_id = fields.Many2one(
         related='sale_order_id.company_id',
         store=True, index=True, precompute=True)
-    customer_name = fields.Char('客户', related='sale_order_id.customer_name', store=True)
+    customer_name = fields.Char('客户', related='sale_order_id.customer_name')
     order_remark = fields.Text(related='sale_order_id.remark',
                                string="订单备注", store=True)
     glb_url = fields.Char(related='sale_order_line_id.glb_url', string='glb文件地址')
@@ -83,7 +105,7 @@ class SfProductionDemandPlan(models.Model):
                                        related='product_id.blank_precision')
     unit_number = fields.Float('单件用量', digits=(16, 3), related='product_id.unit_number')
     embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
-    materials_id = fields.Char('材料', related='demand_plan_id.materials_id', store=True)
+    materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
     model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
     model_process_parameters_ids = fields.Many2many(related='demand_plan_id.model_process_parameters_ids',
                                                     string='表面工艺', )
@@ -127,12 +149,6 @@ class SfProductionDemandPlan(models.Model):
         string='字段自制类型只读'
     )
 
-    is_processing = fields.Boolean(
-        string='正在处理中',
-        default=False,
-        help='用于防止重复点击按钮'
-    )
-
     # hide_action_open_mrp_production = fields.Boolean(
     #     string='显示待工艺确认按钮',
     #     compute='_compute_hid_button',
@@ -621,6 +637,11 @@ class SfProductionDemandPlan(models.Model):
         # 按产品分组并计算总数
         product_data = {}
         for plan in filtered_plan:
+            check_overdelivery_allowed = False
+            if not plan.demand_plan_id.overdelivery_allowed:
+                customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
+                if plan.location_id.id == customer_location_id:
+                    check_overdelivery_allowed = True 
             if plan.product_id not in product_data:
                 # 初始化产品数据，从产品上获取需求量
                 product_data[plan.product_id] = {
@@ -630,17 +651,22 @@ class SfProductionDemandPlan(models.Model):
 
             # 累加计划数量
             product_data[plan.product_id]['plan_uom_qty'] += plan.plan_uom_qty
+            product_data[plan.product_id]['overdelivery_allowed'] = check_overdelivery_allowed
         # 检查需求超过计划数量的产品
         warning_messages = []
+        error_messages = []
         for product, data in product_data.items():
-            if float_compare(data['plan_uom_qty'], data['product_uom_qty'],
+            if data['overdelivery_allowed'] and float_compare(data['plan_uom_qty'], data['product_uom_qty'],precision_rounding=product.uom_id.rounding) == 1:
+                error_messages.append(f"您正在下达的产品 {product.display_name},已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
+            elif float_compare(data['plan_uom_qty'], data['product_uom_qty'],
                              precision_rounding=product.uom_id.rounding) == 1:
                 warning_messages.append(
                     _("您正在下达的产品 %s，计划量%s，需求数量为%s，已超过需求数量") %
                     (product.display_name, data['plan_uom_qty'], data['product_uom_qty'])
                 )
-        if warning_messages and check_overdelivery_allowed:
-            raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
+        if error_messages:
+            error_message = "\n".join(error_messages)
+            raise ValidationError(error_message)
         elif warning_messages:
             warning_message = "\n".join(warning_messages)
             return {
@@ -658,9 +684,6 @@ class SfProductionDemandPlan(models.Model):
 
     def button_release_plan(self):
         self.ensure_one()
-        if self.is_processing:
-            return
-        self.is_processing = True
         check_overdelivery_allowed = False
         if not self.demand_plan_id.overdelivery_allowed:
             customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
@@ -687,38 +710,49 @@ class SfProductionDemandPlan(models.Model):
         self.action_confirm()
 
     def action_confirm(self):
-        self = self.with_context(
-            demand_plan_line_id=self.id
-        )
+        """
+        确认需求计划行，创建 BOM、触发库存规则，并更新状态。
+        """
+        # 将当前需求计划行 ID 写入上下文，便于后续方法使用
+        self = self.with_context(demand_plan_line_id=self.id)
+
+        # 创建物料清单（BOM），根据供货方式进行不同的处理
         self.mrp_bom_create()
+
+        # 启动库存规则（创建采购、生产等）
         self._action_launch_stock_rule()
+
+        # 根据供货方式设置状态字段
         if self.supply_method in ('automation', 'manual'):
-            self.write({'status': '50'})
+            self.write({'status': '50'})  # 自动/手工 供货：待排产
             self.update_sale_order_state()
         else:
-            self.write({'status': '60'})
+            self.write({'status': '60'})  # 外购/外协/客户自供：无需排产
             self.update_sale_order_state()
 
-    def mrp_bom_create(self):
-        bom_type = ''
-        # 根据供货方式修改成品模板
-        if self.supply_method == 'automation':
-            bom_type = 'normal'
-            product_template_id = self.env.ref('sf_dlm.product_template_sf').sudo().product_tmpl_id
-        elif self.supply_method == 'outsourcing':
-            bom_type = 'subcontract'
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo()
-        elif self.supply_method == 'purchase':
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_purchase').sudo()
-        elif self.supply_method == 'manual':
-            bom_type = 'normal'
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
 
-        # 复制成品模板上的属性
-        self.product_id.product_tmpl_id.copy_template(product_template_id)
+    def _get_embryo_template_by_supply_method(self):
+        """
+        根据供货方式返回对应的胚料模板 product.template 记录。
+        """
+        supply_map = {
+            'automation': self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo(),
+            'outsourcing': self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo(),
+            'purchase': self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo(),
+            'manual': self.env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo(),
+            'material_customer_provided': self.env.ref('jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo(),
+        }
+        template = supply_map.get(self.supply_method)
+        if not template:
+            raise UserError(f"未配置供货方式 {self.supply_method} 对应的胚料模板")
+        return template
+
+
+    def mrp_bom_create(self):
+        """
+        创建 BOM（包含胚料与成品 BOM），用于后续生产或采购流程。
+        """
+        # 如果同一计划中已有对应的 BOM 可复用，则直接使用
         if self.supply_method in ('automation', 'manual'):
             line_ids = self.demand_plan_id.line_ids.filtered(
                 lambda p: p.supply_method in ('automation', 'manual') and p.status in ('50', '60'))
@@ -731,13 +765,32 @@ class SfProductionDemandPlan(models.Model):
             if line_ids:
                 self.bom_id = line_ids[0].bom_id.id
                 return
+
+        # 根据供货方式选择模板和 BOM 类型
+        bom_type = ''
+        if self.supply_method == 'automation':
+            bom_type = 'normal'
+            product_template_id = self.env.ref('sf_dlm.product_template_sf').sudo().product_tmpl_id
+        elif self.supply_method == 'outsourcing':
+            bom_type = 'subcontract'
+            product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo()
+        elif self.supply_method == 'purchase':
+            product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_purchase').sudo()
+        elif self.supply_method == 'manual':
+            bom_type = 'normal'
+            product_template_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
+
+        # 使用模板复制内容到当前产品
+        self.product_id.product_tmpl_id.copy_template(product_template_id)
+
+        # 构造 BOM 编码（包含时间戳）
         future_time = datetime.now() + timedelta(hours=8)
-        # 生成BOM单据编码
         code = f"{self.product_id.default_code}-{bom_type}-{future_time.strftime('%Y%m%d%H%M%S')}"
 
         order_id = self.sale_order_id
         product = self.product_id
-        # 拼接方法需要的item结构，成品的模型数据信息就是坯料的数据信息
+
+        # 构造胚料产品的参数
         item = {
             'texture_code': product.materials_id.materials_no,
             'texture_type_code': product.materials_type_id.materials_no,
@@ -750,110 +803,81 @@ class SfProductionDemandPlan(models.Model):
             'embryo_redundancy_id': self.sale_order_line_id.embryo_redundancy_id,
             'model_id': self.model_id
         }
+
+        # 从产品名中提取编号（如 S12345-3）
         product_name = ''
         match = re.search(r'(S\d{5}-\d+)', product.name)
         product_seria = 0
-        # 如果匹配成功，提取结果
         if match:
             product_name = match.group(0)
-            # 获取成品名结尾-n的n
             product_seria = int(product_name.split('-')[-1])
 
-        # 成品供货方式为采购则不生成bom
+        # 如果供货方式不是采购，则需要先创建胚料产品
         if self.supply_method != 'purchase':
-            # 当成品上带有客供料选项时，生成坯料时选择“客供料”路线
+            # 判断是否为客户自供
             if self.sale_order_line_id.embryo_redundancy_id:
-                # 将成品模板的内容复制到成品上
-                customer_provided_embryo = self.env.ref(
-                    'jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo()
-                # 创建坯料，客供料的批量不需要创建bom
-                material_customer_provided_embryo = self.env['product.template'].sudo().no_bom_product_create(
-                    customer_provided_embryo.with_context(active_test=False).product_variant_id,
-                    item,
-                    order_id, 'material_customer_provided', product_seria, product)
-                # 成品配置bom
-                product_bom_material_customer_provided = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    product, bom_type, 'product', code)
-                product_bom_material_customer_provided.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line_has(
-                    material_customer_provided_embryo)
-                self.bom_id = product_bom_material_customer_provided.id
-            elif self.product_id.materials_type_id.gain_way == '自加工':
-                self_machining_id = self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo()
-                # 创建坯料
-                self_machining_embryo = self.env['product.template'].sudo().no_bom_product_create(
-                    self_machining_id,
-                    item,
-                    order_id, 'self_machining', product_seria, product)
-                # 创建坯料的bom
-                self_machining_bom = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    self_machining_embryo, 'normal', False)
-                # 创建坯料里bom的组件
-                self_machining_bom_line = self_machining_bom.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line(
-                    self_machining_embryo)
-                if not self_machining_bom_line:
-                    raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                # 产品配置bom
-                product_bom_self_machining = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    product, bom_type, 'product', code)
-                product_bom_self_machining.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                    self_machining_embryo)
-                self.bom_id = product_bom_self_machining.id
-            elif self.product_id.materials_type_id.gain_way == '外协':
-                outsource_id = self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo()
-                # 创建坯料
-                outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id,
-                                                                                             item,
-                                                                                             order_id,
-                                                                                             'subcontract',
-                                                                                             product_seria,
-                                                                                             product)
-                if outsource_embryo == -3:
-                    raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                # 创建坯料的bom
-                outsource_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(
-                    outsource_embryo,
-                    'subcontract', True)
-                # 创建坯料的bom的组件
-                outsource_bom_line = outsource_bom.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
-                if not outsource_bom_line:
-                    raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                # 产品配置bom
-                product_bom_outsource = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product', code)
-                product_bom_outsource.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                    outsource_embryo)
-                self.bom_id = product_bom_outsource.id
-            elif self.product_id.materials_type_id.gain_way == '采购':
-                purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
-                purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id,
-                                                                                            item,
-                                                                                            order_id,
-                                                                                            'purchase',
-                                                                                            product_seria,
-                                                                                            product)
-                if purchase_embryo and purchase_embryo == -3:
-                    raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                else:
-                    # 产品配置bom
-                    product_bom_purchase = self.env['mrp.bom'].with_user(
-                        self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product', code)
-                    product_bom_purchase.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                        purchase_embryo)
-                    self.bom_id = product_bom_purchase.id
+                embryo_template = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo()
+                embryo_key = 'material_customer_provided'
+            else:
+                embryo_template = self._get_embryo_template_by_supply_method()
+                embryo_key = self.supply_method
+
+            # 获取批次追踪方式
+            tracking_method = embryo_template.tracking
+
+            # 创建胚料产品（无 BOM 产品）
+            embryo_product = self.env['product.template'].sudo().no_bom_product_create(
+                embryo_template.with_context(active_test=False).product_variant_id,
+                item,
+                order_id,
+                embryo_key,
+                product_seria,
+                product
+            )
+
+            if embryo_product == -3:
+                raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
+
+            # 设置胚料 BOM 类型
+            if embryo_key in ('automation', 'manual', 'material_customer_provided'):
+                embryo_bom_type = 'normal'
+            elif embryo_key == 'outsourcing':
+                embryo_bom_type = 'subcontract'
+            elif embryo_key == 'purchase':
+                embryo_bom_type = 'purchase'
+            else:
+                embryo_bom_type = 'normal'
+
+            # 创建胚料 BOM 及 BOM 行
+            embryo_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(
+                embryo_product, embryo_bom_type, True, tracking=tracking_method)
+
+            embryo_bom_line = embryo_bom.with_user(self.env.ref("base.user_admin")).bom_create_line(embryo_product)
+            if not embryo_bom_line:
+                raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
+
+            # 创建成品 BOM（包含胚料）
+            product_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(
+                product, bom_type, 'product', code, tracking=tracking_method)
+            product_bom.with_user(self.env.ref("base.user_admin")).bom_create_line_has(embryo_product)
+
+            # 赋值 BOM ID
+            self.bom_id = product_bom.id
+
 
     def _action_launch_stock_rule(self):
+        """
+        触发库存规则（如采购、生产），并确认相关拣货单。
+        """
         procurements = []
+
         group_id = self.sale_order_id.procurement_group_id
         if not group_id:
+            # 没有分组则创建
             group_id = self.env['procurement.group'].create(self._prepare_procurement_group_vals())
             self.sale_order_id.procurement_group_id = group_id
         else:
+            # 若已有分组但字段有变动则更新
             updated_vals = {}
             if group_id.partner_id != self.sale_order_id.partner_shipping_id:
                 updated_vals.update({'partner_id': self.sale_order_id.partner_shipping_id.id})
@@ -861,27 +885,42 @@ class SfProductionDemandPlan(models.Model):
                 updated_vals.update({'move_type': self.sale_order_id.picking_policy})
             if updated_vals:
                 group_id.write(updated_vals)
+
+        # 构造 procurement 所需的字段
         values = self._prepare_procurement_values(group_id=group_id)
+
+        # 单位换算
         line_uom = self.sale_order_line_id.product_uom
         quant_uom = self.product_id.uom_id
         plan_uom_qty, procurement_uom = line_uom._adjust_uom_quantities(self.plan_uom_qty, quant_uom)
+
+        # 创建 procurement 请求
         procurements.append(self.env['procurement.group'].Procurement(
             self.product_id, plan_uom_qty, procurement_uom,
             self.sale_order_id.partner_shipping_id.property_stock_customer,
             self.product_id.display_name, self.sale_order_id.name, self.sale_order_id.company_id, values))
+
+        # 执行调度
         if procurements:
             procurement_group = self.env['procurement.group']
             if self.env.context.get('import_file'):
                 procurement_group = procurement_group.with_context(import_file=False)
             procurement_group.run(procurements)
+
+        # 确认相关的拣货单
         orders = self.mapped('sale_order_id')
         for order in orders:
             pickings_to_confirm = order.picking_ids.filtered(lambda p: p.state not in ['cancel', 'done'])
             if pickings_to_confirm:
                 pickings_to_confirm.action_confirm()
+
         return True
 
+
     def _prepare_procurement_group_vals(self):
+        """
+        构造创建 procurement group 所需的字段。
+        """
         return {
             'name': self.sale_order_id.name,
             'move_type': self.sale_order_id.picking_policy,
@@ -889,11 +928,18 @@ class SfProductionDemandPlan(models.Model):
             'partner_id': self.sale_order_id.partner_shipping_id.id,
         }
 
+
     def _prepare_procurement_values(self, group_id=False):
+        """
+        构造单个 procurement 请求所需的字段字典。
+        """
         self.ensure_one()
+
+        # 交货日期与计划日期
         date_deadline = self.sale_order_id.commitment_date or (
-                self.sale_order_id.date_order + timedelta(days=self.sale_order_line_id.customer_lead or 0.0))
+            self.sale_order_id.date_order + timedelta(days=self.sale_order_line_id.customer_lead or 0.0))
         date_planned = date_deadline - timedelta(days=self.sale_order_id.company_id.security_lead)
+
         values = {
             'group_id': group_id,
             'sale_line_id': self.sale_order_line_id.id,
@@ -909,63 +955,6 @@ class SfProductionDemandPlan(models.Model):
             'sequence': self.sale_order_line_id.sequence,
             'demand_plan_line_id': self.id
         }
+
         return values
 
-    def button_plan_detail(self):
-        self.ensure_one()
-        purchase_request_ids = self.env['purchase.request'].sudo().search(
-            [('line_ids.demand_plan_line_id', 'in', self.ids)])
-        purchase_order_ids = self.env['purchase.order'].sudo().search(
-            [('order_line.demand_plan_line_id', 'in', self.ids)])
-        picking_ids = self.env['stock.picking'].sudo().search(
-            [('demand_plan_line_ids', 'in', self.ids)])
-        return {
-            'name': _('详情'),
-            'type': 'ir.actions.act_window',
-            'view_mode': 'form',
-            'res_model': 'sf.demand.plan.detail.wizard',
-            'target': 'new',
-            'views': [(False, 'form')],
-            'context': {
-                'default_mrp_production_ids': self.mrp_production_ids.ids,
-                'default_purchase_request_ids': purchase_request_ids.ids,
-                'default_standard_purchase_order_ids': purchase_order_ids.filtered(
-                    lambda o: o.purchase_type == 'standard'
-                ).ids,
-                'default_consignment_purchase_order_ids': purchase_order_ids.filtered(
-                    lambda o: o.purchase_type == 'consignment'
-                ).ids,
-                'default_outsourcing_purchase_order_ids': purchase_order_ids.filtered(
-                    lambda o: o.purchase_type == 'outsourcing'
-                ).ids,
-                'default_outside_purchase_order_ids': purchase_order_ids.filtered(
-                    lambda o: o.purchase_type == 'outside'
-                ).ids,
-                'default_in_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'IN'
-                ).ids,
-                'default_dl_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'DL'
-                ).ids,
-                'default_int_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'INT'
-                ).ids,
-                'default_pc_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'PC'
-                ).ids,
-                'default_sfp_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'SFP'
-                ).ids,
-                'default_onin_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'OCIN'
-                ).ids,
-                'default_ocout_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'OCOUT'
-                ).ids,
-                'default_out_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'OUT'
-                ).ids,
-                'default_res_stock_picking_ids': picking_ids.filtered(
-                    lambda o: o.picking_type_sequence_code == 'RES'
-                ).ids,
-            }}

sf_demand_plan/models/stock_move.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, fields, models
-
-
-class StockMove(models.Model):
-    _inherit = 'stock.move'
-
-    demand_plan_line_ids = fields.Many2many(comodel_name="sf.production.demand.plan",
-                                            string="需求计划明细", compute='_compute_demand_plan_line_ids', store=True)
-
-    @api.depends('origin', 'move_orig_ids')
-    def _compute_demand_plan_line_ids(self):
-        sorted_records = self.sorted(key=lambda r: -r.id)
-        for line in sorted_records:
-            origin = [origin.replace(' ', '') for origin in line.origin.split(',')]
-            if line.created_purchase_request_line_id:
-                line.demand_plan_line_ids = line.created_purchase_request_line_id.demand_plan_line_id.ids
-            elif line.origin and 'MO' in line.origin:
-                mp_ids = self.env['mrp.production'].sudo().search([('name', '=', origin[0])])
-                line.demand_plan_line_ids = mp_ids.demand_plan_line_id.ids if mp_ids else []
-            elif line.origin and 'P' in line.origin:
-                purchase_order_ids = self.env['purchase.order'].sudo().search([('name', '=', origin[0])])
-                if purchase_order_ids.order_line:
-                    line.demand_plan_line_ids = purchase_order_ids.order_line.demand_plan_line_id.ids
-            elif line.move_orig_ids:
-                demand_plan_lines = self.env['sf.production.demand.plan']
-                for move_orig in line.move_orig_ids:
-                    demand_plan_lines |= move_orig.demand_plan_line_ids
-                line.demand_plan_line_ids = demand_plan_lines.ids
-            else:
-                line.demand_plan_line_ids = []
-
-            if not line.demand_plan_line_ids and self.env.context.get('demand_plan_line_id'):
-                plan_ids = self.env.context['demand_plan_line_id']
-                line.demand_plan_line_ids = [plan_ids]

sf_demand_plan/models/stock_picking.py

@@ -1,16 +0,0 @@
-from odoo import fields, api, models, _
-
-
-class StockPicking(models.Model):
-    _inherit = "stock.picking"
-
-    demand_plan_line_ids = fields.Many2many(comodel_name="sf.production.demand.plan",
-                                            string="需求计划明细", compute='_compute_demand_plan_line_ids', store=True)
-
-    @api.depends('move_ids_without_package')
-    def _compute_demand_plan_line_ids(self):
-        for line in self:
-            demand_plan_lines = self.env['sf.production.demand.plan']
-            if line.move_ids_without_package and line.move_ids_without_package.demand_plan_line_ids:
-                demand_plan_lines |= line.move_ids_without_package.demand_plan_line_ids
-            line.demand_plan_line_ids = demand_plan_lines.ids

sf_demand_plan/security/ir.model.access.csv

@@ -13,7 +13,4 @@ access_stock_route_group,stock.route.group,model_stock_route_group,base.group_us
 access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
 
 access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0
-access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1
-
-access_sf_demand_plan_detail_wizard,sf.demand.plan.detail.wizard,model_sf_demand_plan_detail_wizard,base.group_user,1,0,0,0
-access_sf_demand_plan_detail_wizard_for_dispatch,sf.demand.plan.detail.wizard for dispatch,model_sf_demand_plan_detail_wizard,sf_base.group_plan_dispatch,1,1,1,1
+access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1

sf_demand_plan/static/src/js/custom_button.js

@@ -1,58 +0,0 @@
-/** @odoo-module **/
-
-import { registry } from "@web/core/registry";
-import { ListRenderer } from "@web/views/list/list_renderer";
-import { useService } from "@web/core/utils/hooks";
-import { useEffect } from "@odoo/owl";
-
-export class CustomDemandPlanListRenderer extends ListRenderer {
-    setup() {
-        super.setup();
-        this.orm = useService("orm");
-        this.notification = useService("notification");
-        console.log('setup', this.props);
-
-        // 监听selection属性的变化
-        useEffect(() => {
-            this.updateButtonState();
-        }, () => [this.props.list.selection]);
-    }
-
-    /**
-     * 更新按钮状态
-     */
-    async updateButtonState() {
-        const selectedRecords = this.props.list.selection;
-        const isStatus30 = selectedRecords.some(record => record.data.status != "30");
-        const button = $(this.__owl__.parent.bdom.parentEl).find('button[name="button_batch_release_plan"]');
-        if (isStatus30) {
-            // 禁用按钮
-            button.attr('disabled', true);
-        } else {
-            button.attr('disabled', false);
-        }
-    }
-}
-// 使用setTimeout延迟注册，避免在模块加载时立即执行
-setTimeout(() => {
-    const registerCustomRenderer = () => {
-        try {
-            const listView = registry.category("views").get("list");
-            if (listView) {
-                registry.category("views").add("custom_demand_plan_list", {
-                    ...listView,
-                    Renderer: CustomDemandPlanListRenderer,
-                });
-                console.log("Custom demand plan list renderer registered successfully");
-            } else {
-                console.warn("List view not found, retrying...");
-                // 如果还没找到，再等一段时间
-                setTimeout(registerCustomRenderer, 1000);
-            }
-        } catch (error) {
-            console.error("Error registering custom renderer:", error);
-        }
-    };
-
-    registerCustomRenderer();
-}, 1000); 

sf_demand_plan/views/demand_plan.xml

@@ -4,8 +4,7 @@
         <field name="model">sf.production.demand.plan</field>
         <field name="arch" type="xml">
             <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
-                  class="demand_plan_tree freeze-columns-before-part_number" create="false" delete="false"
-                  js_class="custom_demand_plan_list">
+                  class="demand_plan_tree freeze-columns-before-part_number" create="false" delete="false">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
                             class="btn-primary"/>
@@ -92,10 +91,6 @@
                         attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
                 />
                 <button name="edit_button" type="object" string="拆分" class="btn-primary"/>
-                <button string="详情" name="button_plan_detail" type="object"
-                        class="btn-primary"
-                        attrs="{'invisible': [('status', 'not in', ('50','60'))]}"
-                />
             </tree>
         </field>
     </record>

sf_demand_plan/views/demand_plan_info.xml

@@ -108,10 +108,6 @@
                                             class="btn-primary"
                                             attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
                                     />
-                                    <button string="详情" name="button_plan_detail" type="object"
-                                            class="btn-primary"
-                                             attrs="{'invisible': [('status', 'not in', ('50','60'))]}"
-                                    />
                                 </tree>
                             </field>
                         </page>

sf_demand_plan/wizard/__init__.py

@@ -1,3 +1,2 @@
 from . import sf_demand_plan_print_wizard
 from . import sf_release_plan_wizard
-from . import sf_demand_plan_detail_wizard

sf_demand_plan/wizard/sf_demand_plan_detail_wizard.py

@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-from odoo import models, fields, api, _
-
-_logger = logging.getLogger(__name__)
-
-
-class SfDemandPlanDetailWizard(models.TransientModel):
-    _name = 'sf.demand.plan.detail.wizard'
-    _description = u'需求计划详情向导'
-
-    mrp_production_ids = fields.Many2many('mrp.production', string='关联制造订单', readonly=True)
-    purchase_request_ids = fields.Many2many('purchase.request', string='关联采购申请', readonly=True)
-    standard_purchase_order_ids = fields.Many2many('purchase.order', string='关联标准采购',
-                                                   relation='standard_purchase_order_rel',
-                                                   column1='plan_detail_wizard_id', column2='purchase_order_id',
-                                                   readonly=True)
-    consignment_purchase_order_ids = fields.Many2many('purchase.order', string='关联工序外协采购',
-                                                      relation='consignment_purchase_order_rel',
-                                                      column1='plan_detail_wizard_id', column2='purchase_order_id',
-                                                      readonly=True)
-    outsourcing_purchase_order_ids = fields.Many2many('purchase.order', string='关联委外加工采购',
-                                                      relation='outsourcing_purchase_order_rel',
-                                                      column1='plan_detail_wizard_id', column2='purchase_order_id',
-                                                      readonly=True)
-    outside_purchase_order_ids = fields.Many2many('purchase.order', string='关联外购订单采购',
-                                                  relation='outside_purchase_order_rel',
-                                                  column1='plan_detail_wizard_id', column2='purchase_order_id',
-                                                  readonly=True)
-
-    in_stock_picking_ids = fields.Many2many('stock.picking', string='关联收料入库调拨单',
-                                            relation='in_stock_picking_rel',
-                                            column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                            readonly=True)
-
-    dl_stock_picking_ids = fields.Many2many('stock.picking', string='关联客供料入库调拨单',
-                                            relation='dl_stock_picking_rel',
-                                            column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                            readonly=True)
-
-    int_stock_picking_ids = fields.Many2many('stock.picking', string='关联内部调拨',
-                                             relation='int_stock_picking_rel',
-                                             column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                             readonly=True)
-
-    pc_stock_picking_ids = fields.Many2many('stock.picking', string='关联生产发料调拨单',
-                                            relation='pc_stock_picking_rel',
-                                            column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                            readonly=True)
-
-    sfp_stock_picking_ids = fields.Many2many('stock.picking', string='关联生产入库调拨单',
-                                             relation='sfp_stock_picking_rel',
-                                             column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                             readonly=True)
-
-    onin_stock_picking_ids = fields.Many2many('stock.picking', string='关联外协入库调拨单',
-                                              relation='onin_stock_picking_rel',
-                                              column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                              readonly=True)
-
-    ocout_stock_picking_ids = fields.Many2many('stock.picking', string='关联外协出库调拨单',
-                                               relation='ocout_stock_picking_rel',
-                                               column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                               readonly=True)
-
-    out_stock_picking_ids = fields.Many2many('stock.picking', string='关联发料出库调拨单',
-                                             relation='out_stock_picking_rel',
-                                             column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                             readonly=True)
-
-    res_stock_picking_ids = fields.Many2many('stock.picking', string='关联委外发料调拨单',
-                                             relation='res_stock_picking_rel',
-                                             column1='plan_detail_wizard_id', column2='stock_picking_id',
-                                             readonly=True)

sf_demand_plan/wizard/sf_demand_plan_detail_wizard_view.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="action_plan_detail_form" model="ir.ui.view">
-        <field name="name">sf.demand.plan.detail.wizard.form</field>
-        <field name="model">sf.demand.plan.detail.wizard</field>
-        <field name="arch" type="xml">
-            <form string="详情">
-                <notebook>
-                    <page string="采购申请" attrs="{'invisible': [('purchase_request_ids', '=', [])]}">
-                        <field name="purchase_request_ids" widget="many2many"/>
-                    </page>
-                    <page string="制造订单" attrs="{'invisible': [('mrp_production_ids', '=', [])]}">
-                        <field name="mrp_production_ids" widget="many2many"/>
-                    </page>
-                    <page string="标准采购" attrs="{'invisible': [('standard_purchase_order_ids', '=', [])]}">
-                        <field name="standard_purchase_order_ids" widget="many2many"/>
-                    </page>
-                    <page string="工序外协采购" attrs="{'invisible': [('consignment_purchase_order_ids', '=', [])]}">
-                        <field name="consignment_purchase_order_ids" widget="many2many"/>
-                    </page>
-                    <page string="委外加工采购" attrs="{'invisible': [('outsourcing_purchase_order_ids', '=', [])]}">
-                        <field name="outsourcing_purchase_order_ids" widget="many2many"/>
-                    </page>
-                    <page string="外购订单采购" attrs="{'invisible': [('outside_purchase_order_ids', '=', [])]}">
-                        <field name="outside_purchase_order_ids" widget="many2many"/>
-                    </page>
-                    <page string="收料入库" attrs="{'invisible': [('in_stock_picking_ids', '=', [])]}">
-                        <field name="in_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="客供料入库" attrs="{'invisible': [('dl_stock_picking_ids', '=', [])]}">
-                        <field name="dl_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="内部调拨" attrs="{'invisible': [('int_stock_picking_ids', '=', [])]}">
-                        <field name="int_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="生产发料" attrs="{'invisible': [('pc_stock_picking_ids', '=', [])]}">
-                        <field name="pc_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="生产入库" attrs="{'invisible': [('sfp_stock_picking_ids', '=', [])]}">
-                        <field name="sfp_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="外协入库" attrs="{'invisible': [('onin_stock_picking_ids', '=', [])]}">
-                        <field name="onin_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="外协出库" attrs="{'invisible': [('ocout_stock_picking_ids', '=', [])]}">
-                        <field name="ocout_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="发料出库" attrs="{'invisible': [('out_stock_picking_ids', '=', [])]}">
-                        <field name="out_stock_picking_ids" widget="many2many"/>
-                    </page>
-                    <page string="委外发料" attrs="{'invisible': [('res_stock_picking_ids', '=', [])]}">
-                        <field name="res_stock_picking_ids" widget="many2many"/>
-                    </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-</odoo>

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -5,7 +5,7 @@ from odoo import models, fields, api, _
 _logger = logging.getLogger(__name__)
 
 
-class SfDemandPlanPrintWizard(models.Model):
+class SfDemandPlanPrintWizard(models.TransientModel):
     _name = 'sf.demand.plan.print.wizard'
     _description = u'打印向导'
 

sf_demand_plan/wizard/sf_release_plan_wizard.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import models, fields, api, _
-from werkzeug.exceptions import InternalServerError
 
 _logger = logging.getLogger(__name__)
 
@@ -18,10 +17,4 @@ class SfReleasePlanWizard(models.TransientModel):
     def confirm(self):
         if self.demand_plan_line_id:
             for demand_plan_line_id in self.demand_plan_line_id:
-                try:
-                    demand_plan_line_id.action_confirm()
-                except Exception as e:
-                    self.env.cr.rollback()
-                    demand_plan_line_id.write({'is_processing': False})
-                    self.env.cr.commit()
-                    raise InternalServerError('操作失败', e)
+                demand_plan_line_id.action_confirm()

sf_mrs_connect/controllers/__init__.py

@@ -1 +1,2 @@
 from . import controllers
+from . import sync_controller

sf_mrs_connect/controllers/sync_controller.py

@@ -0,0 +1,22 @@
+# study/jikimo_sf/sf_mrs_connect/controllers/sync_controller.py
+from odoo import http
+from odoo.http import request
+
+class FixtureSyncController(http.Controller):
+
+    @http.route('/api/fixture_model/sync_from_mrs', type='json', auth='none', csrf=False)
+    def sync_model(self, **kw):
+        code = kw.get('code')
+        if not code:
+            return {'status':'fail','msg':'code missing'}
+        request.env['sf.fixture.model'].sudo().sync_from_mrs(code)
+        return {'status':'success'}
+
+    @http.route('/api/fixture_param/sync_from_mrs', type='json', auth='none', csrf=False)
+    def sync_param(self, **kw):
+        code = kw.get('code')
+        if not code:
+            return {'status':'fail','msg':'code missing'}
+        request.env['sf.fixture.materials.basic.parameters']\
+            .sudo().sync_from_mrs(code)
+        return {'status':'success'}

sf_mrs_connect/models/common.py

@@ -0,0 +1,14 @@
+# study/jikimo_sf/sf_mrs_connect/models/common.py
+import time, hashlib
+
+class Common:
+    @staticmethod
+    def get_headers(token, secret_key):
+        ts = str(int(time.time()))
+        sign = hashlib.sha256(f"{token}{secret_key}{ts}".encode()).hexdigest()
+        return {
+            "token": token,
+            "sign": sign,
+            "timestamp": ts,
+            "Content-Type": "application/json",
+        }

sf_mrs_connect/models/redis_utils.py

@@ -0,0 +1,30 @@
+# study/jikimo_sf/sf_mrs_connect/models/redis_utils.py
+import redis, json, logging
+
+_logger = logging.getLogger(__name__)
+
+class RedisClient:
+    def __init__(self, host='localhost', port=6379, db=0):
+        try:
+            self.client = redis.Redis(host=host, port=port, db=db, decode_responses=True)
+        except Exception as e:
+            _logger.error(f"Redis init error: {e}")
+            self.client = None
+
+    def get_json(self, key):
+        if not self.client:
+            return None
+        try:
+            data = self.client.get(key)
+            return json.loads(data) if data else None
+        except Exception as e:
+            _logger.error(f"Redis GET error [{key}]: {e}")
+            return None
+
+    def set_json(self, key, value, ex=3600):
+        if not self.client:
+            return
+        try:
+            self.client.set(key, json.dumps(value, ensure_ascii=False), ex=ex)
+        except Exception as e:
+            _logger.error(f"Redis SET error [{key}]: {e}")

sf_mrs_connect/models/sync_common.py

@@ -5,9 +5,11 @@ import base64
 import traceback
 
 import requests
-from odoo import models
+from odoo import models,api,fields
 from odoo.exceptions import ValidationError
-from odoo.addons.sf_base.commons.common import Common
+from .redis_utils import RedisClient
+from .common import Common
+from odoo.addons.jikimo_sf.sf_base.commons.common import Common
 
 _logger = logging.getLogger(__name__)
 
@@ -1506,149 +1508,157 @@ class SyncMulti_Mounting_Type(models.Model):
             raise ValidationError("联装类型认证未通过")
 
 
-class SyncFixtureModel(models.Model):
-    _inherit = 'sf.fixture.model'
-    _description = '同步夹具型号列表'
+# class SyncFixtureModel(models.Model):
+#     _inherit = 'sf.fixture.model'
+#     _description = '同步夹具型号列表'
 
-    url = '/api/fixture_model/list'
+#     url = '/api/fixture_model/list'
 
-    # 定时同步夹具型号列表
-    def sync_fixture_model_yesterday(self):
-        config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
-        result = json.loads(r['result'])
-        if result['status'] == 1:
-            if result.get('fixture_model_yesterday_list'):
-                for item in result['fixture_model_yesterday_list']:
-                    if item:
-                        fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
-                        val = {
-                            "name": item['name'],
-                            "code": item['code'],
-                            "fixture_material_id": self.env['sf.fixture.material'].search(
-                                [('code', '=', item['fixture_material_code'])]).id,
-                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                [('code', '=', item['multi_mounting_type_code'])]).id,
-                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                            "status": item['status'],
-                            "active": item['active'],
-                        }
-                        if not fixture_model:
-                            self.create(val)
-                        else:
-                            fixture_model.write(val)
+#     # 定时同步夹具型号列表
+#     def sync_fixture_model_yesterday(self):
+#         config = self.env['res.config.settings'].get_values()
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         strUrl = config['sf_url'] + self.url
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = r.json()
+#         result = json.loads(r['result'])
+#         if result['status'] == 1:
+#             if result.get('fixture_model_yesterday_list'):
+#                 for item in result['fixture_model_yesterday_list']:
+#                     if item:
+#                         fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
+#                         val = {
+#                             "name": item['name'],
+#                             "code": item['code'],
+#                             "fixture_material_id": self.env['sf.fixture.material'].search(
+#                                 [('code', '=', item['fixture_material_code'])]).id,
+#                             "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+#                                 [('code', '=', item['multi_mounting_type_code'])]).id,
+#                             "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+#                             "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+#                             "status": item['status'],
+#                             "active": item['active'],
+#                         }
+#                         if not fixture_model:
+#                             self.create(val)
+#                         else:
+#                             fixture_model.write(val)
 
-        else:
-            raise ValidationError("夹具型号认证未通过")
+#         else:
+#             raise ValidationError("夹具型号认证未通过")
 
-    # 定时同步所有夹具型号列表
-    def sync_all_fixture_model(self):
-        config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
-        result = json.loads(r['result'])
-        # print('result:%s' % result)
-        if result['status'] == 1:
-            if result.get('fixture_model_all_list'):
-                for item in result['fixture_model_all_list']:
-                    if item:
-                        fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
-                        val = {
-                            "name": item['name'],
-                            "code": item['code'],
-                            "fixture_material_id": self.env['sf.fixture.material'].search(
-                                [('code', '=', item['fixture_material_code'])]).id,
-                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                [('code', '=', item['multi_mounting_type_code'])]).id,
-                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                            "status": item['status'],
-                            "active": item['active'],
-                        }
-                        if not fixture_model:
-                            self.create(val)
-                        else:
-                            fixture_model.write(val)
-        else:
-            raise ValidationError("夹具型号认证未通过")
+#     # 定时同步所有夹具型号列表
+# def sync_all_fixture_model(self):
+#         config = self.env['res.config.settings'].get_values()
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         strUrl = config['sf_url'] + self.url
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = r.json()
+#         result = json.loads(r['result'])
+#         # print('result:%s' % result)
+#         if result['status'] == 1:
+#             if result.get('fixture_model_all_list'):
+#                 for item in result['fixture_model_all_list']:
+#                     if item:
+#                         fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
+#                         val = {
+#                             "name": item['name'],
+#                             "code": item['code'],
+#                             "fixture_material_id": self.env['sf.fixture.material'].search(
+#                                 [('code', '=', item['fixture_material_code'])]).id,
+#                             "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+#                                 [('code', '=', item['multi_mounting_type_code'])]).id,
+#                             "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+#                             "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+#                             "status": item['status'],
+#                             "active": item['active'],
+#                         }
+#                         if not fixture_model:
+#                             self.create(val)
+#                         else:
+#                             fixture_model.write(val)
+#         else:
+#             raise ValidationError("夹具型号认证未通过")
 
 
-class SyncfixtureMaterialsBasicParameters(models.Model):
-    _inherit = 'sf.fixture.materials.basic.parameters'
-    _description = '同步夹具型号基本参数列表'
+# class SyncfixtureMaterialsBasicParameters(models.Model):
+#     _inherit = 'sf.fixture.materials.basic.parameters'
+#     _description = '同步夹具型号基本参数列表'
 
-    url = '/api/fixture_parameters/list'
+#     url = '/api/fixture_parameters/list'
 
-    # 定时同步夹具型号基本信息
-    def sync_fixture_materials_basic_parameters_yesterday(self):
-        config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
-        result = json.loads(r['result'])
-        if result['status'] == 1:
-            if result.get('fixture_parameters_yesterday_list'):
-                all_list = result.get('fixture_parameters_yesterday_list')
-                if all_list.get('zero_chuck_all_list'):
-                    self._write_or_create(all_list.get('zero_chuck_yesterday_list'), '零点卡盘')
-                if all_list.get('zero_tray_all_list'):
-                    self._write_or_create(all_list.get('zero_tray_yesterday_list'), '零点托盘')
-                if all_list.get('pneumatic_fixture_all_list'):
-                    self._write_or_create(all_list.get('pneumatic_fixture_yesterday_list'), '气动夹具')
-                if all_list.get('jaw_vice_all_list'):
-                    self._write_or_create(all_list.get('jaw_vice_yesterday_list'), '虎钳夹具')
-                if all_list.get('magnet_fixture_all_list'):
-                    self._write_or_create(all_list.get('magnet_fixture_yesterday_list'), '磁吸夹具')
-                if all_list.get('adapter_board_all_list'):
-                    self._write_or_create(all_list.get('adapter_board_yesterday_list'), '转接板(锁板)夹具')
-                if all_list.get('scroll_chuck_all_list'):
-                    self._write_or_create(all_list.get('scroll_chuck_yesterday_list'), '三爪卡盘')
-        else:
-            raise ValidationError("夹具型号基本参数认证未通过")
+#     # 定时同步夹具型号基本信息
+#     def sync_fixture_materials_basic_parameters_yesterday(self):
+#         config = self.env['res.config.settings'].get_values()
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         strUrl = config['sf_url'] + self.url
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = r.json()
+#         result = json.loads(r['result'])
+#         if result['status'] == 1:
+#             if result.get('fixture_parameters_yesterday_list'):
+#                 all_list = result.get('fixture_parameters_yesterday_list')
+#                 if all_list.get('zero_chuck_all_list'):
+#                     self._write_or_create(all_list.get('zero_chuck_yesterday_list'), '零点卡盘')
+#                 if all_list.get('zero_tray_all_list'):
+#                     self._write_or_create(all_list.get('zero_tray_yesterday_list'), '零点托盘')
+#                 if all_list.get('pneumatic_fixture_all_list'):
+#                     self._write_or_create(all_list.get('pneumatic_fixture_yesterday_list'), '气动夹具')
+#                 if all_list.get('jaw_vice_all_list'):
+#                     self._write_or_create(all_list.get('jaw_vice_yesterday_list'), '虎钳夹具')
+#                 if all_list.get('magnet_fixture_all_list'):
+#                     self._write_or_create(all_list.get('magnet_fixture_yesterday_list'), '磁吸夹具')
+#                 if all_list.get('adapter_board_all_list'):
+#                     self._write_or_create(all_list.get('adapter_board_yesterday_list'), '转接板(锁板)夹具')
+#                 if all_list.get('scroll_chuck_all_list'):
+#                     self._write_or_create(all_list.get('scroll_chuck_yesterday_list'), '三爪卡盘')
+#                 if all_list.get('air_tray_all_list'):
+#                     self._write_or_create(all_list.get('air_tray_all_list'),'气吹托盘')
+#                 if all_list.get('magnet_tray_all_list'):
+#                     self._write_or_create(all_list.get('magnet_tray_all_list'),'磁吸托盘')
+#         else:
+#             raise ValidationError("夹具型号基本参数认证未通过")
 
-    # 定时同步所有夹具型号基本信息
-    def sync_all_fixture_materials_basic_parameters(self):
-        config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
-        result = json.loads(r['result'])
-        if result['status'] == 1:
-            if result.get('fixture_parameters_all_list'):
-                all_list = result.get('fixture_parameters_all_list')
-                if all_list.get('zero_chuck_all_list'):
-                    self._write_or_create(all_list.get('zero_chuck_all_list'), '零点卡盘')
-                if all_list.get('zero_tray_all_list'):
-                    self._write_or_create(all_list.get('zero_tray_all_list'), '零点托盘')
-                if all_list.get('pneumatic_fixture_all_list'):
-                    self._write_or_create(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
-                if all_list.get('jaw_vice_all_list'):
-                    self._write_or_create(all_list.get('jaw_vice_all_list'), '虎钳夹具')
-                if all_list.get('magnet_fixture_all_list'):
-                    self._write_or_create(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
-                if all_list.get('adapter_board_all_list'):
-                    self._write_or_create(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
-                if all_list.get('scroll_chuck_all_list'):
-                    self._write_or_create(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
-        else:
-            raise ValidationError("夹具型号基本参数认证未通过")
+#     # 定时同步所有夹具型号基本信息
+#     def sync_all_fixture_materials_basic_parameters(self):
+#         config = self.env['res.config.settings'].get_values()
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         strUrl = config['sf_url'] + self.url
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = r.json()
+#         result = json.loads(r['result'])
+#         if result['status'] == 1:
+#             if result.get('fixture_parameters_all_list'):
+#                 all_list = result.get('fixture_parameters_all_list')
+#                 if all_list.get('zero_chuck_all_list'):
+#                     self._write_or_create(all_list.get('zero_chuck_all_list'), '零点卡盘')
+#                 if all_list.get('zero_tray_all_list'):
+#                     self._write_or_create(all_list.get('zero_tray_all_list'), '零点托盘')
+#                 if all_list.get('pneumatic_fixture_all_list'):
+#                     self._write_or_create(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
+#                 if all_list.get('jaw_vice_all_list'):
+#                     self._write_or_create(all_list.get('jaw_vice_all_list'), '虎钳夹具')
+#                 if all_list.get('magnet_fixture_all_list'):
+#                     self._write_or_create(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
+#                if all_list.get('adapter_board_all_list'):
+#                     self._write_or_create(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
+#                 if all_list.get('scroll_chuck_all_list'):
+#                     self._write_or_create(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
+#                 if all_list.get('air_tray_all_list'):
+#                     self._write_or_create(all_list.get('air_tray_all_list'),'气吹托盘')
+#                 if all_list.get('magnet_tray_all_list'):
+#                     self._write_or_create(all_list.get('magnet_tray_all_list'),'磁吸托盘')
+#         else:
+#             raise ValidationError("夹具型号基本参数认证未通过")
 
-    def _write_or_create(self, fixture_parameters_list, material_name):
-        for item in fixture_parameters_list:
-            if item:
-                basic_parameters = self.search([('code', '=', item.get('code')), ('active', 'in', [True, False])])
-                if not basic_parameters:
-                    self.create(self._get_basic_parameters_list(item, material_name))
-                else:
-                    basic_parameters.write(self._get_basic_parameters_list(item, material_name))
+#     def _write_or_create(self, fixture_parameters_list, material_name):
+#         for item in fixture_parameters_list:
+#             if item:
+#                 basic_parameters = self.search([('code', '=', item.get('code')), ('active', 'in', [True, False])])
+#                 if not basic_parameters:
+#                     self.create(self._get_basic_parameters_list(item, material_name))
+#                 else:
+#                     basic_parameters.write(self._get_basic_parameters_list(item, material_name))
 
 
 class SyncFunctionalFixtureType(models.Model):
@@ -3230,4 +3240,94 @@ class EmbryoRedundancySync(models.Model):
                         "height": item['height'],
                         "active": item['active'],
                         "remark": item['remark'],
-                    })
+                    })
+
+
+
+
+
+
+class SyncFixtureModel(models.Model):
+    _inherit = 'sf.fixture.model'
+    _description = 'Redis 优先同步夹具型号'
+
+    def sync_all_fixture_model(self):
+        rc = RedisClient()
+        key = 'mrs:fixture_model_all_list'
+        all_list = rc.get_json(key)
+        if not all_list:
+            raise ValidationError(f"Redis 中未找到 key={key}")
+
+        for item in all_list:
+            if not item or not item.get('code'):
+                continue
+
+            record = self.search([('code', '=', item['code'])], limit=1)
+            vals = {
+                'name': item['name'],
+                'code': item['code'],
+                'fixture_material_id': self.env['sf.fixture.material']
+                    .search([('code', '=', item['fixture_material_code'])], limit=1).id,
+                'multi_mounting_type_id': self.env['sf.multi_mounting.type']
+                    .search([('code', '=', item['multi_mounting_type_code'])], limit=1).id,
+                'brand_id': self.env['sf.machine.brand']
+                    .search([('code', '=', item['brand_code'])], limit=1).id,
+                'model_file': base64.b64decode(item['model_file']) if item.get('model_file') else False,
+                'status': item['status'],
+                'active': item['active'],
+            }
+            if record:
+                record.write(vals)
+            else:
+                self.create(vals)
+
+
+class SyncfixtureMaterialsBasicParameters(models.Model):
+    _inherit = 'sf.fixture.materials.basic.parameters'
+    _description = 'Redis 优先同步夹具基本参数'
+
+    def sync_all_fixture_materials_basic_parameters(self):
+        rc = RedisClient()
+        key = 'mrs:fixture_param_all_list'
+        all_list = rc.get_json(key)
+        if not all_list:
+            raise ValidationError(f"Redis 中未找到 key={key}")
+
+        def _sync_list(param_list, material_name):
+            for item in param_list or []:
+                if not item or not item.get('code'):
+                    continue
+                record = self.search([('code', '=', item['code'])], limit=1)
+                vals = self._get_basic_parameters_list(item, material_name)
+                if record:
+                    record.write(vals)
+                else:
+                    self.create(vals)
+
+        _sync_list(all_list.get('zero_chuck_all_list'), '零点卡盘')
+        _sync_list(all_list.get('zero_tray_all_list'), '零点托盘')
+        _sync_list(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
+        _sync_list(all_list.get('jaw_vice_all_list'), '虎钳夹具')
+        _sync_list(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
+        _sync_list(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
+        _sync_list(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
+        _sync_list(all_list.get('air_tray_all_list'), '气吹托盘')
+        _sync_list(all_list.get('magnet_tray_all_list'), '磁吸托盘')
+
+    def _get_basic_parameters_list(self, item, material_name):
+        """
+        统一结构化 item 数据，供写入模型字段使用（你应当根据 material_name 自定义字段映射）
+        """
+        return {
+            'name': item.get('name'),
+            'code': item.get('code'),
+            'length': item.get('length'),
+            'width': item.get('width'),
+            'height': item.get('height'),
+            'diameter': item.get('diameter'),
+            'weight': item.get('weight'),
+            'fixture_model_id': self.env['sf.fixture.model'].search([('code', '=', item.get('fixture_model_code'))], limit=1).id,
+            'materials_model_id': self.env['sf.materials.model'].search([('code', '=', item.get('material_code'))], limit=1).id,
+            'active': item.get('active', True),
+            # 你可以根据 material_name 判断类型并补充字段
+        }