是否磁吸

sf_base/__manifest__.py

@@ -35,6 +35,7 @@
         ],
         'web.assets_backend': [
             'sf_base/static/src/scss/*.scss',
+            'sf_base/static/src/js/*.js',
         ],
 
     },

sf_base/models/common.py

@@ -42,6 +42,7 @@ class MrsMaterialModel(models.Model):
     materials_num = fields.Char("编码号")
     name = fields.Char('型号名')
     need_h = fields.Boolean("热处理", default="false")
+    need_m = fields.Boolean("是否磁吸", default="false")
     mf_materia_post = fields.Char("热处理后密度")
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")

sf_base/static/src/js/custom_barcode_handlers.js

@@ -0,0 +1,62 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { barcodeGenericHandlers } from '@barcodes/barcode_handlers';
+import { patch } from "@web/core/utils/patch";
+
+// 定义新的 clickOnButton 函数
+function customClickOnButton(selector) {
+    console.log("This is the custom clickOnButton function!");
+
+    const buttons = document.body.querySelectorAll(selector);
+
+    let length = buttons.length;
+    if (length > 0) {
+        buttons[length - 1].click();
+    } else {
+        console.warn(`Button with selector ${selector} not found`);
+    }
+}
+
+patch(barcodeGenericHandlers, "start", {
+    start(env, { ui, barcode, notification }) {
+        // 使用新定义的 clickOnButton 函数
+        const COMMANDS = {
+            "O-CMD.EDIT": () => customClickOnButton(".o_form_button_edit"),
+            "O-CMD.DISCARD": () => customClickOnButton(".o_form_button_cancel"),
+            "O-CMD.SAVE": () => customClickOnButton(".o_form_button_save"),
+            "O-CMD.PREV": () => customClickOnButton(".o_pager_previous"),
+            "O-CMD.NEXT": () => customClickOnButton(".o_pager_next"),
+            "O-CMD.PAGER-FIRST": () => updatePager("first"),
+            "O-CMD.PAGER-LAST": () => updatePager("last"),
+            "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
+            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
+        };
+
+        barcode.bus.addEventListener("barcode_scanned", (ev) => {
+            const barcode = ev.detail.barcode;
+            if (barcode.startsWith("O-BTN.")) {
+                let targets = [];
+                try {
+                    targets = getVisibleElements(ui.activeElement, `[barcode_trigger=${barcode.slice(6)}]`);
+                } catch (_e) {
+                    console.warn(`Barcode '${barcode}' is not valid`);
+                }
+                for (let elem of targets) {
+                    elem.click();
+                }
+            }
+            if (barcode.startsWith("O-CMD.")) {
+                const fn = COMMANDS[barcode];
+                if (fn) {
+                    fn();
+                } else {
+                    notification.add(env._t("Barcode: ") + `'${barcode}'`, {
+                        title: env._t("Unknown barcode command"),
+                        type: "danger"
+                    });
+                }
+            }
+        });
+    }
+})

sf_base/static/src/js/remove_focus.js

@@ -0,0 +1,42 @@
+/** @odoo-module **/
+
+import { registry } from '@web/core/registry';
+
+import { formView } from '@web/views/form/form_view';
+import { FormController } from '@web/views/form/form_controller';
+
+import { listView } from '@web/views/list/list_view';
+import { ListController } from '@web/views/list/list_controller'
+
+import { onRendered, onMounted } from "@odoo/owl";
+
+export class RemoveFocusFormController extends FormController {
+    setup() {
+        super.setup();
+
+        onMounted(() => {
+            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
+        })
+    }
+}
+
+registry.category('views').add('remove_focus_form_view', {
+    ...formView,
+    Controller: RemoveFocusFormController,
+});
+
+
+export class RemoveFocusListController extends ListController {
+    setup() {
+        super.setup();
+
+        onMounted(() => {
+            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
+        })
+    }
+}
+
+registry.category('views').add('remove_focus_list_view', {
+    ...listView,
+    Controller: RemoveFocusListController,
+});

sf_base/views/common_view.xml

@@ -263,6 +263,7 @@
                                 <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="0"/>
                                 <field name="density" readonly="1" required="1"  class="custom_required"/>
+                                <field name="need_m" default="false" readonly="1"/>
                             </group>
                             <group>
                                 <field name="rough_machining" required="1"/>
@@ -306,6 +307,7 @@
                     <field name="tensile_strength"/>
                     <field name="hardness" optional="show"/>
                     <field name="need_h"/>
+                    <field name="need_m"/>
                     <field name="apply" widget="many2many_tags" optional="show"/>
                     <field name="density" optional="show"/>
                     <field name="rough_machining" optional="hide"/>
@@ -352,6 +354,7 @@
                                             <field name="materials_no"/>
                                             <field name="name"/>
                                             <field name="need_h"/>
+                                            <field name="need_m"/>
                                             <field name="mf_materia_post"/>
                                             <field name="density"/>
                                             <field name='materials_id' default="default" invisible="1"/>

sf_demand_plan/__manifest__.py

@@ -30,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/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_demand_plan.py

@@ -222,14 +222,9 @@ class SfDemandPlan(models.Model):
         line_ids = self.line_ids.filtered(lambda p: p.status == '30')
         sum_product_uom_qty = sum(line_ids.mapped('plan_uom_qty'))
         customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-        check_overdelivery_allowed = False
-        for line in line_ids:
-            if line.location_id.id == customer_location_id:
-                if not self.overdelivery_allowed:
+        if not self.overdelivery_allowed and line_ids.filtered(lambda p: p.location_id.id == customer_location_id):
             if float_compare(sum_product_uom_qty, self.product_uom_qty,
-                                     precision_rounding=line.product_id.uom_id.rounding) == 1:
-                        check_overdelivery_allowed = True                
-        if check_overdelivery_allowed:
+                             precision_rounding=self.product_id.uom_id.rounding) == 1:
                 raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
         elif float_compare(sum_product_uom_qty, self.product_uom_qty,
                            precision_rounding=self.product_id.uom_id.rounding) == 1:

sf_demand_plan/models/sf_production_demand_plan.py

@@ -14,10 +14,10 @@ class SfProductionDemandPlan(models.Model):
     _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 +34,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 +83,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 +127,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',
@@ -613,6 +607,11 @@ class SfProductionDemandPlan(models.Model):
         filtered_plan = self.filtered(lambda mo: mo.status == '30')
         if not filtered_plan:
             raise UserError(_("没有需要下达的计划！"))
+        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')
+            if self.location_id.id == customer_location_id:
+                check_overdelivery_allowed = True
         # 按产品分组并计算总数
         product_data = {}
         for plan in filtered_plan:
@@ -660,15 +659,9 @@ class SfProductionDemandPlan(models.Model):
                     'default_demand_plan_line_id': self.ids,
                     'default_release_message': warning_message,
                 }}
-        else:
-            for demand_plan_line_id in filtered_plan:
-                demand_plan_line_id.action_confirm()
 
     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')
@@ -708,6 +701,18 @@ class SfProductionDemandPlan(models.Model):
             self.update_sale_order_state()
 
     def mrp_bom_create(self):
+        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'))
+            if line_ids:
+                self.bom_id = line_ids[0].bom_id.id
+                return
+        elif self.supply_method == 'outsourcing':
+            line_ids = self.demand_plan_id.line_ids.filtered(
+                lambda p: p.supply_method == 'outsourcing' and p.status == '60')
+            if line_ids:
+                self.bom_id = line_ids[0].bom_id.id
+                return
         bom_type = ''
         # 根据供货方式修改成品模板
         if self.supply_method == 'automation':
@@ -727,18 +732,6 @@ class SfProductionDemandPlan(models.Model):
 
         # 复制成品模板上的属性
         self.product_id.product_tmpl_id.copy_template(product_template_id)
-        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'))
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
-        elif self.supply_method == 'outsourcing':
-            line_ids = self.demand_plan_id.line_ids.filtered(
-                lambda p: p.supply_method == 'outsourcing' and p.status == '60')
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
         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')}"
@@ -918,6 +911,3 @@ class SfProductionDemandPlan(models.Model):
             'demand_plan_line_id': self.id
         }
         return values
-
-    def button_plan_detail(self):
-        pass

sf_demand_plan/static/src/js/custom_button.js

@@ -1,59 +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"]');
-        console.log('isStatus30', isStatus30, button);
-        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"/>

sf_demand_plan/views/demand_plan_info.xml

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -37,7 +37,7 @@ class SfDemandPlanPrintWizard(models.TransientModel):
             if pdf_data:
                 try:
                     # 执行打印
-                    # self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
+                    self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
                     record.status = 'success'
                     production_demand_plan_id = self.env['sf.production.demand.plan'].sudo().search(
                         [('model_id', '=', record.model_id)])

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)

sf_manufacturing/__manifest__.py

@@ -11,7 +11,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse', 'jikimo_attachment_viewer',
-                'jikimo_sale_multiple_supply_methods', 'product', 'jikimo_tree_header_buttons_always_visible'],
+                'jikimo_sale_multiple_supply_methods', 'product'],
     'data': [
         'data/cron_data.xml',
         'data/stock_data.xml',

sf_mrs_connect/models/sync_common.py

@@ -1506,149 +1506,149 @@ 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'), '三爪卡盘')
+#         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'), '三爪卡盘')
+#         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):
@@ -3231,3 +3231,108 @@ class EmbryoRedundancySync(models.Model):
                         "active": item['active'],
                         "remark": item['remark'],
                     })
+
+
+
+
+
+
+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)
+
+        # ✅ Redis 无数据时，请求 MRS 端刷新 Redis 缓存
+        if not all_list:
+            config = self.env['res.config.settings'].get_values()
+            headers = Common.get_headers(config['token'], config['sf_secret_key'])
+            refresh_url = config['mrs_url'] + '/api/refresh_redis/fixture_param'
+
+            try:
+                res = requests.post(refresh_url, headers=headers, json={}, timeout=10)
+                res.raise_for_status()
+            except Exception as e:
+                raise ValidationError(f"Redis 无数据，MRS 缓存刷新失败: {str(e)}")
+
+            # 再次尝试从 Redis 获取
+            all_list = rc.get_json(key)
+            if not all_list:
+                raise ValidationError("Redis 刷新后仍无数据，无法同步夹具基本参数")
+
+        # ✅ 同步函数作为局部函数定义在方法体内部
+        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'), '磁吸托盘')
+
+
+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)
+
+        # ✅ Redis 没数据时，请求 MRS 接口刷新
+        if not all_list:
+            config = self.env['res.config.settings'].get_values()
+            headers = Common.get_headers(config['token'], config['sf_secret_key'])
+            refresh_url = config['mrs_url'] + '/api/refresh_redis/fixture_model'
+
+            try:
+                res = requests.post(refresh_url, headers=headers, json={}, timeout=10)
+                res.raise_for_status()
+            except Exception as e:
+                raise ValidationError(f"Redis 无数据，MRS 刷新失败: {str(e)}")
+
+            # 再次尝试获取 Redis
+            all_list = rc.get_json(key)
+            if not all_list:
+                raise ValidationError("刷新后仍无 Redis 数据，无法同步夹具型号")
+
+        # ✅ 开始同步夹具型号
+        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)

sf_plan_management/i18n/zh_CN.po

@@ -45759,6 +45759,11 @@ msgstr ""
 msgid "热处理"
 msgstr ""
 
+#. module: sf_base
+#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__need_m
+msgid "是否磁吸"
+msgstr ""
+
 #. module: sf_base
 #: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__mf_materia_post
 msgid "热处理后密度"

sf_purchase_arrival_inform/__init__.py

@@ -1,2 +0,0 @@
-from . import models
-from . import wizard

sf_purchase_arrival_inform/__manifest__.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': '机企猫智能工厂 采购到货通知',
-    'version': '1.1',
-    'summary': '智能工厂计划管理',
-    'sequence': 1,
-    'description': """
-在本模块，支持采购到货通知
-    """,
-    'category': 'sf',
-    'website': 'https://www.sf.jikimo.com',
-    'depends': ['jikimo_purchase_request', 'quality_control', 'sf_manufacturing'], 
-    'data': [
-        'views/product_category.xml',
-        'views/purchase_view.xml',
-        'wizard/purchase_confirm_wizard_view.xml',
-        'security/ir.model.access.csv',
-    ],
-    'demo': [   
-    ],
-    'assets': {
-        'web.assets_qweb': [
-        ],
-        'web.assets_backend': [
-            
-        ]
-    },
-    'license': 'LGPL-3',
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}

sf_purchase_arrival_inform/models/__init__.py

@@ -1,5 +0,0 @@
-from . import product_category
-from . import purchase_order
-from . import storage_list
-from . import quality_check
-

sf_purchase_arrival_inform/models/product_category.py

@@ -1,7 +0,0 @@
-from odoo import models, fields
-
-
-class SfProductCategory(models.Model):
-    _inherit = 'product.category'
-    arrival_inform = fields.Boolean('到货通知', default=False)
-    

sf_purchase_arrival_inform/models/purchase_order.py

@@ -1,108 +0,0 @@
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-
-
-class SfPurchaseOrder(models.Model):
-    _inherit = 'purchase.order'
-    
-    # 收料入库明细
-    storage_list_ids = fields.One2many('storage.list', 'purchase_order_id', string='收料入库明细')
-    
-    # 计算字段：总收料数量
-    total_received_quantity = fields.Float(string='到货数量',compute='_compute_total_received_quantity',store=True)
-    
-    purchase_order_line_id = fields.Many2one('purchase.order.line', string='采购订单行')
-    
-    @api.depends('order_line.arrival_quantity','order_line.product_qty')
-    def _compute_total_received_quantity(self):
-        for order in self:
-            total_arrival_quantity = sum(line.arrival_quantity for line in order.order_line)
-            total_product_qty=sum(line.product_qty for line in order.order_line)
-            order.total_received_quantity = f'{total_arrival_quantity}/{total_product_qty}'
-    
-    def open_arrival_inform(self):
-        self.ensure_one()
-        # 方式一：把数据写入普通模型（如果要持久化关联关系等场景）
-        # 先清空旧数据（如果需要），避免重复
-        self.env["storage.list"].search([
-            ("purchase_order_id", "=", self.id)
-        ]).unlink()
-        pickings = self.env['stock.picking'].search([
-            ('origin', '=', self.name),
-            # ('picking_type_code', '=', 'incoming'),
-            ('state', '!=', 'cancel')
-        ])
-        relate_vals_list = []
-        for picking in pickings:
-            for move_line in picking.move_ids_without_package:
-                relate_vals = {
-                    "purchase_order_id": self.id,
-                    "product_id": move_line.product_id.id,
-                    "picking_id": picking.id,
-                    "ordered_quantity": move_line.product_uom_qty,
-                    # "current_arrival_quantity": move_line.product_uom_qty,  # 默认到货数量等于需求数量
-                    "product_code": move_line.product_id.default_code,
-                    "product_remark": move_line.name,
-                    "part_number": move_line.part_number,
-                    "state": picking.state,
-                }
-                relate_vals_list.append(relate_vals)
-        if relate_vals_list:
-            self.env["storage.list"].create(relate_vals_list)
-        action = {
-            'name': _("选择到货通知"),
-            'type':'ir.actions.act_window',
-            'view_mode':'form',
-            'views': [(self.env.ref('sf_purchase_arrival_inform.storage_list_wrapper_form').id, 'form')],
-            'res_model':'purchase.order',
-            'target':'new',
-            'res_id': self.id,
-            'context': {
-                'dialog_size': 'large',
-            },
-        }
-        return action
-    
-    def confirm_arrival_inform(self):
-        """确认到货通知"""
-        # 直接调用storage_list的批量确认方法
-        if self.storage_list_ids:
-            self.storage_list_ids.button_confirm()
-        
-        # 关闭弹窗
-        return {'type': 'ir.actions.act_window_close'}
-    
-    #询价单确认时加二次确认逻辑
-    def button_confirm(self):
-        """采购订单确认，弹出确认向导"""
-        # 无订单行时直接确认
-        if not self.order_line:
-            return super().button_confirm()
-        
-        # 直接创建向导记录并打开
-        wizard = self.env['purchase.confirm.wizard'].create({
-            'purchase_order_id': self.id
-        })
-        
-        return {
-            'name': _('询价单订单确认'),
-            'type': 'ir.actions.act_window',
-            'res_model': 'purchase.confirm.wizard',
-            'res_id': wizard.id,
-            'view_mode': 'form',
-            'target': 'new',
-        }
-    
-    def _execute_original_confirm(self):
-        """执行原始的确认逻辑"""
-        res = super().button_confirm()
-        return res
-
-class SfPurchaseOrderLine(models.Model):
-    _inherit = 'purchase.order.line'
-     
-    # 到货数量（实际存储字段）
-    arrival_quantity = fields.Float(string='到货数量', default=0.0, help='累计到货数量')
-    
-
-   

sf_purchase_arrival_inform/models/quality_check.py

@@ -1,61 +0,0 @@
-from odoo import models, fields, api
-import logging
-
-_logger = logging.getLogger(__name__)
-  
-class QualityPoint(models.Model):
-    _inherit = 'quality.point'
-    
-    quality_status = fields.Selection([
-        ('waiting', '等待'),
-        ('none', '待处理')
-    ], string='默认质检状态', 
-       help='收料入库时质量检查单的默认状态。如果设置了此值，系统会在创建质检单时自动使用该状态。')
-    
-class QualityCheck(models.Model):
-    _inherit = 'quality.check'
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        """
-        重写create方法，根据quality.point配置动态设置quality_state
-        当picking_type为收料入库时，从质量控制点配置中获取默认状态
-        """
-        # 先调用父类方法创建记录
-        records = super().create(vals_list)
-        
-        # 对创建的记录进行状态调整
-        for record in records:
-            try:
-                # 只处理收料入库的质检单且未手动设置状态的记录
-                if (record.picking_id and 
-                    record.picking_id.picking_type_id.code == 'incoming' and
-                    record.quality_state in ['none', 'waiting']):  # 只调整默认状态
-                    
-                    # 查找匹配的质量控制点配置
-                    quality_point = record.point_id
-                    if not quality_point and record.product_id:
-                        # 如果没有直接关联的质量点，则根据产品和作业类型查找
-                        domain = self.env['quality.point']._get_domain(
-                            record.product_id, 
-                            record.picking_id.picking_type_id,
-                            measure_on='product'
-                        )
-                        quality_point = self.env['quality.point'].search(domain, limit=1)
-                    
-                    # 如果找到配置且有默认状态值，则更新记录状态
-                    if quality_point and quality_point.quality_status:
-                        original_state = record.quality_state
-                        record.quality_state = quality_point.quality_status
-                        
-                        _logger.info(
-                            f"质量检查单状态已更新: {record.name}, "
-                            f"产品: {record.product_id.name}, "
-                            f"收料单: {record.picking_id.name}, "
-                            f"状态: {original_state} -> {quality_point.quality_status}"
-                        )
-                        
-            except Exception as e:
-                _logger.warning(f"更新质量检查单状态时发生错误: {record.name}, 错误: {str(e)}")
-        
-        return records

sf_purchase_arrival_inform/models/storage_list.py

@@ -1,140 +0,0 @@
-from odoo import models, fields, api
-from odoo.exceptions import ValidationError
-
-
-class StorageList(models.Model):
-    _name = 'storage.list'
-    _description = '收料入库明细'
-    _order = 'create_date desc'
-    
-    # 基础关联字段
-    purchase_order_id = fields.Many2one('purchase.order', string='采购订单', required=True)
-    picking_id = fields.Many2one('stock.picking', string='收料入库单', readonly=True)
-    product_id = fields.Many2one('product.product', string='产品', required=True)
-    
-    # 产品信息（基于product_id的related字段）
-    product_code = fields.Char(related='product_id.default_code', string='产品料号', store=True)
-    product_remark = fields.Text(string='产品说明')
-    part_number = fields.Char(string='零件图号')
-    
-    # 数量字段
-    ordered_quantity = fields.Float(string='需求数量', required=True)
-    # 到货数量，默认=需求数量
-    current_arrival_quantity = fields.Float(string='到货数量', required=True)
-    
-    
-    @api.model
-    def create(self, vals):
-        # 如果没有设置current_arrival_quantity，则默认等于ordered_quantity
-        if 'current_arrival_quantity' not in vals and 'ordered_quantity' in vals:
-            vals['current_arrival_quantity'] = vals['ordered_quantity']
-        return super().create(vals)
-    
-    @api.constrains('current_arrival_quantity')
-    def _check_current_arrival_quantity(self):
-        for line in self:
-            if line.current_arrival_quantity <= 0:
-                raise ValidationError('到货数量必须大于0')
-            if line.current_arrival_quantity > line.ordered_quantity:
-                raise ValidationError('当前到货数量不能超过需求数量') 
-        
-    def button_confirm(self):
-        """更新采购订单行的收料数量"""
-        for record in self:
-            # 查找对应的采购订单行
-            order_line = self.env['purchase.order.line'].search([
-                ('order_id', '=', record.purchase_order_id.id),
-                ('product_id', '=', record.product_id.id)
-            ], limit=1)
-            
-            if order_line:
-                # 累加当前记录的到货数量到采购订单行
-                order_line.arrival_quantity += record.current_arrival_quantity
-        
-        # 更新质量检查单状态为待处理
-        if self:
-            self._update_quality_check_status(self[0].purchase_order_id)
-    
-
-    def _update_quality_check_status(self, purchase_order):
-        """更新质量检查单状态为待处理   
-        Args:
-            purchase_order: 采购订单记录    
-        Returns:
-            int: 更新的质量检查单数量
-        """
-        try:
-            # 获取当前到货通知涉及的收料入库单
-            storage_records = self.env['storage.list'].search([
-                ('purchase_order_id', '=', purchase_order.id)
-            ])            
-            if not storage_records:
-                return 0
-            
-            # 收集所有相关的picking_id和product_id（过滤空值）
-            picking_ids = [pid for pid in storage_records.mapped('picking_id.id') if pid]
-            product_ids = [pid for pid in storage_records.mapped('product_id.id') if pid]
-            
-            if not picking_ids or not product_ids:
-                return 0
-            
-            # 构建质量检查单搜索域，包含等待和待处理状态
-            base_domain = [
-                ('quality_state', 'in', ['waiting', 'none']),
-                ('product_id', 'in', product_ids),
-            ]
-            
-            # 方法1：通过picking_id精确匹配质量检查单
-            quality_checks_by_picking = self.env['quality.check'].search(
-                base_domain + [('picking_id', 'in', picking_ids)]
-            )
-            
-            # 方法2：通过move_id匹配（更精确，因为一个picking可能有多个move）
-            stock_moves = self.env['stock.move'].search([
-                ('picking_id', 'in', picking_ids),
-                ('product_id', 'in', product_ids),
-            ])
-            
-            quality_checks_by_move = self.env['quality.check']
-            if stock_moves:
-                quality_checks_by_move = self.env['quality.check'].search(
-                    base_domain + [('move_id', 'in', stock_moves.ids)]
-                )
-            
-            # 方法3：通过move_line_id匹配（最精确）
-            move_lines = self.env['stock.move.line'].search([
-                ('picking_id', 'in', picking_ids),
-                ('product_id', 'in', product_ids),
-            ])
-            
-            quality_checks_by_move_line = self.env['quality.check']
-            if move_lines:
-                quality_checks_by_move_line = self.env['quality.check'].search(
-                    base_domain + [('move_line_id', 'in', move_lines.ids)]
-                )
-            
-            # 合并所有匹配的质量检查单（去重）
-            all_quality_checks = quality_checks_by_picking | quality_checks_by_move | quality_checks_by_move_line
-            
-            if not all_quality_checks:
-                return 0
-            
-            # 批量更新状态为待处理
-            all_quality_checks.write({'quality_state': 'none'})
-            
-            # 记录日志
-            product_names = storage_records.mapped('product_id.name')
-            purchase_order.message_post(
-                body=f"到货通知确认：已更新 {len(all_quality_checks)} 个质量检查单状态为待处理<br/>"
-                     f"涉及产品：{', '.join(product_names)}<br/>"
-                     f"涉及收料入库单：{', '.join([p.name or '' for p in storage_records.mapped('picking_id')])}"
-            )
-            
-            return len(all_quality_checks)
-            
-        except Exception as e:
-            # 记录错误日志，但不阻断流程
-            purchase_order.message_post(
-                body=f"更新质量检查单状态时发生错误：{str(e)}"
-            )
-            return 0

sf_purchase_arrival_inform/security/ir.model.access.csv

@@ -1,4 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_storage_list,storage.list,model_storage_list,purchase.group_purchase_user,1,1,1,1
-access_purchase_confirm_wizard,purchase.confirm.wizard,model_purchase_confirm_wizard,purchase.group_purchase_user,1,1,1,1
-access_purchase_confirm_wizard_line,purchase.confirm.wizard.line,model_purchase_confirm_wizard_line,purchase.group_purchase_user,1,1,1,1

sf_purchase_arrival_inform/views/product_category.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <!-- 继承产品分类视图 -->
-        <record id="product_category_form_view_inherit" model="ir.ui.view">
-            <field name="name">product.category.form.inherit</field>
-            <field name="model">product.category</field>
-            <field name="inherit_id" ref="stock.product_category_form_view_inherit" />
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='removal_strategy_id']" position="after">
-                    <field name="arrival_inform"/>
-                </xpath>
-            </field>
-        </record>
-        <record id="quality_view_form" model="ir.ui.view">
-            <field name="name">arrival.inform.quality.point.view.form</field>
-            <field name="model">quality.point</field>
-            <field name="inherit_id" ref="mrp_workorder.quality_point_view_form_inherit_mrp"/>
-            <field name="mode">primary</field>
-            <field name="arch" type="xml">
-                <field name="picking_type_ids" position="after">
-                    <field name="quality_status"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</odoo>

sf_purchase_arrival_inform/views/purchase_view.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <!-- 继承采购订单视图 -->
-        <record id="purchase_order_view_tree_inherit" model="ir.ui.view">
-            <field name="name">purchase.order.tree.inherit</field>
-            <field name="model">purchase.order</field>
-            <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='date_planned']" position="after">
-                    <field name="total_received_quantity"/>
-                </xpath>
-                <xpath expr="//tree" position="inside">
-                    <button name="open_arrival_inform" string="到货通知" type="object" class="btn-primary"/>
-                </xpath>
-            </field>
-        </record>
-        <record id="purchase_order_form" model="ir.ui.view">
-            <field name="name">purchase.order.form</field>
-            <field name="model">purchase.order</field>
-            <field name="inherit_id" ref="purchase.purchase_order_form" />
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='order_line']/tree" position="inside">
-                    <field name="arrival_quantity"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!-- 到货通知form视图 -->
-        <record id="storage_list_wrapper_form" model="ir.ui.view">
-            <field name="name">storage.list.wrapper.form</field>
-            <field name="model">purchase.order</field>
-            <field name="arch" type="xml">
-                <form string="选择到货通知" create="false" duplicate="false">
-                    <group>
-                        <field name="name" readonly="1"/>
-                    </group>
-                    
-                    <field name="storage_list_ids">
-                        <tree string="收料入库明细" editable="bottom" create="false" delete="true" export="false">
-                            <field name="product_code"/>
-                            <field name="product_id" readonly="1"/>
-                            <field name="product_remark" widget="section_and_note_text" readonly="1"/>
-                            <field name="part_number" readonly="1"/>
-                            <field name="ordered_quantity" readonly="1"/>
-                            <field name="current_arrival_quantity" attrs="{'invisible': [('ordered_quantity', '=', '0')]}"/>
-                        </tree>
-                    </field>
-                    
-                    <footer>
-                        <button name="confirm_arrival_inform" string="确认" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="取消" class="btn-secondary" special="cancel" data-hotkey="z"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-    </data>
-</odoo>

sf_purchase_arrival_inform/wizard/__init__.py

@@ -1,2 +0,0 @@
-from . import purchase_confirm_wizard
-

sf_purchase_arrival_inform/wizard/purchase_confirm_wizard.py

@@ -1,64 +0,0 @@
-from odoo import models, fields, api, _
-
-
-class PurchaseConfirmWizard(models.TransientModel):
-    _name = 'purchase.confirm.wizard'
-    _description = '采购订单确认向导'
-
-    purchase_order_id = fields.Many2one('purchase.order', string='采购订单', required=True)
-    line_ids = fields.One2many('purchase.confirm.wizard.line', 'wizard_id', string='产品明细')
-    
-    @api.model_create_multi
-    def create(self, vals_list):
-        """创建向导时自动生成产品明细"""
-        records = super().create(vals_list)
-        
-        for record in records:
-            if record.purchase_order_id:
-                # 自动创建产品明细行
-                line_data = []
-                for line in record.purchase_order_id.order_line:
-                    line_data.append({
-                        'wizard_id': record.id,
-                        'product_id': line.product_id.id,
-                        'product_name': line.product_id.name,
-                        'product_qty': line.product_qty,
-                        'product_uom': line.product_uom.name,
-                        'uom_rounding': line.product_uom.rounding,
-                    })
-                
-                if line_data:
-                    self.env['purchase.confirm.wizard.line'].create(line_data)
-        
-        return records
-    
-    def action_confirm(self):
-        """确认采购订单"""
-        if self.purchase_order_id:
-            # 调用原始的确认方法
-            self.purchase_order_id._execute_original_confirm()
-            
-            # 返回关闭向导并刷新采购订单页面
-            return {
-                'type': 'ir.actions.act_window_close',
-                'infos': {
-                    'title': _('成功'),
-                    'message': _('采购订单已确认成功！'),
-                }
-            }
-        
-    def action_cancel(self):
-        """取消操作"""
-        return {'type': 'ir.actions.act_window_close'}
-
-
-class PurchaseConfirmWizardLine(models.TransientModel):
-    _name = 'purchase.confirm.wizard.line'
-    _description = '采购订单确认向导明细'
-
-    wizard_id = fields.Many2one('purchase.confirm.wizard', string='向导', ondelete='cascade')
-    product_id = fields.Many2one('product.product', string='产品')
-    product_name = fields.Char(string='产品名称')
-    product_qty = fields.Float(string='数量')
-    product_uom = fields.Char(string='单位')
-    uom_rounding = fields.Float(string='舍入精度') 

sf_purchase_arrival_inform/wizard/purchase_confirm_wizard_view.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- 采购订单确认向导视图 -->
-    <record id="purchase_confirm_wizard_form" model="ir.ui.view">
-        <field name="name">purchase.confirm.wizard.form</field>
-        <field name="model">purchase.confirm.wizard</field>
-        <field name="arch" type="xml">
-            <form string="采购订单确认">
-                <div class="alert alert-warning" role="alert">
-                    <strong>确认提示：</strong>以下产品数量将按单位舍入精度向上取整处理，请核实后确认是否继续。
-                </div>
-
-                <group>
-                    <field name="purchase_order_id" readonly="1"/>
-                </group>
-
-                <separator string="产品明细信息"/>
-
-                <field name="line_ids" readonly="1" nolabel="1" widget="one2many_list">
-                    <tree decoration-info="True" create="false" edit="false">
-                        <field name="product_name" string="产品名称" width="40%"/>
-                        <field name="product_qty" string="订购数量" width="20%"/>
-                        <field name="product_uom" string="计量单位" width="20%"/>
-                        <field name="uom_rounding" string="舍入精度" widget="float" digits="[16,6]" width="20%"/>
-                    </tree>
-                </field>
-
-                <footer>
-                    <button name="action_confirm" string="确认订单" type="object" class="btn-primary"/>
-                    <button name="action_cancel" string="取消" type="object" class="btn-secondary"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-</odoo> 

sf_sale/models/sale_order.py

@@ -155,7 +155,7 @@ class ReSaleOrder(models.Model):
             'glb_url': item['glb_url'],
             'remark': item.get('remark'),
             'embryo_redundancy_id': item.get('embryo_redundancy_id'),
-            'is_incoming_material': True if item.get('incoming_size') else False,
+            'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
             'manual_quotation': item.get('manual_quotation'),
             'model_id': item['model_id'],
             'delivery_end_date': item['delivery_end_date']
@@ -287,7 +287,7 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
-    is_incoming_material = fields.Boolean('客供料',  store=True)
+    is_incoming_material = fields.Boolean('客供料', compute='_compute_is_incoming_material', store=True)
     embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')