Accept Merge Request #2255: (feature/6711 -> develop)

Merge Request: 日计划量对工单id去重

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2255?initial=true

jikimo_demand_plan_queue/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models

jikimo_demand_plan_queue/__manifest__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+{
+    'name': '机企猫 需求计划排程队列',
+    'version': '1.0',
+    'summary': """ 使用队列进行排程 """,
+    'author': 'fox',
+    'website': '',
+    'category': '',
+    'depends': ['queue_job_batch', 'sf_demand_plan'],
+    'data': [
+        
+    ],
+    
+    'application': True,
+    'installable': True,
+    'auto_install': False,
+    'license': 'LGPL-3',
+}

jikimo_demand_plan_queue/models/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import production_demand_plan

jikimo_demand_plan_queue/models/production_demand_plan.py

@@ -0,0 +1,20 @@
+from odoo import models, fields
+
+
+class ProductionDemandPlan(models.Model):
+    _inherit = 'sf.production.demand.plan'
+
+
+    def _do_production_schedule(self, pro_plan_list):
+        """使用队列进行排程"""
+        batch_size = 10
+        current_time = fields.Datetime.now().strftime('%Y%m%d%H%M%S')
+        index = 1
+        for i in range(0, len(pro_plan_list), batch_size):
+            batch = self.env['queue.job.batch'].get_new_batch('plan-%s-%s' % (current_time, index))
+            pro_plans = pro_plan_list[i:i+batch_size]
+            pro_plans.with_context(
+                job_batch=batch
+            ).with_delay().do_production_schedule()
+            index += 1
+        batch.enqueue()

jikimo_frontend/static/src/scss/custom_style.scss

@@ -521,11 +521,6 @@ div:has(.o_required_modifier) > label::before {
   }
 }
 
-// 设置表格横向滚动
-.o_list_renderer.o_renderer  {
-  max-width: 100%;
-  overflow-x: auto;
-}
 
 // 设置表单页面label文本不换行
 .o_form_view .o_group .o_wrap_label .o_form_label {

jikimo_purchase_request/models/__init__.py

@@ -6,3 +6,4 @@ from . import mrp_production
 from . import purchase_order
 from . import stock_rule
 from . import stock_picking
+from . import product_product

jikimo_purchase_request/models/mrp_production.py

@@ -9,18 +9,11 @@ class MrpProduction(models.Model):
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
-            # if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
+            if item.product_id.is_customer_provided:
-            #     first_order = self.env['mrp.production'].search(
+                item.pr_mp_count = 0
-            #         [('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc')
+            else:
-            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
+                pr_ids = item._get_purchase_request()
-            #     item.pr_mp_count = len(pr_ids)
+                item.pr_mp_count = len(pr_ids)
-            # else:
-            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
-            #     item.pr_mp_count = len(pr_ids)
-            # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-            mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
-            item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
     def action_view_pr_mp(self):
@@ -28,17 +21,9 @@ class MrpProduction(models.Model):
         采购请求
         """
         self.ensure_one()
-        # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
-        # if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
-        #     first_order = self.env['mrp.production'].search(
-        #         [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
-        # else:
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
-        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-        mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
 
+        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+        pr_ids = self._get_purchase_request()
 
         action = {
             'res_model': 'purchase.request',
@@ -52,7 +37,16 @@ class MrpProduction(models.Model):
         else:
             action.update({
                 'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids)],
+                'domain': [('id', 'in', pr_ids.ids)],
                 'view_mode': 'tree,form',
             })
         return action
+
+    def _get_purchase_request(self):
+        """获取跟制造订单相关的采购申请单（根据采购申请单行项目的产品匹配）"""
+        mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
+        product_list = self.product_id._get_product_include_bom()
+        pr_line_ids = pr_ids.line_ids.filtered(lambda l: l.product_id in product_list)
+        return pr_line_ids.mapped('request_id')
+    

jikimo_purchase_request/models/product_product.py

@@ -0,0 +1,17 @@
+from odoo import models
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+
+    def _get_product_include_bom(self):
+        """获取产品列表（包括所有bom）"""
+        self.ensure_one()
+        product_list = [self]
+        bom_ids = self.bom_ids
+        while (bom_ids):
+            bom_product_ids = bom_ids.bom_line_ids.mapped('product_id')
+            product_list.append(bom_product_ids)
+            bom_ids = bom_product_ids.bom_ids
+        return product_list

jikimo_purchase_request/models/purchase_request.py

@@ -150,6 +150,8 @@ class PurchaseRequestLine(models.Model):
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
+                else:
+                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:

jikimo_purchase_request/models/stock_picking.py

@@ -42,6 +42,6 @@ class StockPicking(models.Model):
             purchase_request_lines = self.move_ids.move_orig_ids.purchase_line_id.purchase_request_lines
             if purchase_request_lines:
                purchase_request_lines.move_dest_ids = [
-                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id == purchase_request_lines.product_id.id
+                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id in purchase_request_lines.mapped('product_id.id')
                 ]
         return res

jikimo_test_generate_product_name/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models

jikimo_test_generate_product_name/__manifest__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Jikimo_test_generate_product_name',
+    'version': '',
+    'summary': """ Jikimo_test_generate_product_name Summary """,
+    'author': '',
+    'website': '',
+    'category': '',
+    'depends': ['sf_manufacturing'],
+    'data': [
+        
+    ],
+    
+    'application': True,
+    'installable': True,
+    'auto_install': False,
+    'license': 'LGPL-3',
+}

jikimo_test_generate_product_name/models/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import product_template

jikimo_test_generate_product_name/models/product_template.py

@@ -0,0 +1,21 @@
+from odoo import models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    def generate_product_name(self, order_id, item, i):
+        """生成成品名称"""
+        # 3D文件名（去掉后缀，截取前40个字符）+“-”+模型ID
+        product_name = '%s-%s' % ('.'.join(item['model_name'].split('.')[:-1])[:40], item['model_id'])
+        return product_name
+
+    def generate_embryo_name(self, order_id, item,  materials_id, materials_type_id, embryo_redundancy_id, i):
+        """生成坯料名称"""
+        embryo_name = '%s-%s[%s * %s * %s]%s' % (materials_id.name, materials_type_id.name,
+                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
+                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
+                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height),
+                                            item['model_id'])
+        return embryo_name
+    

sf_bf_connect/models/http.py

@@ -2,7 +2,7 @@
 import logging
 from datetime import datetime, timedelta
 import hashlib
-from odoo import models
+from odoo import models, SUPERUSER_ID
 from odoo.http import request
 
 __author__ = 'jinling.yang'
@@ -48,5 +48,7 @@ class Http(models.AbstractModel):
             _logger.info('sf_secret_key:%s' % factory_secret.sf_secret_key)
             if check_sf_str != datas['HTTP_CHECKSTR']:
                 raise AuthenticationError('数据校验不通过')
+            # 设置管理员用户
+            request.update_env(user=SUPERUSER_ID)
         else:
             raise AuthenticationError('请求参数中无token')

sf_demand_plan/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import wizard

sf_demand_plan/__manifest__.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': '机企猫智能工厂 需求计划',
+    'version': '1.0',
+    'summary': '智能工厂计划管理',
+    'sequence': 1,
+    'description': """
+在本模块，支持齐套检查与下达生产
+    """,
+    'category': 'sf',
+    'website': 'https://www.sf.jikimo.com',
+    'depends': ['sf_plan','jikimo_printing'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/demand_plan.xml',
+        'wizard/sf_demand_plan_print_wizard_view.xml',
+    ],
+    'demo': [
+    ],
+    'assets': {
+        'web.assets_qweb': [
+        ],
+        'web.assets_backend': [
+            'sf_demand_plan/static/src/scss/style.css',
+            'sf_demand_plan/static/src/js/print_demand.js',
+        ]
+    },
+    'license': 'LGPL-3',
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+}

sf_demand_plan/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import sf_production_demand_plan
+from . import sale_order

sf_demand_plan/models/sale_order.py

@@ -0,0 +1,29 @@
+from odoo import models, fields, api, _
+
+
+class ReSaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    mrp_production_ids = fields.Many2many(
+        'mrp.production',
+        compute='_compute_mrp_production_ids',
+        string='与此销售订单相关联的制造订单',
+        groups='mrp.group_mrp_user', store=True)
+
+    def sale_order_create_line(self, product, item):
+        ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
+        vals = {
+            'sale_order_id': ret.order_id.id,
+            'sale_order_line_id': ret.id,
+        }
+        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
+        if demand_plan.product_id.machining_drawings_name:
+            filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
+            wizard_vals = {
+                'demand_plan_id': demand_plan.id,
+                'model_id': demand_plan.model_id,
+                'filename_url': filename_url,
+                'type': '1',
+            }
+            self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
+        return ret

sf_demand_plan/models/sf_production_demand_plan.py

@@ -0,0 +1,553 @@
+# -*- coding: utf-8 -*-
+import ast
+import json
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+from datetime import datetime, timedelta
+from odoo.exceptions import UserError
+
+
+class SfProductionDemandPlan(models.Model):
+    _name = 'sf.production.demand.plan'
+    _description = 'sf_production_demand_plan'
+
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+
+    priority = fields.Selection([
+        ('1', '紧急'),
+        ('2', '高'),
+        ('3', '中'),
+        ('4', '低'),
+    ], string='优先级', default='3')
+    status = fields.Selection([
+        ('10', '草稿'),
+        ('20', '待确认'),
+        ('30', '需求确认'),
+        ('50', '待下达生产'),
+        ('60', '已下达'),
+        ('100', '取消'),
+    ], string='状态', compute='_compute_status', store=True)
+    sale_order_id = fields.Many2one(comodel_name="sale.order",
+                                    string="销售订单", readonly=True)
+    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
+                                         string="销售订单明细", readonly=True)
+    sale_order_line_number = fields.Char(string='销售订单行', compute='_compute_sale_order_line_number', store=True)
+    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')
+    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文件地址')
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        related='sale_order_line_id.product_id',
+        string='产品', store=True, index=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')
+    part_name = fields.Char('零件名称', related='product_id.part_name')
+    part_number = fields.Char('零件图号', compute='_compute_part_number', store=True)
+    is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
+    supply_method = fields.Selection([
+        ('automation', "自动化产线加工"),
+        ('manual', "人工线下加工"),
+        ('purchase', "外购"),
+        ('outsourcing', "委外加工"),
+    ], string='供货方式', related='sale_order_line_id.supply_method', store=True)
+    product_uom_qty = fields.Float(
+        string="需求数量",
+        related='sale_order_line_id.product_uom_qty', store=True)
+    deadline_of_delivery = fields.Date('客户交期', related='sale_order_line_id.delivery_end_date', store=True)
+    inventory_quantity_auto_apply = fields.Float(
+        string="成品库存",
+        compute='_compute_inventory_quantity_auto_apply'
+    )
+    qty_delivered = fields.Float(
+        "交货数量", related='sale_order_line_id.qty_delivered')
+    qty_to_deliver = fields.Float(
+        "待交货数量", related='sale_order_line_id.qty_to_deliver')
+    model_long = fields.Char('尺寸(mm)', compute='_compute_model_long')
+    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
+                                  related='product_id.blank_type')
+    embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long')
+    materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
+                                                 related='product_id.model_machining_precision')
+    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter',
+                                                    'plan_process_parameter_rel',
+                                                    string='表面工艺',
+                                                    compute='_compute_model_process_parameters_ids'
+                                                    , store=True
+                                                    )
+    product_remark = fields.Char("产品备注", related='product_id.model_remark')
+    order_code = fields.Char('E-SHOP订单号', related='sale_order_id.order_code')
+    order_state = fields.Selection(
+        string='订单状态',
+        related='sale_order_line_id.state')
+    route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
+    contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
+    date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
+    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
+    plan_remark = fields.Text("计划备注")
+    material_check = fields.Selection([
+        ('0', "未齐套"),
+        ('1', "已齐套"),
+    ], string='投料齐套检查', compute='_compute_material_check', store=True)
+    processing_time = fields.Char('程序工时', readonly=True)
+    planned_start_date = fields.Date('计划开工日期')
+    actual_start_date = fields.Datetime('实际开工日期', compute='_compute_actual_start_date', store=True)
+    actual_end_date = fields.Datetime('实际完工日期', compute='_compute_actual_end_date', store=True)
+    print_count = fields.Char('打印次数', default='T0C0', readonly=True)
+    sequence = fields.Integer('序号')
+
+    hide_action_open_mrp_production = fields.Boolean(
+        string='显示待工艺确认按钮',
+        compute='_compute_hid_button',
+        default=False
+    )
+
+    hide_action_purchase_orders = fields.Boolean(
+        string='显示采购按钮',
+        compute='_compute_hide_action_purchase_orders',
+        default=False
+    )
+
+    hide_action_stock_picking = fields.Boolean(
+        string='显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_outsourcing_stock_picking = fields.Boolean(
+        string='委外显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_view_programming = fields.Boolean(
+        string='显示编程单按钮',
+        compute='_compute_hid_button',
+        default=False
+    )
+
+    outsourcing_purchase_request = fields.Char('委外采购申请单')
+
+    @api.depends('sale_order_id.state', 'sale_order_id.mrp_production_ids.schedule_state', 'sale_order_id.order_line',
+                 'sale_order_id.mrp_production_ids.state')
+    def _compute_status(self):
+        for record in self:
+            if record.sale_order_id:
+                sale_order_state = record.sale_order_id.state
+                if sale_order_state in ('draft', 'sent', 'supply method'):
+                    record.status = '20'  # 待确认
+                if record.supply_method in ('purchase', 'outsourcing') and sale_order_state in (
+                        'sale', 'processing', 'physical_distribution', 'delivered',
+                        'done') and sale_order_state != 'cancel':
+                    record.status = '60'  # 已下达
+                if record.supply_method in ('automation', 'manual'):
+                    if sale_order_state in (
+                            'sale', 'processing', 'physical_distribution', 'delivered',
+                            'done') and sale_order_state != 'cancel':
+                        record.status = '30'  # 需求确认
+                    # 检查所有制造订单的排程单状态,有一个为待排程状态,就为待下达生产
+                    pending_productions = record.sale_order_id.mrp_production_ids.filtered(
+                        lambda p: p.state == 'confirmed' and p.product_id.id == record.product_id.id
+                    )
+                    if pending_productions:
+                        record.status = '50'  # 待下达生产
+                    # 检查所有制造订单的排程单状态
+                    if record.sale_order_id.mrp_production_ids:
+                        product_productions = record.sale_order_id.mrp_production_ids.filtered(
+                            lambda p: p.product_id.id == record.product_id.id
+                        )
+                        if product_productions and all(order.schedule_state != '未排' for order in product_productions):
+                            record.status = '60'  # 已下达
+                if sale_order_state == 'cancel' or not record.sale_order_line_id:
+                    record.status = '100'  # 取消
+
+    @api.depends('sale_order_line_id.product_id.name')
+    def _compute_sale_order_line_number(self):
+        for line in self:
+            if line.product_id:
+                line.sale_order_line_number = line.sale_order_line_id.product_id.name[-1]
+            else:
+                line.sale_order_line_number = None
+
+    @api.depends('product_id.part_number', 'product_id.model_name')
+    def _compute_part_number(self):
+        for line in self:
+            if line.product_id:
+                if line.product_id.part_number:
+                    line.part_number = line.product_id.part_number
+                else:
+                    if line.product_id.model_name:
+                        line.part_number = line.product_id.model_name.rsplit('.', 1)[0]
+            else:
+                line.part_number = None
+
+    @api.depends('product_id.length', 'product_id.width', 'product_id.height')
+    def _compute_model_long(self):
+        for line in self:
+            if line.product_id:
+                line.model_long = f"{line.product_id.length}*{line.product_id.width}*{line.product_id.height}"
+            else:
+                line.model_long = None
+
+    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height', 'product_id.blank_type')
+    def _compute_embryo_long(self):
+        for line in self:
+            if line.product_id:
+                if line.product_id.blank_type == '圆料':
+                    line.embryo_long = f"Ø{round(line.product_id.model_width, 3)}*{round(line.product_id.model_long, 3)}"
+                else:
+                    line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
+            else:
+                line.embryo_long = None
+
+    @api.depends('product_id.materials_id')
+    def _compute_materials_id(self):
+        for line in self:
+            if line.product_id:
+                line.materials_id = f"{line.product_id.materials_id.name}/{line.product_id.materials_type_id.name}"
+            else:
+                line.materials_id = None
+
+    @api.depends('product_id.model_process_parameters_ids')
+    def _compute_model_process_parameters_ids(self):
+        for line in self:
+            if line.product_id and line.product_id.model_process_parameters_ids:
+                line.model_process_parameters_ids = [(6, 0, line.product_id.model_process_parameters_ids.ids)]
+            else:
+                line.model_process_parameters_ids = [(5, 0, 0)]
+
+    def _compute_inventory_quantity_auto_apply(self):
+        location_id = self.env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id
+        product_ids = self.mapped('product_id').ids
+        if product_ids:
+            quant_data = self.env['stock.quant'].read_group(
+                domain=[
+                    ('product_id', 'in', product_ids),
+                    ('location_id', '=', location_id)
+                ],
+                fields=['product_id', 'inventory_quantity_auto_apply'],
+                groupby=['product_id']
+            )
+            quantity_map = {item['product_id'][0]: item['inventory_quantity_auto_apply'] for item in quant_data}
+        else:
+            quantity_map = {}
+        for line in self:
+            if line.product_id:
+                line.inventory_quantity_auto_apply = quantity_map.get(line.product_id.id, 0.0)
+            else:
+                line.inventory_quantity_auto_apply = 0.0
+
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.date_start')
+    def _compute_actual_start_date(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                if manufacturing_orders:
+                    start_dates = [
+                        workorder.date_start for mo in manufacturing_orders
+                        for workorder in mo.workorder_ids if workorder.date_start
+                    ]
+                    record.actual_start_date = min(start_dates) if start_dates else None
+                else:
+                    record.actual_start_date = None
+            else:
+                record.actual_start_date = None
+
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.state',
+                 'sale_order_id.mrp_production_ids.workorder_ids.date_finished')
+    def _compute_actual_end_date(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                finished_orders = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
+                sum_product_qty = sum(finished_orders.mapped('product_qty'))
+                if finished_orders and float_compare(sum_product_qty, record.product_uom_qty,
+                                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
+                    end_dates = [
+                        workorder.date_finished for mo in finished_orders
+                        for workorder in mo.workorder_ids if workorder.date_finished
+                    ]
+                    record.actual_end_date = max(end_dates) if end_dates else None
+                else:
+                    record.actual_end_date = None
+            else:
+                record.actual_end_date = None
+
+    @api.depends('sale_order_id.mrp_production_ids.move_raw_ids.reserved_availability')
+    def _compute_material_check(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+
+                if manufacturing_orders and manufacturing_orders.move_raw_ids:
+                    # 获取完成的制造订单
+                    done_manufacturing = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
+                    product_qty = sum(done_manufacturing.mapped('product_qty'))
+                    # 需求数量-完成数量
+                    product_uom_qty = record.product_uom_qty - product_qty
+                    total_reserved_availability = sum(manufacturing_orders.mapped('move_raw_ids.reserved_availability'))
+                    if float_compare(total_reserved_availability, product_uom_qty,
+                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
+                        record.material_check = '1'  # 已齐套
+                    else:
+                        record.material_check = '0'  # 未齐套
+                else:
+                    record.material_check = None
+            else:
+                record.material_check = None
+
+    @api.constrains('planned_start_date')
+    def _check_planned_start_date(self):
+        for record in self:
+            if record.planned_start_date and record.planned_start_date < fields.Date.today():
+                raise ValidationError("计划开工日期必须大于或等于今天。")
+
+    def release_production_order(self):
+        if not self.planned_start_date:
+            raise ValidationError("请先填写计划开工日期")
+        pro_plan_list = self.env['sf.production.plan'].search(
+            [('product_id', '=', self.product_id.id), ('state', '=', 'draft')])
+        sf_production_line = self.env['sf.production.line'].sudo().search(
+            [('name', '=', '1#CNC自动生产线')], limit=1)
+        if sf_production_line:
+            now = datetime.now()
+            time_part = (now + timedelta(hours=2)).time()
+            date_part = fields.Date.from_string(self.planned_start_date)
+            date_planned_start = datetime.combine(date_part, time_part)
+            pro_plan_list.production_line_id = sf_production_line.id
+            pro_plan_list.date_planned_start = date_planned_start
+            self._do_production_schedule(pro_plan_list)
+
+    def _do_production_schedule(self, pro_plan_list):
+        for pro_plan in pro_plan_list:
+            pro_plan.do_production_schedule()
+
+
+    def button_action_print(self):
+        return {
+            'res_model': 'sf.demand.plan.print.wizard',
+            'type': 'ir.actions.act_window',
+            'name': _("打印"),
+            'domain': [('demand_plan_id', 'in', self.ids)],
+            'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
+            'target': 'new',
+        }
+
+    @api.depends('sale_order_id.mrp_production_ids.state', 'sale_order_id.mrp_production_ids.programming_state')
+    def _compute_hid_button(self):
+        for record in self:
+            mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == record.product_id.id
+            )
+            record.hide_action_open_mrp_production = bool(mrp_production_ids) and record.supply_method in (
+                'automation', 'manual')
+            programming_mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.programming_state == '编程中' and p.product_id.id == record.product_id.id
+            )
+            record.hide_action_view_programming = bool(programming_mrp_production_ids)
+
+    def _compute_hide_action_purchase_orders(self):
+        for record in self:
+            record.hide_action_purchase_orders = False
+            outsourcing_purchase_request = []
+            if record.supply_method in ('automation',
+                                        'manual') and record.material_check == '0' and not record.sale_order_line_id.is_incoming_material:
+                mrp_production = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda p: p.product_id.id == record.product_id.id
+                ).sorted(key=lambda p: p.id)
+                if mrp_production:
+                    raw_materials = mrp_production.mapped('move_raw_ids.product_id')
+                    if raw_materials:
+                        purchase_orders = self.env['purchase.order'].sudo().search([
+                            ('state', '=', 'purchase'),
+                            ('order_line.product_id', 'in', raw_materials.ids)
+                        ])
+                        total_purchase_quantity = sum(
+                            sum(
+                                order.order_line.filtered(
+                                    lambda line: line.product_id in raw_materials
+                                ).mapped('product_qty')
+                            )
+                            for order in purchase_orders
+                        )
+                        if float_compare(total_purchase_quantity, record.product_uom_qty,
+                                         precision_rounding=record.product_id.uom_id.rounding) == -1:
+                            pr_ids = self.env['purchase.request'].sudo().search(
+                                [('line_ids.product_id', 'in', raw_materials.ids), ('state', '!=', 'done')])
+                            outsourcing_purchase_request.extend(pr_ids.ids)
+            elif record.supply_method in ('purchase', 'outsourcing'):
+                purchase_orders = self.env['purchase.order'].sudo().search([
+                    ('state', 'in', ('purchase', 'done')),
+                    ('order_line.product_id', '=', record.product_id.id)
+                ])
+                total_purchase_quantity = sum(
+                    sum(
+                        order.order_line.filtered(
+                            lambda line: line.product_id in record.product_id
+                        ).mapped('product_qty')
+                    )
+                    for order in purchase_orders
+                )
+
+                if float_compare(total_purchase_quantity, record.product_uom_qty,
+                                 precision_rounding=record.product_id.uom_id.rounding) == -1:
+                    pr_ids = self.env['purchase.request'].sudo().search(
+                        [('origin', 'like', record.sale_order_id.name), ('state', '!=', 'done')])
+                    outsourcing_purchase_request.extend(pr_ids.ids)
+                if record.supply_method == 'outsourcing' and not record.sale_order_line_id.is_incoming_material:
+                    bom_line_ids = record.product_id.bom_ids.bom_line_ids
+                    if bom_line_ids:
+                        # BOM_数量
+                        total_product_qty = sum(line.product_qty for line in bom_line_ids)
+                        bom_product_ids = bom_line_ids.mapped('product_id')
+                        product_purchase_orders = self.env['purchase.order'].sudo().search([
+                            ('state', 'in', ('purchase', 'done')),
+                            ('order_line.product_id', 'in', bom_product_ids.ids)
+                        ])
+                        # 购订单_数量
+                        total_outsourcing_purchase_quantity = sum(
+                            sum(
+                                order.order_line.filtered(
+                                    lambda line: line.product_id in bom_product_ids
+                                ).mapped('product_qty')
+                            )
+                            for order in product_purchase_orders
+                        )
+                        quantity = total_outsourcing_purchase_quantity / total_product_qty
+                        if float_compare(quantity, record.product_uom_qty,
+                                         precision_rounding=record.product_id.uom_id.rounding) == -1:
+                            purchase_request = self.env['purchase.request'].sudo().search(
+                                [('line_ids.product_id', 'in', bom_product_ids.ids),
+                                 ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
+                            outsourcing_purchase_request.extend(purchase_request.ids)
+            record.outsourcing_purchase_request = json.dumps(outsourcing_purchase_request)
+            if outsourcing_purchase_request:
+                record.hide_action_purchase_orders = True
+
+    @api.depends('sale_order_id.mrp_production_ids.picking_ids.state', 'sale_order_id.picking_ids.state')
+    def _compute_hide_action_stock_picking(self):
+        for record in self:
+            record.hide_action_stock_picking = False
+            record.hide_action_outsourcing_stock_picking = False
+            if record.supply_method in ('automation', 'manual'):
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda p: p.product_id.id == record.product_id.id
+                )
+                record.hide_action_stock_picking = bool(manufacturing_orders.mapped('picking_ids').filtered(
+                    lambda p: p.state == 'assigned'))
+            elif record.supply_method in ('purchase', 'outsourcing'):
+                assigned_picking_ids = record.sale_order_id.picking_ids.filtered(
+                    lambda
+                        p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in record.product_id)
+                if record.supply_method == 'outsourcing':
+                    outsourcing_assigned_picking_ids = record.get_outsourcing_picking_ids()
+                    record.hide_action_outsourcing_stock_picking = outsourcing_assigned_picking_ids
+                    record.hide_action_stock_picking = assigned_picking_ids or outsourcing_assigned_picking_ids
+                else:
+                    record.hide_action_stock_picking = assigned_picking_ids
+
+    def get_outsourcing_picking_ids(self):
+        order_ids = self.env['purchase.order'].sudo().search(
+            [('order_line.product_id', 'in', self.product_id.ids),
+             ('purchase_type', '=', 'outsourcing')])
+        outsourcing_picking_ids = order_ids._get_subcontracting_resupplies()
+        outsourcing_assigned_picking_ids = outsourcing_picking_ids.filtered(lambda p: p.state == 'assigned')
+        return outsourcing_assigned_picking_ids
+
+    def action_open_sale_order(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'sale.order',
+            'res_id': self.sale_order_id.id,
+            'view_mode': 'form',
+        }
+
+    def action_open_mrp_production(self):
+        self.ensure_one()
+        mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+            lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == self.product_id.id
+        )
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+        }
+        if len(mrp_production_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': mrp_production_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("制造订单列表"),
+                'domain': [('id', 'in', mrp_production_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_purchase_request(self):
+        self.ensure_one()
+        pr_ids = self.env['purchase.request'].sudo().search(
+            [('id', 'in', ast.literal_eval(self.outsourcing_purchase_request))])
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(pr_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': pr_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("采购申请"),
+                'domain': [('id', 'in', pr_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_stock_picking(self):
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("stock.action_picking_tree_all")
+        picking_ids = None
+        if self.supply_method in ('automation', 'manual'):
+            mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.product_id.id == self.product_id.id
+            )
+            picking_ids = mrp_production_ids.mapped('picking_ids').filtered(
+                lambda p: p.state == 'assigned')
+        elif self.supply_method in ('purchase', 'outsourcing'):
+            picking_ids = self.sale_order_id.picking_ids.filtered(
+                lambda
+                    p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in self.product_id)
+            if self.supply_method == 'outsourcing' and self.hide_action_outsourcing_stock_picking:
+                picking_ids = picking_ids.union(self.get_outsourcing_picking_ids())
+        if picking_ids:
+            if len(picking_ids) > 1:
+                action['domain'] = [('id', 'in', picking_ids.ids)]
+            elif picking_ids:
+                action['res_id'] = picking_ids.id
+                action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+                if 'views' in action:
+                    action['views'] += [(state, view) for state, view in action['views'] if view != 'form']
+            return action
+
+    def action_view_programming(self):
+        self.ensure_one()
+        programming_mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+            lambda p: p.programming_state == '编程中' and p.product_id.id == self.product_id.id
+        ).mapped('programming_no')
+        if programming_mrp_production_ids:
+            programming_no = list(set(programming_mrp_production_ids))
+            numbers_str = "、".join(programming_no)
+            raise ValidationError(f"编程单号：{numbers_str}，请去云平台处理")

sf_demand_plan/security/ir.model.access.csv

@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sf_production_demand_plan,sf.production.demand.plan,model_sf_production_demand_plan,base.group_user,1,0,0,0
+access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for dispatch,model_sf_production_demand_plan,sf_base.group_plan_dispatch,1,1,0,0
+
+access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
+access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0

sf_demand_plan/static/src/js/print_demand.js

@@ -0,0 +1,256 @@
+odoo.define('sf_demand.print_demand', function (require) {
+    "use strict";
+    
+    var ListController = require('web.ListController');
+    var ListRenderer = require('web.ListRenderer');
+    var ListView = require('web.ListView');
+    var viewRegistry = require('web.view_registry');
+    var { url } = require("@web/core/utils/urls") 
+    
+    var CustomListRenderer = ListRenderer.extend({
+        _render: function () {
+            var self = this;
+            this.getParent()?.$buttons.hide();
+            
+            return this._super.apply(this, arguments).then(function () {
+                if(!self.state.data || !self.state.data.length) return
+                // 添加图片预览容器到页面左侧
+                if (!$('.table-image-preview-container').length) {
+                    self.$el.parent().addClass('custom-table-image-container')
+                    self.$el.before(
+                        `<div class="custom-preview-container">
+                            <img class="table-image-preview-container" src="" /> 
+                            <iframe class="table-image-preview-container" src=""/>
+                        </div>`
+                    );
+                
+                }
+                
+                if(!$('.denmand_set').length) {
+                    
+                    const checked = self.getParent().radioCheck || 'all'
+             
+                    self.$el.prepend(`
+                        <form class="denmand_set">
+                           <span>更多设置：</span>
+                           <input type="radio" id="male" name="set" value="图纸">
+                           <label for="male">图纸</label>
+                           <input type="radio" id="female" name="set" value="程序单">
+                           <label for="female">程序单</label>
+                           <input type="radio" id="other" name="set" value="all" >
+                           <label for="other">图纸/程序单</label>
+                       </form>
+                   `)
+                   setTimeout(() => {
+                        $(`input[name=set][value=${checked}]`).prop('checked', true)
+                        $('.denmand_set').trigger('click')
+                   }, 100);
+                    self.$el.prepend(`
+                        <div class="print-button-container" style="margin-bottom:10px;">
+                            <button class="btn btn-primary o_print_custom">
+                                <i class="fa fa-print"></i> 打印
+                            </button>
+                            <button class="btn btn-secondary  o_cancel_custom">
+                                取消
+                            </button>
+                        </div>
+                    `);
+                } 
+            });
+        },
+        start: function() {
+            setTimeout(() => {
+                this.$el.find('.o_data_row').eq(0).trigger('click')
+                this.getParent().$el?.find('.o_cp_top_right,.o_cp_bottom').hide()
+            }, 500);
+            return this._super();
+        },
+        events: _.extend({}, ListRenderer.prototype.events, {
+            'click .o_data_row': '_onCustomRowClick',
+            'click .o_print_custom': '_onPrintClick',
+            'click .o_cancel_custom': '_onCancelClick',
+            'click .denmand_set': '_onDenmandChange',
+        }),
+        _onCancelClick() {
+            this.getParent()?.getParent()?.dialogs.closeAll()
+        },
+        _onCustomRowClick: async function (ev) {
+            var self = this;
+            var $row = $(ev.currentTarget);
+            var index = $row.index();
+            var data = this.state.data[index];
+            if(data.fileData?.fileUrl) {
+
+            } else {
+                data.fileData = { }
+                if(data.res_id) {
+                    // 正确获取 ORM 服务的方式
+                    // var orm = this.getParent().getParent().env.services
+                    const key = data.data.type == 1 ? 'machining_drawings' : 'cnc_worksheet'
+                    const attachment = await this._rpc({
+                        model: 'ir.binary',
+                        method: 'attachment_info',
+                        args: [
+                            data.model,
+                            data.res_id,
+                            key
+                        ],
+                    })
+    
+                    if (attachment) {
+                        Object.assign(data.fileData, attachment)
+                        this._getTypeInfo(attachment.mimetype, data.fileData)
+                    }
+                    const fileUrl = this.getFileUrl(data.fileData.attachment_type, data, key)
+                    data.fileData.fileUrl = fileUrl
+                }
+            }
+            $('.table-image-preview-container').hide()
+            if(data.fileData.attachment_type == 'iframe') {
+                
+                $('iframe.table-image-preview-container').attr('src', decodeURIComponent(data.fileData.fileUrl) ).show()
+            } else {
+                $('img.table-image-preview-container').attr('src', data.fileData.fileUrl).show()
+            }
+        },
+        getSelectedIds: function() {
+            return this.state.data.filter(_ => !_.hide).map(_ => {
+                return _.data.id
+            })
+        },
+        _onPrintClick(e) {
+            var print_ids = this.getSelectedIds();
+            this._rpc({
+                model: 'sf.demand.plan.print.wizard',
+                method: 'demand_plan_print',
+                args: [ print_ids ] ,
+                // context: this.state.getContext()
+            }).then((e) => {
+                
+                this.getParent()?.getParent()?.env.services?.notification.notify( {
+                    type: 'info',
+                    message: e.message,
+                })
+                // self.do_notify("成功", "打印任务已发送到打印机");
+            }).catch(function(error) {
+                console.error("打印错误:", error);
+                // self.do_warn("打印失败", error.data.message || "未知错误");
+            }).finally(e => {
+                this.getParent().reload()
+            })
+            
+        },
+        _onDenmandChange(e) {
+            const isChecked = $(e.currentTarget).find('input:checked').val()
+            this.getParent().radioCheck = isChecked
+            this.$el.find('tbody').find('.o_data_row').show()
+        
+            this.state.data.forEach(_ => {
+                _.hide = false
+            })
+            const self = this
+            if(!isChecked || isChecked == 'all') return
+            this.$el.find('tbody').children('.o_data_row').each(function() { 
+                if($(this).find('td[name=type]').text() != isChecked) {
+                    const i = $(this).index()
+                    
+                    self.state.data[i].hide = true
+                    $(this).hide()
+                }
+            })
+        },
+        getFileUrl(attachment_type, data, key) {
+            let fileUrl
+            switch (attachment_type) {
+                case 'image':
+                        const timer = +new Date()
+                        fileUrl = url("/web/image", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                            unique: '',
+                            timer
+                        });
+               
+                    break;
+                case 'iframe':
+                 
+                    const iframe_file_url = encodeURIComponent(
+                        url("/web/content", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                        })
+                    );
+                    fileUrl = `${this.state.attachment_base}?file=${iframe_file_url}`;
+                case 'unknown':
+                    fileUrl = encodeURIComponent(
+                        url("/web/content", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                        })
+                    );
+            }
+
+            return fileUrl
+        },
+        _getTypeInfo(type, data) {
+            switch (type) {
+                case 'application/pdf':
+                    data.attachment_base = `/web/static/lib/pdfjs/web/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+                    data.attachment_base = `/jikimo_attachment_viewer/static/lib/docxjs/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+                    data.attachment_base = `/jikimo_attachment_viewer/static/lib/exceljs/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+                    data.attachment_base = '';
+                    data.attachment_type = 'unknown'
+                    break;
+                case 'image/png':
+                case 'image/jpeg':
+                case 'image/jpg':
+                    data.attachment_base = ''
+                    data.attachment_type = 'image'
+                    break;
+                default:
+                    data.attachment_base = ''
+                    data.attachment_type = 'unknown'
+                    break;
+            }
+        }
+    });
+    
+    var CustomListController = ListController.extend({
+        // 可以保留或移除，根据是否需要处理自定义事件
+        // 处理打印操作
+        // rpc.query({
+        //     model: 'sf.demand.plan.print.wizard',
+        //     method: 'demand_plan_print',
+        //     args: [recordIds]
+        // }).then(function(result) {
+        //     self.do_notify("成功", "打印任务已发送到打印机");
+        //     // 刷新视图显示最新状态
+        //     self.reload();
+        // }).catch(function(error) {
+        //     self.do_warn("打印失败", error.data.message || "发生未知错误");
+        // });
+    });
+    
+    var PrintDemand = ListView.extend({
+        config: _.extend({}, ListView.prototype.config, {
+            Renderer: CustomListRenderer,
+            Controller: CustomListController,
+        }),
+    });
+
+    viewRegistry.add('print_demand', PrintDemand);
+
+    return PrintDemand;
+});

sf_demand_plan/static/src/scss/style.css

@@ -0,0 +1,84 @@
+.demand_plan_tree .o_list_table_ungrouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    min-width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_grouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_ungrouped  {
+    min-width: 1900px;
+}
+
+
+.o_selected_row {
+    background-color: #e6f7ff !important;
+    font-weight: bold;
+}
+
+.custom-table-image-container {
+    display: flex;
+    height: calc(95vh - 254px);
+    gap: 20px;
+    position: relative;
+    th.o_list_record_selector, td.o_list_record_selector{
+        display: none;
+    }
+    .custom-preview-container, .print_demand {
+        flex: 1;
+        
+        max-width: 49%;
+        tbody {
+            tr:not(.o_data_row) {
+                display: none;
+            }
+        }
+        tfoot {
+            display: none;
+        }
+    }
+    .print_demand {
+        .table-responsive {
+            width: 100%;
+            overflow-x: auto!important;
+        }
+    }
+    .custom-preview-container {
+        background-color: #dadce0;
+        padding: 20px;
+        img {
+            max-width: 100%;
+            max-height: 100%;
+        }
+        iframe {
+            width: 100%;
+            height: 100%;
+        }
+    }
+    .o_print_custom, .o_cancel_custom {
+        position: absolute;
+        bottom: 20px;
+        right: 20px;
+    }
+    .o_print_custom {
+        right: 66px;
+    }
+}
+
+.denmand_set {
+    display: flex;
+    align-items: center;
+    height: 50px;
+    > span {
+        font-weight: bold;
+    }
+    input {
+        margin-left: 30px;
+    }
+    label {
+        margin-left: 5px;
+    }
+    input,label {
+        cursor: pointer;
+    }
+}

sf_demand_plan/views/demand_plan.xml

@@ -0,0 +1,125 @@
+<odoo>
+    <record id="view_sf_production_demand_plan_tree" model="ir.ui.view">
+        <field name="name">sf.production.demand.plan.tree</field>
+        <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">
+                <header>
+                    <button string="打印" name="button_action_print" type="object"
+                            class="btn-primary"/>
+                </header>
+                <field name="sequence" widget="handle"/>
+                <field name="id" optional="hide"/>
+                <field name="priority"/>
+                <field name="status"/>
+                <field name="customer_name"/>
+                <field name="order_remark"/>
+                <field name="glb_url" optional="hide"/>
+                <field name="product_id"/>
+                <field name="model_id" optional="hide"/>
+                <field name="part_name"/>
+                <field name="part_number"/>
+                <field name="is_incoming_material"/>
+                <field name="supply_method"/>
+                <field name="product_uom_qty"/>
+                <field name="deadline_of_delivery"/>
+                <field name="inventory_quantity_auto_apply"/>
+                <field name="qty_delivered"/>
+                <field name="qty_to_deliver"/>
+                <field name="model_long"/>
+                <field name="blank_type" optional="hide"/>
+                <field name="embryo_long"/>
+                <field name="materials_id"/>
+                <field name="model_machining_precision"/>
+                <field name="model_process_parameters_ids" widget="many2many_tags"/>
+                <field name="product_remark" optional="hide"/>
+                <field name="order_code" optional="hide"/>
+                <field name="sale_order_id" optional="hide"/>
+                <field name="sale_order_line_number" optional="hide"/>
+                <field name="order_state"/>
+                <field name="route_id" optional="hide"/>
+                <field name="contract_date"/>
+                <field name="date_order"/>
+                <field name="contract_code"/>
+                <field name="plan_remark"/>
+                <field name="processing_time"/>
+                <field name="material_check" optional="hide"/>
+                <field name="hide_action_open_mrp_production" invisible="1"/>
+                <field name="hide_action_purchase_orders" invisible="1"/>
+                <field name="hide_action_stock_picking" invisible="1"/>
+                <field name="hide_action_view_programming" invisible="1"/>
+                <button name="action_open_sale_order" type="object" string="供货方式待确认" class="btn-secondary"
+                        attrs="{'invisible': [('supply_method', '!=', False)]}"/>
+                <button name="action_open_mrp_production" type="object" string="待工艺确认" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_open_mrp_production', '=', False)]}"/>
+                <button name="action_view_purchase_request" type="object" string="采购申请" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_purchase_orders', '=', False)]}"/>
+                <button name="action_view_stock_picking" type="object" string="调拨单" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_stock_picking', '=', False)]}"/>
+                <button name="action_view_programming" type="object" string="编程单" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_view_programming', '=', False)]}"/>
+                <field name="planned_start_date"/>
+                <field name="actual_start_date"/>
+                <field name="actual_end_date"/>
+                <field name="create_date" optional="hide" string="创建时间"/>
+                <field name="create_uid" optional="hide" string="创建人"/>
+                <field name="write_date" string="更新时间"/>
+                <field name="write_uid" optional="hide" string="更新人"/>
+                <field name="print_count"/>
+                <button name="release_production_order" type="object" string="下达生产" class="btn-primary"
+                        attrs="{'invisible': ['|',('status', '!=', '50'), ('supply_method', 'not in', ['automation', 'manual'])]}"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_sf_production_demand_plan_search" model="ir.ui.view">
+        <field name="name">sf.production.demand.plan.search</field>
+        <field name="model">sf.production.demand.plan</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="order_remark"/>
+                <field name="product_id"/>
+                <field name="part_name"/>
+                <field name="part_number"/>
+                <field name="customer_name"/>
+                <field name="supply_method"/>
+                <field name="materials_id"/>
+                <field name="model_process_parameters_ids"/>
+                <field name="plan_remark"/>
+                <field name="contract_code"/>
+                <group expand="0" string="Group By">
+                    <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
+                    <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
+                    <filter name="group_by_customer_name" string="客户" domain="[]" context="{'group_by': 'customer_name'}"/>
+                    <filter name="group_by_is_incoming_material" string="客供料" domain="[]"
+                            context="{'group_by': 'is_incoming_material'}"/>
+                    <filter name="group_by_supply_method" string="供货方式" domain="[]"
+                            context="{'group_by': 'supply_method'}"/>
+                    <filter name="group_by_deadline_of_delivery" string="客户交期" domain="[]"
+                            context="{'group_by': 'deadline_of_delivery'}"/>
+                    <filter name="group_by_materials_id" string="材料" domain="[]"
+                            context="{'group_by': 'materials_id'}"/>
+                    <filter name="group_by_contract_code" string="合同号" domain="[]"
+                            context="{'group_by': 'contract_code'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="sf_production_demand_plan_action" model="ir.actions.act_window">
+        <field name="name">需求计划</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.production.demand.plan</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <menuitem
+            id="demand_plan_menu"
+            name="需求计划"
+            sequence="140"
+            action="sf_production_demand_plan_action"
+            parent="sf_plan.sf_production_plan_menu"
+    />
+</odoo>

sf_demand_plan/wizard/__init__.py

@@ -0,0 +1 @@
+from . import sf_demand_plan_print_wizard

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import models, fields, api, _
+
+_logger = logging.getLogger(__name__)
+
+
+class SfDemandPlanPrintWizard(models.TransientModel):
+    _name = 'sf.demand.plan.print.wizard'
+    _description = u'打印向导'
+
+    demand_plan_id = fields.Many2one('sf.production.demand.plan', string='需求计划ID')
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        related='demand_plan_id.product_id',
+        string='产品', store=True, index=True)
+    model_id = fields.Char('模型ID')
+    filename_url = fields.Char('文件名/URL')
+    type = fields.Selection([
+        ('1', '图纸'),
+        ('2', '程序单'),
+    ], string='类型')
+    status = fields.Selection([
+        ('not_start', '未开始'),
+        ('success', '成功'),
+        ('fail', '失败'),
+    ], string='状态', default='not_start')
+    machining_drawings = fields.Binary('2D加工图纸', related='product_id.machining_drawings', store=True)
+
+    cnc_worksheet = fields.Binary('程序单')
+
+    @api.model
+    def demand_plan_print(self, print_ids):
+        plan_print_ids = self.env['sf.demand.plan.print.wizard'].sudo().search(
+            [('id', 'in', print_ids)])
+        if not plan_print_ids:
+            return {'message': '记录不存在'}
+        success_records = []
+        failed_records = []
+        for record in plan_print_ids:
+            pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
+            if pdf_data:
+                try:
+                    # 执行打印
+                    self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
+                    record.status = 'success'
+                    t_part, c_part = record.demand_plan_id.print_count.split('C')
+                    t_num = int(t_part[1:])
+                    c_num = int(c_part)
+                    if record.type == '1':
+                        t_num += 1
+                    elif record.type == '2':
+                        c_num += 1
+                    record.demand_plan_id.print_count = f"T{t_num}C{c_num}"
+                    success_records.append({
+                        'filename_url': record.filename_url,
+                    })
+                except Exception as e:
+                    record.status = 'fail'
+                    _logger.error(f"文件{record.filename_url}打印失败: {str(e)}")
+                    failed_records.append({
+                        'filename_url': record.filename_url,
+                    })
+        if failed_records:
+            message = f"成功打印 {len(success_records)} 个文件，失败 {len(failed_records)} 个"
+        else:
+            message = f"所有 {len(success_records)} 个文件打印成功"
+        return {'message': message}
+
+
+class MrpWorkorder(models.Model):
+    _inherit = 'mrp.workorder'
+
+    def write(self, vals):
+        res = super(MrpWorkorder, self).write(vals)
+        for record in self:
+            if 'cnc_worksheet' in vals:
+                demand_plan_print = self.env['sf.demand.plan.print.wizard'].sudo().search(
+                    [('model_id', '=', record.model_id), ('type', '=', '2')])
+                if demand_plan_print:
+                    self.env['sf.demand.plan.print.wizard'].sudo().write(
+                        {'cnc_worksheet': record.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
+                else:
+                    demand_plan = self.env['sf.production.demand.plan'].sudo().search(
+                        [('product_id', '=', record.product_id.id)])
+                    if demand_plan:
+                        wizard_vals = {
+                            'demand_plan_id': demand_plan.id,
+                            'model_id': demand_plan.model_id,
+                            'type': '2',
+                            'cnc_worksheet': record.cnc_worksheet,
+                            'filename_url': record.cnc_worksheet_name
+                        }
+                        self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
+        return res

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="action_plan_print_tree" model="ir.ui.view">
+        <field name="name">sf.demand.plan.print.wizard.tree</field>
+        <field name="model">sf.demand.plan.print.wizard</field>
+        <field name="arch" type="xml">
+            <tree string="打印" class="print_demand" js_class="print_demand">
+                <field name="model_id"/>
+                <field name="filename_url"/>
+                <field name="type"/>
+                <field name="machining_drawings" attrs="{'column_invisible': True }"/>
+                <field name="cnc_worksheet" attrs="{'column_invisible': True }"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+</odoo>

sf_dlm/models/product_template.py

@@ -10,6 +10,7 @@ class ResProductTemplate(models.Model):
     model_name = fields.Char('模型名称')
     categ_type = fields.Selection(
         [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")], string='产品的类别', related='categ_id.type', store=True)
+    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
     model_long = fields.Float('模型长[mm]', digits=(16, 3))
     model_width = fields.Float('模型宽[mm]', digits=(16, 3))
     model_height = fields.Float('模型高[mm]', digits=(16, 3))
@@ -72,14 +73,20 @@ class ResProductTemplate(models.Model):
         copy_product_id.product_tmpl_id.active = True
         model_type = self.env['sf.model.type'].search([], limit=1)
         attachment = self.attachment_create(item['model_name'], item['model_data'])
+        # 判断参数中是否包含 坯料尺寸(长、宽、高)
+        blank_bool = any(value is not None and value != 0 for value in (
+            item.get('blank_length'), item.get('blank_width'), item.get('blank_height'))) if all(
+            key in item for key in ('blank_length', 'blank_width', 'blank_height')) else False
         vals = {
             'name': '%s-%s-%s' % ('P', order_id.name, i),
-            'model_long': item['model_long'] + model_type.embryo_tolerance,
+            'blank_type': item.get('blank_type'),
-            'model_width': item['model_width'] + model_type.embryo_tolerance,
+            'model_long': item.get('blank_length') if blank_bool else item['model_long'] + model_type.embryo_tolerance,
-            'model_height': item['model_height'] + model_type.embryo_tolerance,
+            'model_width': item.get('blank_width') if blank_bool else item['model_width'] + model_type.embryo_tolerance,
-            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
+            'model_height': item.get('blank_height') if blank_bool else item['model_height'] + model_type.embryo_tolerance,
-                    item['model_width'] + model_type.embryo_tolerance) * (
+            'model_volume': ((item['model_long'] + model_type.embryo_tolerance) *
-                                    item['model_height'] + model_type.embryo_tolerance),
+                             (item['model_width'] + model_type.embryo_tolerance) *
+                             (item['model_height'] + model_type.embryo_tolerance)) if not blank_bool else (
+                    item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
             'product_model_type_id': model_type.id,
             'model_processing_panel': 'R',
             'model_machining_precision': item['model_machining_precision'],

sf_dlm_management/views/product_template_management_view.xml

@@ -95,7 +95,7 @@
                     <page string="加工参数">
                         <group>
                             <group string="模型">
-                                <label for="model_long" string="尺寸[mm]"/>
+                                <label for="model_long" string="坯料尺寸[mm]"/>
                                 <div class="o_address_format">
                                     <label for="model_long" string="长"/>
                                     <field name="model_long" class="o_address_zip"/>
@@ -104,6 +104,7 @@
                                     <label for="model_height" string="高"/>
                                     <field name="model_height" class="o_address_zip"/>
                                 </div>
+                                <field name="blank_type" readonly="1"/>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
                                 <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"

sf_machine_connect/controllers/controllers.py

@@ -377,7 +377,11 @@ class Sf_Dashboard_Connect(http.Controller):
             line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
             line_list = list(map(lambda x: x.name, line_list_obj))
             # print('line_list: %s' % line_list)
-            res['LineList'] = line_list
+            res['LineList'] = ['业绩总览']
+            res['LineList'] += line_list
+            res['LineList'].append('人工线下加工中心')
+            # 增加“业绩总览”与“人工线下加工中心”
+            
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -401,37 +405,55 @@ class Sf_Dashboard_Connect(http.Controller):
 
         try:
             plan_obj = request.env['sf.production.plan'].sudo()
-            production_obj = request.env['mrp.production'].sudo()
+            # production_obj = request.env['mrp.production'].sudo()
             work_order_obj = request.env['mrp.workorder'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
+
+            line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
+            cnc_line_list = list(map(lambda x: x.name, line_list_obj))
             # print('line_list: %s' % line_list)
             for line in line_list:
 
+                if line == '业绩总览':
+                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
+                    plan_domain = []
+                elif line == '人工线下加工中心':
+                    work_order_domain = [('routing_type', '=', '人工线下加工')]
+                    plan_domain = [('production_type', '=', '人工线下加工')]
+                else:
+                    work_order_domain = [
+                        ('production_line_id.name', '=', line),
+                        ('routing_type', '=', 'CNC加工')
+                    ]
+                    plan_domain = [('production_line_id.name', '=', line)]
                 # # 工单计划量
                 # plan_data_total_counts = production_obj.search_count(
                 #     [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
                 #      ('active', '=', True)])
 
                 # 工单计划量切换为CNC工单
-                plan_data_total_counts = work_order_obj.search_count(
+                plan_data_total = work_order_obj.search(work_order_domain + [
-                    [('production_line_id.name', '=', line), ('id', '!=', 8061),
+                    ('id', '!=', 8061),
-                     ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
+                    ('state', 'in', ['ready', 'progress', 'done'])
+                ])
+
+                plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
 
                 # # 工单完成量
                 # plan_data_finish_counts = plan_obj.search_count(
                 #     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
 
                 # 工单完成量切换为CNC工单
-                plan_data_finish_counts = work_order_obj.search_count(
+                plan_data_finish = work_order_obj.search(work_order_domain + [
-                    [('production_line_id.name', '=', line),
+                    ('state', 'in', ['done'])
-                     ('state', 'in', ['done']), ('routing_type', '=', 'CNC加工')])
+                ])
+
+                plan_data_finish_counts = sum(plan_data_finish.mapped('qty_produced'))
 
                 # 超期完成量
                 # 搜索所有已经完成的工单
-                plan_data_overtime = work_order_obj.search([
+                plan_data_overtime = work_order_obj.search(work_order_domain + [
-                    ('production_line_id.name', '=', line),
+                    ('state', 'in', ['done'])
-                    ('state', 'in', ['done']),
-                    ('routing_type', '=', 'CNC加工')
                 ])
 
                 # 使用 filtered 进行字段比较
@@ -440,36 +462,38 @@ class Sf_Dashboard_Connect(http.Controller):
                 )
 
                 # 获取数量
-                plan_data_overtime_counts = len(plan_data_overtime_counts)
+                # plan_data_overtime_counts = len(plan_data_overtime_counts)
+                plan_data_overtime_counts = sum(plan_data_overtime_counts.mapped('qty_produced'))
 
                 # 查找符合条件的生产计划记录
-                plan_data = plan_obj.search([
+                # plan_data = plan_obj.search(plan_domain)
-                    ('production_line_id.name', '=', line),
-                ])
 
                 # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
                 # faulty_plans = plan_data.filtered(lambda p: any(
                 #     result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
                 # ))
 
-                faulty_plans = request.env['quality.check'].sudo().search([
+                faulty_plans = work_order_obj.search(work_order_domain + [
-                    ('operation_id.name', '=', 'CNC加工'),
+                    ('state', 'in', ['scrap', 'rework'])
-                    ('quality_state', 'in', ['fail'])
                 ])
 
                 # 查找制造订单取消与归档的数量
-                cancel_order_count = production_obj.search_count(
+                # cancel_order_count = production_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
+                #     [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
-                     ('active', '=', False)])
+                #      ('active', '=', False)])
 
                 # 计算符合条件的记录数量
                 # plan_data_fault_counts = len(faulty_plans) + cancel_order_count
-                plan_data_fault_counts = len(faulty_plans)
+                # plan_data_fault_counts = len(faulty_plans)
+                plan_data_fault_counts = sum(faulty_plans.mapped('qty_produced'))
 
                 # 工单返工数量
 
-                plan_data_rework_counts = plan_obj.search_count(
+                plan_data_rework = work_order_obj.search(work_order_domain + [
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework'])])
+                    ('state', 'in', ['rework'])
+                ])
+
+                plan_data_rework_counts = sum(plan_data_rework.mapped('qty_produced'))
 
                 # 工单完成率
                 finishe_rate = round(
@@ -479,8 +503,9 @@ class Sf_Dashboard_Connect(http.Controller):
                 plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
 
                 # 完成记录
-                plan_data_finish_orders = plan_obj.search(
+                plan_data_finish_orders = plan_obj.search(plan_domain + [
-                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+                    ('state', 'in', ['finished'])
+                ])
 
                 # # 检测量
                 # detection_nums = 0
@@ -534,25 +559,25 @@ class Sf_Dashboard_Connect(http.Controller):
                 delay_rate = round((delay_num / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
                 on_time_rate = 1 - delay_rate
 
-                if plan_data:
+                # if plan_data:
-                    data = {
+                data = {
-                        'plan_data_total_counts': plan_data_total_counts,
+                    'plan_data_total_counts': plan_data_total_counts,
-                        'plan_data_finish_counts': plan_data_finish_counts,
+                    'plan_data_finish_counts': plan_data_finish_counts,
-                        'plan_data_plan_counts': plan_data_total_counts,
+                    'plan_data_plan_counts': plan_data_total_counts,
-                        'plan_data_fault_counts': plan_data_fault_counts,
+                    'plan_data_fault_counts': plan_data_fault_counts,
-                        'nopass_orders_counts': detection_data - len(pass_nums),
+                    'nopass_orders_counts': detection_data - len(pass_nums),
-                        'finishe_rate': finishe_rate,
+                    'finishe_rate': finishe_rate,
-                        'plan_data_progress_deviation': plan_data_progress_deviation,
+                    'plan_data_progress_deviation': plan_data_progress_deviation,
-                        'plan_data_rework_counts': plan_data_rework_counts,
+                    'plan_data_rework_counts': plan_data_rework_counts,
-                        'on_time_rate': on_time_rate,
+                    'on_time_rate': on_time_rate,
-                        # 'detection_data': detection_data,
+                    # 'detection_data': detection_data,
-                        'detection_data': plan_data_finish_counts,
+                    'detection_data': plan_data_finish_counts,
-                        'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts,
+                    'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts,
-                        'plan_data_overtime_counts': plan_data_overtime_counts,
+                    'plan_data_overtime_counts': plan_data_overtime_counts,
-                        'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
+                    'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
-                        if plan_data_finish_counts > 0 else 0,
+                    if plan_data_finish_counts > 0 else 0,
-                    }
+                }
-                    res['data'][line] = data
+                res['data'][line] = data
 
             return json.dumps(res)  # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode()
 
@@ -576,8 +601,11 @@ class Sf_Dashboard_Connect(http.Controller):
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+        # 将时间减去8小时（UTC+8转UTC）
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+        begin_time = (datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+        end_time = (datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+        # begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+        # end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
         print('kw', kw)
         time_unit = kw.get('time_unit', 'day').strip('"')  # 默认单位为天
@@ -608,16 +636,43 @@ class Sf_Dashboard_Connect(http.Controller):
                 date_list.append(current_date)
                 current_date += timedelta(days=1)
             return date_list
+        
 
-        for line in line_list:
+        if time_unit == 'hour':
-            date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
-            order_counts = []
 
-            if time_unit == 'hour':
+            # 计划量，目前只能从mail.message中筛选出
+            plan_order_messages = request.env['mail.message'].sudo().search([
+                ('model', '=', 'mrp.workorder'),
+                ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
+                ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
+                ('tracking_value_ids.field_desc', '=', '状态'),
+                ('tracking_value_ids.new_value_char', '=', '就绪')
+            ])
+                
+            for line in line_list:
+                date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
+                order_counts = []
+
+                if line == '业绩总览':
+                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
+                elif line == '人工线下加工中心':
+                    work_order_domain = [('routing_type', '=', '人工线下加工')]
+                else:
+                    work_order_domain = [
+                        ('production_line_id.name', '=', line),
+                        ('routing_type', '=', 'CNC加工')
+                    ]
                 time_intervals = get_time_intervals(begin_time, end_time, time_unit)
                 print('============================= %s' % time_intervals)
 
                 time_count_dict = {}
+                plan_count_dict = {}
+
+                orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
+                    ('state', 'in', ['done']),
+                    (date_field_name, '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
+                    (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
+                ])
 
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
@@ -629,66 +684,106 @@ class Sf_Dashboard_Connect(http.Controller):
                     #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
                     # ])
 
-                    orders = request.env['mrp.workorder'].sudo().search([
+                    interval_orders = orders.filtered(
-                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
+                        lambda o: o[date_field_name] >= start_time 
-                        ('production_line_id.name', '=', line),
+                        and o[date_field_name] <= end_time
-                        ('state', 'in', ['done']),
+                    )                    
-                        (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
-                    ])
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
-                    time_count_dict[key] = len(orders)
+                    # time_count_dict[key] = len(orders)
+                    time_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
+
+                for time_interval in time_intervals:
+                    start_time, end_time = time_interval
+
+                    # orders = plan_obj.search([
+                    #     ('production_line_id.name', '=', line),
+                    #     ('state', 'in', ['done']),
+                    #     (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                    #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                    # ])
+
+                    interval_plan_orders = plan_order_messages.filtered(
+                        lambda o: o.create_date >= start_time 
+                        and o.create_date <= end_time
+                    )
+
+                    interval_order_ids = set(interval_plan_orders.mapped('res_id'))
+
+                    interval_orders = request.env['mrp.workorder'].sudo().browse(interval_order_ids)
+                    if line == '业绩总览':
+                        interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
+                    elif line == '人工线下加工中心':
+                        interval_orders = interval_orders.filtered(lambda o: o.routing_type == '人工线下加工')
+                    else:
+                        interval_orders = interval_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
+
+                    # 使用小时和分钟作为键，确保每个小时的数据有独立的键
+                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    # time_count_dict[key] = len(orders)
+                    plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
+
                 # order_counts.append()
                 res['data'][line] = {
                     'finish_order_nums': time_count_dict,
-                    'plan_order_nums': 28
+                    'plan_order_nums': plan_count_dict
                 }
-                return json.dumps(res)
+        else:
 
-            date_list = get_date_list(begin_time, end_time)
+            for line in line_list:
+                date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
+                order_counts = []
 
-            for date in date_list:
+                if line == '业绩总览':
-                next_day = date + timedelta(days=1)
+                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-                orders = request.env['mrp.workorder'].sudo().search(
+                elif line == '人工线下加工中心':
-                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                    work_order_domain = [('routing_type', '=', '人工线下加工')]
-                     ('routing_type', '=', 'CNC加工'),
+                else:
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                    work_order_domain = [
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                        ('production_line_id.name', '=', line),
-                     ])
+                        ('routing_type', '=', 'CNC加工')
+                    ]
 
-                rework_orders = request.env['mrp.workorder'].sudo().search(
+                date_list = get_date_list(begin_time, end_time)
-                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['rework']),
-                     ('routing_type', '=', 'CNC加工'),
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                     ])
-                not_passed_orders = request.env['mrp.workorder'].sudo().search(
-                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['scrap', 'cancel']),
-                     ('routing_type', '=', 'CNC加工'),
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                     ])
-                order_counts.append({
-                    'date': date.strftime('%Y-%m-%d'),
-                    'order_count': len(orders),
-                    'rework_orders': len(rework_orders),
-                    'not_passed_orders': len(not_passed_orders)
-                })
-            # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
-            # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
 
-            # date_list_dict = {line: order_counts}
+                for date in date_list:
+                    next_day = date + timedelta(days=1)
+                    orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
+                        ('state', 'in', ['done']),
+                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                    ])
 
-            res['data'][line] = order_counts
+                    rework_orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
+                        ('state', 'in', ['rework']),
+                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                    ])
+                    not_passed_orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
+                        ('state', 'in', ['scrap', 'cancel']),
+                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                    ])
+                    order_counts.append({
+                        'date': date.strftime('%Y-%m-%d'),
+                        'order_count': sum(orders.mapped('qty_produced')),
+                        'rework_orders': sum(rework_orders.mapped('qty_produced')),
+                        'not_passed_orders': sum(not_passed_orders.mapped('qty_produced'))
+                    })
+                # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
+                # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
+
+                # date_list_dict = {line: order_counts}
+
+                res['data'][line] = order_counts
         return json.dumps(res)
 
     # 实时产量
     @http.route('/api/RealTimeProduct', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
     def RealTimeProduct(self, **kw):
         """
-        获取实时产量
+        获取实时产量（作废）
         :param kw:
         :return:
         """
@@ -711,6 +806,21 @@ class Sf_Dashboard_Connect(http.Controller):
 
         # 当班计划量
         for line in line_list:
+
+            if line == '业绩总览':
+                work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
+                plan_domain = []
+            elif line == '人工线下加工中心':
+                work_order_domain = [('routing_type', '=', '人工线下加工')]
+                plan_domain = [('production_type', '=', '人工线下加工')]
+            else:
+                work_order_domain = [
+                    ('production_line_id.name', '=', line),
+                    ('routing_type', '=', 'CNC加工')
+                ]
+                plan_domain = [('production_line_id.name', '=', line)]
+
+
             plan_order_nums = plan_obj.search_count(
                 [('production_line_id.name', '=', line), ('state', 'not in', ['draft']),
                  ('date_planned_start', '>=', begin_time),
@@ -752,42 +862,79 @@ class Sf_Dashboard_Connect(http.Controller):
         :param kw:
         :return:
         """
-
         # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
         res = {'status': 1, 'message': '成功', 'data': {}}
+        # 解决产品名称取到英文的问题
+        request.update_context(lang='zh_CN')
         plan_obj = request.env['sf.production.plan'].sudo()
+        work_order_obj = request.env['mrp.workorder'].sudo()
+        # 获取mrp.workorder的state字段的selection内容
+        state_dict = dict(request.env['mrp.workorder'].sudo()._fields['state'].selection)
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
-        not_done_data = []
-        done_data = []
         final_data = {}
 
+        # 获取当前时间，并计算24小时前的时间
+        current_time = datetime.now()
+        time_48_hours_ago = current_time - timedelta(hours=48)
+
+        # # 计划量，目前只能从mail.message中筛选出
+        # plan_order_messages = request.env['mail.message'].sudo().search([
+        #     ('model', '=', 'mrp.workorder'),
+        #     ('create_date', '>=', time_48_hours_ago.strftime('%Y-%m-%d %H:%M:%S')),
+        #     ('tracking_value_ids.field_desc', '=', '状态'),
+        #     ('tracking_value_ids.new_value_char', 'in', ['就绪', '生产中'])
+        # ])
+
         for line in line_list:
+            not_done_data = []
+            done_data = []
+            not_done_index = 1
+            done_index = 1
+
+            if line == '业绩总览':
+                work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
+            elif line == '人工线下加工中心':
+                work_order_domain = [('routing_type', '=', '人工线下加工')]
+            else:
+                work_order_domain = [
+                    ('production_line_id.name', '=', line),
+                    ('routing_type', '=', 'CNC加工')
+                ]
             # 未完成订单
             # not_done_orders = plan_obj.search(
             #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
             #      ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
             #      ])
-            not_done_orders = request.env['mrp.workorder'].sudo().search(
+            not_done_orders = work_order_obj.search(work_order_domain + [
-                [('production_line_id.name', '=', line), ('state', 'in', ['ready', 'progress']),
+                    ('state', 'in', ['ready', 'progress']),
-                 ('routing_type', '=', 'CNC加工')
+                    ('date_planned_start', '>=', time_48_hours_ago)
-                 ])
+                ], order='id asc'
+            )
+            # not_done_orders = request.env['mrp.workorder'].sudo().browse(plan_order_messages.mapped('res_id'))
+            # if line == '业绩总览':
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
+            # elif line == '人工线下加工中心':
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == '人工线下加工')
+            # else:
+            #     not_done_orders = not_done_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
+
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
-            current_time = datetime.now()
+            # current_time = datetime.now()
-            time_24_hours_ago = current_time - timedelta(hours=24)
+            # time_24_hours_ago = current_time - timedelta(hours=24)
 
-            finish_orders = plan_obj.search([
+            finish_orders = work_order_obj.search(work_order_domain + [
-                ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
+                ('state', 'in', ['done']),
-                ('production_id.state', 'not in', ['cancel']), ('active', '=', True),
+                ('production_id.state', 'not in', ['cancel']),
-                ('actual_end_time', '>=', time_24_hours_ago)
+                ('date_finished', '>=', time_48_hours_ago)
-            ])
+            ], order='id asc')
-            # print(finish_orders)
+            # logging.info('完成订单: %s' % finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -795,14 +942,14 @@ class Sf_Dashboard_Connect(http.Controller):
             finish_order_ids = [order.id for order in finish_orders]
 
             # 对ID进行排序
-            sorted_order_ids = sorted(order_ids)
+            # sorted_order_ids = sorted(order_ids)
 
-            finish_sorted_order_ids = sorted(finish_order_ids)
+            # finish_sorted_order_ids = sorted(finish_order_ids)
 
             # 创建ID与序号的对应关系
-            id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(sorted_order_ids)}
+            # id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(sorted_order_ids)}
 
-            finish_id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(finish_sorted_order_ids)}
+            # finish_id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(finish_sorted_order_ids)}
 
             # # 输出结果或进一步处理
             # for order_id, sequence in id_to_sequence.items():
@@ -823,30 +970,21 @@ class Sf_Dashboard_Connect(http.Controller):
                 material_match = re.search(material_pattern, blank_name)
                 material = material_match.group(1) if material_match else 'No match found'
 
-                state_dict = {
-                    'draft': '待排程',
-                    'done': '已排程',
-                    'processing': '生产中',
-                    'finished': '已完成',
-                    'ready': '待加工',
-                    'progress': '生产中',
-                }
 
                 line_dict = {
-                    'sequence': id_to_sequence[order.id],
+                    'sequence': not_done_index,
                     'workorder_name': order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': 1,
+                    'order_qty': order.qty_production,
                     'state': state_dict[order.state],
 
                 }
                 not_done_data.append(line_dict)
+                not_done_index += 1
 
             for finish_order in finish_orders:
-                if not finish_order.actual_end_time:
-                    continue
                 blank_name = ''
                 try:
                     blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -861,17 +999,18 @@ class Sf_Dashboard_Connect(http.Controller):
                 material = material_match.group(1) if material_match else 'No match found'
 
                 line_dict = {
-                    'sequence': finish_id_to_sequence[finish_order.id],
+                    'sequence': done_index,
-                    'workorder_name': finish_order.name,
+                    'workorder_name': finish_order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': finish_order.product_qty,
+                    'order_qty': finish_order.qty_produced,
-                    'finish_time': finish_order.actual_end_time.strftime(
+                    'finish_time': finish_order.date_finished.strftime(
-                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
+                        '%Y-%m-%d %H:%M:%S') if finish_order.date_finished else ' '
 
                 }
                 done_data.append(line_dict)
+                done_index += 1
 
             # 开始包一层
             res['data'][line] = {'not_done_data': not_done_data, 'done_data': done_data}

sf_manufacturing/controllers/main.py

@@ -45,9 +45,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                 i += 1
-            if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
+            # BFM 内部下单 新增合同等内容补充
-                order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
+            order_id.write_sale_documents(kw)
-                order_id.write({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

sf_manufacturing/models/__init__.py

@@ -18,4 +18,5 @@ from . import quick_easy_order
 from . import purchase_order
 from . import quality_check
 from . import purchase_request_line
+from . import bom
 # from . import stock_warehouse_orderpoint

sf_manufacturing/models/bom.py

@@ -0,0 +1,16 @@
+from odoo import models
+from odoo.osv.expression import AND
+
+
+class MrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    def _bom_subcontract_find(self, product, picking_type=None, company_id=False, bom_type='subcontract', subcontractor=False):
+        domain = self._bom_find_domain(product, picking_type=picking_type, company_id=company_id, bom_type=bom_type)
+        if self.env.context.get('stock_picking') == 'outsourcing':
+            return self.search(domain, order='sequence, product_id, id', limit=1)
+        if subcontractor:
+            domain = AND([domain, [('subcontractor_ids', 'parent_of', subcontractor.ids)]])
+            return self.search(domain, order='sequence, product_id, id', limit=1)
+        else:
+            return self.env['mrp.bom']

sf_manufacturing/models/mrp_production.py

@@ -283,6 +283,8 @@ class MrpProduction(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = production_id.product_id.name
                     if production_id.sale_order_id:
                         sale_order = production_id.sale_order_id
                     else:
@@ -1707,7 +1709,77 @@ class MrpProduction(models.Model):
                         vals['procurement_group_id'] = product_group_id[product_id.id]
                 else:
                     vals['procurement_group_id'] = is_custemer_group_id[key]
-        return super(MrpProduction, self).create(vals_list)
+
+        productions = super(MrpProduction, self).create(vals_list)
+
+        # 查询成品工序排序（自动化产线加工）,供后续使用
+        product_model_type_routing_sorts = self.env['sf.product.model.type.routing.sort'].search([], order='sequence asc')
+        # 查询成品工序排序（人工线下加工）,供后续使用
+        manual_product_model_type_routing_sorts = self.env['sf.manual.product.model.type.routing.sort'].search([], order='sequence asc')
+        # 查询坯料工序排序，供后续使用
+        embryo_model_type_routing_sorts = self.env['sf.embryo.model.type.routing.sort'].search([], order='sequence asc')
+
+        for production in productions:
+            # 生成序列号
+            production.action_generate_serial()
+            # 创建工序模板
+            technology_design_values = []
+            i = 0
+            if production.product_id.categ_id.type == '成品':
+                # 根据加工面板的面数及成品工序模板生成工序设计
+                if production.production_type == '自动化产线加工':
+                    product_routing_workcenter = product_model_type_routing_sorts.filtered(
+                        lambda s: s.product_model_type_id.id == production.product_id.product_model_type_id.id
+                    )
+                else:
+                    product_routing_workcenter = manual_product_model_type_routing_sorts.filtered(
+                        lambda s: s.manual_product_model_type_id.id == production.product_id.product_model_type_id.id
+                    )
+                if production.production_type == '自动化产线加工':
+                    for k in (production.product_id.model_processing_panel.split(',')):
+                        for route in product_routing_workcenter:
+                            i += 1
+                            technology_design_values.append(
+                                self.env['sf.technology.design'].json_technology_design_str(k, route, i, False)
+                            )
+                elif production.production_type == '人工线下加工':
+                    for route in product_routing_workcenter:
+                        i += 1
+                        technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False)
+                        )
+                else:
+                    for route in product_routing_workcenter:
+                        i += 1
+                        technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str(False, route, i, False)
+                        )
+            elif production.product_id.categ_id.type == '坯料':
+                embryo_routing_workcenter = embryo_model_type_routing_sorts.filtered(
+                    lambda s: s.embryo_model_type_id.id == production.product_id.embryo_model_type_id.id
+                )
+                for route_embryo in embryo_routing_workcenter:
+                    i += 1
+                    technology_design_values.append(
+                        self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i, False)
+                    )
+            # 处理表面工艺
+            for item in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
+                if item.route_workcenter_id.surface_technics_id.id:
+                    for process_param in production.product_id.model_process_parameters_ids:
+                        if item.route_workcenter_id.surface_technics_id == process_param.process_id:
+                            technology_design_values.append(
+                            self.env['sf.technology.design'].json_technology_design_str(
+                                False,
+                                item.route_workcenter_id,
+                                i,
+                                process_param
+                            )
+                        )
+            production.technology_design_ids = technology_design_values
+        # 设置制造订单状态为待工艺确认
+        productions.write({'state': 'technology_to_confirmed'})
+        return productions
 
     @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',
                  'procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id')

sf_manufacturing/models/mrp_workorder.py

@@ -334,6 +334,7 @@ class ResMrpWorkOrder(models.Model):
 
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
     technology_design_id = fields.Many2one('sf.technology.design')
+    cnc_worksheet_name = fields.Char('工作指令文件名', readonly=True)
 
     def _compute_default_construction_period_status(self):
         need_list = ['pending', 'waiting', 'ready', 'progress', 'to be detected', 'done']

sf_manufacturing/models/product_template.py

@@ -10,8 +10,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
@@ -26,6 +26,7 @@ class ResProductMo(models.Model):
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
+    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
     model_long = fields.Float('模型长(mm)', digits=(16, 3))
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
@@ -799,6 +800,8 @@ class ResProductMo(models.Model):
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
+                else:
+                    product_name = record.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.name)
                 if match_sale:
@@ -890,14 +893,21 @@ class ResProductMo(models.Model):
             embryo_redundancy_id = item.get('embryo_redundancy')
         if not embryo_redundancy_id:
             raise UserError('请先配置模型类型内的坯料冗余')
+        product_name = self.generate_product_name(order_id, item, i)
+        # 判断参数中是否包含 坯料尺寸(长、宽、高)
+        blank_bool = any(value is not None and value != 0 for value in (
+            item.get('blank_length'), item.get('blank_width'), item.get('blank_height'))) if all(
+            key in item for key in ('blank_length', 'blank_width', 'blank_height')) else False
         vals = {
-            'name': '%s-%s-%s' % ('P', order_id.name, i),
+            'name': product_name,
-            'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long),
+            'blank_type': item.get('blank_type'),
-            'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
+            'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
-            'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
+            'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
-            'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
+            'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
-                    item['model_width'] + embryo_redundancy_id.width) * (
+            'model_volume': self.format_float(((item['model_long'] + embryo_redundancy_id.long) *
-                              item['model_height'] + embryo_redundancy_id.height)),
+                             (item['model_width'] + embryo_redundancy_id.width) *
+                             (item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else (
+                    item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
             'product_model_type_id': model_type.id,
             'model_processing_panel': item['processing_panel_detail'],
             'model_machining_precision': item['model_machining_precision'],
@@ -1012,12 +1022,9 @@ class ResProductMo(models.Model):
         if not embryo_redundancy_id:
             raise UserError('请先配置模型类型内的坯料冗余')
         logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
+        embryo_name = self.generate_embryo_name(order_id, item, materials_id, materials_type_id, embryo_redundancy_id, i)
         vals = {
-            'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
+            'name': embryo_name,
-                                                       order_id.name, i, materials_id.name, materials_type_id.name,
-                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
-                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
-                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height)),
             'length': self.format_float(item['model_long'] + embryo_redundancy_id.long),
             'width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
             'height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
@@ -1119,7 +1126,19 @@ class ResProductMo(models.Model):
 
     # 增加产品表面积
 
+    def generate_product_name(self, order_id, item, i):
+        """生成成品名称"""
+        product_name = '%s-%s-%s' % ('P', order_id.name, i)
+        return product_name
 
+    def generate_embryo_name(self, order_id, item,  materials_id, materials_type_id, embryo_redundancy_id, i):
+        """生成坯料名称"""
+        embryo_name = '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
+                                                       order_id.name, i, materials_id.name, materials_type_id.name,
+                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
+                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
+                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height))
+        return embryo_name
 
 class ResProductFixture(models.Model):
     _inherit = 'product.template'

sf_manufacturing/models/purchase_order.py

@@ -212,6 +212,8 @@ class PurchaseOrderLine(models.Model):
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
+                else:
+                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:

sf_manufacturing/models/sale_order.py

@@ -74,14 +74,17 @@ class SaleOrder(models.Model):
                 'blank_area': product.model_area,
                 'price': product.list_price,
                 'embryo_redundancy_id': line.embryo_redundancy_id,
+                'model_id': line.model_id
             }
             product_name = ''
             match = re.search(r'(S\d{5}-\d+)', product.name)
+            product_seria = 0
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)
-            # 获取成品名结尾-n的n
+                # 获取成品名结尾-n的n
-            product_seria = int(product_name.split('-')[-1])
+                product_seria = int(product_name.split('-')[-1])
+            
             # 成品供货方式为采购则不生成bom
             if line.supply_method != 'purchase':
                 bom_data = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).get_bom(product)
@@ -190,6 +193,19 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
+
+    def write_sale_documents(self, kw):
+        """BFM 内部下单 内容补充 """
+        val = {}
+        if kw.get('contract_file_name') and kw.get('contract_file'):
+            document_id = self.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
+            val.update({'contract_document_id': document_id.id})
+        if kw.get('contract_code') or kw.get('contract_date'):
+            val.update({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
+        if kw.get('customer_name'):
+            val.update({'customer_name': kw.get('customer_name')})
+        self.write(val)
+
     def create_sale_documents(self, contract_file_name, contract_file):
         # 创建ir.attachment记录
         attachment = self.env['ir.attachment'].sudo().create({
@@ -211,9 +227,7 @@ class SaleOrder(models.Model):
             'res_id': self.id,
         })
 
-        self.write({
+        return document
-            'contract_document_id': document.id
-        })
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'

sf_manufacturing/models/sf_technology_design.py

@@ -23,7 +23,6 @@ class sf_technology_design(models.Model):
     # def _compute_group_uniq_id(self):
     #     for record in self:
 
-
     def json_technology_design_str(self, k, route, i, process_parameter):
         workorders_values_str = [0, '', {
             'route_id': route.id if route.routing_type in ['表面工艺'] else route.route_workcenter_id.id,
@@ -36,11 +35,19 @@ class sf_technology_design(models.Model):
         return workorders_values_str
 
     def write(self, vals):
-        return super(sf_technology_design, self).write(vals)
+        res = super(sf_technology_design, self).write(vals)
+        if 'group_uniq_id' in vals or 'process_parameters_id' in vals or 'active' in vals:
+            if self.production_id:
+                process_parameters_id = self.production_id.technology_design_ids.mapped('process_parameters_id')
+                if process_parameters_id.ids:
+                    self.production_id.product_id.model_process_parameters_ids = process_parameters_id.ids
+                else:
+                    self.production_id.product_id.model_process_parameters_ids = None
+        return res
+
     def unlink_technology_design(self):
         self.active = False
 
-
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
@@ -48,10 +55,12 @@ class sf_technology_design(models.Model):
                 raise ValidationError(_("工序不能为空"))
         result = super(sf_technology_design, self).create(vals_list)
         for res in result:
-            record = self.search([('production_id', '=', res.production_id.id), ('active', 'in', [True, False])], order='group_uniq_id desc', limit=1)
+            record = self.search([('production_id', '=', res.production_id.id), ('active', 'in', [True, False])],
-            res.group_uniq_id=record.group_uniq_id + 1
+                                 order='group_uniq_id desc', limit=1)
+            res.group_uniq_id = record.group_uniq_id + 1
         return result
-    def get_duplicates_with_inactive(self,technology_designs):
+
+    def get_duplicates_with_inactive(self, technology_designs):
         # 统计每个 'sequence' 出现的次数
         sequence_count = Counter(technology_design.sequence for technology_design in technology_designs)
 
@@ -62,6 +71,7 @@ class sf_technology_design(models.Model):
         ]
 
         return result
+
     # def rearrange_numbering(self,self_technology_designs):
     #     inactive_designs = self.get_duplicates_with_inactive(self_technology_designs)
     #     if inactive_designs:
@@ -75,7 +85,7 @@ class sf_technology_design(models.Model):
 
     def get_technology_design(self):
         return {
-            'sequence':self.sequence,
+            'sequence': self.sequence,
             'route_id': self.route_id.id,
             'process_parameters_id': self.process_parameters_id.id,
             'panel': self.panel,
@@ -83,17 +93,19 @@ class sf_technology_design(models.Model):
             'time_cycle_manual': self.time_cycle_manual,
             'is_auto': self.is_auto,
             'active': self.active,
-            'group_uniq_id':self.group_uniq_id,
+            'group_uniq_id': self.group_uniq_id,
         }
-    def sync_technology_designs(self,production_technology_designs, self_technology_designs):
+
+    def sync_technology_designs(self, production_technology_designs, self_technology_designs):
         production_id = production_technology_designs[0].production_id.id
-        self_technology_design_dict = {item.group_uniq_id:item for item in self_technology_designs}
+        self_technology_design_dict = {item.group_uniq_id: item for item in self_technology_designs}
-        production_technology_designs_dict = {item.group_uniq_id:item for item in production_technology_designs}
+        production_technology_designs_dict = {item.group_uniq_id: item for item in production_technology_designs}
         for technology_design in production_technology_designs:
             if not self_technology_design_dict.get(technology_design.group_uniq_id):
                 technology_design.write({'production_id': False})
             else:
-                technology_design.write(self_technology_design_dict.get(technology_design.group_uniq_id).get_technology_design())
+                technology_design.write(
+                    self_technology_design_dict.get(technology_design.group_uniq_id).get_technology_design())
         for technology_design in self_technology_designs:
             if not production_technology_designs_dict.get(technology_design.group_uniq_id):
                 technology_design = technology_design.get_technology_design()
@@ -101,9 +113,8 @@ class sf_technology_design(models.Model):
                 technology_design.pop('group_uniq_id')
                 self.env['sf.technology.design'].create(technology_design)
 
-
+    def unified_procedure_multiple_work_orders(self, self_technology_designs, production_item):
-
-    def unified_procedure_multiple_work_orders(self,self_technology_designs,production_item):
         technology_designs = self.env['sf.technology.design'].sudo().search(
             [('production_id', '=', production_item.id), ('active', 'in', [True, False])])
-        self.sync_technology_designs(self_technology_designs=self_technology_designs,production_technology_designs=technology_designs)
+        self.sync_technology_designs(self_technology_designs=self_technology_designs,
+                                     production_technology_designs=technology_designs)

sf_manufacturing/models/stock.py

@@ -95,35 +95,36 @@ class StockRule(models.Model):
                                                                            precision_rounding=proc[
                                                                                0].product_uom.rounding) > 0)
         list2 = []
-        for item in procurements:
+        for procurement, rule in procurements:
-            num = int(item[0].product_qty)
+            num = int(procurement.product_qty)
 
-            product = self.env['product.product'].search(
+            warehouse_id = rule.warehouse_id
-                [("id", '=', item[0].product_id.id)])
+            if not warehouse_id:
-            product_tmpl = self.env['product.template'].search(
+                warehouse_id = rule.location_dest_id.warehouse_id
-                ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
+            manu_rule = rule.route_id.rule_ids.filtered(lambda r: r.action == 'manufacture' and r.warehouse_id == warehouse_id)
-            if product_tmpl:
+
+            if procurement.product_id.product_tmpl_id.single_manufacturing and manu_rule:
                 if num > 1:
                     for no in range(1, num + 1):
                         Procurement = namedtuple('Procurement', ['product_id', 'product_qty',
                                                                  'product_uom', 'location_id', 'name', 'origin',
                                                                  'company_id',
                                                                  'values'])
-                        s = Procurement(product_id=item[0].product_id, product_qty=1.0, product_uom=item[0].product_uom,
+                        s = Procurement(product_id=procurement.product_id, product_qty=1.0, product_uom=procurement.product_uom,
-                                        location_id=item[0].location_id,
+                                        location_id=procurement.location_id,
-                                        name=item[0].name,
+                                        name=procurement.name,
-                                        origin=item[0].origin,
+                                        origin=procurement.origin,
-                                        company_id=item[0].company_id,
+                                        company_id=procurement.company_id,
-                                        values=item[0].values,
+                                        values=procurement.values,
                                         )
-                        item1 = list(item)
+                        # item1 = list(item)
-                        item1[0] = s
+                        # item1[0] = s
 
-                        list2.append(tuple(item1))
+                        list2.append((s, rule))
                 else:
-                    list2.append(item)
+                    list2.append((procurement, rule))
             else:
-                list2.append(item)
+                list2.append((procurement, rule))
 
         for procurement, rule in list2:
             procure_method = rule.procure_method
@@ -162,215 +163,203 @@ class StockRule(models.Model):
             [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
         attachment_info.write({'name': name})
 
-    @api.model
+    # @api.model
-    def _run_manufacture(self, procurements):
+    # def _run_manufacture(self, procurements):
-        productions_values_by_company = defaultdict(list)
+    #     productions_values_by_company = defaultdict(list)
-        errors = []
+    #     errors = []
-        for procurement, rule in procurements:
+    #     for procurement, rule in procurements:
-            if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
+    #         if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
-                # If procurement contains negative quantity, don't create a MO that would be for a negative value.
+    #             # If procurement contains negative quantity, don't create a MO that would be for a negative value.
-                continue
+    #             continue
-            bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
+    #         bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
 
-            productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
+    #         productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
 
-        if errors:
+    #     if errors:
-            raise ProcurementException(errors)
+    #         raise ProcurementException(errors)
 
-        for company_id, productions_values in productions_values_by_company.items():
+    #     for company_id, productions_values in productions_values_by_company.items():
-            # create the MO as SUPERUSER because the current user may not have the rights to do it
+    #         # create the MO as SUPERUSER because the current user may not have the rights to do it
-            # (mto product launched by a sale for example)
+    #         # (mto product launched by a sale for example)
-            '''创建制造订单'''
+    #         '''创建制造订单'''
-            productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
+    #         productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
-                productions_values)
+    #             productions_values)
-            # 将这一批制造订单的采购组根据成品设置为不同的采购组
-            # product_group_id = {}
-            # for index, production in enumerate(productions):
-            #     if production.product_id.id not in product_group_id.keys():
-            #         product_group_id[production.product_id.id] = production.procurement_group_id.id
-            #     else:
-            #         productions_values[index].update({'name': production.name})
-            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
-            #         production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
 
-            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+    #         '''
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #         创建工单
+    #         '''
+    #         # productions._create_workorder()
+    #         #
+    #         # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #         productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+    #                                        (
+    #                                                p.move_dest_ids.procure_method != 'make_to_order' and not
+    #                                        p.move_raw_ids and not p.workorder_ids)).action_confirm()
+    #         # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
+    #         for production in productions:
+    #             if production.picking_ids:
+    #                 product_type_id = production.picking_ids[0].move_ids[0].product_id.categ_id
+    #                 if product_type_id.name == '坯料':
+    #                     location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+    #                     if not location_id:
+    #                         logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+    #                         break
+    #                     for picking_id in production.picking_ids:
+    #                         if picking_id.picking_type_id.name == '内部调拨':
+    #                             if picking_id.location_dest_id.product_type != product_type_id:
+    #                                 picking_id.location_dest_id = location_id.id
+    #                         elif picking_id.picking_type_id.name == '生产发料':
+    #                             if picking_id.location_id.product_type != product_type_id:
+    #                                 picking_id.location_id = location_id.id
 
-            '''
+    #         for production in productions:
-            创建工单
+    #             '''
-            '''
+    #             创建制造订单时生成序列号
-            # productions._create_workorder()
+    #             '''
-            #
+    #             # production.action_generate_serial()
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+    #             origin_production = production.move_dest_ids and production.move_dest_ids[
-            productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+    #                 0].raw_material_production_id or False
-                                           (
+    #             orderpoint = production.orderpoint_id
-                                                   p.move_dest_ids.procure_method != 'make_to_order' and not
+    #             if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
-                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
+    #                 production.message_post(
-            # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
+    #                     body=_('This production order has been created from Replenishment Report.'),
-            for production in productions:
+    #                     message_type='comment',
-                if production.picking_ids:
+    #                     subtype_xmlid='mail.mt_note')
-                    product_type_id = production.picking_ids[0].move_ids[0].product_id.categ_id
+    #             elif orderpoint:
-                    if product_type_id.name == '坯料':
+    #                 production.message_post_with_view(
-                        location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+    #                     'mail.message_origin_link',
-                        if not location_id:
+    #                     values={'self': production, 'origin': orderpoint},
-                            logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+    #                     subtype_id=self.env.ref('mail.mt_note').id)
-                            break
+    #             elif origin_production:
-                        for picking_id in production.picking_ids:
+    #                 production.message_post_with_view(
-                            if picking_id.picking_type_id.name == '内部调拨':
+    #                     'mail.message_origin_link',
-                                if picking_id.location_dest_id.product_type != product_type_id:
+    #                     values={'self': production, 'origin': origin_production},
-                                    picking_id.location_dest_id = location_id.id
+    #                     subtype_id=self.env.ref('mail.mt_note').id)
-                            elif picking_id.picking_type_id.name == '生产发料':
-                                if picking_id.location_id.product_type != product_type_id:
-                                    picking_id.location_id = location_id.id
 
-            for production in productions:
+    #             '''
-                '''
+    #             创建生产计划
-                创建制造订单时生成序列号
+    #             '''
-                '''
+    #             # 工单耗时
-                production.action_generate_serial()
+    #             # workorder_duration = 0
-                origin_production = production.move_dest_ids and production.move_dest_ids[
+    #             # for workorder in production.workorder_ids:
-                    0].raw_material_production_id or False
+    #             #     workorder_duration += workorder.duration_expected
-                orderpoint = production.orderpoint_id
-                if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
-                    production.message_post(
-                        body=_('This production order has been created from Replenishment Report.'),
-                        message_type='comment',
-                        subtype_xmlid='mail.mt_note')
-                elif orderpoint:
-                    production.message_post_with_view(
-                        'mail.message_origin_link',
-                        values={'self': production, 'origin': orderpoint},
-                        subtype_id=self.env.ref('mail.mt_note').id)
-                elif origin_production:
-                    production.message_post_with_view(
-                        'mail.message_origin_link',
-                        values={'self': production, 'origin': origin_production},
-                        subtype_id=self.env.ref('mail.mt_note').id)
 
-                '''
+    #             # sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
-                创建生产计划
+    #             # # 如果订单为空，则获取来源制造订单的销售单
-                '''
+    #             # if not sale_order:
-                # 工单耗时
+    #             #     mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
-                workorder_duration = 0
+    #             #                                                               limit=1)
-                for workorder in production.workorder_ids:
+    #             #     if mrp_production:
-                    workorder_duration += workorder.duration_expected
+    #             #         sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
-
+    #             # else:
-                sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+    #             #     mrp_production = production
-                # 如果订单为空，则获取来源制造订单的销售单
+    #             # # if sale_order:
-                if not sale_order:
+    #             # # sale_order.write({'schedule_status': 'to schedule'})
-                    mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
+    #             # self.env['sf.production.plan'].sudo().with_company(company_id).create({
-                                                                              limit=1)
+    #             #     'name': production.name,
-                    if mrp_production:
+    #             #     'order_deadline': sale_order.deadline_of_delivery,
-                        sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+    #             #     'production_id': production.id,
-                else:
+    #             #     'date_planned_start': production.date_planned_start,
-                    mrp_production = production
+    #             #     'origin': mrp_production.origin,
-                # if sale_order:
+    #             #     'product_qty': production.product_qty,
-                # sale_order.write({'schedule_status': 'to schedule'})
+    #             #     'product_id': production.product_id.id,
-                self.env['sf.production.plan'].sudo().with_company(company_id).create({
+    #             #     'state': 'draft',
-                    'name': production.name,
+    #             # })
-                    'order_deadline': sale_order.deadline_of_delivery,
+    #         all_production = productions
-                    'production_id': production.id,
+    #         grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
-                    'date_planned_start': production.date_planned_start,
+    #         # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-                    'origin': mrp_production.origin,
+    #         product_id_to_production_names = {}
-                    'product_qty': production.product_qty,
+    #         # 对于每个product_id，获取其所有生产订单的名称
-                    'product_id': production.product_id.id,
+    #         for product_id, all_production in grouped_product_ids.items():
-                    'state': 'draft',
+    #             # 为同一个product_id创建一个生产订单名称列表
-                })
+    #             product_id_to_production_names[product_id] = [production.name for production in all_production]
-            all_production = productions
+    #         for production_item in productions:
-            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
+    #             technology_design_values = []
-            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
+    #             # production_programming = self.env['mrp.production'].search(
-            product_id_to_production_names = {}
+    #             #     [('product_id.id', '=', production_item.product_id.id),
-            # 对于每个product_id，获取其所有生产订单的名称
+    #             #      ('origin', '=', production_item.origin)],
-            for product_id, all_production in grouped_product_ids.items():
+    #             #     limit=1, order='id asc')
-                # 为同一个product_id创建一个生产订单名称列表
+    #             # if production_item.product_id.id in product_id_to_production_names:
-                product_id_to_production_names[product_id] = [production.name for production in all_production]
+    #             #     # 同一个产品多个制造订单对应一个编程单和模型库
-            for production_item in productions:
+    #             #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                technology_design_values = []
+    #             #     if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
-                production_programming = self.env['mrp.production'].search(
+    #             #                                                                                   '人工线下加工']:
-                    [('product_id.id', '=', production_item.product_id.id),
+    #             #         if not production_programming.programming_no:
-                     ('origin', '=', production_item.origin)],
+    #             #             production_item.fetchCNC(
-                    limit=1, order='id asc')
+    #             #                 ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                if production_item.product_id.id in product_id_to_production_names:
+    #             #         else:
-                    # 同一个产品多个制造订单对应一个编程单和模型库
+    #             #             production_item.write({'programming_no': production_programming.programming_no,
-                    # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+    #             #                                    'programming_state': '编程中'})
-                    if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
+    #             i = 0
-                                                                                                  '人工线下加工']:
+    #             if production_item.product_id.categ_id.type == '成品':
-                        if not production_programming.programming_no:
+    #                 # 根据加工面板的面数及成品工序模板生成工序设计
-                            production_item.fetchCNC(
+    #                 if production_item.production_type == '自动化产线加工':
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+    #                     model = 'sf.product.model.type.routing.sort'
-                        else:
+    #                     domain = [
-                            production_item.write({'programming_no': production_programming.programming_no,
+    #                         ('product_model_type_id', '=', production_item.product_id.product_model_type_id.id)]
-                                                   'programming_state': '编程中'})
+    #                 else:
-                i = 0
+    #                     model = 'sf.manual.product.model.type.routing.sort'
-                if production_item.product_id.categ_id.type == '成品':
+    #                     domain = [('manual_product_model_type_id', '=',
-                    # 根据加工面板的面数及成品工序模板生成工序设计
+    #                                production_item.product_id.product_model_type_id.id)]
-                    if production_item.production_type == '自动化产线加工':
+    #                 product_routing_workcenter = self.env[model].search(domain, order='sequence asc')
-                        model = 'sf.product.model.type.routing.sort'
+    #                 if production_item.production_type == '自动化产线加工':
-                        domain = [
+    #                     for k in (production_item.product_id.model_processing_panel.split(',')):
-                            ('product_model_type_id', '=', production_item.product_id.product_model_type_id.id)]
+    #                         for route in product_routing_workcenter:
-                    else:
+    #                             i += 1
-                        model = 'sf.manual.product.model.type.routing.sort'
+    #                             technology_design_values.append(
-                        domain = [('manual_product_model_type_id', '=',
+    #                                 self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
-                                   production_item.product_id.product_model_type_id.id)]
+    #                 elif production_item.production_type == '人工线下加工':
-                    product_routing_workcenter = self.env[model].search(domain, order='sequence asc')
+    #                     for route in product_routing_workcenter:
-                    if production_item.production_type == '自动化产线加工':
+    #                         i += 1
-                        for k in (production_item.product_id.model_processing_panel.split(',')):
+    #                         technology_design_values.append(
-                            for route in product_routing_workcenter:
+    #                             self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False))
-                                i += 1
+    #                 else:
-                                technology_design_values.append(
+    #                     for route in product_routing_workcenter:
-                                    self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
+    #                         i += 1
-                    elif production_item.production_type == '人工线下加工':
+    #                         technology_design_values.append(
-                        for route in product_routing_workcenter:
+    #                             self.env['sf.technology.design'].json_technology_design_str(False, route, i, False))
-                            i += 1
+    #             elif production_item.product_id.categ_id.type == '坯料':
-                            technology_design_values.append(
+    #                 embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
-                                self.env['sf.technology.design'].json_technology_design_str('ZM', route, i, False))
+    #                     [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)],
-                    else:
+    #                     order='sequence asc'
-                        for route in product_routing_workcenter:
+    #                 )
-                            i += 1
+    #                 for route_embryo in embryo_routing_workcenter:
-                            technology_design_values.append(
+    #                     i += 1
-                                self.env['sf.technology.design'].json_technology_design_str(False, route, i, False))
+    #                     technology_design_values.append(
-                elif production_item.product_id.categ_id.type == '坯料':
+    #                         self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i,
-                    embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
+    #                                                                                     False))
-                        [('embryo_model_type_id', '=', production_item.product_id.embryo_model_type_id.id)],
+    #             surface_technics_arr = []
-                        order='sequence asc'
+    #             route_workcenter_arr = []
-                    )
+    #             for item in production_item.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
-                    for route_embryo in embryo_routing_workcenter:
+    #                 if item.route_workcenter_id.surface_technics_id.id:
-                        i += 1
+    #                     for process_param in production_item.product_id.model_process_parameters_ids:
-                        technology_design_values.append(
+    #                         if item.route_workcenter_id.surface_technics_id == process_param.process_id:
-                            self.env['sf.technology.design'].json_technology_design_str(False, route_embryo, i,
+    #                             surface_technics_arr.append(
-                                                                                        False))
+    #                                 item.route_workcenter_id.surface_technics_id.id)
-                surface_technics_arr = []
+    #                             route_workcenter_arr.append(item.route_workcenter_id.id)
-                route_workcenter_arr = []
+    #             if surface_technics_arr:
-                for item in production_item.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
+    #                 production_process = self.env['sf.production.process'].search(
-                    if item.route_workcenter_id.surface_technics_id.id:
+    #                     [('id', 'in', surface_technics_arr)],
-                        for process_param in production_item.product_id.model_process_parameters_ids:
+    #                     order='sequence asc'
-                            if item.route_workcenter_id.surface_technics_id == process_param.process_id:
+    #                 )
-                                surface_technics_arr.append(
+    #                 for p in production_process:
-                                    item.route_workcenter_id.surface_technics_id.id)
+    #                     logging.info('production_process:%s' % p.name)
-                                route_workcenter_arr.append(item.route_workcenter_id.id)
+    #                     process_parameters = production_item.product_id.model_process_parameters_ids.filtered(
-                if surface_technics_arr:
+    #                         lambda pm: pm.process_id.id == p.id)
-                    production_process = self.env['sf.production.process'].search(
+    #                     for process_parameter in process_parameters:
-                        [('id', 'in', surface_technics_arr)],
+    #                         i += 1
-                        order='sequence asc'
+    #                         route_production_process = self.env[
-                    )
+    #                             'mrp.routing.workcenter'].search(
-                    for p in production_process:
+    #                             [('surface_technics_id', '=', p.id),
-                        logging.info('production_process:%s' % p.name)
+    #                              ('id', 'in', route_workcenter_arr)])
-                        process_parameters = production_item.product_id.model_process_parameters_ids.filtered(
+    #                         technology_design_values.append(
-                            lambda pm: pm.process_id.id == p.id)
+    #                             self.env['sf.technology.design'].json_technology_design_str(False,
-                        for process_parameter in process_parameters:
+    #                                                                                         route_production_process,
-                            i += 1
+    #                                                                                         i,
-                            route_production_process = self.env[
+    #                                                                                         process_parameter))
-                                'mrp.routing.workcenter'].search(
+    #             production_item.technology_design_ids = technology_design_values
-                                [('surface_technics_id', '=', p.id),
+    #         productions.write({'state': 'technology_to_confirmed'})
-                                 ('id', 'in', route_workcenter_arr)])
+    #         return True
-                            technology_design_values.append(
-                                self.env['sf.technology.design'].json_technology_design_str(False,
-                                                                                            route_production_process,
-                                                                                            i,
-                                                                                            process_parameter))
-                production_item.technology_design_ids = technology_design_values
-            productions.write({'state': 'technology_to_confirmed'})
-            return True
 
 
 class ProductionLot(models.Model):
@@ -637,6 +626,8 @@ class StockPicking(models.Model):
                     if lot_ids:
                         move.action_clear_lines_show_details()
                         move.action_show_details()
+        # 先进行设置数量
+        self.action_set_quantities_to_reservation()
         res = super().button_validate()
         # lot_ids = None
         # product_ids = self.move_ids.mapped('product_id')
@@ -861,6 +852,8 @@ class ReStockMove(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = move.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:
@@ -893,6 +886,8 @@ class ReStockMove(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = production_id.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:
@@ -1210,6 +1205,20 @@ class ReStockMove(models.Model):
                 res['lot_id'] = self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids[0].lot_id.id
         return res
 
+    def _get_subcontract_bom(self):
+        self.ensure_one()
+        purchase_type = getattr(self.picking_id.purchase_id, 'purchase_type', False)
+        if purchase_type:
+            self = self.with_context(stock_picking=purchase_type)
+        bom = self.env['mrp.bom'].sudo()._bom_subcontract_find(
+            self.product_id,
+            picking_type=self.picking_type_id,
+            company_id=self.company_id.id,
+            bom_type='subcontract',
+            subcontractor=self.picking_id.partner_id
+        )
+        return bom
+
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_mrs_connect/controllers/controllers.py

@@ -42,6 +42,12 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 res = {'status': -2, 'message': '查询到待工艺确认的制造订单'}
                 return json.JSONEncoder().encode(res)
             if productions:
+                # 修改需求计划中的程序工时
+                demand_plan = request.env['sf.production.demand.plan'].with_user(
+                    request.env.ref("base.user_admin")).search([('model_id', '=', ret['folder_name'])])
+                if demand_plan and ret['total_estimated_time']:
+                    demand_plan.write(
+                        {'processing_time': ret['total_estimated_time']})
 
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
@@ -91,12 +97,15 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                         files_panel = os.listdir(program_path_tmp_panel)
                         panel_file_path = ''
+                        panel_file_name = ''
                         if files_panel:
                             for file in files_panel:
                                 file_extension = os.path.splitext(file)[1]
                                 if file_extension.lower() == '.pdf':
                                     panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                    panel_file_name = os.path.splitext(file)[0]
                                     logging.info('panel_file_path:%s' % panel_file_path)
+                                    logging.info('panel_file_name:%s' % panel_file_name)
                                     
                             # 向编程单中添加二维码
                             request.env['printing.utils'].add_qr_code_to_pdf(
@@ -105,7 +114,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 "模型ID：%s" % model_id,
                                 "零件图号：%s" % part_number if part_number else None
                             )
-                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read()),
+                                                 'cnc_worksheet_name': panel_file_name})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
                                                                                                 'cancel'] and ap.processing_panel == panel)

sf_mrs_connect/models/__init__.py

@@ -1,4 +1,5 @@
 from . import ftp_operate
 from . import res_config_setting
 from . import sync_common
-from . import order_price
+from . import order_price
+from . import mrp_production

sf_mrs_connect/models/mrp_production.py

@@ -0,0 +1,44 @@
+from itertools import groupby
+from odoo import models, api
+from odoo.tools.misc import OrderedSet
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+            生成编程单
+        """
+        productions = super().create(vals_list)
+        # 定义变量存储编程单
+        grouped_product_programming_no = {}
+        # 定义产品拼接成的制造订单名称
+        grouped_product_production_name = {}
+        # 查出所有的制造订单，为了适配通过补货生成的制造订单
+        all_productions = self.env['mrp.production'].search([('origin', '=', productions[0].origin)])
+        # 将不同产品的制造订单进行分组
+        grouped_product_productions = {k: list(g) for k, g in groupby(all_productions, key=lambda x: x.product_id.id)}
+
+        for product_id, grouped_productions in grouped_product_productions.items():
+            # 产品对应的编程单号
+            if product_id not in grouped_product_programming_no:
+                # 使用列表推导式获取非空的programming_no
+                programming_nos = [p.programming_no for p in grouped_productions if p.programming_no if p.programming_no is not False]
+                if programming_nos:
+                    grouped_product_programming_no[product_id] = programming_nos[0]
+            grouped_product_production_name[product_id] = ','.join(list(map(lambda p:p.name, grouped_productions)))
+        # 同一个产品的制造订单只请求一次CNC编程
+        for production in productions:
+            if not production.programming_no and production.production_type in ['自动化产线加工','人工线下加工']:
+                if production.product_id.id not in grouped_product_programming_no:
+                    production.fetchCNC(grouped_product_production_name[production.product_id.id])
+                    grouped_product_programming_no[production.product_id.id] = production.programming_no
+                else:
+                    production.write({
+                        'programming_no': grouped_product_programming_no[production.product_id.id],
+                        'programming_state': '编程中'
+                    })
+        return productions

sf_plan/models/__init__.py

@@ -3,3 +3,4 @@
 
 from . import custom_plan
 from . import change_manufactuing
+from . import mrp_production

sf_plan/models/mrp_production.py

@@ -0,0 +1,41 @@
+from odoo import models, api
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+            创建生产计划
+        """
+        productions = super().create(vals_list)
+
+        for production in productions:
+            # 工单耗时
+            workorder_duration = 0
+            for workorder in production.workorder_ids:
+                workorder_duration += workorder.duration_expected
+
+            sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+            # 如果订单为空，则获取来源制造订单的销售单
+            if not sale_order:
+                mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)],
+                                                                            limit=1)
+                if mrp_production:
+                    sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+            else:
+                mrp_production = production
+            # if sale_order:
+            # sale_order.write({'schedule_status': 'to schedule'})
+            self.env['sf.production.plan'].sudo().with_company(production.company_id).create({
+                'name': production.name,
+                'order_deadline': sale_order.deadline_of_delivery,
+                'production_id': production.id,
+                'date_planned_start': production.date_planned_start,
+                'origin': mrp_production.origin,
+                'product_qty': production.product_qty,
+                'product_id': production.product_id.id,
+                'state': 'draft',
+            })
+        return productions

sf_quality/data/insepection_report_template.xml

@@ -92,7 +92,7 @@
 
 
                     <div class="page" style="min-height: 800px; position: relative; padding-bottom: 250px;">
-                        
+
                         <table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
                             <tr>
                                 <td style="width: 15%; border: 1px solid black;"><strong>产品名称:</strong></td>
@@ -113,7 +113,7 @@
                                 <td style="border: 1px solid black;"><span t-field="o.check_qty"/></td>
                             </tr>
                         </table>
-                        
+
                         <h4 class="text-center mt-4">检验结果</h4>
                         <div class="" style="position: relative;">
                         <table class="table table-sm mt-2" style="border: 1px solid black;">
@@ -148,7 +148,7 @@
                                 </tr>
                             </tbody>
                         </table>
-                        <img src="/sf_quality/static/img/pass.png" style="width: 200px; height: 200px;position: absolute; bottom: 20px; right: 20%;"/>
+                        <img src="/sf_quality/static/img/pass.png" style="width: 100px; height: 100px; position: absolute; bottom: -100px; left: 90px;"/>
 
                         </div>
                         <div style="clear: both; margin-top: 30px; padding-top: 10px;">
@@ -182,7 +182,7 @@
                                 </span>
                             </div>
                         </div>
-                        
+
                         <div class="row mt-4">
                             <div class="col-6">
                                 <p><strong>操作员: </strong> <span t-field="o.measure_operator"/></p>
@@ -200,11 +200,11 @@
                                 <p></p>
                             </div>
                         </div> -->
-                        
                         <!-- 页脚固定在底部 -->
-                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
+
-                        <t t-call="sf_quality.report_quality_footer"/>
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-                    <!-- </div> -->
+                            <t t-call="sf_quality.report_quality_footer"/>
+                        <!-- </div> -->
                     </div>
                 </t>
             </t>
@@ -275,7 +275,7 @@
                                 </tr>
                             </tbody>
                         </table>
-                        <img src="/sf_quality/static/img/pass.png" style="width: 200px; height: 200px;position: absolute; bottom: 20px; right: 20%;"/>
+                        <img src="/sf_quality/static/img/pass.png" style="width: 100px; height: 100px; position: absolute; bottom: -100px; left: 90px;"/>
 
                         </div>
                         <div style="clear: both; margin-top: 30px; padding-top: 10px;">
@@ -329,9 +329,11 @@
                         </div> -->
 
                         <!-- 页脚固定在底部 -->
-                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
+<!--                        <t t-if="loop.index == len(docs) - 1">-->
-                        <t t-call="sf_quality.html_report_quality_footer"/>
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-                    <!-- </div> -->
+                            <t t-call="sf_quality.html_report_quality_footer"/>
+                        <!-- </div> -->
+<!--                        </t>-->
                     </div>
                 </t>
             </t>

sf_quality/models/stock.py

@@ -1,11 +1,41 @@
+import logging
+
 from odoo import api, models
+from odoo.exceptions import ValidationError, UserError
 
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
+    def _compute_check(self):
+        super()._compute_check()
+        for picking in self:
+            picking_to_quality = picking.get_picking_to_quality()
+            if not picking_to_quality:
+                picking.quality_check_todo = False
+                break
+            else:
+                need_quality_line = picking.get_need_quality_line(picking_to_quality)
+                if not need_quality_line or all(not line.get('need_done_check_ids') for line in need_quality_line):
+                    picking.quality_check_todo = False
+
+    def check_quality(self):
+        self.ensure_one()
+        # checkable_products = self.mapped('move_line_ids').mapped('product_id')
+        # checks = self.check_ids.filtered(lambda check: check.quality_state == 'none' and (
+        #         check.product_id in checkable_products or check.measure_on == 'operation'))
+        checks = self.env['quality.check']
+        picking_to_quality = self._get_picking_to_quality()
+        need_quality_line = self.get_need_quality_line(picking_to_quality)
+        if need_quality_line and any(line.get('need_done_check_ids') for line in need_quality_line):
+            for item in need_quality_line:
+                checks += item.get('need_done_check_ids')
+        if checks:
+            return checks.action_open_quality_check_wizard()
+        return False
+
     def button_validate(self):
-        """
+        """=
             出厂检验报告上传
         """
 
@@ -17,43 +47,133 @@ class StockPicking(models.Model):
                 if not out_quality_check.is_factory_report_uploaded:
                     if out_quality_check and self.state == 'assigned':
                         out_quality_check.upload_factory_report()
+        quality_action = self.pinking_checkout_quality()
+        if quality_action:
+            return quality_action
+        res = super(StockPicking, self).button_validate()
+        return res
 
+    def pinking_checkout_quality(self):
         """
             调拨单若关联了质量检查单，验证调拨单时，应校验是否有不合格品，若存在，应弹窗提示：
             “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
         """
-        context = self.env.context
+        try:
-        if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
+            self.ensure_one()
-            # 回滚事务，为二次确认/取消做准备
+            context = self.env.context
-            self.env.cr.rollback()
+            if not context.get('pinking_checkout_quality'):
-            quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
+                picking_to_quality = self._get_picking_to_quality()
-            product_list = list(set([quality_check_id.product_id for quality_check_id in quality_check_ids]))
+                if not picking_to_quality: return False
-            fail_check_text = ''
+                need_quality_val = self.get_need_quality_line(picking_to_quality)
-            for product_id in product_list:
+                if any(line.get('fail_check_ids') for line in need_quality_val):
-                check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id)
+                    # 回滚事务，为二次确认/取消做准备
-                if all(check_id.measure_on == 'move_line' for check_id in check_ids):
+                    self.env.cr.rollback()
-                    number = sum(check_ids.mapped('qty_line'))
+                    # 获取存在失败的 质检单 调拨单明细行
-                else:
+                    check_list = [item for item in need_quality_val if item.get('fail_check_ids')]
-                    number = sum(self.move_ids_without_package.filtered(
+                    fail_check_text = ''
-                        lambda ml: ml.product_id == product_id).mapped('quantity_done'))
+                    for item in check_list:
-                    if number == 0:
+                        move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty')
-                        number = sum(self.move_ids_without_package.filtered(
+                        fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name}  {pre_done_qty}件'
-                            lambda ml: ml.product_id == product_id).mapped('reserved_availability'))
+                                           if fail_check_text != '' else f'{move_id.product_id.display_name}  {pre_done_qty}件')
-                        if number == 0:
+                    return {
-                            number = sum(self.move_ids_without_package.filtered(
+                        'type': 'ir.actions.act_window',
-                                lambda ml: ml.product_id == product_id).mapped('product_uom_qty'))
+                        'res_model': 'picking.validate.check.wizard',
-                fail_check_text = (f'{fail_check_text}、{product_id.display_name}  {number}件'
+                        'name': '质检不合格提示',
-                                   if fail_check_text != '' else f'{product_id.display_name}  {number}件')
+                        'view_mode': 'form',
-            return {
+                        'target': 'new',
-                'type': 'ir.actions.act_window',
+                        'context': {
-                'res_model': 'picking.validate.check.wizard',
+                            'default_picking_id': self.id,
-                'name': '质检不合格提示',
+                            'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
-                'view_mode': 'form',
+                            'pinking_checkout_quality': True}
-                'target': 'new',
+                    }
-                'context': {
+            else:
-                    'default_picking_id': self.id,
+                return False
-                    'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
+        except Exception as e:
-                    'again_validate': True}
+            logging.info('pinking_checkout_quality()方法报错：%s' % e)
-            }
+            raise ValidationError('调拨单验证质检单是否合格时报错,请联系管理员处理！！')
-        res = super(StockPicking, self).button_validate()
+
+    def get_need_quality_line(self, picking_to_quality):
+        """
+            # 对需要进行质检，还没有质检完成的明细行进行统计
+            # 1、当【质量标准_控制方式】=“产品、作业”，仅校验“预完成数量”>0的产品行对应的质检单必须处理。
+              2、当【质量标准_控制方式】=“数量”时，仅校验“预完成数量”>0的产品行对应的质检单必须处理：
+                1）每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+                2）每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证；
+        """
+        res = []
+        for item in picking_to_quality:
+            need_done_check_ids = self.env['quality.check']
+            fail_check_ids = self.env['quality.check']
+            move_id, pre_done_qty, check_ids = item.values()
+            check_ids_1 = check_ids.filtered(lambda qc: qc.measure_on in ('operation', 'product'))
+            if check_ids_1:
+                check_ids_1_done = check_ids_1.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+                check_ids_1_fail = check_ids_1.filtered(lambda qc: qc.quality_state == 'fail')
+                check_ids_1_none = check_ids_1.filtered(lambda qc: qc.quality_state == 'none')
+                if check_ids_1 and not check_ids_1_done:
+                    need_done_check_ids += check_ids_1_none
+                if check_ids_1_fail:
+                    fail_check_ids += check_ids_1_fail
+
+            check_ids_2 = check_ids.filtered(lambda qc: qc.measure_on == 'move_line')
+            if check_ids_2:
+                check_ids_2_done = check_ids_2.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+                check_ids_2_fail = check_ids_2.filtered(lambda qc: qc.quality_state == 'fail')
+                check_ids_2_none = check_ids_2.filtered(lambda qc: qc.quality_state == 'none')
+                # 每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+                if len(check_ids_2) >= move_id.product_uom_qty and len(check_ids_2_done) < pre_done_qty:
+                    need_done_check_ids += check_ids_2_none
+                # 每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证
+                elif len(check_ids_2) < move_id.product_uom_qty and len(check_ids_2_done) == 0:
+                    need_done_check_ids += check_ids_2_none
+                if check_ids_2_fail:
+                    fail_check_ids += check_ids_2_fail
+
+            if need_done_check_ids or fail_check_ids:
+                res.append({'move_id': move_id,
+                            'pre_done_qty': pre_done_qty,
+                            'check_ids': check_ids,
+                            'fail_check_ids': fail_check_ids,
+                            'need_done_check_ids': need_done_check_ids})
         return res
+
+    def get_picking_to_quality(self):
+        self.ensure_one()
+        return self._get_picking_to_quality()
+
+    def _get_picking_to_quality(self):
+        """
+            对需要质检的明细行进行统计(针对“预完成数量”>0的行)
+        """
+        quality_piking_line_list = []
+        pre_done_qty_lines = self._get_pinking_pre_done_qty()
+        for line in pre_done_qty_lines:
+            move_id, pre_done_qty = line.values()
+            if pre_done_qty == 0:
+                continue
+            product_id = move_id.product_id
+            check_ids = self.check_ids.filtered(lambda c: c.product_id == product_id)
+            quality_piking_line_list.append({'move_id': move_id, 'pre_done_qty': pre_done_qty, 'check_ids': check_ids})
+        return quality_piking_line_list
+
+    def _get_pinking_pre_done_qty(self):
+        """
+            return: 明细行 及 预完成数量
+            1、若调拨单所有明细行的【完成】=0，且任意行的【预留】<【需求】，则验证时将会话是否需创建欠单。
+                ---->此时“预完成数量”=【预留】
+            2、若调拨单任意行的0<【完成】<【需求】，且则验证时将会话是否需创建欠单
+                ---->此时“预完成数量”=【完成】
+        """
+        # if all(move_id.quantity_done == 0 for move_id in self.move_ids_without_package):
+        #     pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.reserved_availability} for move_id in
+        #                     self.move_ids_without_package]
+        # else:
+        #     pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.quantity_done} for move_id in
+        #                     self.move_ids_without_package]
+        pre_done_qty = []
+        for move_id in self.move_ids_without_package:
+            if move_id.quantity_done > 0:
+                pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.quantity_done})
+            else:
+                pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.reserved_availability})
+        return pre_done_qty

sf_quality/views/quality_check_view.xml

@@ -66,7 +66,7 @@
                 <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="attrs">{'invisible': ['|','|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework')),'&amp;',('quality_state', '=', 'pass'), ('test_type', '=', 'factory_inspection')]}</attribute>
                 <attribute name="string">不合格</attribute>
             </xpath>
 

sf_sale/models/quick_easy_order.py

@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError

sf_sale/models/quick_easy_order_old.py

@@ -5,8 +5,8 @@ import requests
 import os
 from datetime import datetime
 # from OCC.Core.GProp import GProp_GProps
-from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path

sf_sale/models/sale_order.py

@@ -63,6 +63,7 @@ class ReSaleOrder(models.Model):
 
     model_display_version = fields.Char('模型展示版本', default="v1")
 
+    customer_name = fields.Char('终端客户')
     contract_code = fields.Char('合同编号')
     contract_date = fields.Date('合同日期')
     contract_document_id = fields.Many2one('documents.document', string='合同文件')
@@ -157,7 +158,7 @@ class ReSaleOrder(models.Model):
             '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'],
+            'delivery_end_date': item['delivery_end_date']
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -291,8 +292,7 @@ class ResaleOrderLine(models.Model):
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')
     model_id = fields.Char('模型ID')
-
+    delivery_end_date = fields.Date('客户交期')
-    delivery_end_date = fields.Date('交货截止日期')
 
     @api.depends('embryo_redundancy_id')
     def _compute_is_incoming_material(self):

sf_sale/views/sale_order_view.xml

@@ -90,6 +90,9 @@
                 <field name="partner_id" position="replace">
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_customer': True }"
                            options='{"always_reload": True,"no_create": True}'/>
+                    <field name="customer_name" readonly="1"/>
+                    <field name="contract_code" readonly="1"/>
+                    <field name="contract_date" readonly="1"/>
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -138,7 +141,7 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='remark']" position="before">
-                    <field name="delivery_end_date" optional="hide"/>
+                    <field name="delivery_end_date" optional="show"/>
                 </xpath>
                 
                 <field name="user_id" position="attributes">

sf_tool_management/models/base.py

@@ -818,6 +818,7 @@ class FunctionalToolAssembly(models.Model):
 
     def _get_old_tool_material_lot(self, material_ids):
         """ 根据先进先出原则选择物料批次 """
+        material_ids = material_ids.filtered(lambda m: m.tracking != 'none')
         location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
         stock_quant = self.env['stock.quant'].sudo().search(
             [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],
@@ -833,8 +834,8 @@ class FunctionalToolAssembly(models.Model):
             location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
             if location_lots:
                 return location_lots[0]
-        raise ValidationError(f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位库存不足，请先进行盘点入库')
+        raise ValidationError(
-
+            f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位库存不足，请先进行盘点入库')
 
     def _get_inventory_bom(self, inventory_id):
         """获取BOM的刀具物料产品信息"""
@@ -894,25 +895,25 @@ class FunctionalToolAssembly(models.Model):
             tool_material_ids = self._get_all_material_location_lot(tool_data.get('pad_ids'))
             tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_4')
 
+        action = {
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "domain": [('cutting_tool_type', '=', tool_type)],
+            "context": {'tool_id': self.id, 'search_default_bom_ids': 1, 'tool_material_ids': tool_material_ids.ids}
+        }
         if tool_type == '刀柄':
-            return {
+            action.update({
-                "type": "ir.actions.act_window",
                 "res_model": "product.product",
                 "views": [[tool_material_tree_id.id, "tree"],
-                          [self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]],
+                          [self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]]
-                "target": "new",
+            })
-                "domain": [('id', 'in', tool_material_ids.ids)],
-                "context": {'tool_id': self.id}
-            }
         elif tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
-            return {
+            action.update({
-                "type": "ir.actions.act_window",
                 "res_model": "sf.shelf.location.lot",
-                "views": [[tool_material_tree_id.id, "tree"]],
+                "views": [[tool_material_tree_id.id, "tree"],
-                "target": "new",
+                          [self.env.ref('sf_tool_management.view_shelf_location_lot_search').id, 'search']]
-                "domain": [('id', 'in', tool_material_ids.ids)],
+            })
-                "context": {'tool_id': self.id}
+        return action
-            }
 
     def _get_all_material_location_lot(self, material_ids):
         """ 获取所有满足条件 """

sf_tool_management/models/stock.py

@@ -256,6 +256,22 @@ class ProductProduct(models.Model):
         })
         return stock_lot
 
+    def search(self, domain, offset=0, limit=None, order=None, count=False):
+        context = self.env.context
+        tool_material_ids = context.get('tool_material_ids')
+        if tool_material_ids:
+            if context.get('default_tool_bom_id'):
+                domain += [('id', 'in', tool_material_ids)]
+                return super(ProductProduct, self).search(domain, offset=0, limit=None, order=None, count=False)
+            else:
+                domain_1 = domain + [('id', 'in', tool_material_ids)]
+                domain_2 = domain + [('id', 'not in', tool_material_ids)]
+                res_1 = super(ProductProduct, self).search(domain_1, offset=0, limit=None, order=None, count=False)
+                res_2 = super(ProductProduct, self).search(domain_2, offset=0, limit=None, order=None, count=False)
+            return res_1 + res_2
+        else:
+            return super(ProductProduct, self).search(domain, offset=0, limit=None, order=None, count=False)
+
     def get_stock_lot_name(self, obj):
         """
             生成功能刀具序列号
@@ -317,6 +333,22 @@ class SfShelfLocationLot(models.Model):
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image', '适配刀片形状',
                                          related='product_id.fit_blade_shape_id')
 
+    def search(self, domain, offset=0, limit=None, order=None, count=False):
+        context = self.env.context
+        tool_material_ids = context.get('tool_material_ids')
+        if tool_material_ids:
+            if context.get('default_tool_bom_id'):
+                domain += [('id', 'in', tool_material_ids)]
+                return super(SfShelfLocationLot, self).search(domain, offset=0, limit=None, order=None, count=False)
+            else:
+                domain_1 = domain + [('id', 'in', tool_material_ids)]
+                domain_2 = domain + [('id', 'not in', tool_material_ids)]
+                res_1 = super(SfShelfLocationLot, self).search(domain_1, offset=0, limit=None, order=None, count=False)
+                res_2 = super(SfShelfLocationLot, self).search(domain_2, offset=0, limit=None, order=None, count=False)
+            return res_1 + res_2
+        else:
+            return super(SfShelfLocationLot, self).search(domain, offset=0, limit=None, order=None, count=False)
+
     @api.depends('lot_id')
     def _compute_product_id(self):
         for item in self:

sf_tool_management/views/functional_tool_views.xml

@@ -187,6 +187,7 @@
                                         <field name="current_location" string="当前位置"/>
                                         <field name="current_shelf_location_id" string="当前货位"
                                                attrs="{'invisible': [('current_shelf_location_id', '=', False)]}"/>
+                                        <field name="create_date" string="装刀时间"/>
                                     </group>
                                 </group>
                             </page>

sf_tool_management/views/stock.xml

@@ -33,10 +33,15 @@
     </record>
 
     <record id="view_tool_product_search" model="ir.ui.view">
+        <field name="name">刀柄产品搜索视图</field>
         <field name="model">product.product</field>
+        <field name="priority" eval="10"/>
         <field name="arch" type="xml">
             <search>
                 <field name="name"/>
+                <field name="specification_id"/>
+                <field name="brand_id"/>
+                <filter string="bom物料" name="bom_ids"  domain="[]" context="{'default_tool_bom_id': 1}"/>
             </search>
         </field>
     </record>
@@ -141,4 +146,17 @@
             </tree>
         </field>
     </record>
+
+    <record id="view_shelf_location_lot_search" model="ir.ui.view">
+        <field name="name">sf.shelf.location.lot.search</field>
+        <field name="model">sf.shelf.location.lot</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="product_id"/>
+                <field name="specification_id"/>
+                <field name="brand_id"/>
+                <filter string="bom物料" name="bom_ids"  domain="[]" context="{'default_tool_bom_id': 1}"/>
+            </search>
+        </field>
+    </record>
 </odoo>

sf_warehouse/__manifest__.py

@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': '机企猫智能工厂 库存管理',
-    'version': '1.0',
+    'version': '1.2',
     'summary': '智能工厂库存管理',
     'sequence': 1,
     'description': """
@@ -23,17 +23,16 @@
     'demo': [
     ],
     'assets': {
-
         'web.assets_qweb': [
         ],
-
         'web.assets_backend': [
             # 'sf_warehouse/static/src/js/vanilla-masker.min.js',
             'sf_warehouse/static/src/css/kanban_color_change.scss',
             'sf_warehouse/static/src/js/custom_kanban_controller.js',
             'sf_warehouse/static/src/xml/custom_kanban_controller.xml',
+            'sf_warehouse/static/src/css/kanban_location_custom.scss',
+            'sf_warehouse/static/src/js/shelf_location_search.js',
         ]
-
     },
     'license': 'LGPL-3',
     'installable': True,

sf_warehouse/migrations/1.2/post-migrate.py

@@ -0,0 +1,27 @@
+import logging
+from odoo import api, SUPERUSER_ID
+
+_logger = logging.getLogger(__name__)
+
+def migrate(cr, version):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    sf_shelf_model = env["sf.shelf"]
+    sf_shelf_location_model = env["sf.shelf.location"]
+    
+    preproduction_shelf_ids = sf_shelf_location_model.get_preproduction_shelf_ids()
+    
+    shelves = sf_shelf_model.search([])
+    for shelf in shelves:
+        if shelf.id not in preproduction_shelf_ids:
+            continue
+            
+        shelf_barcode = shelf.barcode or ""
+        if not shelf_barcode:
+            continue
+        # locations = sf_shelf_location_model.search([("shelf_id", "=", shelf.id)], order="id asc")
+        locations = shelf.location_ids.sorted('id')
+        for index, location in enumerate(locations, start=1):
+            new_barcode = f"{shelf_barcode}-{index:03d}"
+            location.barcode = new_barcode
+        cr.commit()
+        _logger.info('货架【%s】的%d个货位被更新' % (shelf.name, len(locations)))

sf_warehouse/static/src/css/kanban_location_custom.scss

@@ -0,0 +1,198 @@
+// 定义看板公共样式的Mixin
+@mixin kanban-common-styles($record-count-each-row, $record-gap: 16px) {
+    $record-gap-total-width: $record-gap * ($record-count-each-row - 1);
+    
+    display: flex !important;
+    flex-wrap: wrap !important;
+    overflow-x: hidden !important;
+    overflow-y: auto !important;
+    padding: 0 !important;
+    gap: $record-gap !important;
+    width: 100% !important;
+    height: 100% !important;
+  
+    // === 卡片基础样式（完全保留）===
+    .o_kanban_record {
+      flex: 0 0 calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+      height: calc((100% - #{$record-gap * 6}) / 6) !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      background-color: white !important;
+      border: 1px solid #dee2e6 !important;
+      border-radius: 4px !important;
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
+      min-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+      max-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+      position: relative;
+      transition: all 0.25s ease !important;
+      overflow: visible !important; // 允许悬停条溢出卡片边界
+  
+      // === 状态标签（保留原设计）===
+      .status-label {
+        position: absolute;
+        top: 8px;
+        right: 8px;
+        padding: 3px 8px;
+        background: rgba(255, 255, 255, 0.9);
+        border: 1px solid #e0e0e0;
+        border-radius: 3px;
+        font-size: 11px;
+        color: #424242;
+        z-index: 2;
+      }
+  
+      // === 优化：悬停信息条（核心改动）===
+      .status-hover-bar {
+        position: absolute;
+        bottom: calc(100% + 8px); // 默认显示在卡片上方
+        left: 0;
+        z-index: 1000;
+        min-width: max-content;    // 宽度自适应内容
+        max-width: 300px;          // 防止过宽
+        padding: 10px 12px;
+        background: rgba(255, 255, 255, 0.95);
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+        font-size: 12px;
+        color: #424242;
+        white-space: nowrap;       // 强制单行显示
+        opacity: 0;
+        pointer-events: none;      // 避免阻挡卡片交互
+        transition: opacity 0.2s ease, transform 0.2s ease;
+        transform: translateY(10px);
+        
+        // 三角形指示器
+        &::after {
+          content: '';
+          position: absolute;
+          top: 100%;
+          left: 15px;
+          border: 6px solid transparent;
+          border-top-color: rgba(0, 0, 0, 0.85);
+        }
+  
+        div {
+          margin-bottom: 4px;
+          line-height: 1.4;
+        }
+      }
+  
+      // === 悬停触发逻辑 ===
+      &:hover {
+        transform: translateY(-4px) !important;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
+        z-index: 10;
+  
+        .status-hover-bar {
+        background: rgba(50, 50, 50, 0.9);
+        color: #fff !important;
+        font-size: 12px;
+          opacity: 0.9;
+          transform: translateY(0);
+          pointer-events: auto; // 悬停时允许交互
+        }
+      }
+  
+      // === 边界保护（智能定位）===
+      // 左侧卡片：左对齐
+      &:nth-child(#{$record-count-each-row}n+1) .status-hover-bar {
+        left: 0;
+        right: auto;
+        &::after { left: 15px; }
+      }
+  
+      // 右侧卡片：右对齐
+      &:nth-child(#{$record-count-each-row}n) .status-hover-bar {
+        left: auto;
+        right: 0;
+        &::after {
+          left: auto;
+          right: 15px;
+        }
+      }
+      &:nth-child(#{$record-count-each-row}n + #{$record-count-each-row - 1}) .status-hover-bar {
+        left: auto;
+        right: 0;
+        &::after {
+          left: auto;
+          right: 15px;
+        }
+      }
+      // 顶部卡片：悬停条显示在下方
+      &:nth-child(-n+#{$record-count-each-row}) .status-hover-bar {
+        bottom: auto;
+        top: calc(100% + 8px);
+        &::after {
+          top: auto;
+          bottom: 100%;
+          border-top-color: transparent;
+          border-bottom-color: rgba(255, 255, 255, 0.95);
+        }
+      }
+  
+      // === 禁用状态样式（保留原效果）===
+      &.kanban_color_3 {
+        opacity: 0.6;
+        &:hover {
+          opacity: 0.85;
+          .status-hover-bar {
+            background:rgba(0, 0, 0, 0.85);
+            color: white !important;
+            border: 1px solid rgba(255, 255, 255, 0.15) !important; 
+          }
+        }
+      }
+    }
+  }
+  
+  // === 看板视图样式（完全保留）===
+  .o_kanban_view {
+    // 卡片内部结构（不修改）
+    .o_kanban_record {
+      .o_kanban_record_bottom {
+        margin: 0;
+      }
+      .oe_kanban_card.kanban_color_3,
+      .oe_kanban_card.kanban_color_1,
+      .oe_kanban_card.kanban_color_2 {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        .sf_kanban_custom_location_info_style {
+          display: flex !important;
+          justify-content: center !important;
+          align-items: center !important;
+          width: 100%;
+          font-size: 15px;
+          color: #000000;
+          padding:0px;
+        }
+  
+        .sf_kanban_no {
+          display: flex !important;
+          justify-content: center !important;
+          align-items: center !important;
+          font-size: 18px;
+          color: #000000;
+        }
+      }
+    }
+  
+    // 不同列数的看板样式
+    .sf_kanban_location_style12 {
+      @include kanban-common-styles(12);
+    }
+    .sf_kanban_location_style19 {
+      @include kanban-common-styles(19);
+    }
+    .sf_kanban_location_style4 {
+      @include kanban-common-styles(4);
+    }
+    .sf_kanban_location_style3 {
+      @include kanban-common-styles(3);
+    }
+  }

sf_warehouse/static/src/js/custom_kanban_controller.js

@@ -1,21 +1,197 @@
-/** @odoo-module */
+/** @odoo-module */
-
+
-import {KanbanController} from "@web/views/kanban/kanban_controller";
+import { KanbanController } from "@web/views/kanban/kanban_controller";
-import {kanbanView} from "@web/views/kanban/kanban_view";
+import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
-import {registry} from "@web/core/registry";
+import { kanbanView } from "@web/views/kanban/kanban_view";
-
+import { registry } from "@web/core/registry";
-// the controller usually contains the Layout and the renderer.
+import { useService } from "@web/core/utils/hooks";
-class CustomKanbanController extends KanbanController {
+import { useState, onWillStart, onWillUnmount, onMounted } from "@odoo/owl";
-    // Your logic here, override or insert new methods...
+
-    // if you override setup(), don't forget to call super.setup()
+
-}
+// 自定义看板渲染器
-
+class CustomKanbanRenderer extends KanbanRenderer {
-CustomKanbanController.template = "sf_warehouse.CustomKanbanView";
+
-
+}
-export const customKanbanView = {
+
-    ...kanbanView, // contains the default Renderer/Controller/Model
+// 自定义看板控制器
-    Controller: CustomKanbanController,
+class CustomKanbanController extends KanbanController {
-};
+    setup() {
-
+        super.setup();
-// Register it to the views registry
+        this.orm = useService("orm");
-registry.category("views").add("custom_kanban", customKanbanView);
+        this.searchModel = this.model.env.searchModel;
+        this.defaultPagerLimit = this.getSystemDefaultLimit();
+        this._onUpdate = (payload) => {
+            this._handleSearchUpdate(payload);
+        };
+
+        this.env.services.user.updateContext({
+            isBaseStyle: true
+        });
+        let self = this;
+        
+        onWillStart(async () => {
+            try {
+                this.preproductionShelfIds = await this.orm.call(
+                    'sf.shelf.location',
+                    'get_preproduction_shelf_ids',
+                    []
+                );
+            } catch (error) {
+                this.preproductionShelfIds = [];
+            }
+            
+            this.searchModel.on('update', self, self._onUpdate);
+            await this.loadShelfLayersData();
+        });
+
+        // 组件销毁时移除监听
+        onWillUnmount(() => {
+            this.searchModel.off('update', self, self._onUpdate);
+        });
+
+        // 监听视图切换事件以监控面包屑
+        onMounted(() => {
+            this.handleRouteChange()
+        });
+    }
+
+    handleRouteChange() {
+        this.render(true);
+        let domain = this.searchModel.domain;
+        if (domain.length > 0) {
+            let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+            if (shelfDomain && shelfDomain[2] && this.preproductionShelfIds && this.preproductionShelfIds.includes(shelfDomain[2])) {
+                this.onShelfChange(shelfDomain[2]);
+            } else {
+                this.setKanbanStyle('sf_kanban_location_style');
+            }
+        } else {
+            this.setKanbanStyle('sf_kanban_location_style');
+        }
+    }
+
+    _handleSearchUpdate() {
+        try {
+            let domain = this.searchModel.domain;
+            if (domain.length > 0) {
+                let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+                if (shelfDomain) {
+                    let shelfId = shelfDomain[2];
+                    if (shelfId && this.preproductionShelfIds.includes(shelfId)) {
+                        this.onShelfChange(shelfId);
+                        return;
+                    }
+                }
+            }
+            //设置默认样式
+            this.updatePagerLimit(this.defaultPagerLimit);
+            this.setKanbanStyle('sf_kanban_location_style');
+        } catch (error) {
+        }
+    }
+
+    // 加载所有货架的层数数据
+    async loadShelfLayersData() {
+        this.shelfLayersMap = {};
+        const shelfIds = await this.orm.search('sf.shelf', []);
+        const shelves = await this.orm.read('sf.shelf', shelfIds, ['id', 'layer_capacity']);
+
+        shelves.forEach(shelf => {
+            this.shelfLayersMap[shelf.id] = shelf.layer_capacity;
+        });
+    }
+
+    setKanbanStyle(style) {
+        this.env.services.user.updateContext({
+            isBaseStyle: style === 'sf_kanban_location_style'
+        });
+        const kanbanViewEl = document.querySelector('.o_kanban_renderer');
+        if (kanbanViewEl) {
+            let isHave = false;
+            // 移除所有现有的 sf_kanban_* 类
+            Array.from(kanbanViewEl.classList).forEach(cls => {
+                if (cls.startsWith('sf_kanban_location_style')) {
+                    kanbanViewEl.classList.remove(cls);
+                    isHave = true;
+                }
+            });
+
+            // 添加新类
+            if (isHave) kanbanViewEl.classList.add(style);
+        }
+        
+        // 获取当前的搜索域
+        let domain = this.searchModel.domain;
+        let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+        
+        // 只有当shelf_id在preproductionShelfIds中时才删除幽灵看板
+        if (shelfDomain && this.preproductionShelfIds && this.preproductionShelfIds.includes(shelfDomain[2])) {
+            const ghostCards = document.querySelectorAll('.o_kanban_ghost');
+            ghostCards.forEach(card => {
+                card.remove();
+            });
+        }
+    }
+
+    updatePagerLimit(limit) {
+        if (this.model.root.limit !== limit) {
+            this.model.root.limit = limit;
+            this.render(true);
+        }
+    }
+
+    // 处理货架变更事件
+    async onShelfChange(shelfId) {
+        let style = 'sf_kanban_location_style';
+        let isBaseStyle = true;
+        if (shelfId) {
+            // 如果没有缓存，从服务器加载数据
+            if (!(shelfId in this.shelfLayersMap)) {
+                const [shelf] = await this.orm.read('sf.shelf', [shelfId], ['layer_capacity']);
+                this.shelfLayersMap[shelfId] = shelf.layer_capacity;
+            }
+
+            // 获取该货架的层数
+            const layerCapacity = this.shelfLayersMap[shelfId];
+            // 根据层数设置不同的样式
+            if (layerCapacity >= 1) {
+                style = `sf_kanban_location_style${layerCapacity}`;
+                isBaseStyle = false;
+            }
+        }
+        if (isBaseStyle) {
+            this.updatePagerLimit(this.defaultPagerLimit);
+        }
+        else {
+            this.updatePagerLimit(500);
+        }
+        this.setKanbanStyle(style);
+    }
+
+    /**
+     * 获取系统默认分页记录数
+     */
+    getSystemDefaultLimit() {
+        // 方法1：从用户服务获取默认值
+        const userService = this.env.services.user;
+
+        // 获取用户配置的默认分页大小
+        if (userService && userService.user_context && userService.user_context.limit) {
+            return userService.user_context.limit;
+        }
+
+        // 方法3：使用Odoo核心默认值（通常为80）
+        return 80;
+    }
+}
+
+// 设置自定义模板
+CustomKanbanController.template = "sf_warehouse.CustomKanbanView";
+
+export const customKanbanView = {
+    ...kanbanView,
+    Controller: CustomKanbanController,
+    Renderer: CustomKanbanRenderer,
+};
+
+registry.category("views").add("custom_kanban", customKanbanView);

sf_warehouse/views/shelf_location.xml

@@ -1,330 +1,344 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo>
-    <data>
+    <data>
-        <!--         货架视图 -->
+        <!--         货架视图 -->
-        <record id="view_sf_shelf" model="ir.ui.view">
+        <record id="view_sf_shelf" model="ir.ui.view">
-            <field name="name">Sf Shelf</field>
+            <field name="name">Sf Shelf</field>
-            <field name="model">sf.shelf</field>
+            <field name="model">sf.shelf</field>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">
-                <form string="Sf Shelf">
+                <form string="Sf Shelf">
-                    <header>
+                    <header>
-                        <field name="is_there_area" invisible="1"/>
+                        <field name="is_there_area" invisible="1"/>
-                        <button string="生成货位" name="create_location" type="object" class="oe_highlight"
+                        <button string="生成货位" name="create_location" type="object" class="oe_highlight"
-                                attrs="{'invisible': [('is_there_area', '=', True)]}"/>
+                                attrs="{'invisible': [('is_there_area', '=', True)]}"/>
-                    </header>
+                    </header>
-                    <sheet>
+                    <sheet>
-                        <group>
+                        <group>
-                            <field name="barcode" string="货架编码"/>
+                            <field name="barcode" string="货架编码"/>
-                            <field name="name" string="货架名称"/>
+                            <field name="name" string="货架名称"/>
-                            <field name="check_state" string="审核状态"/>
+                            <field name="check_state" string="审核状态"/>
-                            <field name="channel" string="通道"/>
+                            <field name="channel" string="通道"/>
-                            <field name="shelf_location_id" string="所属库区"/>
+                            <field name="shelf_location_id" string="所属库区"/>
-                            <field name="direction" string="方向"/>
+                            <field name="direction" string="方向"/>
-                            <field name="shelf_height" string="货架高度(m)"/>
+                            <field name="shelf_height" string="货架高度(m)"/>
-                            <field name="shelf_layer" string="货架层数"/>
+                            <field name="shelf_layer" string="货架层数"/>
-                            <field name="layer_capacity" string="层数容量"/>
+                            <field name="layer_capacity" string="层数容量"/>
-                            <field name="shelf_rotative_Boolean"/>
+                            <field name="shelf_rotative_Boolean"/>
-                        </group>
+                        </group>
-                        <notebook>
+                        <notebook>
-                            <page string="货位">
+                            <page string="货位">
-                                <button name="print_all_location_barcode" type="object" string="一键打印"
+                                <button name="print_all_location_barcode" type="object" string="一键打印"
-                                        class="oe_highlight"/>
+                                        class="oe_highlight"/>
-                                <field name="location_ids" widget="one2many_list">
+                                <field name="location_ids" widget="one2many_list">
-                                    <tree string="Shelf Location">
+                                    <tree string="Shelf Location">
-                                        <field name="barcode" string="编码"/>
+                                        <field name="barcode" string="编码"/>
-                                        <field name="name" string="名称"/>
+                                        <field name="name" string="名称"/>
-                                        <field name="qr_code" string="条码" widget="image"/>
+                                        <field name="qr_code" string="条码" widget="image"/>
-                                        <button string="打印" name="print_single_location_qr_code" type="object"
+                                        <button string="打印" name="print_single_location_qr_code" type="object"
-                                                class="oe_highlight"/>
+                                                class="oe_highlight"/>
-                                    </tree>
+                                    </tree>
-                                </field>
+                                </field>
-                            </page>
+                            </page>
-                        </notebook>
+                        </notebook>
-                    </sheet>
+                    </sheet>
-                </form>
+                </form>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-        <record id="view_sf_shelf_tree" model="ir.ui.view">
+        <record id="view_sf_shelf_tree" model="ir.ui.view">
-            <field name="name">Sf Shelf tree</field>
+            <field name="name">Sf Shelf tree</field>
-            <field name="model">sf.shelf</field>
+            <field name="model">sf.shelf</field>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">
-                <tree string="Sf Shelf">
+                <tree string="Sf Shelf">
-                    <field name="barcode" string="货架编码"/>
+                    <field name="barcode" string="货架编码"/>
-                    <field name="name" string="名称"/>
+                    <field name="name" string="名称"/>
-                    <field name="shelf_location_id" string="所属库区"/>
+                    <field name="shelf_location_id" string="所属库区"/>
-                </tree>
+                </tree>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-        <!--         货架action -->
+        <!--         货架action -->
-        <record id="sf_shelf_action" model="ir.actions.act_window">
+        <record id="sf_shelf_action" model="ir.actions.act_window">
-            <field name="name">货架</field>
+            <field name="name">货架</field>
-            <field name="type">ir.actions.act_window</field>
+            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.shelf</field>
+            <field name="res_model">sf.shelf</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form</field>
-            <!--             <field name="view_id" ref="view_sf_shelf_tree"/> -->
+            <!--             <field name="view_id" ref="view_sf_shelf_tree"/> -->
-        </record>
+        </record>
-
+
-        <!--         货架菜单 -->
+        <!--         货架菜单 -->
-        <menuitem
+        <menuitem
-                id="sf_shelf_menu"
+                id="sf_shelf_menu"
-                name="货架"
+                name="货架"
-                parent="stock.menu_warehouse_config"
+                parent="stock.menu_warehouse_config"
-                sequence="19"
+                sequence="19"
-                action="sf_shelf_action"
+                action="sf_shelf_action"
-                groups="sf_base.group_sf_stock_user"/>
+                groups="sf_base.group_sf_stock_user"/>
-
+
-
+
-        <record id="view_shelf_location_tree" model="ir.ui.view">
+        <record id="view_shelf_location_tree" model="ir.ui.view">
-            <field name="name">Shelf Location tree</field>
+            <field name="name">Shelf Location tree</field>
-            <field name="model">sf.shelf.location</field>
+            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">
-                <tree string="Shelf Location">
+                <tree string="Shelf Location">
-                    <field name="barcode"/>
+                    <field name="barcode"/>
-                    <field name="name"/>
+                    <field name="name"/>
-                    <field name="location_id"/>
+                    <field name="location_id"/>
-                    <!--                     <field name="check_state" widget="label_selection"-->
+                    <!--                     <field name="check_state" widget="label_selection"-->
-                    <!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
+                    <!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
-                    <!--                     <button name="action_check" string="审核" type="object"-->
+                    <!--                     <button name="action_check" string="审核" type="object"-->
-                    <!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
+                    <!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
-                    <!--                                groups="sf_base.group_sf_stock_manager"-->
+                    <!--                                groups="sf_base.group_sf_stock_manager"-->
-                    <!--                                class="oe_highlight"/>-->
+                    <!--                                class="oe_highlight"/>-->
-                </tree>
+                </tree>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-
+
-        <!--        货架货位移动历史按钮-->
+        <!--        货架货位移动历史按钮-->
-
+
-        <record id="sf_stock_move_line_view_search" model="ir.ui.view">
+        <record id="sf_stock_move_line_view_search" model="ir.ui.view">
-            <field name="name">sf.view.picking.form</field>
+            <field name="name">sf.view.picking.form</field>
-            <field name="model">stock.move.line</field>
+            <field name="model">stock.move.line</field>
-            <field name="inherit_id" ref="stock.stock_move_line_view_search"/>
+            <field name="inherit_id" ref="stock.stock_move_line_view_search"/>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">
-                <xpath expr="//field[@name='product_id']" position="after">
+                <xpath expr="//field[@name='product_id']" position="after">
-                    <field name='current_location_id'/>
+                    <field name='current_location_id'/>
-                    <field name='destination_location_id'/>
+                    <field name='destination_location_id'/>
-                </xpath>
+                </xpath>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-        <record id="stock_move_line_action1" model="ir.actions.act_window">
+        <record id="stock_move_line_action1" model="ir.actions.act_window">
-            <field name="name">移动历史</field>
+            <field name="name">移动历史</field>
-            <field name="res_model">stock.move.line</field>
+            <field name="res_model">stock.move.line</field>
-            <field name="type">ir.actions.act_window</field>
+            <field name="type">ir.actions.act_window</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="sf_stock_move_line_view_search"/>
+            <field name="search_view_id" ref="sf_stock_move_line_view_search"/>
-            <field name="view_id" ref="stock.view_move_line_tree"/>
+            <field name="view_id" ref="stock.view_move_line_tree"/>
-            <field name="help" type="html">
+            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
+                <p class="oe_view_nocontent_create">
-                    产品移动历史
+                    产品移动历史
-                </p>
+                </p>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-        <record id="view_shelf_location_form" model="ir.ui.view">
+        <record id="view_shelf_location_form" model="ir.ui.view">
-            <field name="name">Shelf Location form</field>
+            <field name="name">Shelf Location form</field>
-            <field name="model">sf.shelf.location</field>
+            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">
-                <form string="Shelf Location" create="0">
+                <form string="Shelf Location" create="0">
-                    <header>
+                    <header>
-                        <button string="货位变更"
+                        <button string="货位变更"
-                                name="%(sf_warehouse.sf_shelf_location_wizard_act)d"
+                                name="%(sf_warehouse.sf_shelf_location_wizard_act)d"
-                                type="action"
+                                type="action"
-                                context="{'default_name':name,
+                                context="{'default_name':name,
-                                'default_current_name':name,
+                                'default_current_name':name,
-                                'default_current_product_sn_ids':product_sn_ids,
+                                'default_current_product_sn_ids':product_sn_ids,
-                                'default_lot_id':product_sn_id,
+                                'default_lot_id':product_sn_id,
-                                'default_current_shelf_id':shelf_id,
+                                'default_current_shelf_id':shelf_id,
-                                'default_current_location_id':location_id,
+                                'default_current_location_id':location_id,
-                                'default_current_barcode_id':id,
+                                'default_current_barcode_id':id,
-                                'default_current_product_id':product_id,
+                                'default_current_product_id':product_id,
-                                    }"
+                                    }"
-                                class="btn-primary" attrs="{'invisible':[('location_status','!=','占用')]}"/>
+                                class="btn-primary" attrs="{'invisible':[('location_status','!=','占用')]}"/>
-                        <field name="location_status" invisible="1"/>
+                        <field name="location_status" invisible="1"/>
-                        <button string="禁用货位" name="action_location_status_disable" type="object"
+                        <button string="禁用货位" name="action_location_status_disable" type="object"
-                                class="oe_highlight"
+                                class="oe_highlight"
-                                attrs="{'invisible': [('location_status', '!=', '空闲')]}"/>
+                                attrs="{'invisible': [('location_status', '!=', '空闲')]}"/>
-                        <button string="启用货位" name="action_location_status_enable" type="object"
+                        <button string="启用货位" name="action_location_status_enable" type="object"
-                                class="oe_highlight"
+                                class="oe_highlight"
-                                attrs="{'invisible': [('location_status', '!=', '禁用')]}"/>
+                                attrs="{'invisible': [('location_status', '!=', '禁用')]}"/>
-                    </header>
+                    </header>
-                    <sheet>
+                    <sheet>
-                        <div class="oe_button_box" name="button_box">
+                        <div class="oe_button_box" name="button_box">
-                            <button name="%(stock_move_line_action1)d"
+                            <button name="%(stock_move_line_action1)d"
-                                    type="action"
+                                    type="action"
-                                    class="oe_stat_button"
+                                    class="oe_stat_button"
-                                    context="{'search_default_current_location_id': [active_id]}"
+                                    context="{'search_default_current_location_id': [active_id]}"
-                                    icon="fa-exchange">
+                                    icon="fa-exchange">
-                                <field string="当前位置历史" name="current_move_ids" widget="statinfo"/>
+                                <field string="当前位置历史" name="current_move_ids" widget="statinfo"/>
-                            </button>
+                            </button>
-                            <button name="%(stock_move_line_action1)d"
+                            <button name="%(stock_move_line_action1)d"
-                                    type="action"
+                                    type="action"
-                                    class="oe_stat_button"
+                                    class="oe_stat_button"
-                                    context="{'search_default_destination_location_id': [active_id]}"
+                                    context="{'search_default_destination_location_id': [active_id]}"
-                                    icon="fa-exchange">
+                                    icon="fa-exchange">
-                                <field string="目标位置历史" name="destination_move_ids" widget="statinfo"/>
+                                <field string="目标位置历史" name="destination_move_ids" widget="statinfo"/>
-                            </button>
+                            </button>
-                        </div>
+                        </div>
-                        <group>
+                        <group>
-                            <field name="barcode" readonly="1"/>
+                            <field name="barcode" readonly="1"/>
-                            <field name="name" readonly="1"/>
+                            <field name="name" readonly="1"/>
-                            <field name="rotative_Boolean" invisible="1"/>
+                            <field name="rotative_Boolean" invisible="1"/>
-                            <field name="shelf_id" readonly="1"/>
+                            <field name="shelf_id" readonly="1"/>
-                            <field name="location_id" readonly="1"/>
+                            <field name="location_id" readonly="1"/>
-                            <field name="product_id"/>
+                            <field name="product_id"/>
-                            <field name="product_sn_id" options="{'no_create': True}"
+                            <field name="product_sn_id" options="{'no_create': True}"
-                                   attrs="{'invisible': [('product_sn_ids', '!=', [])]}"/>
+                                   attrs="{'invisible': [('product_sn_ids', '!=', [])]}"/>
-                            <field name="product_sn_ids"
+                            <field name="product_sn_ids"
-                                   attrs="{'invisible': [('product_sn_ids', '=', [])]}">
+                                   attrs="{'invisible': [('product_sn_ids', '=', [])]}">
-                                <tree edit="1" create="0" delete="0" editable="bottom">
+                                <tree edit="1" create="0" delete="0" editable="bottom">
-                                    <field name="lot_id" readonly="1"/>
+                                    <field name="lot_id" readonly="1"/>
-                                    <field name="qty" readonly="1"/>
+                                    <field name="qty" readonly="1"/>
-                                </tree>
+                                </tree>
-                            </field>
+                            </field>
-                            <field name="product_num" readonly="1"/>
+                            <field name="product_num" readonly="1"/>
-                            <field name="location_status"/>
+                            <field name="location_status"/>
-                            <field name="storage_time" widget="datetime"/>
+                            <field name="storage_time" widget="datetime"/>
-                            <field name="production_id" readonly="1"/>
+                            <field name="production_id" readonly="1"/>
-                        </group>
+                        </group>
-                    </sheet>
+                    </sheet>
-                </form>
+                </form>
-            </field>
+            </field>
-        </record>
+        </record>
-
+
-        <record id="shelf_location_kanban_view" model="ir.ui.view">
+<record id="shelf_location_kanban_view" model="ir.ui.view">
-            <field name="name">shelf.location.kanban</field>
+    <field name="name">shelf.location.kanban</field>
-            <field name="model">sf.shelf.location</field>
+    <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
+    <field name="arch" type="xml">
-                <kanban class="o_kanban_mobile" js_class="custom_kanban" create="0">
+        <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
-                    <templates>
+            <templates>
-                        <t t-name="kanban-box">
+                <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click
+                    <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
-                        #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
+                    <div t-attf-class="oe_kanban_card oe_kanban_global_click
-                        #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
+                    #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
-                        #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
+                    #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
-                                <!--                                 标题 -->
+                    #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
-                                <div class="o_kanban_card_header">
+                    
-                                    <div class="o_kanban_card_header_title">
+                        <!-- 所有情况都需要的数据 (隐藏) -->
-                                        <field name="name"/>
+                        <div style="display:none">
-                                    </div>
+                            <field name="location_status"/>
-                                </div>
+                            <field name="tool_name_id"/>
-                                <!--                                 内容 -->
+                        </div>
-                                <div class="o_kanban_record_bottom">
+                        
-                                    <field name="location_status"/>
+                        <t t-if="isBaseStyle">
-                                </div>
+                            <div class="o_kanban_card_header">
-                                <div class="o_kanban_record_bottom">
+                                <div class="o_kanban_card_header_title">
-                                    <field name="product_sn_id"/>
+                                    <field name="name"/>
-                                    <span>|</span>
+                                </div>
-                                    <field name="product_id"/>
+                            </div>
-                                </div>
+                            <div class="o_kanban_record_bottom">
-                            </div>
+                                <field name="product_sn_id"/>
-                        </t>
+                                <field name="product_id"/>
-                        <!--                                             <t t-name="kanban-box"> -->
+                            </div>
-                        <!--                                                  <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
+                        </t>
-                        <!--                                                     #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
+                        
-                        <!--                                                     #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
+                        <t t-else="">
-                        <!--                                                     #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
+                            <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
-                        <!--                                                     看板内容 -->
+                                <field name="kanban_show_layer_info"/>
-                        <!--                                                 </div> -->
+                            </div>
-                        <!--                                                 <div t-attf-class="oe_kanban_card"> -->
+                            <!-- 添加RFID字段 -->
-                        <!--                                                     标题 -->
+                           <!--  <t t-if="record.data and record.data.display_rfid">
-                        <!--                                                     <div class="o_kanban_card_header"> -->
+                                <div class="o_kanban_record_bottom">
-                        <!--                                                         <div class="o_kanban_card_header_title"> -->
+                                    <field name="display_rfid"/>
-                        <!--                                                             <field name="name"/> -->
+                                </div>
-                        <!--                                                         </div> -->
+                            </t>
-                        <!--                                                     </div> -->
+                            <t t-if="record.data and record.data.tool_rfid">
-                        <!--                                                     内容 -->
+                                <div class="o_kanban_record_bottom">
-                        <!--                                                     <div class="o_kanban_record_bottom"> -->
+                                    <field name="tool_rfid"/>
-                        <!--                                                         <field name="location_status"/> -->
+                                </div>
-                        <!--                                                     </div> -->
+                            </t> -->
-                        <!--                                                     <div class="o_kanban_record_bottom"> -->
+                            <!-- 悬停时显示的详细信息 -->
-                        <!--                                                         <field name="product_sn_id"/> -->
+                            <div class="status-hover-bar">
-                        <!--                                                         <span> | </span> -->
+                                 <t t-if="record.product_id.value">
-                        <!--                                                         <field name="product_id"/> -->
+                                        <div>产品: <t t-esc="record.product_id.value"/></div>
-                        <!--                                                     </div> -->
+                                    </t>
-                        <!--                                                 </div> -->
+                                <t t-if="record.product_sn_id.value">
-                        <!--                                             </t> -->
+                                        <div>标签ID: <t t-esc="record.product_sn_id.value"/></div>
-                    </templates>
+                                    </t>
-                </kanban>
+                                 <!-- <t t-if="record.display_rfid.value">
-            </field>
+                                        <div>rfid: <t t-esc="record.display_rfid.value"/></div>
-        </record>
+                                    </t>
-
+                                    <t t-if="record.tool_rfid.value">
-        <!--     搜索视图 -->
+                                        <div>rfid: <t t-esc="record.tool_rfid.value"/></div>
-        <record id="shelf_location_search_view" model="ir.ui.view">
+                                    </t> -->
-            <field name="name">shelf.location.search</field>
+                                     <t t-if="record.tool_name_id and record.tool_name_id.value">
-            <field name="model">sf.shelf.location</field>
+                                        <div>功能刀具名称: <t t-esc="record.tool_name_id.value"/></div>
-            <field name="arch" type="xml">
+                                    </t>
-                <search string="货位">
+                                <div>状态: <t t-esc="record.location_status.value"/></div>
-                    <field name="barcode"/>
+                            </div>
-                    <field name="product_id"/>
+                        </t>
-                    <searchpanel class="account_root">
+                    </div>
-                        <!--                     <field name="location_type" icon="fa-filter"/> -->
+                </t>
-                        <!--                         <field name="location_id" select="multi" icon="fa-filter"/> -->
+            </templates>
-                        <field name="location_id" string="所属库区" icon="fa-filter"/>
+        </kanban>
-                        <field name="shelf_id" string="货架"/>
+    </field>
-                        <!--                     <field name="location_status" icon="fa-filter"/> -->
+</record>
-                    </searchpanel>
+        <!--     搜索视图 -->
-                </search>
+        <record id="shelf_location_search_view" model="ir.ui.view">
-            </field>
+            <field name="name">shelf.location.search</field>
-        </record>
+            <field name="model">sf.shelf.location</field>
-
+            <field name="arch" type="xml">
-        <record id="shelf_location_kanban_action_id" model="ir.actions.act_window">
+                <search string="货位">
-            <field name="name">货位看板</field>
+                    <field name="barcode"/>
-            <field name="type">ir.actions.act_window</field>
+                    <field name="product_id"/>
-            <field name="res_model">sf.shelf.location</field>
+                    <searchpanel class="account_root">
-            <field name="view_mode">kanban,form</field>
+                        <!--                     <field name="location_type" icon="fa-filter"/> -->
-            <!--             <field name="domain">[('check_state','=','enable')]</field> -->
+                        <!--                         <field name="location_id" select="multi" icon="fa-filter"/> -->
-        </record>
+                        <field name="location_id" string="所属库区" icon="fa-filter"/>
-
+                        <field name="shelf_id" string="货架"/>
-        <!--     <record id="example_action" model="ir.actions.act_window"> -->
+                        <!--                     <field name="location_status" icon="fa-filter"/> -->
-        <!--     <field name="name">Example</field> -->
+                    </searchpanel>
-        <!--     <field name="type">ir.actions.act_window</field> -->
+                </search>
-        <!--     <field name="res_model">stock.location</field> -->
+            </field>
-        <!--     <field name="view_mode">kanban</field> -->
+        </record>
-        <!--     <field name="searchpanel">true</field> -->
+
-        <!--     <field name="searchpanel_field_label">货架</field> -->
+        <record id="shelf_location_kanban_action_id" model="ir.actions.act_window">
-        <!--     <field name="searchpanel_field_name">parent_id</field> -->
+            <field name="name">货位看板</field>
-        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
+            <field name="type">ir.actions.act_window</field>
-        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
+            <field name="res_model">sf.shelf.location</field>
-        <!-- </record> -->
+            <field name="view_mode">kanban,form</field>
-
+            <!--             <field name="domain">[('check_state','=','enable')]</field> -->
-
+        </record>
-        <menuitem id="shelf_location_kanban_menu" name="货位看板" parent="stock.menu_stock_root"
+
-                  sequence="51"
+        <!--     <record id="example_action" model="ir.actions.act_window"> -->
-                  action="shelf_location_kanban_action_id"
+        <!--     <field name="name">Example</field> -->
-                  groups="sf_base.group_sf_stock_user"/>
+        <!--     <field name="type">ir.actions.act_window</field> -->
-
+        <!--     <field name="res_model">stock.location</field> -->
-        <record id="action_sf_shelf_location" model="ir.actions.act_window">
+        <!--     <field name="view_mode">kanban</field> -->
-            <field name="name">货位</field>
+        <!--     <field name="searchpanel">true</field> -->
-            <field name="type">ir.actions.act_window</field>
+        <!--     <field name="searchpanel_field_label">货架</field> -->
-            <field name="res_model">sf.shelf.location</field>
+        <!--     <field name="searchpanel_field_name">parent_id</field> -->
-            <field name="view_mode">tree,form</field>
+        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
-        </record>
+        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
-
+        <!-- </record> -->
-        <!--     <record id="example_action" model="ir.actions.act_window"> -->
+
-        <!--     <field name="name">Example</field> -->
+
-        <!--     <field name="type">ir.actions.act_window</field> -->
+        <menuitem id="shelf_location_kanban_menu" name="货位看板" parent="stock.menu_stock_root"
-        <!--     <field name="res_model">stock.location</field> -->
+                  sequence="51"
-        <!--     <field name="view_mode">kanban</field> -->
+                  action="shelf_location_kanban_action_id"
-        <!--     <field name="searchpanel">true</field> -->
+                  groups="sf_base.group_sf_stock_user"/>
-        <!--     <field name="searchpanel_field_label">货架</field> -->
+
-        <!--     <field name="searchpanel_field_name">parent_id</field> -->
+        <record id="action_sf_shelf_location" model="ir.actions.act_window">
-        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
+            <field name="name">货位</field>
-        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
+            <field name="type">ir.actions.act_window</field>
-        <!-- </record> -->
+            <field name="res_model">sf.shelf.location</field>
-
+            <field name="view_mode">tree,form</field>
-
+        </record>
-        <!--     <menuitem id="menu_stock_location" name="货位状态" parent="stock.menu_stock_root" -->
+
-        <!--         sequence="50" -->
+        <!--     <record id="example_action" model="ir.actions.act_window"> -->
-        <!--         action="kanban_action_id"/>     -->
+        <!--     <field name="name">Example</field> -->
-
+        <!--     <field name="type">ir.actions.act_window</field> -->
-        <menuitem id="menu_sf_shelf_location" name="货位" parent="stock.menu_warehouse_config"
+        <!--     <field name="res_model">stock.location</field> -->
-                  sequence="20"
+        <!--     <field name="view_mode">kanban</field> -->
-                  action="action_sf_shelf_location"
+        <!--     <field name="searchpanel">true</field> -->
-                  groups="sf_base.group_sf_stock_user"/>
+        <!--     <field name="searchpanel_field_label">货架</field> -->
-
+        <!--     <field name="searchpanel_field_name">parent_id</field> -->
-
+        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
-    </data>
+        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
-</odoo>
+        <!-- </record> -->
+
+
+        <!--     <menuitem id="menu_stock_location" name="货位状态" parent="stock.menu_stock_root" -->
+        <!--         sequence="50" -->
+        <!--         action="kanban_action_id"/>     -->
+
+        <menuitem id="menu_sf_shelf_location" name="货位" parent="stock.menu_warehouse_config"
+                  sequence="20"
+                  action="action_sf_shelf_location"
+                  groups="sf_base.group_sf_stock_user"/>
+
+
+    </data>
+</odoo>