解决采购申请创建的采购单取消后导致后续单据无法就绪的问题

jikimo_demand_plan_queue/__init__.py

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

jikimo_demand_plan_queue/__manifest__.py

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

jikimo_demand_plan_queue/models/__init__.py

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

jikimo_demand_plan_queue/models/production_demand_plan.py

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

jikimo_frontend/static/src/scss/custom_style.scss

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

jikimo_purchase_request/__manifest__.py

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

jikimo_purchase_request/models/__init__.py

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

jikimo_purchase_request/models/mrp_production.py

@@ -12,7 +12,9 @@ class MrpProduction(models.Model):
             if item.product_id.is_customer_provided:
                 item.pr_mp_count = 0
             else:
-                pr_ids = item._get_purchase_request()
+                # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+                mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
+                pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
                 item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
@@ -23,7 +25,8 @@ class MrpProduction(models.Model):
         self.ensure_one()
 
         # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-        pr_ids = self._get_purchase_request()
+        mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
 
         action = {
             'res_model': 'purchase.request',
@@ -41,12 +44,3 @@ class MrpProduction(models.Model):
                 'view_mode': 'tree,form',
             })
         return action
-
-    def _get_purchase_request(self):
-        """获取跟制造订单相关的采购申请单（根据采购申请单行项目的产品匹配）"""
-        mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
-        product_list = self.product_id._get_product_include_bom()
-        pr_line_ids = pr_ids.line_ids.filtered(lambda l: l.product_id in product_list)
-        return pr_line_ids.mapped('request_id')
-    

jikimo_purchase_request/models/product_product.py

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

jikimo_purchase_request/models/purchase_order.py

@@ -16,69 +16,6 @@ class PurchaseOrder(models.Model):
         ('rejected', '已驳回')
     ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
 
-    # 成品采购订单对应的坯料采购申请单和采购订单数量
-    purchase_request_count = fields.Integer('子·采购申请数量', compute='_compute_purchase_request')
-    purchase_order_count = fields.Integer('子·采购订单数量', compute='_compute_purchase_request')
-
-    @api.depends('state')
-    def _compute_purchase_request(self):
-        for record in self:
-            purchase_request_ids, purchase_order_ids = record.get_purchase_request_order()
-            record.purchase_request_count = len(purchase_request_ids)
-            record.purchase_order_count = len(purchase_order_ids)
-
-    def action_view_preform_body_purchase_request(self):
-        self.ensure_one()
-        name_list = self._get_pinking_name()
-        purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
-
-        action = {
-            'res_model': 'purchase.request',
-            'type': 'ir.actions.act_window',
-        }
-        if len(purchase_request_ids) == 1:
-            action.update({
-                'view_mode': 'form',
-                'res_id': purchase_request_ids[0].id,
-            })
-        else:
-            action.update({
-                'name': _("子·采购申请"),
-                'domain': [('id', 'in', purchase_request_ids.ids)],
-                'view_mode': 'tree,form',
-            })
-        return action
-
-    def action_view_preform_body_purchase_order(self):
-        self.ensure_one()
-        name_list = self._get_pinking_name()
-        purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
-
-        action = {
-            'res_model': 'purchase.order',
-            'type': 'ir.actions.act_window',
-        }
-        if len(purchase_order_ids) == 1:
-            action.update({
-                'view_mode': 'form',
-                'res_id': purchase_order_ids[0].id,
-            })
-        else:
-            action.update({
-                'name': _("子·采购订单"),
-                'domain': [('id', 'in', purchase_order_ids.ids)],
-                'view_mode': 'tree,form',
-            })
-        return action
-
-    def get_purchase_request_order(self):
-        name_list = self._get_pinking_name()
-        purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
-        purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
-        return purchase_request_ids, purchase_order_ids
-
-    def _get_pinking_name(self):
-        return [picking_id.name for picking_id in self.picking_ids if picking_id.name]
 
     def button_confirm(self):
         res = super(PurchaseOrder, self).button_confirm()
@@ -94,12 +31,20 @@ class PurchaseOrder(models.Model):
     
     def button_cancel(self):
         """
-            将取消的采购订单关联的库存移动撤销
+            1. 先将采购订单行与目标库存移动断开链接，避免采购单取消后，调拨单被调整为mts的问题
+            2. 取消采购订单
+            3. 将采购订单行与目标库存移动重新建立链接
         """
-        move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
+        created_purchase_request_line_ids = {}
+        if self.order_line.move_dest_ids.created_purchase_request_line_id:
+            move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
+            created_purchase_request_line_ids = {move.id: move.created_purchase_request_line_id for move in move_ids}
+            self.order_line.write({'move_dest_ids': [(5, 0, 0)]})
         res =super(PurchaseOrder, self).button_cancel()
-        if move_ids.mapped('created_purchase_request_line_id'):
+        for move_id, created_purchase_request_line_id in created_purchase_request_line_ids.items():
-            move_ids.write({'state': 'waiting', 'is_done': False})
+            self.env['stock.move'].browse(move_id).created_purchase_request_line_id = created_purchase_request_line_id
+        # if move_ids.mapped('created_purchase_request_line_id'):
+        #     move_ids.write({'state': 'waiting', 'is_done': False})
         return res
 
     def write(self, vals):

jikimo_purchase_request/models/purchase_request.py

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

jikimo_purchase_request/models/stock_picking.py

@@ -42,17 +42,6 @@ class StockPicking(models.Model):
             purchase_request_lines = self.move_ids.move_orig_ids.purchase_line_id.purchase_request_lines
             if purchase_request_lines:
                purchase_request_lines.move_dest_ids = [
-                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id in purchase_request_lines.mapped('product_id.id')
+                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id == purchase_request_lines.product_id.id
                 ]
-        return res
+        return res
-
-    def _subcontracted_produce(self, subcontract_details):
-        super()._subcontracted_produce(subcontract_details)
-
-        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
-        if self:
-            pr_ids = self.env["purchase.request"].sudo().search(
-                [('origin', 'like', self.name), ('rule_purchase_to_request', '=', True), ('state', '=', 'draft')])
-            if pr_ids:
-                pr_ids.write({'need_validation': False})
-                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})

jikimo_purchase_request/models/stock_rule.py

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

jikimo_purchase_request/views/purchase_order.xml

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

jikimo_purchase_request/views/purchase_request_view.xml

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

sf_demand_plan/__manifest__.py

@@ -10,21 +10,11 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_plan'],
+    'depends': ['sf_plan', 'jikimo_printing'],
     'data': [
         'security/ir.model.access.csv',
-        'data/stock_route_group.xml',
-<<<<<<< HEAD
-        'views/sale_order_views.xml',
         'views/demand_plan.xml',
-        'views/demand_main_plan.xml',
-=======
-        'views/demand_plan.xml',
->>>>>>> develop
-        'views/stock_route.xml',
         'wizard/sf_demand_plan_print_wizard_view.xml',
-        'wizard/sf_release_plan_wizard_views.xml',
-        'views/menu_view.xml',
     ],
     'demo': [
     ],
@@ -33,7 +23,6 @@
         ],
         'web.assets_backend': [
             'sf_demand_plan/static/src/scss/style.css',
-            'sf_demand_plan/static/src/js/print_demand.js',
         ]
     },
     'license': 'LGPL-3',

sf_demand_plan/data/stock_route_group.xml

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

sf_demand_plan/migrations/1.1/post-migrate.py

@@ -1,25 +0,0 @@
-# migrations/1.1.0/post-migrate.py
-import os
-import csv
-import logging
-from odoo import api, SUPERUSER_ID
-
-_logger = logging.getLogger(__name__)
-
-#需求计划模块升级的时候，同步处理存量需求明细数据，关联上新加的需求计划主表
-def migrate(cr, version):
-    # 获取环境
-    env = api.Environment(cr, SUPERUSER_ID, {})
-
-    ProductionLine = env['sf.production.demand.plan']
-    DemandPlan = env['sf.demand.main.plan']
-
-    lines = ProductionLine.search([('demand_plan_id', '=', False)])
-    for line in lines:
-        vals = {
-            'sale_order_id': line.sale_order_id.id,
-            'sale_order_line_id': line.sale_order_line_id.id,
-            'line_ids': line.ids
-        }
-        new_plan = DemandPlan.create(vals)
-        line.write({'demand_plan_id': new_plan.id})

sf_demand_plan/models/__init__.py

@@ -1,11 +1,4 @@
 # -*- coding: utf-8 -*-
-from . import mrp_bom
+
-from . import mrp_production
-from . import sf_demand_main_plan
 from . import sf_production_demand_plan
 from . import sale_order
-from . import stock_route
-from . import stock_rule
-from . import purchase_request
-from . import purchase_order
-

sf_demand_plan/models/mrp_bom.py

@@ -1,20 +0,0 @@
-from odoo import models, fields
-
-
-class MrpBom(models.Model):
-    _inherit = 'mrp.bom'
-
-    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-    def bom_create(self, product, bom_type, product_type, code=None):
-        bom_id = self.env['mrp.bom'].create({
-            'product_tmpl_id': product.product_tmpl_id.id,
-            'type': bom_type,
-            # 'subcontractor_id': '' or subcontract.partner_id.id,
-            'product_qty': 1,
-            'product_uom_id': 1,
-            'code': code
-        })
-        if bom_type == 'subcontract' and product_type is not False:
-            subcontract = self.get_supplier(product.materials_type_id)
-            bom_id.subcontractor_id = subcontract.partner_id.id
-        return bom_id

sf_demand_plan/models/mrp_production.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models, api
-
-
-class MrpProduction(models.Model):
-    _inherit = 'mrp.production'
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.depends('demand_plan_line_id')
-    def _compute_production_type(self):
-        for production in self:
-            if production.demand_plan_line_id.supply_method == 'automation':
-                production.production_type = '自动化产线加工'
-            elif production.demand_plan_line_id.supply_method == 'manual':
-                production.production_type = '人工线下加工'
-            else:
-                production.production_type = None
-
-    def _get_purchase_request(self):
-        """获取跟制造订单相关的采购申请单"""
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', '=', self.name)])
-        return pr_ids

sf_demand_plan/models/purchase_order.py

@@ -1,22 +0,0 @@
-from odoo import api, fields, models, _
-from odoo.tools import float_compare
-
-
-class PurchaseOrder(models.Model):
-    _inherit = 'purchase.order'
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.depends('origin', 'demand_plan_line_id')
-    def _compute_purchase_type(self):
-        for purchase in self:
-            if purchase.order_line[0].product_id.categ_id.name == '坯料':
-                if purchase.order_line[0].product_id.materials_type_id.gain_way == '外协':
-                    purchase.purchase_type = 'outsourcing'
-            else:
-                if purchase.demand_plan_line_id.supply_method == 'outsourcing':
-                    purchase.purchase_type = 'outsourcing'
-
-                elif purchase.demand_plan_line_id.supply_method == 'purchase':
-                    purchase.purchase_type = 'outside'

sf_demand_plan/models/purchase_request.py

@@ -1,110 +0,0 @@
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError, ValidationError
-
-
-class PurchaseRequestLine(models.Model):
-    _inherit = 'purchase.request.line'
-    _description = '采购申请明细'
-
-    supply_method = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式', readonly=True)
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.depends('demand_plan_line_id')
-    def _compute_supply_method(self):
-        for prl in self:
-            if prl.demand_plan_line_id:
-                prl.supply_method = prl.demand_plan_line_id.supply_method
-            else:
-                prl.supply_method = None
-
-
-class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
-    _inherit = "purchase.request.line.make.purchase.order"
-
-    def make_purchase_order(self):
-        res = []
-        purchase_obj = self.env["purchase.order"]
-        po_line_obj = self.env["purchase.order.line"]
-        purchase = False
-
-        if len(set([item_id.line_id.supply_method for item_id in self.item_ids])) > 1:
-            raise ValidationError('不同供货方式不可合并创建询价单!')
-
-        for item in self.item_ids:
-            line = item.line_id
-            if item.product_qty <= 0.0:
-                raise UserError(_("Enter a positive quantity."))
-            if self.purchase_order_id:
-                purchase = self.purchase_order_id
-            if not purchase:
-                po_data = self._prepare_purchase_order(
-                    line.request_id.picking_type_id,
-                    line.request_id.group_id,
-                    line.company_id,
-                    line.request_id.origin,
-                )
-                po_data['demand_plan_line_id'] = item.line_id.demand_plan_line_id.id
-                # po_data.update({'related_product':line.related_product.id})
-                purchase = purchase_obj.create(po_data)
-
-            # Look for any other PO line in the selected PO with same
-            # product and UoM to sum quantities instead of creating a new
-            # po line
-            domain = self._get_order_line_search_domain(purchase, item)
-            available_po_lines = po_line_obj.search(domain)
-            new_pr_line = True
-            # If Unit of Measure is not set, update from wizard.
-            if not line.product_uom_id:
-                line.product_uom_id = item.product_uom_id
-            # Allocation UoM has to be the same as PR line UoM
-            alloc_uom = line.product_uom_id
-            wizard_uom = item.product_uom_id
-            if available_po_lines and not item.keep_description:
-                new_pr_line = False
-                po_line = available_po_lines[0]
-                po_line.purchase_request_lines = [(4, line.id)]
-                po_line.move_dest_ids |= line.move_dest_ids
-                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
-                    po_line.product_uom_qty, alloc_uom
-                )
-                wizard_product_uom_qty = wizard_uom._compute_quantity(
-                    item.product_qty, alloc_uom
-                )
-                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
-                self.create_allocation(po_line, line, all_qty, alloc_uom)
-            else:
-                po_line_data = self._prepare_purchase_order_line(purchase, item)
-                if item.keep_description:
-                    po_line_data["name"] = item.name
-                if line.related_product:
-                    po_line_data.update({'related_product': line.related_product.id})
-                po_line = po_line_obj.create(po_line_data)
-                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
-                    po_line.product_uom_qty, alloc_uom
-                )
-                wizard_product_uom_qty = wizard_uom._compute_quantity(
-                    item.product_qty, alloc_uom
-                )
-                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
-                self.create_allocation(po_line, line, all_qty, alloc_uom)
-            self._post_process_po_line(item, po_line, new_pr_line)
-            res.append(purchase.id)
-
-        purchase_requests = self.item_ids.mapped("request_id")
-        purchase_requests.button_in_progress()
-        return {
-            "domain": [("id", "in", res)],
-            "name": _("RFQ"),
-            "view_mode": "tree,form",
-            "res_model": "purchase.order",
-            "view_id": False,
-            "context": False,
-            "type": "ir.actions.act_window",
-        }

sf_demand_plan/models/sale_order.py

@@ -9,53 +9,14 @@ class ReSaleOrder(models.Model):
         compute='_compute_mrp_production_ids',
         string='与此销售订单相关联的制造订单',
         groups='mrp.group_mrp_user', store=True)
-    demand_plan_ids = fields.Many2many(comodel_name="sf.demand.main.plan",
-                                      string="需求计划", readonly=True)
-    demand_plan_count = fields.Integer(
-        "需求计划生成计数",
-        compute='_compute_demand_plan_count',
-    )
-    #暂时不知道哪里用到了
-    @api.depends('demand_plan_ids.line_ids.status')
-    def _compute_purchase_request_count(self):
-        for record in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', record.name)])
-            if pr_ids:
-                record.purchase_request_purchase_order_count = len(pr_ids)
-            else:
-                record.purchase_request_purchase_order_count = 0
-    #计算需求计划生成计数
-    @api.depends('demand_plan_ids.line_ids')
-    def _compute_demand_plan_count(self):
-        for line in self:
-            demand_plan = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', line.id)])
-            line.demand_plan_count = len(demand_plan)
 
     def sale_order_create_line(self, product, item):
         ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
-        # vals = {
+        vals = {
-        #     'sale_order_id': ret.order_id.id,
+            'sale_order_id': ret.order_id.id,
-        #     'sale_order_line_id': ret.id,
+            'sale_order_line_id': ret.id,
-        # }
+        }
-        # demand_plan_info = self.env['sf.demand.main.plan'].sudo().create(vals)
+        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
-        # vals.update({'demand_plan_id': demand_plan_info.id, 'plan_uom_qty': ret.product_uom_qty})
-        # demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
-        # demand_plan_info.write({'line_ids': demand_plan.ids})
-        # 优化方案1：使用事务确保数据一致性
-        with self.env.cr.savepoint():
-            # 1. 先创建主计划
-            demand_plan_info = self.env['sf.demand.main.plan'].sudo().create({
-                'sale_order_id': ret.order_id.id,
-                'sale_order_line_id': ret.id,
-            })
-            # 2. 创建明细计划时直接建立关联（利用One2many的inverse特性）
-            demand_plan = self.env['sf.production.demand.plan'].sudo().create({
-                'demand_plan_id': demand_plan_info.id,
-                'plan_uom_qty': ret.product_uom_qty,
-                'sale_order_id': ret.order_id.id,     
-                'sale_order_line_id': ret.id,        
-            })
-        # 3. 不需要手动更新line_ids，Odoo的ORM会自动处理One2many关系
         if demand_plan.product_id.machining_drawings_name:
             filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
             wizard_vals = {
@@ -65,23 +26,4 @@ class ReSaleOrder(models.Model):
                 'type': '1',
             }
             self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
-        ret.order_id.demand_plan_ids = [(4, demand_plan_info.id)]
         return ret
-    #从sf工厂调过来时，调用了，这里重写
-    def confirm_to_supply_method(self):
-        self.state = 'sale'
-        for line in self.order_line:
-            if line.product_id.auto_machining:
-                line.supply_method = 'automation'
-    #在销售订单打开需求计划列表
-    def action_view_demand_plan(self):
-        self.ensure_one()
-        demand_plan_ids = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', self.id)]).ids
-        return {
-            'res_model': 'sf.production.demand.plan',
-            'type': 'ir.actions.act_window',
-            'name': _("需求计划"),
-            'domain': [('id', 'in', demand_plan_ids)],
-            'view_mode': 'tree',
-        }
-

sf_demand_plan/models/sf_demand_main_plan.py

@@ -1,206 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-from odoo.tools import float_compare
-from odoo.exceptions import ValidationError
-
-
-class SfDemandMainPlan(models.Model):
-    _name = 'sf.demand.main.plan'
-    _description = 'sf_demand_main_plan'
-
-    def _get_machining_precision(self):
-        machinings = self.env['sf.machining.accuracy'].sudo().search([])
-        list = [(m.sync_id, m.name) for m in machinings]
-        return list
-
-    state = fields.Selection([
-        ('10', '需求确认'),
-        ('20', '待工艺设计'),
-        ('30', '部分下达'),
-        ('40', '已下达'),
-        ('50', '取消'),
-    ], string='状态', default='10', compute='_compute_state', store=True)
-
-    line_ids = fields.One2many(comodel_name='sf.production.demand.plan',
-                               inverse_name='demand_plan_id', string="需求计划", copy=True)
-
-    sale_order_id = fields.Many2one(comodel_name="sale.order",
-                                    string="销售订单", readonly=True)
-    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
-                                         string="销售订单明细", readonly=True)
-
-    product_id = fields.Many2one(
-        comodel_name='product.product',
-        related='sale_order_line_id.product_id',
-        string='产品', store=True, index=True)
-
-    part_name = fields.Char('零件名称', related='product_id.part_name')
-    part_number = fields.Char('零件图号', compute='_compute_part_number', store=True)
-    materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
-
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
-                                  related='product_id.blank_type')
-    embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long', store=True)
-    is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
-    pending_qty = fields.Float(
-        string="待计划",
-        compute='_compute_pending_qty', store=True)
-    planned_qty = fields.Float(
-        string="已计划",
-        compute='_compute_planned_qty', store=True)
-    model_id = fields.Char('模型ID', related='product_id.model_id')
-    customer_name = fields.Char('客户', related='sale_order_id.customer_name')
-    product_uom_qty = fields.Float(
-        string="需求数量",
-        related='sale_order_line_id.product_uom_qty', store=True)
-    deadline_of_delivery = fields.Date('客户交期', related='sale_order_line_id.delivery_end_date', store=True)
-    contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
-    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
-
-    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter',
-                                                    'demand_plan_process_parameter_rel',
-                                                    string='表面工艺',
-                                                    compute='_compute_model_process_parameters_ids'
-                                                    , store=True
-                                                    )
-    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
-                                                 related='product_id.model_machining_precision')
-
-    inventory_quantity_auto_apply = fields.Float(
-        string="成品库存",
-        compute='_compute_inventory_quantity_auto_apply', store=True
-    )
-
-    priority = fields.Selection([
-        ('1', '紧急'),
-        ('2', '高'),
-        ('3', '中'),
-        ('4', '低'),
-    ], string='优先级', default='3')
-
-    hide_button_release_plan = fields.Boolean(
-        string='显示下达计划按钮',
-        compute='_compute_hide_button_release_plan',
-        default=False
-    )
-
-    @api.depends('product_id.part_number', 'product_id.model_name')
-    def _compute_part_number(self):
-        for line in self:
-            if line.product_id:
-                if line.product_id.part_number:
-                    line.part_number = line.product_id.part_number
-                else:
-                    if line.product_id.model_name:
-                        line.part_number = line.product_id.model_name.rsplit('.', 1)[0]
-            else:
-                line.part_number = None
-
-    @api.depends('product_id.materials_id')
-    def _compute_materials_id(self):
-        for line in self:
-            if line.product_id:
-                line.materials_id = f"{line.product_id.materials_id.name}/{line.product_id.materials_type_id.name}"
-            else:
-                line.materials_id = None
-
-    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height')
-    def _compute_embryo_long(self):
-        for line in self:
-            if line.product_id:
-                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.model_process_parameters_ids')
-    def _compute_model_process_parameters_ids(self):
-        for line in self:
-            if line.product_id and line.product_id.model_process_parameters_ids:
-                line.model_process_parameters_ids = [(6, 0, line.product_id.model_process_parameters_ids.ids)]
-            else:
-                line.model_process_parameters_ids = [(5, 0, 0)]
-
-    def _compute_inventory_quantity_auto_apply(self):
-        location_id = self.env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id
-        product_ids = self.mapped('product_id').ids
-        if product_ids:
-            quant_data = self.env['stock.quant'].read_group(
-                domain=[
-                    ('product_id', 'in', product_ids),
-                    ('location_id', '=', location_id)
-                ],
-                fields=['product_id', 'inventory_quantity_auto_apply'],
-                groupby=['product_id']
-            )
-            quantity_map = {item['product_id'][0]: item['inventory_quantity_auto_apply'] for item in quant_data}
-        else:
-            quantity_map = {}
-        for line in self:
-            if line.product_id:
-                line.inventory_quantity_auto_apply = quantity_map.get(line.product_id.id, 0.0)
-            else:
-                line.inventory_quantity_auto_apply = 0.0
-
-    @api.depends('product_uom_qty', 'line_ids.plan_uom_qty')
-    def _compute_pending_qty(self):
-        for line in self:
-            sum_plan_uom_qty = sum(line.line_ids.mapped('plan_uom_qty'))
-            pending_qty = line.product_uom_qty - sum_plan_uom_qty
-            rounding = line.product_id.uom_id.rounding or 0.01#设置默认精度
-            # 如果精度小于等于0，则设置为0.01   
-            if rounding<=0:
-                rounding = 0.01
-            # 如果计划量小于等于0，则设置为0
-            if float_compare(pending_qty, 0, precision_rounding=rounding) == -1:
-                line.pending_qty = 0
-            else:
-                line.pending_qty = pending_qty
-
-    @api.depends('line_ids.plan_uom_qty')
-    def _compute_planned_qty(self):
-        for line in self:
-            line.planned_qty = sum(line.line_ids.mapped('plan_uom_qty'))
-
-    @api.depends('line_ids.status')
-    def _compute_hide_button_release_plan(self):
-        for line in self:
-            line.hide_button_release_plan = bool(line.line_ids.filtered(lambda p: p.status != '60'))
-
-    def button_release_plan(self):
-        pass
-
-    @api.depends('line_ids.status', 'sale_order_id.state')
-    def _compute_state(self):
-        for line in self:
-            #已下达的订单
-            status_line = line.line_ids.filtered(lambda p: p.status == '60')
-            if line.sale_order_id.state == 'cancel':
-                line.state = '50'
-                line.line_ids.status = '100'
-            elif len(line.line_ids) == len(status_line):
-                line.state = '40'
-            #排除上面全部下达的情形后，如果有已下达订单，则状态为部分
-            elif bool(status_line):
-                line.state = '30'
-            else:
-                line.state = '10'
-
-    def write(self, vals):
-        res = super(SfDemandMainPlan, self).write(vals)
-        line_ids = self.line_ids.filtered(lambda p: p.plan_uom_qty == 0 or p.plan_uom_qty < 0)
-        if line_ids:
-            raise ValidationError(f"计划量不能小于等于0")
-        if 'line_ids' in vals:
-            for line in self.line_ids:
-                if not line.sale_order_id:
-                    line.sale_order_id = self.sale_order_id
-                if not line.sale_order_line_id:
-                    line.sale_order_line_id = self.sale_order_line_id
-        return res
-
-    def name_get(self):
-        result = []
-        for plan in self:
-            result.append((plan.id, plan.sale_order_id.name))
-        return result

sf_demand_plan/models/stock_route.py

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

sf_demand_plan/models/stock_rule.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, fields, models
-
-
-class StockRule(models.Model):
-    _inherit = 'stock.rule'
-
-    def _prepare_mo_vals(self, product_id, product_qty, product_uom, location_id, name, origin, company_id, values,
-                         bom):
-        res = super()._prepare_mo_vals(product_id, product_qty, product_uom, location_id, name, origin, company_id,
-                                       values, bom)
-        if self.env.context.get('demand_plan_line_id'):
-            res['demand_plan_line_id'] = self.env.context.get('demand_plan_line_id')
-        return res
-
-    @api.model
-    def _prepare_purchase_request_line(self, request_id, procurement):
-        res = super()._prepare_purchase_request_line(request_id, procurement)
-        if self.env.context.get('demand_plan_line_id'):
-            res['demand_plan_line_id'] = self.env.context.get('demand_plan_line_id')
-        return res

sf_demand_plan/security/ir.model.access.csv

@@ -1,20 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_production_demand_plan,sf.production.demand.plan,model_sf_production_demand_plan,base.group_user,1,0,0,0
-access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for dispatch,model_sf_production_demand_plan,sf_base.group_plan_dispatch,1,1,1,1
+access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for dispatch,model_sf_production_demand_plan,sf_base.group_plan_dispatch,1,1,0,0
 
 access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
 access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0
-
-<<<<<<< HEAD
-access_sf_demand_main_plan,sf.demand.main.plan,model_sf_demand_main_plan,base.group_user,1,0,0,0
-access_sf_demand_main_plan_for_dispatch,sf.demand.main.plan for dispatch,model_sf_demand_main_plan,sf_base.group_plan_dispatch,1,1,0,0
-
-access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
-access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
-
-access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0
-access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1
-=======
-access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
-access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
->>>>>>> develop

sf_demand_plan/static/src/js/print_demand.js

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

sf_demand_plan/static/src/scss/style.css

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

sf_demand_plan/views/demand_main_plan.xml

@@ -1,70 +0,0 @@
-<odoo>
-    <record id="view_sf_demand_main_plan_form" model="ir.ui.view">
-        <field name="name">sf.demand.main.plan.form</field>
-        <field name="model">sf.demand.main.plan</field>
-        <field name="arch" type="xml">
-            <form>
-                <header>
-                    <field name="hide_button_release_plan" invisible="1"/>
-                    <!--                    <button string="下达计划" name="button_release_plan" type="object"-->
-                    <!-- class="btn-primary" attrs="{'invisible': [('hide_button_release_plan', '=', False)]}"/>-->
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="product_id"/>
-                            <field name="part_name"/>
-                            <field name="part_number"/>
-                            <field name="materials_id"/>
-                            <field name="blank_type"/>
-                            <field name="embryo_long"/>
-                            <field name="is_incoming_material"/>
-                            <field name="pending_qty"/>
-                            <field name="planned_qty"/>
-                            <field name="model_id"/>
-                        </group>
-                        <group>
-                            <field name="customer_name"/>
-                            <field name="product_uom_qty"/>
-                            <field name="deadline_of_delivery"/>
-                            <field name="contract_date"/>
-                            <field name="contract_code"/>
-                            <field name="model_process_parameters_ids" widget="many2many_tags"/>
-                            <field name="model_machining_precision"/>
-                            <field name="inventory_quantity_auto_apply"/>
-                            <field name="priority" attrs="{'readonly': [('state',  'in', ('40','50'))]}"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="计划">
-                            <field name="line_ids" attrs="{'readonly': [('state', 'in', ('40','50'))]}">
-                                <tree editable="bottom" delete="false">
-                                    <field name="status"/>
-                                    <field name="supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide"/>
-                                    <field name="plan_uom_qty"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object" class="btn-primary" attrs="{'invisible': [('status', 'in', ('50','60','100'))]}" />
-                                    <button name="button_release_production" type="object" string="下发生产" class="btn-primary" attrs="{'invisible': [('hide_release_production_order', '=', False)]}" />
-                                    <button name="button_delete" type="object" string="删除" class="btn-primary" attrs="{'invisible': [('status', 'not in', ('10','20','30'))]}" confirm='是否确认删除？'/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-</odoo>

sf_demand_plan/views/demand_plan.xml

@@ -1,18 +1,19 @@
-<odoo>  
+<odoo>
     <record id="view_sf_production_demand_plan_tree" model="ir.ui.view">
         <field name="name">sf.production.demand.plan.tree</field>
         <field name="model">sf.production.demand.plan</field>
         <field name="arch" type="xml">
-            <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
+            <tree string="需求计划" default_order="sequence desc,create_date desc" editable="bottom"
-                  class="demand_plan_tree freeze-columns-before-part_number"  create="false" delete="false">
+                  class="demand_plan_tree">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
                             class="btn-primary"/>
                 </header>
                 <field name="sequence" widget="handle"/>
                 <field name="id" optional="hide"/>
+                <field name="priority"/>
                 <field name="status"/>
-                <field name="customer_name"/>
+                <field name="partner_id"/>
                 <field name="order_remark"/>
                 <field name="glb_url" optional="hide"/>
                 <field name="product_id"/>
@@ -20,58 +21,52 @@
                 <field name="part_name"/>
                 <field name="part_number"/>
                 <field name="is_incoming_material"/>
-                <field name="supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
+                <field name="supply_method"/>
                 <field name="product_uom_qty"/>
                 <field name="deadline_of_delivery"/>
                 <field name="inventory_quantity_auto_apply"/>
                 <field name="qty_delivered"/>
                 <field name="qty_to_deliver"/>
                 <field name="model_long"/>
-                <field name="blank_type" optional="hide"/>
+                <field name="materials_id"/>
-                <field name="blank_precision"/>
+                <field name="model_machining_precision"/>
-                <field name="embryo_long"/>
+                <field name="model_process_parameters_ids" widget="many2many_tags"/>
                 <field name="product_remark" optional="hide"/>
                 <field name="order_code" optional="hide"/>
                 <field name="sale_order_id" optional="hide"/>
                 <field name="sale_order_line_number" optional="hide"/>
                 <field name="order_state"/>
+                <field name="route_id" optional="hide"/>
                 <field name="contract_date"/>
                 <field name="date_order"/>
                 <field name="contract_code"/>
-                <field name="plan_remark" attrs="{'readonly': [('status', 'in', ('60','100'))]}"/>
+                <field name="plan_remark"/>
-                <field name="priority" decoration-danger="priority == '1'"
+                <field name="processing_time"/>
-                       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_open_mrp_production" invisible="1"/>
-                <!--                <field name="hide_action_purchase_orders" invisible="1"/>-->
+                <field name="hide_action_purchase_orders" invisible="1"/>
-                <!--                <field name="hide_action_stock_picking" invisible="1"/>-->
+                <field name="hide_action_stock_picking" invisible="1"/>
-                <!--                <field name="hide_action_view_programming" invisible="1"/>-->
+                <field name="hide_action_view_programming" invisible="1"/>
-                <!--                <button name="action_open_sale_order" type="object" string="供货方式待确认" class="btn-secondary"-->
+                <button name="action_open_sale_order" type="object" string="供货方式待确认" class="btn-secondary"
-                <!--                        attrs="{'invisible': [('supply_method', '!=', False)]}"/>-->
+                        attrs="{'invisible': [('supply_method', '!=', False)]}"/>
-                <!--                <button name="action_open_mrp_production" type="object" string="待工艺确认" class="btn-secondary"-->
+                <button name="action_open_mrp_production" type="object" string="待工艺确认" class="btn-secondary"
-                <!--                        attrs="{'invisible': [('hide_action_open_mrp_production', '=', False)]}"/>-->
+                        attrs="{'invisible': [('hide_action_open_mrp_production', '=', False)]}"/>
-                <!--                <button name="action_view_purchase_request" type="object" string="采购申请" class="btn-secondary"-->
+                <button name="action_view_purchase_request" type="object" string="采购申请" class="btn-secondary"
-                <!--                        attrs="{'invisible': [('hide_action_purchase_orders', '=', False)]}"/>-->
+                        attrs="{'invisible': [('hide_action_purchase_orders', '=', False)]}"/>
-                <!--                <button name="action_view_stock_picking" type="object" string="调拨单" class="btn-secondary"-->
+                <button name="action_view_stock_picking" type="object" string="调拨单" class="btn-secondary"
-                <!--                        attrs="{'invisible': [('hide_action_stock_picking', '=', False)]}"/>-->
+                        attrs="{'invisible': [('hide_action_stock_picking', '=', False)]}"/>
-                <!--                <button name="action_view_programming" type="object" string="编程单" class="btn-secondary"-->
+                <button name="action_view_programming" type="object" string="编程单" class="btn-secondary"
-                <!--                        attrs="{'invisible': [('hide_action_view_programming', '=', False)]}"/>-->
+                        attrs="{'invisible': [('hide_action_view_programming', '=', False)]}"/>
-                <field name="planned_start_date" attrs="{'readonly': [('status',  'in', ('60','100'))]}"/>
+                <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="更新时间"/>
                 <field name="write_uid" optional="hide" string="更新人"/>
                 <field name="print_count"/>
-                <field name="hide_release_production_order" invisible="1"/>
+                <button name="release_production_order" type="object" string="下达生产" class="btn-primary"
-                <button name="button_release_production" type="object" string="下发生产" class="btn-primary"
+                        attrs="{'invisible': ['|',('status', '!=', '50'), ('supply_method', 'not in', ['automation', 'manual'])]}"/>
-                        attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                />
-                <button name="action_edit_demand_plan_form" type="object" string="编辑" class="btn-primary"/>
             </tree>
         </field>
     </record>
@@ -85,7 +80,7 @@
                 <field name="product_id"/>
                 <field name="part_name"/>
                 <field name="part_number"/>
-                <field name="customer_name"/>
+                <field name="partner_id"/>
                 <field name="supply_method"/>
                 <field name="materials_id"/>
                 <field name="model_process_parameters_ids"/>
@@ -94,8 +89,7 @@
                 <group expand="0" string="Group By">
                     <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
                     <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
-                    <filter name="group_by_customer_name" string="客户" domain="[]"
+                    <filter name="group_by_partner_id" string="客户" domain="[]" context="{'group_by': 'partner_id'}"/>
-                            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="[]"
@@ -109,7 +103,8 @@
                 </group>
             </search>
         </field>
-    </record> 
+    </record>
+
     <record id="sf_production_demand_plan_action" model="ir.actions.act_window">
         <field name="name">需求计划</field>
         <field name="type">ir.actions.act_window</field>
@@ -117,4 +112,12 @@
         <field name="view_mode">tree</field>
     </record>
 
-</odoo>
+
+    <menuitem
+            id="demand_plan_menu"
+            name="需求计划"
+            sequence="140"
+            action="sf_production_demand_plan_action"
+            parent="sf_plan.sf_production_plan_menu"
+    />
+</odoo>

sf_demand_plan/views/menu_view.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <menuitem
-                id="demand_plan_menu"
-                name="需求计划"
-                sequence="140"
-                action="sf_demand_plan.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>
-    </data>
-</odoo>

sf_demand_plan/views/sale_order_views.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="view_order_form_inherit_plan" model="ir.ui.view">
-        <field name="name">view.sale.order.form.inherit.plan</field>
-        <field name="inherit_id" ref="sf_manufacturing.view_order_form_inherit_supply_method"/>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <xpath expr="//header/button[@name='action_confirm'][last()]" position="attributes">
-                <attribute name="invisible">True</attribute>
-            </xpath>
-
-            <xpath expr="//page/field[@name='order_line']/tree/field[@name='supply_method']" position="attributes">
-                <attribute name="invisible">True</attribute>
-            </xpath> 
-
-            <xpath expr="//div[@name='button_box']" position="inside">
-                <button class="oe_stat_button" name="action_view_demand_plan" type="object" icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('demand_plan_count', '=', 0)]}">
-                    <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="demand_plan_count"/>
-                        </span>
-                        <span class="o_stat_text">需求计划</span>
-                    </div>
-                </button>
-            </xpath>
-        </field>
-    </record>
-</odoo>

sf_demand_plan/views/stock_route.xml

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

sf_demand_plan/wizard/__init__.py

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -27,17 +27,11 @@ 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
+    def demand_plan_print(self):
-    def demand_plan_print(self, print_ids):
+        for record in self:
-        plan_print_ids = self.env['sf.demand.plan.print.wizard'].sudo().search(
-            [('id', 'in', print_ids)])
-        if not plan_print_ids:
-            return {'message': '记录不存在'}
-        success_records = []
-        failed_records = []
-        for record in plan_print_ids:
             pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
             if pdf_data:
                 try:
@@ -52,20 +46,9 @@ class SfDemandPlanPrintWizard(models.TransientModel):
                     elif record.type == '2':
                         c_num += 1
                     record.demand_plan_id.print_count = f"T{t_num}C{c_num}"
-                    success_records.append({
-                        'filename_url': record.filename_url,
-                    })
                 except Exception as e:
                     record.status = 'fail'
                     _logger.error(f"文件{record.filename_url}打印失败: {str(e)}")
-                    failed_records.append({
-                        'filename_url': record.filename_url,
-                    })
-        if failed_records:
-            message = f"成功打印 {len(success_records)} 个文件，失败 {len(failed_records)} 个"
-        else:
-            message = f"所有 {len(success_records)} 个文件打印成功"
-        return {'message': message}
 
 
 class MrpWorkorder(models.Model):
@@ -76,7 +59,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(
-                    [('model_id', '=', record.model_id), ('type', '=', '2')])
+                    [('workorder_id', '=', record.id)])
                 if demand_plan_print:
                     self.env['sf.demand.plan.print.wizard'].sudo().write(
                         {'cnc_worksheet': record.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
@@ -88,6 +71,7 @@ class MrpWorkorder(models.Model):
                             'demand_plan_id': demand_plan.id,
                             'model_id': demand_plan.model_id,
                             'type': '2',
+                            'workorder_id': record.id,
                             'cnc_worksheet': record.cnc_worksheet,
                             'filename_url': record.cnc_worksheet_name
                         }

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -4,12 +4,12 @@
         <field name="name">sf.demand.plan.print.wizard.tree</field>
         <field name="model">sf.demand.plan.print.wizard</field>
         <field name="arch" type="xml">
-            <tree string="打印" class="print_demand" js_class="print_demand">
+            <tree string="打印">
                 <field name="model_id"/>
                 <field name="filename_url"/>
                 <field name="type"/>
-                <field name="machining_drawings" attrs="{'column_invisible': True }"/>
+                <field name="machining_drawings" widget="adaptive_viewer"/>
-                <field name="cnc_worksheet" attrs="{'column_invisible': True }"/>
+                <field name="cnc_worksheet" widget="pdf_viewer"/>
                 <field name="status"/>
             </tree>
         </field>

sf_demand_plan/wizard/sf_release_plan_wizard.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-from odoo import models, fields, api, _
-
-_logger = logging.getLogger(__name__)
-
-
-class SfReleasePlanWizard(models.TransientModel):
-    _name = 'sf.release.plan.wizard'
-    _description = u'下达计划向导'
-
-    demand_plan_id = fields.Many2one(comodel_name="sf.demand.main.plan",
-                                     string="需求计划", readonly=True)
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    release_message = fields.Char(string='提示', readonly=True)
-
-    def confirm(self):
-        if self.demand_plan_line_id:
-            self.demand_plan_line_id.action_confirm()

sf_demand_plan/wizard/sf_release_plan_wizard_views.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record model="ir.ui.view" id="sf_release_plan_wizard_form">
-        <field name="name">sf.release.plan.wizard.form</field>
-        <field name="model">sf.release.plan.wizard</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <div>
-                        <div style="white-space: pre-wrap;">
-                            <field name="release_message"/>
-                        </div>
-                    </div>
-                    <footer>
-                        <button string="确认" name="confirm" type="object" class="oe_highlight"/>
-                        <button string="取消" class="btn btn-secondary" special="cancel"/>
-                    </footer>
-                </sheet>
-            </form>
-        </field>
-    </record>
-</odoo>

sf_dlm/models/product_supplierinfo.py

@@ -3,7 +3,6 @@ import logging
 
 import re
 from odoo import models, fields, api
-from odoo.exceptions import ValidationError
 
 
 class ResProductCategory(models.Model):
@@ -48,14 +47,11 @@ 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': product.unit_number,
+            'product_qty': 1,
             'product_uom_id': 1
         }
         return self.env['mrp.bom.line'].sudo().create(vals)
@@ -126,7 +122,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
 
 

sf_dlm/models/product_template.py

@@ -10,7 +10,6 @@ class ResProductTemplate(models.Model):
     model_name = fields.Char('模型名称')
     categ_type = fields.Selection(
         [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")], string='产品的类别', related='categ_id.type', store=True)
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
     model_long = fields.Float('模型长[mm]', digits=(16, 3))
     model_width = fields.Float('模型宽[mm]', digits=(16, 3))
     model_height = fields.Float('模型高[mm]', digits=(16, 3))
@@ -73,20 +72,14 @@ 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_long': item.get('blank_length') if blank_bool else item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item['model_width'] + model_type.embryo_tolerance,
-            'model_width': item.get('blank_width') if blank_bool else item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item['model_height'] + 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) * (
-            'model_volume': ((item['model_long'] + model_type.embryo_tolerance) *
+                    item['model_width'] + model_type.embryo_tolerance) * (
-                             (item['model_width'] + model_type.embryo_tolerance) *
+                                    item['model_height'] + model_type.embryo_tolerance),
-                             (item['model_height'] + model_type.embryo_tolerance)) if not blank_bool else (
-                    item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
             'product_model_type_id': model_type.id,
             'model_processing_panel': 'R',
             'model_machining_precision': item['model_machining_precision'],

sf_dlm_management/views/product_template_management_view.xml

@@ -95,9 +95,7 @@
                     <page string="加工参数">
                         <group>
                             <group string="模型">
-                                <field name="blank_type" readonly="1"/>
+                                <label for="model_long" string="尺寸[mm]"/>
-                                <field name="blank_precision" readonly="1"/>
-                                <label for="model_long" string="坯料尺寸[mm]"/>
                                 <div class="o_address_format">
                                     <label for="model_long" string="长"/>
                                     <field name="model_long" class="o_address_zip"/>
@@ -106,7 +104,6 @@
                                     <label for="model_height" string="高"/>
                                     <field name="model_height" class="o_address_zip"/>
                                 </div>
-                                <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="加工面板"

sf_manufacturing/controllers/main.py

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

sf_manufacturing/models/__init__.py

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

sf_manufacturing/models/bom.py

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

sf_manufacturing/models/mrp_production.py

@@ -1709,7 +1709,6 @@ class MrpProduction(models.Model):
                         vals['procurement_group_id'] = product_group_id[product_id.id]
                 else:
                     vals['procurement_group_id'] = is_custemer_group_id[key]
-
         return super(MrpProduction, self).create(vals_list)
 
     @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',

sf_manufacturing/models/product_template.py

@@ -26,16 +26,13 @@ class ResProductMo(models.Model):
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
-    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='加工精度')
-    model_processing_panel = fields.Char('模型加工面板', default='')
+    model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长(mm)', digits=(16, 3))
     width = fields.Float('宽(mm)', digits=(16, 3))
@@ -896,24 +893,16 @@ 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),
-            'blank_precision': item.get('blank_precision'),
+            'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
-            'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
+            'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
-            'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
+            'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
-            'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
+                    item['model_width'] + embryo_redundancy_id.width) * (
-            'unit_number': item.get('unit_number'),
+                              item['model_height'] + embryo_redundancy_id.height)),
-            'model_volume': self.format_float(((item['model_long'] + embryo_redundancy_id.long) *
-                             (item['model_width'] + embryo_redundancy_id.width) *
-                             (item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else (
-                    item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
             'product_model_type_id': model_type.id,
-            'model_processing_panel': item['processing_panel_detail'] if item['processing_panel_detail'] else '',
+            'model_processing_panel': item['processing_panel_detail'],
             'model_machining_precision': item['model_machining_precision'],
             'model_code': item['barcode'],
             'length': item['model_long'],
@@ -961,7 +950,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)

sf_manufacturing/models/sale_order.py

@@ -193,19 +193,6 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
-
-    def write_sale_documents(self, kw):
-        """BFM 内部下单 内容补充 """
-        val = {}
-        if kw.get('contract_file_name') and kw.get('contract_file'):
-            document_id = self.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
-            val.update({'contract_document_id': document_id.id})
-        if kw.get('contract_code') or kw.get('contract_date'):
-            val.update({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
-        if kw.get('customer_name'):
-            val.update({'customer_name': kw.get('customer_name')})
-        self.write(val)
-
     def create_sale_documents(self, contract_file_name, contract_file):
         # 创建ir.attachment记录
         attachment = self.env['ir.attachment'].sudo().create({
@@ -227,7 +214,9 @@ class SaleOrder(models.Model):
             'res_id': self.id,
         })
 
-        return document
+        self.write({
+            'contract_document_id': document.id
+        })
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'

sf_manufacturing/models/stock.py

@@ -21,7 +21,6 @@ from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError
 from io import BytesIO
 from odoo.exceptions import ValidationError
-from dateutil.relativedelta import relativedelta
 
 
 class stockWarehouse(models.Model):
@@ -96,36 +95,35 @@ class StockRule(models.Model):
                                                                            precision_rounding=proc[
                                                                                0].product_uom.rounding) > 0)
         list2 = []
-        for procurement, rule in procurements:
+        for item in procurements:
-            num = int(procurement.product_qty)
+            num = int(item[0].product_qty)
 
-            warehouse_id = rule.warehouse_id
+            product = self.env['product.product'].search(
-            if not warehouse_id:
+                [("id", '=', item[0].product_id.id)])
-                warehouse_id = rule.location_dest_id.warehouse_id
+            product_tmpl = self.env['product.template'].search(
-            manu_rule = rule.route_id.rule_ids.filtered(lambda r: r.action == 'manufacture' and r.warehouse_id == warehouse_id)
+                ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
-
+            if product_tmpl:
-            if procurement.product_id.product_tmpl_id.single_manufacturing and manu_rule:
                 if num > 1:
                     for no in range(1, num + 1):
                         Procurement = namedtuple('Procurement', ['product_id', 'product_qty',
                                                                  'product_uom', 'location_id', 'name', 'origin',
                                                                  'company_id',
                                                                  'values'])
-                        s = Procurement(product_id=procurement.product_id, product_qty=1.0, product_uom=procurement.product_uom,
+                        s = Procurement(product_id=item[0].product_id, product_qty=1.0, product_uom=item[0].product_uom,
-                                        location_id=procurement.location_id,
+                                        location_id=item[0].location_id,
-                                        name=procurement.name,
+                                        name=item[0].name,
-                                        origin=procurement.origin,
+                                        origin=item[0].origin,
-                                        company_id=procurement.company_id,
+                                        company_id=item[0].company_id,
-                                        values=procurement.values,
+                                        values=item[0].values,
                                         )
-                        # item1 = list(item)
+                        item1 = list(item)
-                        # item1[0] = s
+                        item1[0] = s
 
-                        list2.append((s, rule))
+                        list2.append(tuple(item1))
                 else:
-                    list2.append((procurement, rule))
+                    list2.append(item)
             else:
-                list2.append((procurement, rule))
+                list2.append(item)
 
         for procurement, rule in list2:
             procure_method = rule.procure_method
@@ -185,6 +183,18 @@ class StockRule(models.Model):
             '''创建制造订单'''
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
+            # 将这一批制造订单的采购组根据成品设置为不同的采购组
+            # product_group_id = {}
+            # for index, production in enumerate(productions):
+            #     if production.product_id.id not in product_group_id.keys():
+            #         product_group_id[production.product_id.id] = production.procurement_group_id.id
+            #     else:
+            #         productions_values[index].update({'name': production.name})
+            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
+            #         production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
+
+            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
 
             '''
             创建工单
@@ -728,33 +738,6 @@ class StockPicking(models.Model):
                         production.workorder_ids.write({'back_button_display': False})
         return res
 
-    def _prepare_subcontract_mo_vals(self, subcontract_move, bom):
-        subcontract_move.ensure_one()
-        group = self.env['procurement.group'].sudo().search([('name', '=', self.name)])
-        if not group:
-            group = self.env['procurement.group'].create({
-                'name': self.name,
-                'partner_id': self.partner_id.id,
-            })
-        product = subcontract_move.product_id
-        warehouse = self._get_warehouse(subcontract_move)
-        vals = {
-            'company_id': subcontract_move.company_id.id,
-            'procurement_group_id': group.id,
-            'subcontractor_id': subcontract_move.picking_id.partner_id.commercial_partner_id.id,
-            'picking_ids': [subcontract_move.picking_id.id],
-            'product_id': product.id,
-            'product_uom_id': subcontract_move.product_uom.id,
-            'bom_id': bom.id,
-            'location_src_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
-            'location_dest_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
-            'product_qty': subcontract_move.product_uom_qty,
-            'picking_type_id': warehouse.subcontracting_type_id.id,
-            'date_planned_start': subcontract_move.date - relativedelta(days=product.produce_delay)
-        }
-        return vals
-
-
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
         production = workorders[0].production_id
@@ -1233,20 +1216,6 @@ class ReStockMove(models.Model):
                 res['lot_id'] = self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids[0].lot_id.id
         return res
 
-    def _get_subcontract_bom(self):
-        self.ensure_one()
-        purchase_type = getattr(self.picking_id.purchase_id, 'purchase_type', False)
-        if purchase_type:
-            self = self.with_context(stock_picking=purchase_type)
-        bom = self.env['mrp.bom'].sudo()._bom_subcontract_find(
-            self.product_id,
-            picking_type=self.picking_type_id,
-            company_id=self.company_id.id,
-            bom_type='subcontract',
-            subcontractor=self.picking_id.partner_id
-        )
-        return bom
-
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_mrs_connect/models/__init__.py

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

sf_quality/data/insepection_report_template.xml

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

sf_quality/models/stock.py

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

sf_quality/views/quality_check_view.xml

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

sf_sale/models/sale_order.py

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

sf_sale/views/sale_order_view.xml

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

sf_tool_management/models/base.py

@@ -818,7 +818,6 @@ class FunctionalToolAssembly(models.Model):
 
     def _get_old_tool_material_lot(self, material_ids):
         """ 根据先进先出原则选择物料批次 """
-        material_ids = material_ids.filtered(lambda m: m.tracking != 'none')
         location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
         stock_quant = self.env['stock.quant'].sudo().search(
             [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],

sf_warehouse/migrations/1.2/post-migrate.py

@@ -7,14 +7,8 @@ def migrate(cr, version):
     env = api.Environment(cr, SUPERUSER_ID, {})
     sf_shelf_model = env["sf.shelf"]
     sf_shelf_location_model = env["sf.shelf.location"]
-    
-    preproduction_shelf_ids = sf_shelf_location_model.get_preproduction_shelf_ids()
-    
     shelves = sf_shelf_model.search([])
     for shelf in shelves:
-        if shelf.id not in preproduction_shelf_ids:
-            continue
-            
         shelf_barcode = shelf.barcode or ""
         if not shelf_barcode:
             continue

sf_warehouse/models/model.py

@@ -13,7 +13,6 @@ 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'
@@ -460,40 +459,7 @@ 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:
@@ -597,27 +563,8 @@ 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'
@@ -634,7 +581,6 @@ class SfShelfLocationLot(models.Model):
         for item in self:
             if item.qty_num > item.qty:
                 raise ValidationError('变更数量不能比库存数量大！！！')
-    
 
 
 class SfStockMoveLine(models.Model):

sf_warehouse/static/src/css/kanban_location_custom.scss

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

sf_warehouse/static/src/js/custom_kanban_controller.js

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

sf_warehouse/views/shelf_location.xml

@@ -193,78 +193,53 @@
             </field>
         </record>
 
-<record id="shelf_location_kanban_view" model="ir.ui.view">
+        <record id="shelf_location_kanban_view" model="ir.ui.view">
-    <field name="name">shelf.location.kanban</field>
+            <field name="name">shelf.location.kanban</field>
-    <field name="model">sf.shelf.location</field>
+            <field name="model">sf.shelf.location</field>
-    <field name="arch" type="xml">
+            <field name="arch" type="xml">
-        <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
+                <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
-            <templates>
+                    <templates>
-                <t t-name="kanban-box">
+                        <t t-name="kanban-box">
-                    <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
+                            <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
-                    <div t-attf-class="oe_kanban_card oe_kanban_global_click
+                            <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_1' : ''}
-                    #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
+                        #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
-                    #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
+                        #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
-                    
-                        <!-- 所有情况都需要的数据 (隐藏) -->
-                        <div style="display:none">
-                            <field name="location_status"/>
-                            <field name="tool_name_id"/>
-                        </div>
                         
-                        <t t-if="isBaseStyle">
+                               <!-- 所有情况都需要的数据 (隐藏) -->
-                            <div class="o_kanban_card_header">
+                                <div style="display:none">
-                                <div class="o_kanban_card_header_title">
+                                    <field name="location_status"/>
-                                    <field name="name"/>
                                 </div>
-                            </div>
+                                
-                            <div class="o_kanban_record_bottom">
+                                
-                                <field name="product_sn_id"/>
+                                <t t-if="isBaseStyle">
-                                <field name="product_id"/>
+                                    <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>
                         </t>
-                        
+                    </templates>
-                        <t t-else="">
+                </kanban>
-                            <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
+            </field>
-                                <field name="kanban_show_layer_info"/>
+        </record>
-                            </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>