需求计划列表字段位置变动

调拨动作中屏蔽验证
新增坯料类型
2025-06-30 17:13:46 +08:00 · 2025-06-30 13:36:04 +08:00 · 2025-06-27 15:29:02 +08:00 · 2025-06-27 15:17:15 +08:00 · 2025-06-27 15:10:15 +08:00 · 2025-06-26 17:04:50 +08:00
21 changed files with 749 additions and 370 deletions
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/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 {
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/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,11 @@ 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')
+    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision')
+    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')
@@ -197,6 +197,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 +289,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,7 +322,7 @@ 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
@@ -320,7 +337,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 +403,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
--- a/sf_demand_plan/static/src/js/print_demand.js
+++ b/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) {
--- a/sf_demand_plan/static/src/scss/style.css
+++ b/sf_demand_plan/static/src/scss/style.css
@@ -63,4 +63,27 @@
    .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;
+    }
+}
+
+th[data-name=processing_time] + th::before{
+    content: '待执行单据';
+    line-height: 38px;
+}
--- a/sf_demand_plan/views/demand_plan.xml
+++ b/sf_demand_plan/views/demand_plan.xml
@@ -3,17 +3,16 @@
        <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"
-                  class="demand_plan_tree">
+            <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
+                  class="demand_plan_tree freeze-columns-before-part_number">
                <header>
                    <button string="打印" name="button_action_print" type="object"
                            class="btn-primary"/>
                </header>
                <field name="sequence" widget="handle"/>
                <field name="id" optional="hide"/>
-                <field name="priority"/>
                <field name="status"/>
-                <field name="partner_id"/>
+                <field name="customer_name"/>
                <field name="order_remark"/>
                <field name="glb_url" optional="hide"/>
                <field name="product_id"/>
@@ -28,6 +27,9 @@
                <field name="qty_delivered"/>
                <field name="qty_to_deliver"/>
                <field name="model_long"/>
+                <field name="blank_type" optional="hide"/>
+                <field name="blank_precision"/>
+                <field name="embryo_long"/>
                <field name="materials_id"/>
                <field name="model_machining_precision"/>
                <field name="model_process_parameters_ids" widget="many2many_tags"/>
@@ -41,7 +43,10 @@
                <field name="date_order"/>
                <field name="contract_code"/>
                <field name="plan_remark"/>
-                <field name="processing_time"/>
+                <field name="priority" decoration-danger="priority == '1'"
+                       decoration-warning="priority == '2'"
+                       decoration-info="priority == '3'"
+                       decoration-success="priority == '4'"/>
                <field name="material_check" optional="hide"/>
                <field name="hide_action_open_mrp_production" invisible="1"/>
                <field name="hide_action_purchase_orders" invisible="1"/>
@@ -60,6 +65,7 @@
                <field name="planned_start_date"/>
                <field name="actual_start_date"/>
                <field name="actual_end_date"/>
+                <field name="processing_time"/>
                <field name="create_date" optional="hide" string="创建时间"/>
                <field name="create_uid" optional="hide" string="创建人"/>
                <field name="write_date" string="更新时间"/>
@@ -80,7 +86,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 +95,8 @@
                <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="[]"
@@ -120,4 +127,9 @@
            action="sf_production_demand_plan_action"
            parent="sf_plan.sf_production_plan_menu"
    />
+
+    <!--    调拨动作中屏蔽验证-->
+    <record id="stock.action_validate_picking" model="ir.actions.server">
+        <field name="binding_model_id" eval="False"/>
+    </record>
 </odoo>
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
+++ b/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
                        }
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
@@ -14,21 +14,4 @@
            </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>
--- a/sf_dlm/models/product_supplierinfo.py
+++ b/sf_dlm/models/product_supplierinfo.py
@@ -3,6 +3,7 @@ import logging

 import re
 from odoo import models, fields, api
+from odoo.exceptions import ValidationError


 class ResProductCategory(models.Model):
@@ -47,11 +48,14 @@ class ResMrpBomMo(models.Model):
                item.subcontractor_name = ''

    def bom_create_line_has(self, embryo):
+        product = self.product_tmpl_id
+        if product.unit_number in (0, None, False):
+            raise ValidationError(f'产品{product.name}单件用量的值不能为{product.unit_number}')
        vals = {
            'bom_id': self.id,
            'product_id': embryo.id,
            'product_tmpl_id': embryo.product_tmpl_id.id,
-            'product_qty': 1,
+            'product_qty': product.unit_number,
            'product_uom_id': 1
        }
        return self.env['mrp.bom.line'].sudo().create(vals)
@@ -122,7 +126,7 @@ class ResMrpBomMo(models.Model):
    # 查bom的原材料
    def get_raw_bom(self, product):
        raw_bom = self.env['product.product'].search(
-            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)],limit=1)
+            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)], limit=1)
        return raw_bom


--- a/sf_dlm/models/product_template.py
+++ b/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'],
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -95,6 +95,8 @@
                    <page string="加工参数">
                        <group>
                            <group string="模型">
+                                <field name="blank_type" readonly="1"/>
+                                <field name="blank_precision" readonly="1"/>
                                <label for="model_long" string="坯料尺寸[mm]"/>
                                <div class="o_address_format">
                                    <label for="model_long" string="长"/>
@@ -104,7 +106,7 @@
                                    <label for="model_height" string="高"/>
                                    <field name="model_height" class="o_address_zip"/>
                                </div>
-                                <field name="blank_type" readonly="1"/>
+                                <field name="unit_number" readonly="1"/>
                                <field name="model_volume" string="体积[mm³]"/>
                                <field name="product_model_type_id" string="模型类型"/>
                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"
--- a/sf_machine_connect/controllers/controllers.py
+++ b/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_produced'))

                # # 工单完成量
                # 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()

@@ -608,16 +633,34 @@ 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':
+                
+            for line in line_list:
+                date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
+                order_counts = []

-            if time_unit == 'hour':
+                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 +672,113 @@ 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)
+                    # time_count_dict[key] = len(orders)
+                    time_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
+
+                # 计划量，目前只能从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 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_orders = request.env['mrp.workorder'].sudo().browse(interval_plan_orders.mapped('res_id'))
+                    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.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    # time_count_dict[key] = len(orders)
+                    plan_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
+
                # 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 +801,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,10 +857,10 @@ class Sf_Dashboard_Connect(http.Controller):
        :param kw:
        :return:
        """
-
        # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
        res = {'status': 1, 'message': '成功', 'data': {}}
        plan_obj = request.env['sf.production.plan'].sudo()
+        work_order_obj = request.env['mrp.workorder'].sudo()
        line_list = ast.literal_eval(kw['line_list'])
        begin_time_str = kw['begin_time'].strip('"')
        end_time_str = kw['end_time'].strip('"')
@@ -765,28 +870,39 @@ class Sf_Dashboard_Connect(http.Controller):
        not_done_data = []
        done_data = []
        final_data = {}
+        not_done_index = 1
+        done_index = 1

        for line in line_list:
+
+            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'])], order='id asc'
+            )

            # 完成订单
            # 获取当前时间，并计算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)
-            ])
+            finish_orders = work_order_obj.search(work_order_domain + [
+                ('state', 'in', ['finished']),
+                ('production_id.state', 'not in', ['cancel']),
+                ('date_finished', '>=', time_24_hours_ago)
+            ], order='id asc')
            # print(finish_orders)

            # 获取所有未完成订单的ID列表
@@ -795,14 +911,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():
@@ -833,16 +949,17 @@ class Sf_Dashboard_Connect(http.Controller):
                }

                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:
@@ -861,17 +978,18 @@ class Sf_Dashboard_Connect(http.Controller):
                material = material_match.group(1) if material_match else 'No match found'

                line_dict = {
-                    'sequence': finish_id_to_sequence[finish_order.id],
+                    'sequence': done_index,
                    'workorder_name': finish_order.name,
                    'blank_name': blank_name,
                    'material': material,
                    'dimensions': dimensions,
-                    'order_qty': finish_order.product_qty,
+                    'order_qty': order.qty_produced,
                    'finish_time': finish_order.actual_end_time.strftime(
                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '

                }
                done_data.append(line_dict)
+                done_index += 1

            # 开始包一层
            res['data'][line] = {'not_done_data': not_done_data, 'done_data': done_data}
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -27,9 +27,11 @@ class ResProductMo(models.Model):
    categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
    model_name = fields.Char('模型名称')
    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
+    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型')
    model_long = fields.Float('模型长(mm)', digits=(16, 3))
    model_width = fields.Float('模型宽(mm)', digits=(16, 3))
    model_height = fields.Float('模型高(mm)', digits=(16, 3))
+    unit_number = fields.Float('单件用量', digits=(16, 3), default=1)
    model_volume = fields.Float('模型体积(m³)')
    model_area = fields.Float('模型表面积(m²)')
    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
@@ -894,15 +896,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)),
+            'blank_precision': item.get('blank_precision'),
+            '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),
+            'unit_number': item.get('unit_number'),
+            '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_machining_precision': item['model_machining_precision'],
@@ -952,7 +961,7 @@ class ResProductMo(models.Model):
            self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
                                   'quality_standard', item['quality_standard_mimetype'])
        return copy_product_id
-    
+
    def format_float(self, value):
        # 将浮点数转换为字符串
        value_str = str(value)
--- a/sf_quality/data/insepection_report_template.xml
+++ b/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,7 +200,7 @@
                                <p></p>
                            </div>
                        </div> -->
-                        
+
                        <!-- 页脚固定在底部 -->
                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
                        <t t-call="sf_quality.report_quality_footer"/>
@@ -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;">
--- a/sf_quality/views/quality_check_view.xml
+++ b/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>

--- a/sf_sale/models/sale_order.py
+++ b/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):
--- a/sf_sale/views/sale_order_view.xml
+++ b/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">
--- a/sf_warehouse/migrations/1.2/post-migrate.py
+++ b/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
--- a/sf_warehouse/models/model.py
+++ b/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):
--- a/sf_warehouse/static/src/css/kanban_location_custom.scss
+++ b/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);
    }
-}
+  }
--- a/sf_warehouse/static/src/js/custom_kanban_controller.js
+++ b/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) {
--- a/sf_warehouse/views/shelf_location.xml
+++ b/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>
Author	SHA1	Message	Date
guanhuan	fe8df494f9	需求计划列表字段位置变动	2025-06-30 17:13:46 +08:00
guanhuan	32cd68e15f	调拨动作中屏蔽验证	2025-06-30 13:36:04 +08:00
guanhuan	f0e47371ed	新增坯料类型	2025-06-27 15:29:02 +08:00
yuxianghui	6dde814acc	产品-form页面加工参数添加坯料类型字段	2025-06-27 15:17:15 +08:00
yuxianghui	71ab241e94	产品添加坯料类型字段，值来着bfm下单	2025-06-27 15:10:15 +08:00
yuxianghui	0a13acbb68	修改销售订单确认时，生成产品BOM时校验单位用量值的提示信息	2025-06-26 17:04:50 +08:00
hyyy	4b026535f8	修改固定列tree的传参方式	2025-06-25 14:01:34 +08:00
hyyy	99ac89f995	需求-字段命名调整	2025-06-25 09:54:37 +08:00
yuxianghui	35b1d648c3	产品新增单件用量 unit_number 字段，值由bfm下单同步获得；产品生成的BOM中组件数量的值由unit_number 字段提供。	2025-06-24 15:36:23 +08:00
guanhuan	fe3492ceb5	坯料尺寸显示修改	2025-06-24 11:32:41 +08:00
yuxianghui	4274b9fe99	出厂检验报告-页脚修改回退	2025-06-20 17:53:04 +08:00
禹翔辉	4ddabdefa1	Accept Merge Request #2227 : (feature/出厂检验报告模版 -> develop) Merge Request: 优化出厂检验报告模版 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2227	2025-06-20 13:39:42 +08:00
yuxianghui	364127beb3	1	2025-06-20 13:37:42 +08:00
yuxianghui	109ea8729d	优化出厂检验报告模版	2025-06-20 12:03:17 +08:00
禹翔辉	32de726164	Accept Merge Request #2226 : (feature/平台下单接口优化 -> develop) Merge Request: 修改出厂检验报告模版 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2226	2025-06-20 11:49:32 +08:00
yuxianghui	79f89f068b	修改出厂检验报告模版	2025-06-20 11:47:59 +08:00
禹翔辉	52189cff72	Accept Merge Request #2225 : (feature/平台下单接口优化 -> develop) Merge Request: 修改出厂检验报告生成模版 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2225	2025-06-20 11:37:18 +08:00
yuxianghui	aadccce47e	修改出厂检验报告生成模版	2025-06-20 11:35:23 +08:00
胡尧	abd88fd721	Accept Merge Request #2224 : (feature/6711 -> develop) Merge Request: 修改产量接口bug Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2224?initial=true	2025-06-20 11:27:06 +08:00
胡尧	2c2fa87719	修改产量接口bug	2025-06-20 11:26:48 +08:00
胡尧	7d8b7048a8	Accept Merge Request #2223 : (feature/6711 -> develop) Merge Request: 去掉多余代码 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2223?initial=true	2025-06-20 11:15:58 +08:00
胡尧	e7b312fb22	去掉多余代码	2025-06-20 10:53:31 +08:00
禹翔辉	bc641bde3a	Accept Merge Request #2222 : (feature/平台下单接口优化 -> develop) Merge Request: 处理bfm下单报错 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2222	2025-06-20 10:30:25 +08:00
yuxianghui	d73ffab9b5	处理bfm下单报错	2025-06-20 10:28:07 +08:00
黄焱	4b1c0bc3b5	Accept Merge Request #2221 : (feature/前端样式修改 -> develop) Merge Request: 质检PDF预览logo移位 Created By: @黄焱 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2221?initial=true	2025-06-20 09:23:34 +08:00
hyyy	45730e2dd4	质检PDF预览logo移位	2025-06-20 09:09:45 +08:00
禹翔辉	8903f32cf8	Accept Merge Request #2220 : (feature/质检按钮隐藏 -> develop) Merge Request: 处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2220	2025-06-19 16:34:32 +08:00
yuxianghui	8bd1c8a095	处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题	2025-06-19 16:29:31 +08:00
谷耀东	abf9a0997b	Accept Merge Request #2219 : (feature/7154 -> develop) Merge Request: 恢复刀具房样式和编码 Created By: @谷耀东 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @谷耀东 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2219	2025-06-19 16:28:02 +08:00
guyaodong	aec2d1c516	恢复刀具房样式和编码	2025-06-19 16:18:04 +08:00
禹翔辉	127efb67d7	Accept Merge Request #2218 : (feature/质检按钮隐藏 -> develop) Merge Request: 质检单按钮隐藏 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2218	2025-06-19 15:19:34 +08:00
yuxianghui	78edf1f7eb	质检单按钮隐藏	2025-06-19 15:17:26 +08:00
胡尧	e6e13a5970	Accept Merge Request #2217 : (feature/6711 -> develop) Merge Request: 修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2217?initial=true	2025-06-19 15:03:27 +08:00
胡尧	55cc4906ef	修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细	2025-06-19 15:02:55 +08:00
黄焱	427b548939	Accept Merge Request #2216 : (feature/前端样式修改 -> develop) Merge Request: 修改合格logo位置 Created By: @黄焱 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2216?initial=true	2025-06-19 14:37:13 +08:00
hyyy	8c9db7e8c8	修改合格logo位置	2025-06-19 14:32:59 +08:00
管欢	990f73ea4e	Accept Merge Request #2215 : (feature/齐套检查与下达生产 -> develop) Merge Request: 物料需求计划增加字段显示 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2215	2025-06-19 11:21:12 +08:00
胡尧	d21e0c7fd9	修改大屏数据接口，支持线下数据	2025-06-19 10:54:33 +08:00
guanhuan	b4ed65a75c	物料需求计划增加字段显示	2025-06-19 10:37:35 +08:00
管欢	53ba2ec589	Accept Merge Request #2214 : (feature/齐套检查与下达生产 -> develop) Merge Request: 物料需求计划增加字段显示 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2214	2025-06-19 09:58:10 +08:00
guanhuan	566bc0e1e2	物料需求计划增加字段显示	2025-06-19 09:40:29 +08:00
黄焱	5f216684f0	Accept Merge Request #2213 : (feature/前端样式修改 -> develop) Merge Request: 修改出厂检验报告合格LOGO移位 Created By: @黄焱 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2213?initial=true	2025-06-18 18:00:26 +08:00
hyyy	e86bd59a43	修改出厂检验报告合格LOGO移位	2025-06-18 17:56:27 +08:00
禹翔辉	e55625e4b6	Accept Merge Request #2212 : (feature/处理sf.t更新报错 -> develop) Merge Request: bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2212	2025-06-18 17:02:57 +08:00
yuxianghui	790dd3dd05	销售订单行的交货截止日期改为客户交期	2025-06-18 17:00:16 +08:00
yuxianghui	84846fb3da	bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高	2025-06-18 16:54:15 +08:00
禹翔辉	f45a46255b	Accept Merge Request #2211 : (feature/处理sf.t更新报错 -> develop) Merge Request: 处理sf.t更新报错 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2211	2025-06-18 16:12:12 +08:00
yuxianghui	fe5b005e45	1	2025-06-18 16:11:49 +08:00
yuxianghui	fc33280509	处理sf.t更新报错	2025-06-18 16:09:44 +08:00
黄焱	60ed04cf77	Accept Merge Request #2208 : (feature/前端样式修改 -> develop) Merge Request: 修改需求计划模块需求与bug Created By: @黄焱 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2208	2025-06-18 15:47:36 +08:00
禹翔辉	3439b47b0c	Accept Merge Request #2206 : (feature/删除客户交期字段 -> develop) Merge Request: 删除客户交期字段 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2206	2025-06-18 15:45:32 +08:00
管欢	33c5d648b5	Accept Merge Request #2210 : (feature/齐套检查与下达生产 -> develop) Merge Request: 批量排程时间修改 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2210	2025-06-18 15:41:54 +08:00
谷耀东	c7b50d9706	Accept Merge Request #2209 : (feature/7141 -> develop) Merge Request: 增加kanban悬停tip Created By: @谷耀东 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @谷耀东 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2209	2025-06-18 15:41:44 +08:00
guanhuan	05caed1d91	批量排程时间修改	2025-06-18 14:49:35 +08:00
guyaodong	8b66fda899	增加kanban悬停tip	2025-06-18 14:26:53 +08:00
hyyy	1456d4303b	修改需求计划模块需求与bug	2025-06-18 14:18:37 +08:00
guanhuan	9d2f23de7c	批量排程时间修改	2025-06-18 14:05:23 +08:00
yuxianghui	9393a48e70	删除客户交期字段	2025-06-18 11:11:51 +08:00
胡尧	749f44d6df	Accept Merge Request #2205 : (feature/7134 -> develop) Merge Request: 修改采购申请相关欠单创建报错的问题 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2205?initial=true	2025-06-18 10:56:54 +08:00
胡尧	7af7079a5c	Accept Merge Request #2204 : (feature/7134 -> develop) Merge Request: 采购申请按钮按照产品以及bom产品过滤 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2204?initial=true	2025-06-18 10:34:57 +08:00
管欢	531bc2e090	Accept Merge Request #2203 : (feature/齐套检查与下达生产 -> develop) Merge Request: 打印列表程序单数据修改 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2203	2025-06-18 09:44:16 +08:00
guanhuan	bc3ab21d75	打印列表程序单数据修改	2025-06-18 09:40:12 +08:00
guanhuan	d1811ea24b	需齐套检查修改	2025-06-17 16:33:01 +08:00
guanhuan	b426d5d505	需求计划排序修改	2025-06-17 14:58:27 +08:00
胡尧	61034c3424	调整数据获取逻辑	2025-06-16 17:33:55 +08:00
胡尧	10e995ec7f	修改获取产量相关接口	2025-06-16 16:25:01 +08:00