命名修改

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -119,24 +119,13 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
             this.listherHeaderBodyNum()
         })
         const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
-        
         if(treeModifiers) {
-            if(treeModifiers.merge_fields) {
+            this.props.merge_key = treeModifiers.merge_key;
-                this.props.merge_key = treeModifiers.merge_key;
+            this.props.merge_fields = treeModifiers.merge_fields.split(',');
-                this.props.merge_fields = treeModifiers.merge_fields.split(',');
+            const data = this.setColumns(this.props.merge_key);
-                const data = this.setColumns(this.props.merge_key);
+            owl.onMounted(() => {
-                owl.onMounted(() => {
+                this.mergeColumns(this.props.merge_fields,  data)
-                    this.mergeColumns(this.props.merge_fields,  data)
+            })
-                })
-            }
-            if(treeModifiers.pacthResize) {
-
-                owl.onPatched(() => {
-                    this.columnWidths = null;
-                    this.freezeColumnWidths();
-                    
-                })
-            }
         }
         return this._super(...arguments);
     },

jikimo_purchase_request/__manifest__.py

@@ -14,9 +14,7 @@
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',
         'views/purchase_request_line_view.xml',
-        'views/stock_picking_views.xml',
         'wizard/purchase_request_wizard_views.xml',
-        'views/purchase_request_menu_views.xml',
     ],
     'assets': {
         'web.assets_backend': [

jikimo_purchase_request/models/mrp_production.py

@@ -18,8 +18,9 @@ class MrpProduction(models.Model):
             #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
             #     item.pr_mp_count = len(pr_ids)
             # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-            mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
+            first_mp = self.env['mrp.production'].search(
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
+                    [('origin', '=', item.origin)], limit=1, order='id asc')
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
             item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
@@ -36,8 +37,9 @@ class MrpProduction(models.Model):
         # else:
         #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
         # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-        mrp_names = self.env['mrp.production'].search([('origin', '=', self.origin)]).mapped('name')
+        first_mp = self.env['mrp.production'].search(
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
+                    [('origin', '=', self.origin)], limit=1, order='id asc')
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
 
 
         action = {

jikimo_purchase_request/models/purchase_order.py

@@ -1,5 +1,4 @@
 from odoo import api, fields, models, _
-from odoo.tools import float_compare
 
 
 class PurchaseOrder(models.Model):
@@ -14,43 +13,4 @@ class PurchaseOrder(models.Model):
         ('done', '完成'),
         ('cancel', '取消'),
         ('rejected', '已驳回')
-    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
+    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
-
-
-    def button_confirm(self):
-        res = super(PurchaseOrder, self).button_confirm()
-        # 取消反向调拨单
-        reverse_move_ids = self.env['stock.move'].search([
-            ('origin', '=', self.name),
-            ('purchase_line_id', '=', False),
-            ('state', '!=', 'done')
-        ])
-        if reverse_move_ids:
-            reverse_move_ids.picking_id.action_cancel()
-        return res
-    
-    def button_cancel(self):
-        """
-            将取消的采购订单关联的库存移动撤销
-        """
-        move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
-        res =super(PurchaseOrder, self).button_cancel()
-        if move_ids.mapped('created_purchase_request_line_id'):
-            move_ids.write({'state': 'waiting', 'is_done': False})
-        return res
-
-    def write(self, vals):
-        res = super(PurchaseOrder, self).write(vals)
-        if 'state' in vals and vals['state'] == 'purchase':
-            purchase_request = self.order_line.purchase_request_lines.request_id
-            if purchase_request:
-                finished = True
-                # 判断该采购申请所有明细行是否都完成
-                for purchase_request_line in purchase_request.line_ids:
-                    finished_qty = sum(purchase_request_line.purchase_lines.filtered(lambda line: line.state == 'purchase').mapped('product_qty'))
-                    if float_compare(finished_qty ,purchase_request_line.product_qty, precision_rounding=purchase_request_line.product_id.uom_id.rounding) < 0:
-                        finished = False
-                        break
-                if finished:
-                    purchase_request.button_done()
-        return res

jikimo_purchase_request/models/purchase_request.py

@@ -2,14 +2,13 @@ import re
 import ast
 from odoo import models, fields, api, _
 from itertools import groupby
-from odoo.tools import float_compare
 
 
 class PurchaseRequest(models.Model):
     _inherit = 'purchase.request'
     _description = '采购申请'
 
-    # 为state添加取消状态
+     # 为state添加取消状态
     state = fields.Selection(
         selection_add=[('cancel', '已取消')],
         ondelete={'cancel': 'set default'}  # 添加 ondelete 策略
@@ -37,13 +36,11 @@ class PurchaseRequest(models.Model):
         lines = self.mapped("line_ids.purchase_lines.order_id")
         # 采购单产品和数量
         product_summary = {}
-        product_rounding = {}
         if lines:
             for line in lines:
                 for line_item in line.order_line:
                     product_id = line_item.product_id.id
                     qty = line_item.product_qty
-                    product_rounding[product_id] = line_item.product_id.uom_id.rounding
                     if product_id in product_summary:
                         product_summary[product_id] += qty
                     else:
@@ -53,7 +50,7 @@ class PurchaseRequest(models.Model):
         discrepancies = []
         for product_id, qty in product_qty_map.items():
             if product_id in product_summary:
-                if float_compare(product_summary[product_id], qty, precision_rounding=product_rounding[product_id]) < 0:
+                if product_summary[product_id] != qty:
                     discrepancies.append((product_id, qty, product_summary[product_id]))
             else:
                 discrepancies.append((product_id, qty, 0))
@@ -67,17 +64,17 @@ class PurchaseRequest(models.Model):
                 # 添加确认框
             message += "确认关闭？"
             return {
-                'name': _('采购申请'),
+                    'name': _('采购申请'),
-                'type': 'ir.actions.act_window',
+                    'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
+                    'views': [(self.env.ref(
-                    'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
+                        'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
-                           'form')],
+                               'form')],
-                'res_model': 'purchase.request.wizard',
+                    'res_model': 'purchase.request.wizard',
-                'target': 'new',
+                    'target': 'new',
-                'context': {
+                    'context': {
-                    'default_purchase_request_id': self.id,
+                        'default_purchase_request_id': self.id,
-                    'default_message': message,
+                        'default_message': message,
-                }}
+            }}
         return super(PurchaseRequest, self).button_done()
 
 
@@ -99,8 +96,7 @@ class PurchaseRequestLine(models.Model):
         ('outsourcing', "委外加工"),
     ], string='供货方式', compute='_compute_supply_method', store=True)
 
-    purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count',
+    purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count', readonly=True)
-                                            readonly=True)
     purchase_count = fields.Integer(string="采购订单数量", compute="_compute_purchase_count", readonly=True)
 
     @api.depends("purchase_lines")

jikimo_purchase_request/models/stock_picking.py

@@ -36,12 +36,10 @@ class StockPicking(models.Model):
 
     def _action_done(self):
         res = super(StockPicking, self)._action_done()
-        # 将新产生的backorder对应上原来的采购申请明细行
+        # 将采购申请明细行的move_dest_ids设置为backorder_ids
         backorder_ids = self.backorder_ids
         if backorder_ids:
             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 = [
+                purchase_request_lines.move_dest_ids = [(4, x.id) for x in backorder_ids.move_ids]
-                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id == purchase_request_lines.product_id.id
-                ]
         return res

jikimo_purchase_request/models/stock_rule.py

@@ -79,4 +79,12 @@ class StockRule(models.Model):
             )
 
         res = super(StockRule, self)._run_buy(new_procurements)
+        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
+        origins = list(set([procurement[0].origin for procurement in procurements]))
+        for origin in origins:
+            pr_ids = self.env["purchase.request"].sudo().search(
+                [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])
+            if pr_ids:
+                pr_ids.write({'need_validation': False})
+                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
         return res

jikimo_purchase_request/views/purchase_request_menu_views.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="menu_purhcase_request" model="ir.ui.menu">
-            <field name="name">采购申请</field>
-            <field name="parent_id" ref="purchase.menu_purchase_root" />
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="purchase_request.menu_purchase_request_pro_mgt" model="ir.ui.menu">
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="jikimo_purchase_request.menu_purhcase_request"/>
-        </record>
-        
-        <record id="purchase_request.menu_purchase_request_line" model="ir.ui.menu">
-            <field name="sequence">10</field>
-            <field name="parent_id" ref="jikimo_purchase_request.menu_purhcase_request"/>
-        </record>
-    </data>
-</odoo>
-

jikimo_purchase_request/views/purchase_request_view.xml

@@ -15,29 +15,15 @@
                 <field name="part_number"/>
                 <field name="part_name"/>
             </xpath>
-             <xpath expr="//button[@name='button_done']" position="attributes">
+            <xpath expr="//button[@name='button_done']" position="attributes">
                 <attribute name="class"/>
             </xpath>
-              <xpath expr="//button[@name='button_in_progress']" position="attributes">
+            <xpath expr="//button[@name='button_in_progress']/following-sibling::button[1]" position="attributes">
-                  <attribute name="invisible">1</attribute>
-            </xpath>
-            <xpath expr="//button[@name='%(purchase_request.action_purchase_request_line_make_purchase_order)d']" position="attributes">
                 <attribute name="class">oe_highlight</attribute>
             </xpath>
         </field>
     </record>
 
-    <record id="view_purchase_request_tree_sf" model="ir.ui.view">
-        <field name="name">purchase.request.sf.tree</field>
-        <field name="model">purchase.request</field>
-        <field name="inherit_id" ref="purchase_request.view_purchase_request_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='activity_ids']" position="attributes">
-                <attribute name="optional">hide</attribute>
-            </xpath>
-        </field>
-    </record>
-
     <record id="view_purchase_request_line_tree_sf" model="ir.ui.view">
         <field name="name">purchase.request.line.sf.tree</field>
         <field name="model">purchase.request.line</field>
@@ -83,9 +69,4 @@
             </xpath>
         </field>
     </record>
-
-    <record model="ir.actions.act_window" id="purchase_request.purchase_request_form_action">
-        <field name="name">Purchase Requests</field>
-        <field name="context"></field>
-    </record>
 </odoo>

jikimo_purchase_request_tier_validation/__manifest__.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "机企猫 采购申请审批流程",
+    'name': "机企猫 采购审批流程",
 
     'summary': """
-        采购申请审批流程""",
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
 
     'description': """
         Long description of module's purpose

jikimo_purchase_request_tier_validation/models/__init__.py

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

jikimo_purchase_request_tier_validation/models/models.py

@@ -22,9 +22,3 @@ class PurchaseRequest(models.Model):
             self.state = 'approved'
 
         return res
-    
-    @api.model
-    def _get_under_validation_exceptions(self):
-        res = super(PurchaseRequest, self)._get_under_validation_exceptions()
-        res.append("state")
-        return res

jikimo_purchase_request_tier_validation/models/stock_rule.py

@@ -1,16 +0,0 @@
-from odoo import models, api
-
-class StockRule(models.Model):
-    _inherit = 'stock.rule'
-
-    def _run_buy(self, procurements):
-        res = super(StockRule, self)._run_buy(procurements)
-        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
-        origins = list(set([procurement[0].origin for procurement in procurements]))
-        for origin in origins:
-            pr_ids = self.env["purchase.request"].sudo().search(
-                [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])
-            if pr_ids:
-                pr_ids.write({'need_validation': False})
-                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
-        return res

jikimo_purchase_tier_validation/__manifest__.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "机企猫 采购审批流程",
+    'name': "机企猫 采购申请审批流程",
 
     'summary': """
-        采购审批流程""",
+        采购申请审批流程""",
 
     'description': """
-        采购审批流程""",
+        采购申请审批流程""",
 
     'author': "My Company",
     'website': "https://www.yourcompany.com",

quality_control/models/quality.py

@@ -339,7 +339,7 @@ class QualityCheck(models.Model):
 
         # 4. 获取报告动作并生成PDF（此时二维码将包含正确的文档ID）
         report_action = self.env.ref('sf_quality.action_report_quality_inspection')
-        pdf_content, v = report_action._render_qweb_pdf(
+        pdf_content, _ = report_action._render_qweb_pdf(
             report_ref=report_action.report_name,
             res_ids=self.ids
         )

sf_base/decorators/api_log.py

@@ -34,20 +34,17 @@ def api_log(name=None, requester=None):
                 # 计算响应时间
                 end_time = datetime.now()
                 response_time = (end_time - start_time).total_seconds()
-
-                # 获取响应状态
-                status = result.get('code') if 'code' in result else result.get('ErrorCode') if 'ErrorCode' in result else 200
                 
                 # 创建日志记录
                 log_vals = {
                     'name': name or func.__name__,
                     'path': path,
-                    'method': method.upper(),
+                    'method': method,
                     'request_data': json.dumps(request_data, ensure_ascii=False),
                     'response_data': json.dumps(result, ensure_ascii=False),
                     'remote_addr': remote_addr,
                     'response_time': response_time,
-                    'status': 200 if status == 0 else status,
+                    'status': result.get('code') or result.get('ErrorCode') or 500,
                     'requester': requester,
                     'responser': '智能工厂'
                 }

sf_base/models/api_log.py

@@ -59,7 +59,7 @@ class ApiRequestLog(models.Model):
         self.sudo().create({
             'name': name,
             'path': url,
-            'method': method.upper(),
+            'method': method,
             'request_data': request_body,
             'response_data': response_body,
             'remote_addr': None,

sf_base/views/api_log_views.xml

@@ -5,15 +5,13 @@
         <field name="model">api.request.log</field>
         <field name="arch" type="xml">
             <tree>
+                <field name="create_date"/>
                 <field name="name"/>
                 <field name="path"/>
                 <field name="method"/>
                 <field name="remote_addr"/>
-                <field name="response_time" sum="0"/>
+                <field name="response_time"/>
-                <field name="requester"/>
+                <field name="status"/>
-                <field name="responser"/>
-                <field name="create_date" string="请求时间"/>
-                <field name="status" sum="0"/>
             </tree>
         </field>
     </record>
@@ -34,8 +32,6 @@
                         <group>
                             <field name="response_time"/>
                             <field name="status"/>
-                            <field name="requester"/>
-                            <field name="responser"/>
                             <field name="create_date" string="请求时间"/>
                         </group>
                     </group>
@@ -52,23 +48,6 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_api_request_log_search">
-        <field name="name">api.request.log.search</field>
-        <field name="model">api.request.log</field>
-        <field name="arch" type="xml">
-            <search string="API请求日志">
-                <field name="name"/>
-                <field name="requester"/>
-                <field name="responser"/>
-                <group>
-                    <filter name="name" context="{'group_by':'name'}"/>
-                    <filter name="requester" context="{'group_by':'requester'}"/>
-                    <filter name="responser" context="{'group_by':'responser'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
     <record id="action_api_request_log" model="ir.actions.act_window">
         <field name="name">API请求日志</field>
         <field name="res_model">api.request.log</field>

sf_demand_plan/__init__.py

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

sf_demand_plan/__manifest__.py

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

sf_demand_plan/controllers/__init__.py

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

sf_demand_plan/controllers/controllers.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+from odoo import http, fields, models
+from odoo.http import request
+from odoo.addons.sf_base.controllers.controllers import MultiInheritController
+
+
+class SfPlanMrsConnect(http.Controller, MultiInheritController):
+
+    @http.route('/api/demand_plan/update_processing_time', type='json', auth='sf_token', methods=['GET', 'POST'],
+                csrf=False,
+                cors="*")
+    def update_processing_time(self, **kw):
+        """
+        根据模型id修改程序工时
+        :param kw:
+        :return:
+        """
+        try:
+            res = {'status': 1, 'message': '成功'}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            ret = json.loads(ret['result'])
+            logging.info('根据模型id修改程序工时:%s' % ret)
+            demand_plan = request.env['sf.production.demand.plan'].sudo().search(
+                [('model_id', '=', ret['model_id'])])
+            if demand_plan:
+                demand_plan.write(
+                    {'processing_time': ret['total_estimated_time']})
+            else:
+                res = {'status': 0, 'message': '未查到该需求计划'}
+        except Exception as e:
+            logging.info('update_demand_paln error:%s' % e)
+            res['status'] = -1
+            res['message'] = '系统解析错误！'
+        return json.JSONEncoder().encode(res)

sf_demand_plan/models/__init__.py

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

sf_demand_plan/models/sale_order.py

@@ -0,0 +1,23 @@
+from odoo import models, fields, api, _
+
+
+class ReSaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    def sale_order_create_line(self, product, item):
+        ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
+        vals = {
+            'sale_order_id': ret.order_id.id,
+            'sale_order_line_id': ret.id,
+        }
+        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
+        if demand_plan.product_id.machining_drawings_name:
+            filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
+            wizard_vals = {
+                'demand_plan_id': demand_plan.id,
+                'model_id': demand_plan.model_id,
+                'filename_url': filename_url,
+                'type': '1',
+            }
+            self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
+        return ret

sf_demand_plan/models/sf_production_demand_plan.py

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

sf_demand_plan/security/ir.model.access.csv

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

sf_demand_plan/static/src/scss/style.css

@@ -0,0 +1,11 @@
+.demand_plan_tree .o_list_table_ungrouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    min-width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_grouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_ungrouped  {
+    min-width: 1900px;
+}

sf_demand_plan/views/demand_plan.xml

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

sf_demand_plan/wizard/__init__.py

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="action_plan_print_tree" model="ir.ui.view">
+        <field name="name">sf.demand.plan.print.wizard.tree</field>
+        <field name="model">sf.demand.plan.print.wizard</field>
+        <field name="arch" type="xml">
+            <tree string="打印">
+                <field name="model_id"/>
+                <field name="filename_url"/>
+                <field name="type"/>
+                <field name="machining_drawings" widget="adaptive_viewer"/>
+                <field name="cnc_worksheet" widget="pdf_viewer"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+</odoo>

sf_manufacturing/controllers/main.py

@@ -45,9 +45,6 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                 i += 1
-            if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
-                order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
-                order_id.write({'contract_code': kw.get('contract_code')})
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

sf_manufacturing/models/mrp_production.py

@@ -636,17 +636,13 @@ class MrpProduction(models.Model):
     # 增加触发时间参数
     def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
         try:
-            reason = ""
             manufacturing_type = None
             if self.is_scrap:
                 manufacturing_type = 'scrap'
-                reason = "报废"
             elif self.tool_state == '2':
                 manufacturing_type = 'invalid_tool_rework'
-                reason = "无效功能刀具"
             elif self.is_rework:
                 manufacturing_type = 'rework'
-                reason = "返工"
             res = {'programming_no': self.programming_no,
                    'manufacturing_type': manufacturing_type,
                    'trigger_time': trigger_time,
@@ -661,16 +657,6 @@ class MrpProduction(models.Model):
             result = json.loads(ret['result'])
             logging.info('update_programming_state-ret:%s' % result)
             if result['status'] == 1:
-                self.programming_record_ids.create({
-                    'number': len(self.programming_record_ids) + 1,
-                    'production_id': self.id,
-                    'reason': reason,
-                    'programming_method': False,
-                    'current_programming_count': False,
-                    'target_production_id': False,
-                    'apply_time': fields.Datetime.now(),
-                    'send_time': False,
-                })
                 self.write({'is_rework': True})
             else:
                 raise UserError(ret['message'])
@@ -801,17 +787,6 @@ class MrpProduction(models.Model):
             if ret['status'] == 1:
                 self.write(
                     {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
-                # 生成编程记录
-                self.programming_record_ids.create({
-                    'number': len(self.programming_record_ids) + 1,
-                    'production_id': self.id,
-                    'reason': '首次下发',
-                    'programming_method': False,
-                    'current_programming_count': False,
-                    'target_production_id': False,
-                    'apply_time': fields.Datetime.now(),
-                    'send_time': False,
-                })
             else:
                 raise UserError(ret['message'])
         except Exception as e:
@@ -1797,6 +1772,7 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
+        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1865,7 +1841,6 @@ class sf_programming_record(models.Model):
     target_production_id = fields.Char('目标制造单号')
     apply_time = fields.Datetime('申请时间')
     send_time = fields.Datetime('下发时间')
-    apply_uid = fields.Many2one('res.users', '申请人', default=lambda self: self.env.user)
 
 
 class sf_detection_result(models.Model):

sf_manufacturing/models/mrp_workorder.py

@@ -326,6 +326,7 @@ class ResMrpWorkOrder(models.Model):
 
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
     technology_design_id = fields.Many2one('sf.technology.design')
+    cnc_worksheet_name = fields.Char('工作指令文件名', readonly=True)
 
     def _compute_default_construction_period_status(self):
         need_list = ['pending', 'waiting', 'ready', 'progress', 'to be detected', 'done']
@@ -744,25 +745,21 @@ class ResMrpWorkOrder(models.Model):
     #         self.workpiece_delivery_ids[0].write({'rfid_code': self.rfid_code})
 
     def get_plan_workorder(self, production_line):
-        tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+        tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
-        tomorrow_start = f"{tomorrow} 00:00:00"
+        tomorrow_start = tomorrow + ' 00:00:00'
-        tomorrow_end = f"{tomorrow} 23:59:59"
+        tomorrow_end = tomorrow + ' 23:59:59'
         logging.info('tomorrow:%s' % tomorrow)
         sql = """
           SELECT *
           FROM mrp_workorder
           WHERE state!='rework'
-          AND (date_planned_start + interval '8 hours') >= %s::timestamp
+          to_char(date_planned_start::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')>= %s
-          AND (date_planned_finished + interval '8 hours') <= %s::timestamp
+          AND to_char(date_planned_finished::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')<= %s
           """
         params = [tomorrow_start, tomorrow_end]
         if production_line:
-            line = self.env['sf.production.line'].search(
-                [('name', '=', production_line)], limit=1)
-            if not line:
-                raise ValueError(f"生产线'{production_line}'不存在")
             sql += "AND production_line_id = %s"
-            params.append(line.id)
+            params.append(production_line)
         self.env.cr.execute(sql, params)
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]
@@ -1592,17 +1589,25 @@ class ResMrpWorkOrder(models.Model):
                     len(done_workorder) == len(
                 record.production_id.workorder_ids.filtered(lambda wo: wo.state != 'cancel'))):
                 is_production_id = True
+            if record.routing_type in ['解除装夹'] or (
+                    record.is_rework is True and record.routing_type in ['装夹预调']):
+                for workorder in record.production_id.workorder_ids:
+                    if workorder.processing_panel == record.processing_panel:
+                        rfid_code = workorder.rfid_code
+                        if record.is_rework is not True:
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': False, 'rfid_code': False})
+                        elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
+                            {'tool_material_status': '可用'})
+                        if workorder.rfid_code:
+                            raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
+                        # workorder.rfid_code_old = rfid_code
+                        # workorder.rfid_code = False
+                        logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
 
-            if record.routing_type in ['解除装夹']:
-                rfid_code = record.rfid_code
-                work_ids = record.production_id.workorder_ids.filtered(
-                    lambda wo: wo.processing_panel == record.processing_panel and wo.state != 'rework')
-                work_ids.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
-                    {'tool_material_status': '可用'})
-                if any(wo.rfid_code for wo in work_ids):
-                    raise ValidationError(f'【{record.name}】工单解绑失败，请重新点击完成按钮！！！')
-                logging.info('work_ids.rfid_code:%s' % [wo.rfid_code for wo in work_ids])
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:

sf_manufacturing/models/product_template.py

@@ -10,8 +10,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-# from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):

sf_manufacturing/models/sale_order.py

@@ -190,30 +190,7 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
-    def create_sale_documents(self, contract_file_name, contract_file):
-        # 创建ir.attachment记录
-        attachment = self.env['ir.attachment'].sudo().create({
-            'name': contract_file_name,
-            'type': 'binary',
-            'datas': contract_file,
-            'res_model': 'sale.order',
-        })
 
-        # 获取默认的文档文件夹
-        workspace = self.env.ref('sf_sale.documents_sales_contracts_folder_1').id
-
-        # 创建 documents.document 记录
-        document = self.env['documents.document'].sudo().create({
-            'name': contract_file_name,
-            'attachment_id': attachment.id,
-            'folder_id': workspace,
-            'res_model': 'sale.order',
-            'res_id': self.id,
-        })
-
-        self.write({
-            'contract_document_id': document.id
-        })
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -427,7 +427,6 @@
                                 <field name="programming_method"/>
                                 <field name="current_programming_count"/>
                                 <field name="target_production_id"/>
-                                <field name="apply_uid"/>
                                 <field name="apply_time"/>
                                 <field name="send_time"/>
                             </tree>

sf_manufacturing/wizard/production_wizard.py

@@ -46,10 +46,10 @@ class ProductionWizard(models.TransientModel):
         mrp_workorder_list = self.mrp_production_id.workorder_ids.filtered(lambda kw: kw.rfid_code)
         for workorder in mrp_workorder_list:
             rfid_code = workorder.rfid_code
-            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code and wo.state != 'rework').write(
+            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code is not False).write(
                 {'rfid_code_old': rfid_code, 'rfid_code': False})
             workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
-                                           (wo.rfid_code_old or wo.rfid_code) and wo.state != 'rework')).write(
+                                           (wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
                 {'rfid_code_old': False, 'rfid_code': False})
 
         if self.is_remanufacture is True:

sf_manufacturing/wizard/rework_wizard.py

@@ -125,28 +125,13 @@ class ReworkWizard(models.TransientModel):
                 # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
                 # 2、返工CNC工单和装夹预调工单则自动解绑RFID
                 clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
-
-                # for order in rework_workorder_ids:
-                #     order.write({
-                #         'rfid_code_old': order.rfid_code,
-                #         'rfid_code': False
-                #     })
-                # 返工工单状态设置为【返工】
-                rework_workorder_ids.write({'state': 'rework'})
                 if clamp_workorder_ids:
                     for clamp_workorder_id in clamp_workorder_ids:
-                        # 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录
+                        self.production_id.workorder_ids.filtered(
-                        self.production_id.workorder_ids.filtered(lambda wk: (
+                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                                wk.processing_panel == clamp_workorder_id.processing_panel
+                            {'rfid_code': None})
-                                and wk.state == 'rework' and wk.rfid_code)).write(
+                # 返工工单状态设置为【返工】
-                            {'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None})
+                rework_workorder_ids.write({'state': 'rework'})
-                        # 清除返工的装夹预调工单同面的非返工工单的RFID
-                        self.production_id.workorder_ids.filtered(lambda wk: (
-                                wk.processing_panel == clamp_workorder_id.processing_panel and wk.state != 'rework')).write(
-                            {'rfid_code_old': None, 'rfid_code': None})
-                # 清除其他返工工单的RFID
-                for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code):
-                    work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                 workorders_values = []
                 for work in rework_workorder_ids:
@@ -173,12 +158,8 @@ class ReworkWizard(models.TransientModel):
                     # ====新工单绑定rfid===
                     for new_work_id in new_work_ids:
                         if new_work_id.routing_type in ['CNC加工', '解除装夹']:
-                            # 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
+                            new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
-                            work_id = self.production_id.workorder_ids.filtered(
+                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
-                                lambda wk: (wk.processing_panel == new_work_id.processing_panel and wk.rfid_code
-                                            and wk.routing_type == '装夹预调' and wk.state != 'rework'))
-                            if work_id:
-                                new_work_id.write({'rfid_code': work_id.rfid_code})
                     self.production_id.detection_result_ids.filtered(
                         lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
                     panels = []  # 返工的加工面
@@ -232,13 +213,11 @@ class ReworkWizard(models.TransientModel):
                                     self.production_id.get_new_program(panel_name)
                             if self.reprogramming_num >= 0 and self.programming_state == '已下发':
                                 # ============= 处理CNC加工加工工单的 CNC程序和cmm程序 信息=============
-                                for cnc_work in new_work_ids.filtered(
+                                for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
-                                        lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
                                     ret = {'programming_list': []}
                                     old_cnc_rework = max(self.production_id.workorder_ids.filtered(
                                         lambda crw: crw.processing_panel == cnc_work.processing_panel
-                                                    and crw.state == 'rework' and (
+                                                    and crw.state == 'rework' and (crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
-                                                            crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
                                         key=lambda w: w.create_date
                                     )
                                     # 获取当前工单的CNC程序和cmm程序
@@ -280,8 +259,7 @@ class ReworkWizard(models.TransientModel):
                                     new_cnc_workorder = self.production_id.workorder_ids.filtered(
                                         lambda ap1: ap1.processing_panel == cnc_work.processing_panel
                                                     and ap1.state not in (
-                                                        'rework', 'done') and (
+                                                        'rework', 'done') and (ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
-                                                            ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
                                     )
                                     if not new_cnc_workorder.cnc_ids:
                                         new_cnc_workorder.write({
@@ -318,8 +296,7 @@ class ReworkWizard(models.TransientModel):
                                  'is_rework': False})
                 # ==================申请重新编程=======================
                 if self.is_reprogramming is True:
-                    self.production_id.update_programming_state(
+                    self.production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
-                        trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
                     self.production_id.write(
                         {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
                 # ================= 返工完成，制造订单状态置为加工中 ==============
@@ -340,7 +317,7 @@ class ReworkWizard(models.TransientModel):
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
                         if p.processing_panel is not False and p.processing_panel not in panel_arr:
-                            if len(panel_arr) > 0:
+                            if len(panel_arr)>0:
                                 panel_arr += ','.join(p.processing_panel)
                             else:
                                 panel_arr = p.processing_panel

sf_message/data/bussiness_node.xml

@@ -126,11 +126,6 @@
             <field name="model">mrp.production</field>
         </record>
 
-        <record id="bussiness_purchase_request" model="jikimo.message.bussiness.node">
-            <field name="name">采购申请待处理通知</field>
-            <field name="model">purchase.request</field>
-        </record>
-
         <record id="bussiness_outsourcing" model="jikimo.message.bussiness.node">
             <field name="name">委外加工采购单提醒</field>
             <field name="model">purchase.order</field>
@@ -161,13 +156,9 @@
             <field name="model">purchase.order</field>
         </record>
 
-<!--        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">-->
+        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">
-<!--            <field name="name">待质检提醒</field>-->
+            <field name="name">待质检提醒</field>
-<!--            <field name="model">product.product</field>-->
+            <field name="model">product.product</field>
-<!--        </record>-->
-        <record id="bussiness_quality_check_none" model="jikimo.message.bussiness.node">
-            <field name="name">待质检</field>
-            <field name="model">quality.check</field>
         </record>
     </data>
 

sf_message/data/template_data.xml

@@ -339,18 +339,6 @@
 事项：请确认委外采购单并处理。</field>
         </record>
 
-        <record id="template_purchase_request" model="jikimo.message.template">
-            <field name="name">采购申请待处理通知</field>
-            <field name="model_id" ref="purchase_request.model_purchase_request"/>
-            <field name="model">purchase.request</field>
-            <field name="bussiness_node_id" ref="bussiness_purchase_request"/>
-            <field name="msgtype">markdown</field>
-            <field name="urgency">normal</field>
-            <field name="content">### 采购申请待处理提醒：
-单号：[{{name}}]({{request_url}})
-事项：您有一张新的采购申请单待处理。</field>
-        </record>
-
         <record id="template_purchase_remind" model="jikimo.message.template">
             <field name="name">外购订单采购单提醒</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
@@ -414,28 +402,16 @@
             </field>
         </record>
 
-<!--        <record id="template_quality_check" model="jikimo.message.template">-->
+        <record id="template_quality_check" model="jikimo.message.template">
-<!--            <field name="name">待质检提醒</field>-->
-<!--            <field name="model_id" ref="product.model_product_product"/>-->
-<!--            <field name="model">product.product</field>-->
-<!--            <field name="bussiness_node_id" ref="bussiness_quality_check"/>-->
-<!--            <field name="msgtype">markdown</field>-->
-<!--            <field name="urgency">normal</field>-->
-<!--            <field name="content">### 待质检提醒：-->
-<!--单号：产品[{{name}}]({{url}})-->
-<!--事项：有{{num}}个质检单需要处理。</field>-->
-<!--        </record>-->
-<!--    </data>-->
-            <record id="template_quality_check_none" model="jikimo.message.template">
             <field name="name">待质检提醒</field>
-            <field name="model_id" ref="quality.model_quality_check"/>
+            <field name="model_id" ref="product.model_product_product"/>
-            <field name="model">quality.check</field>
+            <field name="model">product.product</field>
-            <field name="bussiness_node_id" ref="bussiness_quality_check_none"/>
+            <field name="bussiness_node_id" ref="bussiness_quality_check"/>
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 待质检提醒：
-单号：[{{name}}]({{url}})
+单号：产品[{{name}}]({{url}})
-事项：有一个质检单需要处理({{type_name}})。</field>
+事项：有{{num}}个质检单需要处理。</field>
         </record>
     </data>
 

sf_message/models/__init__.py

@@ -14,4 +14,3 @@ from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
 from . import sf_message_product
 from . import sf_message_quality_check
-from . import sf_message_purchase_request

sf_message/models/sf_message_product.py

@@ -29,18 +29,18 @@ class SFMessageProduct(models.Model):
                         '{{number}}', str(production_num)).replace(
                         '{{request_url}}', url)
                     contents.append(content)
-            # if message_queue_id.message_template_id.name == '待质检提醒':
+            if message_queue_id.message_template_id.name == '待质检提醒':
-            #     content = message_queue_id.message_template_id.content
+                content = message_queue_id.message_template_id.content
-            #     product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-            #     quality_check_num = self.env['quality.check'].sudo().search_count(
+                quality_check_num = self.env['quality.check'].sudo().search_count(
-            #         [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
+                    [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
-            #     if quality_check_num >= 1:
+                if quality_check_num >= 1:
-            #         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-            #         action_id = self.env.ref('quality_control.quality_check_action_report').id
+                    action_id = self.env.ref('quality_control.quality_check_action_report').id
-            #         url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
-            #         content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
+                    content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
-            #             '{{num}}', str(quality_check_num))
+                        '{{num}}', str(quality_check_num))
-            #         contents.append(content)
+                    contents.append(content)
         return contents, message_queue_ids
 
     def get_request_url(self, routing_type):

sf_message/models/sf_message_purchase_request.py

@@ -1,46 +0,0 @@
-import logging
-import re
-from odoo import models, fields, api, _
-from urllib.parse import urlencode
-
-
-class SFMessagePurchaseRequest(models.Model):
-    _name = 'purchase.request'
-    _description = "采购申请"
-    _inherit = ['purchase.request', 'jikimo.message.dispatch']
-
-    def write(self, vals):
-        original_state = {}
-        for item in self:
-            original_state.update({f'{item.id}': item.state})
-        res = super(SFMessagePurchaseRequest, self).write(vals)
-        for item in self:
-            if vals.get('state') == 'approved' and original_state.get(f'{item.id}') != 'approved':
-                item.add_queue('采购申请待处理通知')
-        return res
-
-    def _get_message(self, message_queue_ids):
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '采购申请待处理通知':
-                content = message_queue_id.message_template_id.content
-                url = self.request_url(int(message_queue_id.res_id))
-                request_line = self.env['purchase.request'].search([('id', '=', int(message_queue_id.res_id))])
-                content = content.replace('{{name}}', request_line.name).replace(
-                    '{{request_url}}', url)
-                contents.append(content)
-        return contents, message_queue_ids
-
-    def request_url(self, id):
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('purchase_request.purchase_request_form_action').id
-        menu_id = self.env.ref('purchase_request.menu_purchase_request_act').id
-        # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
-                  'model': 'purchase.request',
-                  'view_type': 'form'}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url

sf_message/models/sf_message_quality_check.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import models, fields, api, _
-from urllib.parse import urlencode
 
 
 class SFMessageQualityCheck(models.Model):
@@ -11,70 +10,25 @@ class SFMessageQualityCheck(models.Model):
     @api.model_create_multi
     def create(self, vals_list):
         result = super().create(vals_list)
-        # try:
+        try:
-        #     # 判断是否为web页面创建请求
+            # 判断是否为web页面创建请求
-        #     is_web_request = self.env.context.get('is_web_request', False)
+            is_web_request = self.env.context.get('is_web_request', False)
-        #     if not is_web_request:
+            if not is_web_request:
-        #         for obj in result:
+                for obj in result:
-        #             jikimo_message_queue = self.get_message_queue(obj.product_id.id)
+                    jikimo_message_queue = self.get_message_queue(obj.product_id.id)
-        #             if not jikimo_message_queue:
+                    if not jikimo_message_queue:
-        #                 obj.product_id.add_queue('待质检提醒')
+                        obj.product_id.add_queue('待质检提醒')
-        # except Exception as e:
+        except Exception as e:
-        #     logging.info('add_queue待质检提醒 error:%s' % e)
+            logging.info('add_queue待质检提醒 error:%s' % e)
-        qc_ids = result.filtered(lambda qc: qc.quality_state == 'none')
-        if qc_ids:
-            message_template_id = self.env['jikimo.message.template'].sudo().search([('name', '=', '待质检提醒')])
-            for qc in qc_ids:
-                queue_id = self.env['jikimo.message.queue'].sudo().search(
-                    [('message_template_id', '=', message_template_id[-1].id), ('res_id', '=', qc.id)])
-                if not queue_id and '制造' not in [pt.name for pt in qc.point_id.picking_type_ids]:
-                    qc.add_queue('待质检')
         return result
 
-    #
+    def get_message_queue(self, res_id):
-    # def get_message_queue(self, res_id):
+        business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
-    #     business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
+        message_template = self.env["jikimo.message.template"].sudo().search([
-    #     message_template = self.env["jikimo.message.template"].sudo().search([
+            ("name", "=", '待质检提醒'),
-    #         ("name", "=", '待质检提醒'),
+            ("bussiness_node_id", "=", business_node_id)
-    #         ("bussiness_node_id", "=", business_node_id)
+        ], limit=1)
-    #     ], limit=1)
+        jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
-    #     jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+            [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
-    #         [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
+             ('message_template_id', '=', message_template.id)])
-    #          ('message_template_id', '=', message_template.id)])
+        return jikimo_message_queue
-    #     return jikimo_message_queue
-    def write(self, vals):
-        original_state = self.quality_state
-        res = super(SFMessageQualityCheck, self).write(vals)
-        if res and vals.get('quality_state') == 'none' and original_state != 'none':
-            message_template_id = self.env['jikimo.message.template'].sudo().search([('name', '=', '待质检提醒')])
-            queue_id = self.env['jikimo.message.queue'].sudo().search(
-                [('message_template_id', '=', message_template_id[-1].id), ('res_id', '=', self.id)])
-            if not queue_id and '制造' not in [pt.name for pt in self.point_id.picking_type_ids]:
-                self.add_queue('待质检')
-        return res
-
-    def _get_message(self, message_queue_ids):
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '待质检提醒':
-                content = message_queue_id.message_template_id.content
-                qc_line = self.search([('id', '=', int(message_queue_id.res_id))])
-                url = self.request_url(int(message_queue_id.res_id))
-                content = content.replace('{{name}}', qc_line.name).replace(
-                    '{{url}}', url).replace('{{type_name}}', qc_line.point_id.title)
-                contents.append(content)
-        return contents, message_queue_ids
-
-    def request_url(self, id):
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('quality_control.quality_check_action_main').id
-        menu_id = self.env.ref('quality_control.menu_quality_checks').id
-        # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
-                  'model': 'quality.check',
-                  'view_type': 'form'}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url

sf_mrs_connect/controllers/controllers.py

@@ -91,12 +91,15 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                         files_panel = os.listdir(program_path_tmp_panel)
                         panel_file_path = ''
+                        panel_file_name = ''
                         if files_panel:
                             for file in files_panel:
                                 file_extension = os.path.splitext(file)[1]
                                 if file_extension.lower() == '.pdf':
                                     panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                    panel_file_name = os.path.splitext(file)[0]
                                     logging.info('panel_file_path:%s' % panel_file_path)
+                                    logging.info('panel_file_name:%s' % panel_file_name)
                                     
                             # 向编程单中添加二维码
                             request.env['printing.utils'].add_qr_code_to_pdf(
@@ -105,7 +108,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 "模型ID：%s" % model_id,
                                 "零件图号：%s" % part_number if part_number else None
                             )
-                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read()),
+                                                 'cnc_worksheet_name': panel_file_name})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
                                                                                                 'cancel'] and ap.processing_panel == panel)
@@ -143,114 +147,94 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 for production in productions:
                     logging.info('production====:%s' % production.name)
                     record_ids_obj = production.programming_record_ids.filtered(
-                        lambda r: r.send_time is False)
+                        lambda r: r.current_programming_count == ret['reprogramming_num'])
                     logging.info('record_ids_obj====:%s' % record_ids_obj)
                     if record_ids_obj:
-                        record_ids_obj = record_ids_obj.sorted('id')[0]
                         logging.info('record_ids_obj.reason====:%s' % record_ids_obj.reason)
-                        record_ids_obj.write({
+                        record_ids_obj.write(
-                            'current_programming_count': ret['reprogramming_num'],
+                            {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
-                            'send_time': ret['send_time'],
-                            'target_production_id': productions_reprogram,
-                            'programming_method': ret['programme_way']
-                        })
                         logging.info('已更新编程记录:%s' % record_ids_obj)
                         correct_record_ids_obj = record_ids_obj
                         correct_production_id = production.id
-                    # 更新重新编程记录
+                    if ret['reprogramming_num'] == 0:
+                        logging.info('首次下发')
+                        production.programming_record_ids.create({
+                            'number': 1,
+                            'production_id': production.id,
+                            'reason': '首次下发',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': False,
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建首次下发的编程记录:%s' % production.name)
+                    elif ret['reset_flag']:
+                        logging.info('重置状态')
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '重置状态',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': False,
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建重置状态的编程记录:%s' % production.name)
+                    elif ret['manufacturing_type'] == 'rework':
+                        logging.info('返工')
+                        rework_record_ids_obj = production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '返工',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建返工的编程记录:%s' % production.name)
+                        logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
+                        # rework_production_id = production.id
+                        # logging.info('rework_production_id====:%s' % rework_production_id)
+                    elif ret['manufacturing_type'] == 'scrap':
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '报废',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                    elif ret['manufacturing_type'] == 'invalid_tool_rework':
+                        logging.info('无效功能刀具')
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '无效功能刀具',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
+                    elif ret['reprogramming_reason']:
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': ret['reprogramming_reason'],
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
                     else:
-                        if ret['reset_flag']:
+                        logging.info('无对应状态，不需更新编程记录')
-                            logging.info('重置状态')
-                            production.programming_record_ids.create({
-                                'number': len(production.programming_record_ids) + 1,
-                                'production_id': production.id,
-                                'reason': '重置状态',
-                                'programming_method': ret['programme_way'],
-                                'current_programming_count': ret['reprogramming_num'],
-                                'target_production_id': productions_reprogram,
-                                'apply_time': False,
-                                'send_time': ret['send_time'],
-                            })
-                        else:
-                            logging.info('无对应状态，不需更新编程记录')
-                    # if ret['reprogramming_num'] == 0:
-                    #     logging.info('首次下发')
-                    #     production.programming_record_ids.create({
-                    #         'number': 1,
-                    #         'production_id': production.id,
-                    #         'reason': '首次下发',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': False,
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建首次下发的编程记录:%s' % production.name)
-                    # elif ret['reset_flag']:
-                    #     logging.info('重置状态')
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '重置状态',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': False,
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建重置状态的编程记录:%s' % production.name)
-                    # elif ret['manufacturing_type'] == 'rework':
-                    #     logging.info('返工')
-                    #     rework_record_ids_obj = production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '返工',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建返工的编程记录:%s' % production.name)
-                    #     logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
-                    #     # rework_production_id = production.id
-                    #     # logging.info('rework_production_id====:%s' % rework_production_id)
-                    # elif ret['manufacturing_type'] == 'scrap':
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '报废',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    # elif ret['manufacturing_type'] == 'invalid_tool_rework':
-                    #     logging.info('无效功能刀具')
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '无效功能刀具',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
-                    # elif ret['reprogramming_reason']:
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': ret['reprogramming_reason'],
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    
 
                 for production in productions:
                     logging.info('production====:%s' % production.name)
@@ -269,7 +253,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 'current_programming_count': correct_record_ids_obj.current_programming_count,
                                 'target_production_id': correct_record_ids_obj.target_production_id,
                                 'apply_time': correct_record_ids_obj.apply_time,
-                                'apply_uid': correct_record_ids_obj.apply_uid.id,
                                 'send_time': correct_record_ids_obj.send_time,
                             })
                             logging.info('已创建正确的制造订单的编程记录:%s' % production.name)

sf_quality/__manifest__.py

@@ -13,7 +13,7 @@
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
     # 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string，故需要sf_manufacturing先安装
-    'depends': ['quality_control', 'web_widget_model_viewer', 'sf_manufacturing','jikimo_attachment_viewer', 'jikimo_confirm_dialog'],
+    'depends': ['quality_control', 'web_widget_model_viewer', 'sf_manufacturing','jikimo_attachment_viewer'],
     'data': [
         'security/ir.model.access.csv',
         'data/check_standards.xml',

sf_quality/models/quality.py

@@ -5,7 +5,7 @@ from odoo import fields, models, api
 from odoo.exceptions import ValidationError
 from datetime import datetime
 from odoo.addons.sf_base.commons.common import Common
-from odoo.tools import float_round, float_compare
+from odoo.tools import float_round
 
 
 class QualityCheck(models.Model):
@@ -208,96 +208,4 @@ class QualityCheck(models.Model):
                         'title': '警告',
                         'message': '不合格数量不能超过已检数量'
                     }
-                }
+                }
-            
-    total_qty_readonly = fields.Boolean(compute='_compute_total_qty_readonly', store=True)
-
-    def _compute_total_qty_readonly(self):
-        report_test_type_id = self.env.ref('sf_quality.test_type_factory_inspection').id
-        for record in self:
-            if (record.measure_on != 'move_line' or record.workorder_id is False) and record.point_id.test_type_id.id != report_test_type_id:
-                record.total_qty_readonly = True
-            else:
-                record.total_qty_readonly = False
-
-    def preview_doc(self):
-        """预览出厂检验报告"""
-        self.ensure_one()
-        picking_qty = sum(self.picking_id.move_ids.filtered(lambda m: m.product_id == self.product_id).mapped('product_uom_qty'))
-        if not self._check_total_qty(picking_qty) and self.quality_state in ['waiting', 'none']:
-            return {
-                'type': 'ir.actions.client',
-                'tag': 'jikimo_confirm_dialog',
-                'params': {
-                    'active_id': self.id,
-                    'message': f"拣货调拨单号{self.picking_id.name}需求数量为{picking_qty}，当前质量检查单产品数量为{self.total_qty}，数量不一致，是否确认继续？",
-                    'next_model': self._name,
-                    'next_method': 'preview_doc_confirm',
-                    'context': self.env.context
-                }
-            }
-        action = self.env.ref("sf_quality.action_report_quality_inspection_preview").read()[0]
-        return action
-    
-
-    def preview_doc_confirm(self):
-        self.ensure_one()
-        action = self.env.ref("sf_quality.action_report_quality_inspection_preview").read()[0]
-        action['context'] = {
-            'active_id': self.id,
-            'active_ids': [self.id]
-        }
-        return action
-
-    def _check_total_qty(self, compare_qty):
-        """
-            检查质量检查单的总数量是否匹配
-        """
-        self.ensure_one()
-        return float_compare(float(self.total_qty), compare_qty, self.picking_id.product_id.uom_id.rounding) == 0
-    
-
-    def preview_do_publish(self):
-        self.ensure_one()
-        self._check_part_number()
-        self._check_measure_line()
-        self._check_check_qty_and_total_qty()
-
-        picking_qty = sum(self.picking_id.move_ids.filtered(lambda m: m.product_id == self.product_id).mapped('product_uom_qty'))
-        if not self._check_total_qty(picking_qty):
-            return {
-                'type': 'ir.actions.client',
-                'tag': 'jikimo_confirm_dialog',
-                'params': {
-                    'active_id': self.id,
-                    'message': f"拣货调拨单号{self.picking_id.name}需求数量为{picking_qty}，当前质量检查单产品数量为{self.total_qty}，数量不一致，是否确认继续？",
-                    'next_model': self._name,
-                    'next_method': 'preview_do_publish_confirm',
-                    'context': self.env.context,
-                }
-            }
-        else:
-            return self.do_publish()
-        
-
-    def preview_do_publish_confirm(self):
-        self.ensure_one()
-        return {
-            'name': '发布确认',
-            'type': 'ir.actions.act_window',
-            'res_model': 'quality.check.publish.wizard',
-            'view_mode': 'form',
-            'views': [[False, 'form']],
-            'target': 'new',
-            'context': {
-                'default_check_id': self.id,
-                'default_product_name': self.product_id.name,
-                'default_total_qty': self.total_qty,
-                'default_check_qty': self.check_qty,
-                'default_measure_count': self.column_nums,
-                'default_item_count': len(self.measure_line_ids),
-                'default_old_report_name': self.old_report_name,
-                'default_publish_status': self.publish_status,
-                'is_web_request': True
-            }
-        }

sf_quality/views/quality_check_view.xml

@@ -73,50 +73,47 @@
             <xpath expr="//header" position="inside">
                 <field name="is_out_check" invisible="1"/>
                 <field name="publish_status" invisible="1"/>              
-                <button name="preview_doc" 
+                <button name="%(sf_quality.action_report_quality_inspection_preview)d" 
                 string="预览"
-                type="object" 
+                type="action" 
                 class="oe_highlight" attrs="{'invisible': [('is_out_check', '=', False)]}"/>
 <!--                  --><!-- 如果还需要打印按钮 -->
 <!--                 <button name="%(sf_quality.action_report_quality_inspection)d"  -->
 <!--                         string="打印报告"  -->
 <!--                         type="action"/> -->
 <!--                 <button name="do_preview" string="预览" type="object" class="btn-primary" attrs="{'invisible': [('is_out_check', '=', False)]}"/> -->
-                <button name="preview_do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
+                <button name="do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
 <!--                 <button name="get_report_url" string="ceshi" type="object" class="btn-primary"/> -->
 <!--                 <button name="upload_factory_report" string="upload_factory_report" type="object" class="btn-primary"/> -->
                 <button name="do_cancel_publish" string="取消发布" type="object" class="btn-primary" confirm="确定取消发布吗？" attrs="{'invisible': ['|',('is_out_check', '=', False), ('publish_status', '!=', 'published')]}"/>
-                <button name="preview_do_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
+                <button name="do_re_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
-            </xpath>
-            <xpath expr="//field[@name='total_qty']" position="before">
-                <field name="total_qty_readonly" invisible="1"/>
             </xpath>
             <xpath expr="//field[@name='total_qty']" position="attributes">
                 <attribute name="attrs">{
                     'invisible': ['&amp;', '|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False), '|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
-                    'readonly': [('total_qty_readonly', '=', True)],
+                    'readonly': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
                     'on_change': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)]
                 }</attribute>
             </xpath>
             <xpath expr="//field[@name='total_qty']" position="after">
                 <label for="workorder_qty_to_test"
-                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
                     <field name="workorder_qty_to_test" attrs="{'readonly': 0, 'on_chnage': 1}"/>
                     <field name="uom_id"/>
                 </div>
                 <label for="workorder_qty_tested"
-                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
                     <field name="workorder_qty_tested" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
                     <field name="uom_id"/>
                 </div>
                 <label for="workorder_qty_test_failed"
-                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
                     <field name="workorder_qty_test_failed" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
                     <field name="uom_id"/>
                 </div>

sf_sale/__manifest__.py

@@ -17,7 +17,6 @@
         'wizard/sale_order_wizard_views.xml',
         'wizard/purchase_order_wizard_views.xml',
         'data/cron_data.xml',
-        'data/documents_data.xml',
         'views/sale_team.xml',
         'views/sale_order_view.xml',
         'views/res_partner_view.xml',

sf_sale/data/documents_data.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <!-- 创建采购合同文件夹 -->
-        <record id="documents_sales_contracts_folder" model="documents.folder">
-            <field name="name">销售合同</field>
-            <field name="description">存放销售合同相关文件</field>
-            <field name="sequence">8</field>
-        </record>
-        <record id="documents_sales_contracts_folder_1" model="documents.folder">
-            <field name="name">下单凭证</field>
-            <field name="parent_folder_id" ref="documents_sales_contracts_folder"/>
-        </record>
-    </data>
-</odoo>

sf_sale/models/quick_easy_order.py

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

sf_sale/models/quick_easy_order_old.py

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

sf_sale/models/sale_order.py

@@ -63,11 +63,6 @@ class ReSaleOrder(models.Model):
 
     model_display_version = fields.Char('模型展示版本', default="v1")
 
-    contract_code = fields.Char('合同编号')
-    contract_document_id = fields.Many2one('documents.document', string='合同文件')
-    contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
-    contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
-
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
                           deadline_of_delivery, payments_way, pay_way, order_number, state='sale',
@@ -199,15 +194,17 @@ class ReSaleOrder(models.Model):
     @api.depends('order_line.purchase_line_ids.order_id')
     def _compute_purchase_order_count(self):
         for order in self:
-            order.purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
+            order.purchase_order_count = len(order._get_purchase_orders().filtered(
-            order.consignment_purchase_order_count = len(order._get_sale_to_purchase_1('outsourcing'))
+                lambda po: po.purchase_type not in ['outsourcing']))
+            order.consignment_purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
 
     def action_view_purchase_orders(self):
         """
         采购
         """
         self.ensure_one()
-        purchase_order_ids = self._get_sale_to_purchase('outsourcing')
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type not in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -225,20 +222,12 @@ class ReSaleOrder(models.Model):
             })
         return action
 
-    def _get_sale_to_purchase(self, purchase_type):
-        """查询满足条件的采购订单"""
-        purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type not in ['outsourcing']).ids
-        order_ids = self.env['purchase.order'].sudo().search(
-            [('origin', '=', self.name), ('purchase_type', '!=', purchase_type)]).ids
-        return list(set(purchase_order_ids) | set(order_ids))
-
     def action_view_consignment_purchase_orders(self):
         """
         委外加工
         """
         self.ensure_one()
-        outsourcing_purchase_order_ids = self._get_sale_to_purchase_1('outsourcing')
+        outsourcing_purchase_order_ids = self._get_sale_to_purchase('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -256,7 +245,7 @@ class ReSaleOrder(models.Model):
             })
         return action
 
-    def _get_sale_to_purchase_1(self, purchase_type):
+    def _get_sale_to_purchase(self, purchase_type):
         """查询满足条件的采购订单"""
         purchase_order_ids = self._get_purchase_orders().filtered(
             lambda po: po.purchase_type == purchase_type).ids
@@ -375,13 +364,12 @@ class RePurchaseOrder(models.Model):
 
     @api.depends('partner_id')
     def _compute_user_id(self):
-        for item in self:
+        if not self.user_id:
-            if not item.user_id:
+            if self.partner_id:
-                if item.partner_id:
+                self.user_id = self.partner_id.purchase_user_id.id
-                    item.user_id = item.partner_id.purchase_user_id.id
+                # self.state = 'purchase'
-                    # self.state = 'purchase'
+            else:
-                else:
+                self.user_id = self.env.user.id
-                    item.user_id = item.env.user.id
 
     @api.constrains('order_line')
     def check_order_line(self):

sf_sale/views/sale_order_view.xml

@@ -198,20 +198,7 @@
                     </div>
                     <field name="date_order" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])], 'required': True}" nolabel="1"/>
                 </xpath>
-                <xpath expr="//notebook/page[@name='customer_signature']" position="after">
+
-                    <page string="合同" name="contract_documents"
-                          attrs="{'invisible': [('contract_document_id', '=', False)]}">
-                        <group>
-                            <group>
-                                <field name="contract_document_id" invisible="1"/>
-                                <field name="contract_file_name" invisible="1"/>
-                                <field name="contract_file"
-                                       widget="adaptive_viewer"
-                                       filename="contract_file_name"/>
-                            </group>
-                        </group>
-                    </page>
-                </xpath>
             </field>
         </record>
 

sf_tool_management/models/functional_tool.py

@@ -150,17 +150,6 @@ class FunctionalCuttingToolEntity(models.Model):
                         else:
                             # 原刀从线边出库
                             item.tool_in_out_stock_location_1(location_id, tool_room_id)
-                    # 系统中该刀在线边刀架其他位置，需先清除这个位置的刀具信息
-                    shelf_location_id = self.env['sf.shelf.location'].sudo().search([
-                        ('product_sn_id', '=', item.barcode_id.id)])
-                    if shelf_location_id:
-                        shelf_location_id.write(
-                            {'product_id': None,
-                             'product_sn_id': None,
-                             'tool_rfid': None,
-                             "tool_name_id": None,
-                             'product_num': 0,
-                             'location_status': '空闲'})
                     # 新刀入库到线边
                     item.create_stock_move(pre_manufacturing_id, location_id)
                     item.current_shelf_location_id = location_id.id

sf_warehouse/__manifest__.py

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

sf_warehouse/migrations/1.2/post-migrate.py

@@ -1,21 +0,0 @@
-from odoo import api, SUPERUSER_ID
-
-def migrate(cr, version):
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    sf_shelf_model = env["sf.shelf"]
-    sf_shelf_location_model = env["sf.shelf.location"]
-    
-    preproduction_shelf_ids = sf_shelf_location_model.get_preproduction_shelf_ids()
-    
-    shelves = sf_shelf_model.search([])
-    for shelf in shelves:
-        if shelf.id not in preproduction_shelf_ids:
-            continue
-            
-        shelf_barcode = shelf.barcode or ""
-        if not shelf_barcode:
-            continue
-        locations = sf_shelf_location_model.search([("shelf_id", "=", shelf.id)], order="id asc")
-        for index, location in enumerate(locations, start=1):
-            new_barcode = f"{shelf_barcode}-{index:03d}"
-            location.barcode = new_barcode

sf_warehouse/models/sync_common.py

@@ -121,13 +121,12 @@ class MrsShelfLocationDataSync(models.Model):
                         tool.tool_in_out_stock_location(location_id)
                         if tool:
                             location_id.product_sn_id = tool.barcode_id.id
-                            # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
+                            # 修改功能刀具状态
-                            if 'LifeStd' in item and 'LifeUse' in item:
+                            if item.get('State') == '报警':
-                                tool.sudo().write({
+                                if tool.functional_tool_status != item.get('State'):
-                                    'max_lifetime_value': item['LifeStd'],
+                                    tool.write({
-                                    'used_value': item['LifeUse'],
+                                        'functional_tool_status': item['State']
-                                    'functional_tool_status': item['State'],
+                                    })
-                                })
                         else:
                             location_id.product_sn_id = False
                             if item['RfidCode']:

sf_warehouse/static/src/css/kanban_location_custom.scss

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

sf_warehouse/static/src/js/custom_kanban_controller.js

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

sf_warehouse/views/shelf_location.xml

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