采购申请批量转采购按钮显示优化

Merge Request: 处理 由采购订单-委外加工类型生成的同一个补货组的坯料采购申请单据没有合并 问题

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2263

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/__manifest__.py

@@ -10,6 +10,7 @@
     'data': [
         'security/ir.model.access.csv',
         'views/sale_order_view.xml',
+        'views/purchase_order.xml',
         'views/mrp_production.xml',
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',

jikimo_purchase_request/models/purchase_order.py

@@ -16,6 +16,69 @@ class PurchaseOrder(models.Model):
         ('rejected', '已驳回')
     ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
 
+    # 成品采购订单对应的坯料采购申请单和采购订单数量
+    purchase_request_count = fields.Integer('子·采购申请数量', compute='_compute_purchase_request')
+    purchase_order_count = fields.Integer('子·采购订单数量', compute='_compute_purchase_request')
+
+    @api.depends('state')
+    def _compute_purchase_request(self):
+        for record in self:
+            purchase_request_ids, purchase_order_ids = record.get_purchase_request_order()
+            record.purchase_request_count = len(purchase_request_ids)
+            record.purchase_order_count = len(purchase_order_ids)
+
+    def action_view_preform_body_purchase_request(self):
+        self.ensure_one()
+        name_list = self._get_pinking_name()
+        purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
+
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_request_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_request_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("子·采购申请"),
+                'domain': [('id', 'in', purchase_request_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_preform_body_purchase_order(self):
+        self.ensure_one()
+        name_list = self._get_pinking_name()
+        purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
+
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_order_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_order_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("子·采购订单"),
+                'domain': [('id', 'in', purchase_order_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def get_purchase_request_order(self):
+        name_list = self._get_pinking_name()
+        purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
+        purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
+        return purchase_request_ids, purchase_order_ids
+
+    def _get_pinking_name(self):
+        return [picking_id.name for picking_id in self.picking_ids if picking_id.name]
 
     def button_confirm(self):
         res = super(PurchaseOrder, self).button_confirm()

jikimo_purchase_request/models/purchase_request.py

@@ -16,6 +16,7 @@ class PurchaseRequest(models.Model):
     )
 
     rule_new_add = fields.Boolean('采购请求为规则创建', default=False, compute='_compute_state', store=True)
+    rule_purchase_to_request = fields.Boolean('采购单根据规则创建坯料采购申请', default=False)
 
     @api.depends('state')
     def _compute_state(self):

jikimo_purchase_request/models/stock_picking.py

@@ -44,4 +44,15 @@ class StockPicking(models.Model):
                purchase_request_lines.move_dest_ids = [
                    (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
+        return res
+
+    def _subcontracted_produce(self, subcontract_details):
+        super()._subcontracted_produce(subcontract_details)
+
+        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
+        if self:
+            pr_ids = self.env["purchase.request"].sudo().search(
+                [('origin', 'like', self.name), ('rule_purchase_to_request', '=', True), ('state', '=', 'draft')])
+            if pr_ids:
+                pr_ids.write({'need_validation': False})
+                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})

jikimo_purchase_request/models/stock_rule.py

@@ -26,7 +26,7 @@ class StockRule(models.Model):
             request_data = rule._prepare_purchase_request(
                 procurement.origin, procurement.values
             )
-            request_data.update({'rule_new_add': True})
+            request_data = self._update_request_data(procurement, request_data)
             pr = purchase_request_model.create(request_data)
             cache[domain] = pr
         elif (
@@ -44,6 +44,18 @@ class StockRule(models.Model):
         request_line_data.update({'origin': procurement.origin})
         purchase_request_line_model.create(request_line_data)
 
+    def _update_request_data(self, procurement, request_data):
+        sp = self.env['stock.picking'].sudo().search([('name', '=', procurement.origin)])
+        if len(sp) == 1:
+            po = self.env['purchase.order'].sudo().search(
+                [('name', '=', sp.origin), ('purchase_type', '=', 'outsourcing')])
+            if po:
+                request_data.update({'rule_purchase_to_request': True})
+        else:
+            request_data.update({'rule_new_add': True})
+        return request_data
+
+
     def _run_buy(self, procurements):
         # 如果补货组相同，并且产品相同，则合并
         procurements_dict = defaultdict()

jikimo_purchase_request/views/purchase_order.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="purchase_order_form_jikimo_purchase_request" model="ir.ui.view">
+        <field name="name">purchase.order.inherited.form.jikimo.purchase.request</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="mrp_subcontracting_purchase.purchase_order_form_mrp_subcontracting_purchase"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_button_box')]/button[@name='action_view_subcontracting_resupply']" position="before">
+                <button
+                    class="oe_stat_button" name="action_view_preform_body_purchase_order"
+                    type="object" icon="fa-truck" attrs="{'invisible': [('purchase_order_count', '=', 0)]}"  groups="stock.group_stock_user">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value"><field name="purchase_order_count"/></span>
+                        <span class="o_stat_text">子·采购订单</span>
+                    </div>
+                </button>
+                <button
+                    class="oe_stat_button" name="action_view_preform_body_purchase_request"
+                    type="object" icon="fa-truck" attrs="{'invisible': [('purchase_request_count', '=', 0)]}" groups="stock.group_stock_user">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value"><field name="purchase_request_count"/></span>
+                        <span class="o_stat_text">子·采购申请</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request/views/purchase_request_view.xml

@@ -67,6 +67,16 @@
                 <field name="part_number"/>
                 <field name="part_name" invisible="1"/>
             </xpath>
+            <xpath expr="//tree" position="inside">
+                <header>
+                    <button
+                            name="%(purchase_request.action_purchase_request_line_make_purchase_order)d"
+                            string="创建询价单"
+                            type="action"
+                            class="btn-primary"
+                    />
+                </header>
+            </xpath>
         </field>
     </record>
 

sf_demand_plan/__manifest__.py

@@ -10,10 +10,12 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_plan', 'jikimo_printing'],
+    'depends': ['sf_plan','jikimo_printing'],
     'data': [
         'security/ir.model.access.csv',
+        'data/stock_route_group.xml',
         'views/demand_plan.xml',
+        'views/stock_route.xml',
         'wizard/sf_demand_plan_print_wizard_view.xml',
     ],
     'demo': [

sf_demand_plan/data/stock_route_group.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="0">
+        <record id="stock_route_group_automation_sf" model="stock.route.group">
+            <field name="name">自动化产线加工</field>
+            <field name="code">automation</field>
+        </record>
+        <record id="stock_route_group_manual_sf" model="stock.route.group">
+            <field name="name">人工线下加工</field>
+            <field name="code">manual</field>
+        </record>
+        <record id="stock_route_group_purchase_sf" model="stock.route.group">
+            <field name="name">外购</field>
+            <field name="code">purchase</field>
+        </record>
+        <record id="stock_route_group_outsourcing_sf" model="stock.route.group">
+            <field name="name">委外加工</field>
+            <field name="code">outsourcing</field>
+        </record>
+    </data>
+</odoo>

sf_demand_plan/models/__init__.py

@@ -2,3 +2,4 @@
 
 from . import sf_production_demand_plan
 from . import sale_order
+from . import stock_route

sf_demand_plan/models/sf_production_demand_plan.py

@@ -39,11 +39,7 @@ class SfProductionDemandPlan(models.Model):
     company_id = fields.Many2one(
         related='sale_order_id.company_id',
         store=True, index=True, precompute=True)
-    partner_id = fields.Many2one(
-        comodel_name='res.partner',
-        related='sale_order_line_id.order_partner_id',
-        string="客户",
-        store=True, index=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文件地址')
@@ -64,7 +60,7 @@ class SfProductionDemandPlan(models.Model):
     product_uom_qty = fields.Float(
         string="需求数量",
         related='sale_order_line_id.product_uom_qty', store=True)
-    deadline_of_delivery = fields.Date('客户交期', related='sale_order_id.deadline_of_delivery', 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'
@@ -73,7 +69,10 @@ class SfProductionDemandPlan(models.Model):
         "交货数量", related='sale_order_line_id.qty_delivered')
     qty_to_deliver = fields.Float(
         "待交货数量", related='sale_order_line_id.qty_to_deliver')
-    model_long = fields.Char('尺寸', compute='_compute_model_long')
+    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')
@@ -89,6 +88,9 @@ class SfProductionDemandPlan(models.Model):
         string='订单状态',
         related='sale_order_line_id.state')
     route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
+    route_ids = fields.Many2many('stock.route', 'stock_route_demand_plan', 'demand_plan_id', 'route_id', '路线',
+                                 domain=[('demand_plan_selectable', '=', True)], compute='_compute_route_ids',
+                                 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)
@@ -136,6 +138,18 @@ class SfProductionDemandPlan(models.Model):
 
     outsourcing_purchase_request = fields.Char('委外采购申请单')
 
+    @api.depends('supply_method')
+    def _compute_route_ids(self):
+        for pdp in self:
+            if pdp.supply_method:
+                group_id = self.env['stock.route.group'].sudo().search([('code', '=', pdp.supply_method)])
+                route_ids = self.env['stock.route'].sudo().search(
+                    [('demand_plan_selectable', '=', True), ('stock_route_group_ids', '=', group_id.id)])
+                if route_ids:
+                    pdp.route_ids = route_ids.ids
+                    break
+            pdp.route_ids = None
+
     @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):
@@ -197,6 +211,17 @@ class SfProductionDemandPlan(models.Model):
             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:
@@ -278,9 +303,15 @@ class SfProductionDemandPlan(models.Model):
             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, record.product_uom_qty,
+                    if float_compare(total_reserved_availability, product_uom_qty,
                                      precision_rounding=record.product_id.uom_id.rounding) >= 0:
                         record.material_check = '1'  # 已齐套
                     else:
@@ -305,13 +336,16 @@ class SfProductionDemandPlan(models.Model):
             [('name', '=', '1#CNC自动生产线')], limit=1)
         if sf_production_line:
             now = datetime.now()
-            time_part = (now + timedelta(minutes=3)).time()
+            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
-            for pro_plan in pro_plan_list:
-                pro_plan.do_production_schedule()
+            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 {
@@ -320,7 +354,6 @@ class SfProductionDemandPlan(models.Model):
             'name': _("打印"),
             'domain': [('demand_plan_id', 'in', self.ids)],
             'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
-            'search_view_id': self.env.ref('sf_demand_plan.action_plan_print_search').id,
             'target': 'new',
         }
 
@@ -387,29 +420,30 @@ class SfProductionDemandPlan(models.Model):
                     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
-                    # 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')
+                    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
                         )
-                        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)
+                        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

sf_demand_plan/models/stock_route.py

@@ -0,0 +1,49 @@
+from odoo import models, fields, api, _
+
+
+class SfStockRoute(models.Model):
+    _inherit = 'stock.route'
+
+    demand_plan_selectable = fields.Boolean("需求计划行")
+    stock_route_group_ids = fields.Many2many('stock.route.group', 'route_to_group', string='路线组')
+    demand_plan_ids = fields.Many2many('sf.production.demand.plan', 'stock_route_demand_plan', 'route_id',
+                                       'demand_plan_id', '需求计划', copy=False, compute='_compute_demand_plan_ids',
+                                       store=True)
+
+    @api.depends('demand_plan_selectable', 'stock_route_group_ids')
+    def _compute_demand_plan_ids(self):
+        for sr in self:
+            if sr.demand_plan_selectable:
+                stock_route_group = [srg.code for srg in sr.stock_route_group_ids]
+                demand_plan_ids = self.env['sf.production.demand.plan'].sudo().search(
+                    [('supply_method', 'in', stock_route_group)])
+                if demand_plan_ids:
+                    sr.demand_plan_ids = demand_plan_ids.ids
+                    break
+            sr.demand_plan_ids = None
+
+    # def name_get(self):
+    #     res = super().name_get()
+    #     if self.env.context.get('demand_plan_search_stock_route_id'):
+    #         demand_plan_id = self.env['sf.production.demand.plan'].sudo().browse(
+    #             int(self.env.context.get('demand_plan_search_stock_route_id')))
+    #         if demand_plan_id and demand_plan_id.supply_method:
+    #             supply_method = self._set_supply_method(demand_plan_id.supply_method)
+    #             res = [(item[0], f'{item[1]}-{supply_method}') for item in res if len(item) == 2]
+    #     return res
+    #
+    # def _set_supply_method(self, supply_method):
+    #     return {
+    #         'automation': "自动化产线加工",
+    #         'manual': "人工线下加工",
+    #         'purchase': "外购",
+    #         'outsourcing': "委外加工"
+    #     }.get(supply_method)
+
+
+class SfStockRouteGroup(models.Model):
+    _name = 'stock.route.group'
+    _description = '路线组'
+
+    name = fields.Char('名称')
+    code = fields.Char('编码')

sf_demand_plan/security/ir.model.access.csv

@@ -4,3 +4,6 @@ access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for disp
 
 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
+
+access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
+access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0

sf_demand_plan/static/src/js/print_demand.js

@@ -13,6 +13,7 @@ odoo.define('sf_demand.print_demand', function (require) {
             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')
@@ -22,29 +23,53 @@ odoo.define('sf_demand.print_demand', function (require) {
                             <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 .o_cancel_custom': '_onCancelClick',
+            'click .denmand_set': '_onDenmandChange',
         }),
         _onCancelClick() {
             this.getParent()?.getParent()?.dialogs.closeAll()
@@ -89,14 +114,12 @@ odoo.define('sf_demand.print_demand', function (require) {
             }
         },
         getSelectedIds: function() {
-            return this.state.data.map(_ => {
+            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',
@@ -114,10 +137,28 @@ odoo.define('sf_demand.print_demand', function (require) {
                 // 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) {

sf_demand_plan/static/src/scss/style.css

@@ -63,4 +63,22 @@
     .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

@@ -3,7 +3,7 @@
         <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,create_date desc" editable="bottom"
+            <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
                   class="demand_plan_tree">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
@@ -13,7 +13,7 @@
                 <field name="id" optional="hide"/>
                 <field name="priority"/>
                 <field name="status"/>
-                <field name="partner_id"/>
+                <field name="customer_name"/>
                 <field name="order_remark"/>
                 <field name="glb_url" optional="hide"/>
                 <field name="product_id"/>
@@ -28,6 +28,8 @@
                 <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"/>
@@ -36,7 +38,8 @@
                 <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="route_ids" widget="many2many_tags" optional="hide" readonly="0"
+                       context="{'demand_plan_search_stock_route_id': id}"/>
                 <field name="contract_date"/>
                 <field name="date_order"/>
                 <field name="contract_code"/>
@@ -80,7 +83,7 @@
                 <field name="product_id"/>
                 <field name="part_name"/>
                 <field name="part_number"/>
-                <field name="partner_id"/>
+                <field name="customer_name"/>
                 <field name="supply_method"/>
                 <field name="materials_id"/>
                 <field name="model_process_parameters_ids"/>
@@ -89,7 +92,7 @@
                 <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_partner_id" string="客户" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <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="[]"

sf_demand_plan/views/stock_route.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="sf_stock_location_route_form_view" model="ir.ui.view">
+        <field name="name">stock.route.form</field>
+        <field name="model">stock.route</field>
+        <field name="inherit_id" ref="stock.stock_location_route_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='packaging_selectable']" position="after">
+                <field name="demand_plan_selectable"/>
+            </xpath>
+            <xpath expr="//group[@name='route_selector']" position="after">
+                <group name="group_category" string="组类">
+                    <group>
+                        <field name="stock_route_group_ids" options="{'no_create': True}" widget="many2many_tags"/>
+                        <field name="demand_plan_ids" invisible="1" options="{'no_create': True}" widget="many2many_tags"/>
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -27,7 +27,6 @@ class SfDemandPlanPrintWizard(models.TransientModel):
     ], string='状态', default='not_start')
     machining_drawings = fields.Binary('2D加工图纸', related='product_id.machining_drawings', store=True)
 
-    workorder_id = fields.Many2one('mrp.workorder', string='工单')
     cnc_worksheet = fields.Binary('程序单')
 
     @api.model
@@ -77,7 +76,7 @@ class MrpWorkorder(models.Model):
         for record in self:
             if 'cnc_worksheet' in vals:
                 demand_plan_print = self.env['sf.demand.plan.print.wizard'].sudo().search(
-                    [('workorder_id', '=', record.id)])
+                    [('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})
@@ -89,7 +88,6 @@ class MrpWorkorder(models.Model):
                             'demand_plan_id': demand_plan.id,
                             'model_id': demand_plan.model_id,
                             'type': '2',
-                            'workorder_id': record.id,
                             'cnc_worksheet': record.cnc_worksheet,
                             'filename_url': record.cnc_worksheet_name
                         }

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -4,31 +4,14 @@
         <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" >
+            <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="machining_drawings" attrs="{'column_invisible': True }"/>
+                <field name="cnc_worksheet" attrs="{'column_invisible': True }"/>
                 <field name="status"/>
             </tree>
         </field>
     </record>
-
-    <record id="action_plan_print_search" model="ir.ui.view">
-        <field name="name">sf.demand.plan.print.wizard.search</field>
-        <field name="model">sf.demand.plan.print.wizard</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="type"/>
-                <filter string="图纸" name="filter_type_1" domain="[('type', '=', '1')]"/>
-                <filter string="程序单" name="filter_type_2" domain="[('type', '=', '2')]"/>
-                <filter string="图纸、程序单" name="filter_type_all" domain="[('type', 'in', ('1','2'))]"/>
-                <separator/>
-                <group expand="0" string="Group By">
-                    <filter name="group_by_type" string="类型" domain="[]" context="{'group_by': 'type'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
 </odoo>

sf_dlm/models/product_template.py

@@ -73,15 +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),
             'blank_type': item.get('blank_type'),
-            'model_long': item['model_long'] + model_type.embryo_tolerance,
-            'model_width': item['model_width'] + model_type.embryo_tolerance,
-            'model_height': item['model_height'] + model_type.embryo_tolerance,
-            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
-                    item['model_width'] + model_type.embryo_tolerance) * (
-                                    item['model_height'] + model_type.embryo_tolerance),
+            'model_long': item.get('blank_length') if blank_bool else item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item.get('blank_width') if blank_bool else item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item.get('blank_height') if blank_bool else item['model_height'] + model_type.embryo_tolerance,
+            'model_volume': ((item['model_long'] + 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_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(
-                    [('production_line_id.name', '=', line), ('id', '!=', 8061),
-                     ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
+                plan_data_total = work_order_obj.search(work_order_domain + [
+                    ('id', '!=', 8061),
+                    ('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(
-                    [('production_line_id.name', '=', line),
-                     ('state', 'in', ['done']), ('routing_type', '=', 'CNC加工')])
+                plan_data_finish = work_order_obj.search(work_order_domain + [
+                    ('state', 'in', ['done'])
+                ])
+
+                plan_data_finish_counts = sum(plan_data_finish.mapped('qty_produced'))
 
                 # 超期完成量
                 # 搜索所有已经完成的工单
-                plan_data_overtime = work_order_obj.search([
-                    ('production_line_id.name', '=', line),
-                    ('state', 'in', ['done']),
-                    ('routing_type', '=', 'CNC加工')
+                plan_data_overtime = work_order_obj.search(work_order_domain + [
+                    ('state', 'in', ['done'])
                 ])
 
                 # 使用 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([
-                    ('production_line_id.name', '=', line),
-                ])
+                # plan_data = plan_obj.search(plan_domain)
 
                 # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
                 # 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([
-                    ('operation_id.name', '=', 'CNC加工'),
-                    ('quality_state', 'in', ['fail'])
+                faulty_plans = work_order_obj.search(work_order_domain + [
+                    ('state', 'in', ['scrap', 'rework'])
                 ])
 
                 # 查找制造订单取消与归档的数量
-                cancel_order_count = production_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
-                     ('active', '=', False)])
+                # cancel_order_count = production_obj.search_count(
+                #     [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
+                #      ('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(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework'])])
+                plan_data_rework = work_order_obj.search(work_order_domain + [
+                    ('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(
-                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+                plan_data_finish_orders = plan_obj.search(plan_domain + [
+                    ('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:
-                    data = {
-                        'plan_data_total_counts': plan_data_total_counts,
-                        'plan_data_finish_counts': plan_data_finish_counts,
-                        'plan_data_plan_counts': plan_data_total_counts,
-                        'plan_data_fault_counts': plan_data_fault_counts,
-                        'nopass_orders_counts': detection_data - len(pass_nums),
-                        'finishe_rate': finishe_rate,
-                        'plan_data_progress_deviation': plan_data_progress_deviation,
-                        'plan_data_rework_counts': plan_data_rework_counts,
-                        'on_time_rate': on_time_rate,
-                        # 'detection_data': detection_data,
-                        'detection_data': 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,
-                        'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
-                        if plan_data_finish_counts > 0 else 0,
-                    }
-                    res['data'][line] = data
+                # if plan_data:
+                data = {
+                    'plan_data_total_counts': plan_data_total_counts,
+                    'plan_data_finish_counts': plan_data_finish_counts,
+                    'plan_data_plan_counts': plan_data_total_counts,
+                    'plan_data_fault_counts': plan_data_fault_counts,
+                    'nopass_orders_counts': detection_data - len(pass_nums),
+                    'finishe_rate': finishe_rate,
+                    'plan_data_progress_deviation': plan_data_progress_deviation,
+                    'plan_data_rework_counts': plan_data_rework_counts,
+                    'on_time_rate': on_time_rate,
+                    # 'detection_data': detection_data,
+                    'detection_data': 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,
+                    'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
+                    if plan_data_finish_counts > 0 else 0,
+                }
+                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')
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+        # 将时间减去8小时（UTC+8转UTC）
+        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:
-            date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
-            order_counts = []
+        if time_unit == 'hour':
 
-            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([
-                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
-                        ('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_orders = orders.filtered(
+                        lambda o: o[date_field_name] >= start_time 
+                        and o[date_field_name] <= end_time
+                    )                    
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
-                    time_count_dict[key] = len(orders)
+                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    # 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:
-                next_day = date + timedelta(days=1)
-                orders = request.env['mrp.workorder'].sudo().search(
-                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
-                     ('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'))
-                     ])
+                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加工')
+                    ]
 
-                rework_orders = request.env['mrp.workorder'].sudo().search(
-                    [('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 = get_date_list(begin_time, end_time)
 
-            # 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,72 @@ 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(
-                [('production_line_id.name', '=', line), ('state', 'in', ['ready', 'progress']),
-                 ('routing_type', '=', 'CNC加工')
-                 ])
+            not_done_orders = work_order_obj.search(work_order_domain + [
+                    ('state', 'in', ['ready', 'progress']),
+                    ('date_planned_start', '>=', time_48_hours_ago),
+                    ('date_planned_start', '<=', current_time)
+                ], order='id asc'
+            )
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
-            current_time = datetime.now()
-            time_24_hours_ago = current_time - timedelta(hours=24)
+            # current_time = datetime.now()
+            # time_24_hours_ago = current_time - timedelta(hours=24)
 
-            finish_orders = plan_obj.search([
-                ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                ('production_id.state', 'not in', ['cancel']), ('active', '=', True),
-                ('actual_end_time', '>=', time_24_hours_ago)
-            ])
-            # print(finish_orders)
+            finish_orders = work_order_obj.search(work_order_domain + [
+                ('state', 'in', ['done']),
+                ('production_id.state', 'not in', ['cancel']),
+                ('date_finished', '>=', time_48_hours_ago)
+            ], order='id asc')
+            # logging.info('完成订单: %s' % finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -795,14 +935,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 +963,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 +992,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],
-                    'workorder_name': finish_order.name,
+                    'sequence': done_index,
+                    'workorder_name': finish_order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': finish_order.product_qty,
-                    'finish_time': finish_order.actual_end_time.strftime(
-                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
+                    'order_qty': finish_order.qty_produced,
+                    'finish_time': finish_order.date_finished.strftime(
+                        '%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/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

@@ -1709,6 +1709,7 @@ 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)
 
     @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',

sf_manufacturing/models/product_template.py

@@ -33,7 +33,7 @@ class ResProductMo(models.Model):
     model_volume = fields.Float('模型体积(m³)')
     model_area = fields.Float('模型表面积(m²)')
     model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
-    model_processing_panel = fields.Char('模型加工面板')
+    model_processing_panel = fields.Char('模型加工面板', default='')
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长(mm)', digits=(16, 3))
     width = fields.Float('宽(mm)', digits=(16, 3))
@@ -894,17 +894,22 @@ class ResProductMo(models.Model):
         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': product_name,
             'blank_type': item.get('blank_type'),
-            'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long),
-            'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
-            'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
-            'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
-                    item['model_width'] + embryo_redundancy_id.width) * (
-                              item['model_height'] + embryo_redundancy_id.height)),
+            'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
+            'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
+            'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
+            'model_volume': self.format_float(((item['model_long'] + embryo_redundancy_id.long) *
+                             (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_processing_panel': item['processing_panel_detail'] if item['processing_panel_detail'] else '',
             'model_machining_precision': item['model_machining_precision'],
             'model_code': item['barcode'],
             'length': item['model_long'],

sf_manufacturing/models/stock.py

@@ -21,6 +21,7 @@ from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError
 from io import BytesIO
 from odoo.exceptions import ValidationError
+from dateutil.relativedelta import relativedelta
 
 
 class stockWarehouse(models.Model):
@@ -95,35 +96,36 @@ class StockRule(models.Model):
                                                                            precision_rounding=proc[
                                                                                0].product_uom.rounding) > 0)
         list2 = []
-        for item in procurements:
-            num = int(item[0].product_qty)
+        for procurement, rule in procurements:
+            num = int(procurement.product_qty)
 
-            product = self.env['product.product'].search(
-                [("id", '=', item[0].product_id.id)])
-            product_tmpl = self.env['product.template'].search(
-                ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
-            if product_tmpl:
+            warehouse_id = rule.warehouse_id
+            if not warehouse_id:
+                warehouse_id = rule.location_dest_id.warehouse_id
+            manu_rule = rule.route_id.rule_ids.filtered(lambda r: r.action == 'manufacture' and r.warehouse_id == warehouse_id)
+
+            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,
-                                        location_id=item[0].location_id,
-                                        name=item[0].name,
-                                        origin=item[0].origin,
-                                        company_id=item[0].company_id,
-                                        values=item[0].values,
+                        s = Procurement(product_id=procurement.product_id, product_qty=1.0, product_uom=procurement.product_uom,
+                                        location_id=procurement.location_id,
+                                        name=procurement.name,
+                                        origin=procurement.origin,
+                                        company_id=procurement.company_id,
+                                        values=procurement.values,
                                         )
-                        item1 = list(item)
-                        item1[0] = s
+                        # item1 = list(item)
+                        # 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
@@ -183,18 +185,6 @@ class StockRule(models.Model):
             '''创建制造订单'''
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 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())
 
             '''
             创建工单
@@ -738,6 +728,33 @@ class StockPicking(models.Model):
                         production.workorder_ids.write({'back_button_display': False})
         return res
 
+    def _prepare_subcontract_mo_vals(self, subcontract_move, bom):
+        subcontract_move.ensure_one()
+        group = self.env['procurement.group'].sudo().search([('name', '=', self.name)])
+        if not group:
+            group = self.env['procurement.group'].create({
+                'name': self.name,
+                'partner_id': self.partner_id.id,
+            })
+        product = subcontract_move.product_id
+        warehouse = self._get_warehouse(subcontract_move)
+        vals = {
+            'company_id': subcontract_move.company_id.id,
+            'procurement_group_id': group.id,
+            'subcontractor_id': subcontract_move.picking_id.partner_id.commercial_partner_id.id,
+            'picking_ids': [subcontract_move.picking_id.id],
+            'product_id': product.id,
+            'product_uom_id': subcontract_move.product_uom.id,
+            'bom_id': bom.id,
+            'location_src_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
+            'location_dest_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
+            'product_qty': subcontract_move.product_uom_qty,
+            'picking_type_id': warehouse.subcontracting_type_id.id,
+            'date_planned_start': subcontract_move.date - relativedelta(days=product.produce_delay)
+        }
+        return vals
+
+
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
         production = workorders[0].production_id
@@ -1216,6 +1233,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/models/__init__.py

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

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> -->
+
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
+                            <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-call="sf_quality.html_report_quality_footer"/>
-                    <!-- </div> -->
+<!--                        <t t-if="loop.index == len(docs) - 1">-->
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
+                            <t t-call="sf_quality.html_report_quality_footer"/>
+                        <!-- </div> -->
+<!--                        </t>-->
                     </div>
                 </t>
             </t>

sf_quality/models/stock.py

@@ -1,59 +1,180 @@
+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):
-        """
+        """=
             出厂检验报告上传
         """
 
         out_quality_checks = self.env['quality.check'].search(
-            [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告')])
+            [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告'),
+             ('quality_state', '=', 'pass')])
         # out_quality_checks 可能存在多个
         if out_quality_checks:
             for out_quality_check in out_quality_checks:
                 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
-        if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
-            # 回滚事务，为二次确认/取消做准备
-            self.env.cr.rollback()
-            quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
-            product_list = list(set([quality_check_id.product_id for quality_check_id in quality_check_ids]))
-            fail_check_text = ''
-            for product_id in product_list:
-                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):
-                    number = sum(check_ids.mapped('qty_line'))
-                else:
-                    number = sum(self.move_ids_without_package.filtered(
-                        lambda ml: ml.product_id == product_id).mapped('quantity_done'))
-                    if number == 0:
-                        number = sum(self.move_ids_without_package.filtered(
-                            lambda ml: ml.product_id == product_id).mapped('reserved_availability'))
-                        if number == 0:
-                            number = sum(self.move_ids_without_package.filtered(
-                                lambda ml: ml.product_id == product_id).mapped('product_uom_qty'))
-                fail_check_text = (f'{fail_check_text}、{product_id.display_name}  {number}件'
-                                   if fail_check_text != '' else f'{product_id.display_name}  {number}件')
-            return {
-                'type': 'ir.actions.act_window',
-                'res_model': 'picking.validate.check.wizard',
-                'name': '质检不合格提示',
-                'view_mode': 'form',
-                'target': 'new',
-                'context': {
-                    'default_picking_id': self.id,
-                    'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
-                    'again_validate': True}
-            }
-        res = super(StockPicking, self).button_validate()
+        try:
+            self.ensure_one()
+            context = self.env.context
+            if not context.get('pinking_checkout_quality'):
+                picking_to_quality = self._get_picking_to_quality()
+                if not picking_to_quality: return False
+                need_quality_val = self.get_need_quality_line(picking_to_quality)
+                if any(line.get('fail_check_ids') for line in need_quality_val):
+                    # 回滚事务，为二次确认/取消做准备
+                    self.env.cr.rollback()
+                    # 获取存在失败的 质检单 调拨单明细行
+                    check_list = [item for item in need_quality_val if item.get('fail_check_ids')]
+                    fail_check_text = ''
+                    for item in check_list:
+                        move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty')
+                        fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name}  {pre_done_qty}件'
+                                           if fail_check_text != '' else f'{move_id.product_id.display_name}  {pre_done_qty}件')
+                    return {
+                        'type': 'ir.actions.act_window',
+                        'res_model': 'picking.validate.check.wizard',
+                        'name': '质检不合格提示',
+                        'view_mode': 'form',
+                        'target': 'new',
+                        'context': {
+                            'default_picking_id': self.id,
+                            'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
+                            'pinking_checkout_quality': True}
+                    }
+            else:
+                return False
+        except Exception as e:
+            logging.info('pinking_checkout_quality()方法报错：%s' % e)
+            raise ValidationError('调拨单验证质检单是否合格时报错,请联系管理员处理！！')
+
+    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')),'&amp;',('quality_state', '=', 'pass'), ('test_type', '=', '出厂检验报告')]}</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/sale_order.py

@@ -158,8 +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'],
-            'customer_delivery_date': item.get('customer_delivery_date'),
+            'delivery_end_date': item['delivery_end_date']
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -293,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('交货截止日期')
-    customer_delivery_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

@@ -127,7 +127,6 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="replace">
                     <field name="name" widget="section_and_note_text" optional="show"
                            string="参数说明(长/宽/高/体积/精度/材质)"/>
-                    <field name="customer_delivery_date" readonly="1"/>
                     <field name="manual_quotation" readonly="1"/>
                     <field name="is_incoming_material" readonly="1"/>
                 </xpath>
@@ -142,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_warehouse/migrations/1.2/post-migrate.py

@@ -7,8 +7,14 @@ 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

sf_warehouse/models/model.py

@@ -13,6 +13,7 @@ from odoo import api, fields, models, _
 from odoo.osv import expression
 from odoo.exceptions import UserError, ValidationError
 
+_logger = logging.getLogger(__name__)
 
 class SfLocation(models.Model):
     _inherit = 'stock.location'
@@ -459,7 +460,40 @@ class ShelfLocation(models.Model):
     product_sn_ids = fields.One2many('sf.shelf.location.lot', 'shelf_location_id', string='产品批次号')
     # 产品数量
     product_num = fields.Integer('总数量', compute='_compute_number', store=True)
-
+    tool_rfid = fields.Char('Rfid', compute='_compute_tool', store=True)
+    tool_name_id = fields.Many2one('sf.functional.cutting.tool.entity', string='功能刀具名称', compute='_compute_tool', store=True)
+    display_rfid = fields.Char('RFID', compute='_compute_display_rfid', store=True)
+    @api.depends('product_sn_id')
+    def _compute_display_rfid(self):
+        """计算显示 RFID"""
+        for record in self:
+            try:
+                record.display_rfid = record.product_sn_id.rfid if record.product_sn_id else ''
+            except Exception as e:
+                record.display_rfid = ''
+    
+    @api.depends('product_id')
+    def _compute_tool(self):
+        """计算工具 RFID"""
+        for record in self:
+            try:
+                if record.product_id:
+                    if record.product_id.categ_id.name == '功能刀具':
+                        # 搜索关联的功能刀具实体
+                        tool_id = self.env['sf.functional.cutting.tool.entity'].search(
+                            [('barcode_id', '=', record.product_sn_id.id)], limit=1
+                        )
+                        if tool_id:
+                            record.tool_rfid = tool_id.rfid
+                            record.tool_name_id = tool_id.id
+                            continue
+                # 默认值
+                record.tool_rfid = ''
+                record.tool_name_id = False
+            except Exception as e:
+                record.tool_rfid = ''
+                record.tool_name_id = False
+                _logger.error(f"计算 tool_rfid 时出错: {e}")
     @api.depends('product_num')
     def _compute_product_num(self):
         for record in self:
@@ -563,8 +597,27 @@ class ShelfLocation(models.Model):
                 else: 
                     _layer_capacity = _layer_capacity
                     _layer = _layer+1
+                _layer_capacity = f"{_layer_capacity:02d}"
                 record.kanban_show_layer_info=f"{_layer}-{_layer_capacity}"
                 record.kanban_show_center_control_code=f"{_cc_code}"
+    @api.model
+    def get_preproduction_shelf_ids(self):
+        """
+        获取预生产区域的货架ID列表
+        Returns:
+            list: 货架ID列表
+        """
+        query = """
+            SELECT DISTINCT b.shelf_id 
+            FROM stock_location a
+            LEFT JOIN sf_shelf_location b ON a.id = b.location_id
+            WHERE a.barcode LIKE 'WH-PREPRODUCTION'
+        """
+        self.env.cr.execute(query)
+        result = self.env.cr.fetchall()
+        # 将结果转换为ID列表
+        shelf_ids = [record[0] for record in result if record[0]]
+        return shelf_ids
 
 class SfShelfLocationLot(models.Model):
     _name = 'sf.shelf.location.lot'
@@ -581,6 +634,7 @@ class SfShelfLocationLot(models.Model):
         for item in self:
             if item.qty_num > item.qty:
                 raise ValidationError('变更数量不能比库存数量大！！！')
+    
 
 
 class SfStockMoveLine(models.Model):

sf_warehouse/static/src/css/kanban_location_custom.scss

@@ -1,128 +1,198 @@
-// 定义一个 mixin 来处理重复的样式
-@mixin kanban-common-styles($record-count-each-row,
-    $record-gap: 16px,
-    $color-guide-width: 70px) {
+// 定义看板公共样式的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: 0px !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: 0px !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;
-
+      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 {
-            transform: translateY(-1px) !important;
-            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important;
-        }
-
-        .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: 14px;
-                color: #000000;
-            }
-
-            .sf_kanban_no {
-                display: flex !important;
-                justify-content: center !important;
-                align-items: center !important;
-                font-size: 18px;
-                color: #000000;
-            }
+          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; 
+          }
         }
+      }
     }
-}
-
-// 使用 mixin 为不同的列数生成样式
-.o_kanban_view {
-    .sf_kanban_location_style {
-         // 设置卡片样式
-        .o_kanban_record {
-
-            &:hover {
-                transform: translateY(-1px) !important;
-                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important;
-            }
-
-            .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: 14px;
-                    color: #000000;
-                }
-
-                .sf_kanban_no {
-                    display: flex !important;
-                    justify-content: center !important;
-                    align-items: center !important;
-                    font-size: 18px;
-                    color: #000000;
-                }
-            }
+  }
+  
+  // === 看板视图样式（完全保留）===
+  .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);
+      @include kanban-common-styles(12);
     }
-
     .sf_kanban_location_style19 {
-        @include kanban-common-styles(19);
+      @include kanban-common-styles(19);
     }
-
     .sf_kanban_location_style4 {
-        @include kanban-common-styles(4);
+      @include kanban-common-styles(4);
     }
-
     .sf_kanban_location_style3 {
-        @include kanban-common-styles(3);
+      @include kanban-common-styles(3);
     }
-}
+  }

sf_warehouse/static/src/js/custom_kanban_controller.js

@@ -28,8 +28,18 @@ class CustomKanbanController extends KanbanController {
             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();
         });
@@ -50,7 +60,11 @@ class CustomKanbanController extends KanbanController {
         let domain = this.searchModel.domain;
         if (domain.length > 0) {
             let shelfDomain = domain.find(item => item[0] === 'shelf_id');
-            this.onShelfChange(shelfDomain[2]);
+            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');
         }
@@ -63,8 +77,7 @@ class CustomKanbanController extends KanbanController {
                 let shelfDomain = domain.find(item => item[0] === 'shelf_id');
                 if (shelfDomain) {
                     let shelfId = shelfDomain[2];
-                    // 如果货架ID存在，则设置相应的样式
-                    if (shelfId) {
+                    if (shelfId && this.preproductionShelfIds.includes(shelfId)) {
                         this.onShelfChange(shelfId);
                         return;
                     }
@@ -75,7 +88,6 @@ class CustomKanbanController extends KanbanController {
             this.setKanbanStyle('sf_kanban_location_style');
         } catch (error) {
         }
-
     }
 
     // 加载所有货架的层数数据
@@ -107,10 +119,18 @@ class CustomKanbanController extends KanbanController {
             // 添加新类
             if (isHave) kanbanViewEl.classList.add(style);
         }
-        const ghostCards = document.querySelectorAll('.o_kanban_ghost');
-        ghostCards.forEach(card => {
-            card.remove();
-        });
+        
+        // 获取当前的搜索域
+        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) {

sf_warehouse/views/shelf_location.xml

@@ -193,53 +193,78 @@
             </field>
         </record>
 
-        <record id="shelf_location_kanban_view" model="ir.ui.view">
-            <field name="name">shelf.location.kanban</field>
-            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
-                <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
-                    <templates>
-                        <t t-name="kanban-box">
-                            <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click
-                        #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
-                        #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
-                        #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
+<record id="shelf_location_kanban_view" model="ir.ui.view">
+    <field name="name">shelf.location.kanban</field>
+    <field name="model">sf.shelf.location</field>
+    <field name="arch" type="xml">
+        <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
+            <templates>
+                <t t-name="kanban-box">
+                    <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
+                    <div t-attf-class="oe_kanban_card oe_kanban_global_click
+                    #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
+                    #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
+                    #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
+                    
+                        <!-- 所有情况都需要的数据 (隐藏) -->
+                        <div style="display:none">
+                            <field name="location_status"/>
+                            <field name="tool_name_id"/>
+                        </div>
                         
-                               <!-- 所有情况都需要的数据 (隐藏) -->
-                                <div style="display:none">
-                                    <field name="location_status"/>
+                        <t t-if="isBaseStyle">
+                            <div class="o_kanban_card_header">
+                                <div class="o_kanban_card_header_title">
+                                    <field name="name"/>
                                 </div>
-                                
-                                
-                                <t t-if="isBaseStyle">
-                                    <div class="o_kanban_card_header">
-                                        <div class="o_kanban_card_header_title">
-                                            <field name="name"/>
-                                        </div>
-                                    </div>
-                                    <div class="o_kanban_record_bottom">
-                                        <field name="product_sn_id"/>
-                                        <span>|</span>
-                                        <field name="product_id"/>
-                                    </div>
-                                </t>
-                                
-                                <t t-else="">
-                                    <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
-                                        <field name="kanban_show_layer_info"/>
-                                    </div>
-                                    <div class="o_kanban_record_bottom sf_kanban_no">
-                                        <field name="kanban_show_center_control_code"/>
-                                    </div>
-                                </t>
+                            </div>
+                            <div class="o_kanban_record_bottom">
+                                <field name="product_sn_id"/>
+                                <field name="product_id"/>
                             </div>
                         </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
+                        
+                        <t t-else="">
+                            <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
+                                <field name="kanban_show_layer_info"/>
+                            </div>
+                            <!-- 添加RFID字段 -->
+                           <!--  <t t-if="record.data and record.data.display_rfid">
+                                <div class="o_kanban_record_bottom">
+                                    <field name="display_rfid"/>
+                                </div>
+                            </t>
+                            <t t-if="record.data and record.data.tool_rfid">
+                                <div class="o_kanban_record_bottom">
+                                    <field name="tool_rfid"/>
+                                </div>
+                            </t> -->
+                            <!-- 悬停时显示的详细信息 -->
+                            <div class="status-hover-bar">
+                                 <t t-if="record.product_id.value">
+                                        <div>产品: <t t-esc="record.product_id.value"/></div>
+                                    </t>
+                                <t t-if="record.product_sn_id.value">
+                                        <div>标签ID: <t t-esc="record.product_sn_id.value"/></div>
+                                    </t>
+                                 <!-- <t t-if="record.display_rfid.value">
+                                        <div>rfid: <t t-esc="record.display_rfid.value"/></div>
+                                    </t>
+                                    <t t-if="record.tool_rfid.value">
+                                        <div>rfid: <t t-esc="record.tool_rfid.value"/></div>
+                                    </t> -->
+                                     <t t-if="record.tool_name_id and record.tool_name_id.value">
+                                        <div>功能刀具名称: <t t-esc="record.tool_name_id.value"/></div>
+                                    </t>
+                                <div>状态: <t t-esc="record.location_status.value"/></div>
+                            </div>
+                        </t>
+                    </div>
+                </t>
+            </templates>
+        </kanban>
+    </field>
+</record>
         <!--     搜索视图 -->
         <record id="shelf_location_search_view" model="ir.ui.view">
             <field name="name">shelf.location.search</field>