功能刀具组装时自动根据BOM配置选取物料逻辑优化为：一直查找直到找到一个满足条件的物料货位，如果没有就给提示。

jikimo_demand_plan_queue/__init__.py

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

jikimo_demand_plan_queue/__manifest__.py

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

jikimo_demand_plan_queue/models/__init__.py

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

jikimo_demand_plan_queue/models/production_demand_plan.py

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

jikimo_frontend/static/src/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_fields = treeModifiers.merge_fields.split(',');
-                const data = this.setColumns(this.props.merge_key);
-                owl.onMounted(() => {
-                    this.mergeColumns(this.props.merge_fields,  data)
-                })
-            }
-            if(treeModifiers.pacthResize) {
-
-                owl.onPatched(() => {
-                    this.columnWidths = null;
-                    this.freezeColumnWidths();
-                    
-                })
-            }
+            this.props.merge_key = treeModifiers.merge_key;
+            this.props.merge_fields = treeModifiers.merge_fields.split(',');
+            const data = this.setColumns(this.props.merge_key);
+            owl.onMounted(() => {
+                this.mergeColumns(this.props.merge_fields,  data)
+            })
         }
         return this._super(...arguments);
     },

jikimo_frontend/static/src/scss/custom_style.scss

@@ -157,11 +157,11 @@ td.o_required_modifier {
   color: #aaa;
 }
 
-// .o_kanban_primary_left {
-//   display: flex;
-//   flex-direction: row-reverse;
-//   justify-content: flex-start;
-// }
+.o_kanban_primary_left {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: flex-start;
+}
 
 .o_list_view .o_list_table thead {
   position: sticky;
@@ -521,6 +521,11 @@ div:has(.o_required_modifier) > label::before {
   }
 }
 
+// 设置表格横向滚动
+.o_list_renderer.o_renderer  {
+  max-width: 100%;
+  overflow-x: auto;
+}
 
 // 设置表单页面label文本不换行
 .o_form_view .o_group .o_wrap_label .o_form_label {

jikimo_printing/__init__.py

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

jikimo_printing/__manifest__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': '机企猫 打印模块',
-    'version': '1.0',
-    'summary': """ 包含机台二维码，程序单打印等 """,
-    'author': '机企猫',
-    'website': 'https://www.jikimo.com',
-    'category': '机企猫',
-    'depends': ['sf_manufacturing', 'sf_maintenance', 'base_report_to_printer'],
-    'data': [
-         'views/maintenance_views.xml',
-    ],
-    
-    'application': True,
-    'installable': True,
-    'auto_install': False,
-    'license': 'LGPL-3',
-}

jikimo_printing/models/__init__.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import jikimo_printing
-from . import maintenance_printing
-from . import workorder_printing
-

jikimo_printing/models/jikimo_printing.py

@@ -1,87 +0,0 @@
-from io import BytesIO
-import qrcode
-from reportlab.pdfgen import canvas
-from reportlab.lib.pagesizes import A4
-from PIL import Image
-import logging
-from reportlab.lib.utils import ImageReader
-from odoo import models, fields, api
-import base64
-
-_logger = logging.getLogger(__name__)
-
-class JikimoPrinting(models.AbstractModel):
-    _name = 'jikimo.printing'
-
-    def print_qr_code(self, data):
-        """
-            打印二维码
-        """
-        printer = self.env['printing.printer'].get_default()
-        if not printer:
-            _logger.error("未找到默认打印机")
-            return False
-
-        # 生成二维码
-        qr = qrcode.QRCode(version=1, box_size=10, border=5)
-        qr.add_data(data)
-        qr.make(fit=True)
-        qr_image = qr.make_image(fill_color="black", back_color="white")
-
-        # 将PIL Image转换为reportlab可用的格式
-        temp_image = BytesIO()
-        qr_image.save(temp_image, format="PNG")
-        temp_image.seek(0)
-
-        # 创建PDF
-        pdf_buffer = BytesIO()
-        c = canvas.Canvas(pdf_buffer, pagesize=A4)
-
-        # 计算位置
-        a4_width, a4_height = A4
-        qr_width = 200
-        qr_height = 200
-        x = (a4_width - qr_width) / 2
-        y = (a4_height - qr_height) / 2
-
-        # 直接从BytesIO绘制图片
-        c.drawImage(ImageReader(Image.open(temp_image)), x, y, width=qr_width, height=qr_height)
-        c.save()
-
-        # 获取PDF内容并打印
-        pdf_content = pdf_buffer.getvalue()
-        # _logger.info(f"打印内容: {pdf_content}")
-        printer.print_document(report=None, content=pdf_content, doc_format='pdf')
-
-        # 清理资源
-        pdf_buffer.close()
-        temp_image.close()
-
-        return True
-
-    def print_pdf(self, pdf_data):
-        """
-            打印PDF
-        """
-        printer = self.env['printing.printer'].get_default()
-        if not printer:
-            _logger.error("未找到默认打印机")
-            return False
-
-        pdf_data_str = pdf_data.decode('ascii', errors='ignore')
-        decoded_data = base64.b64decode(pdf_data_str)
-        
-        # 处理二进制数据
-        pdf_buffer = BytesIO()
-        pdf_buffer.write(decoded_data)
-        pdf_buffer.seek(0)
-        
-        # 获取PDF内容
-        pdf_content = pdf_buffer.getvalue()
-        
-        printer.print_document(report=None, content=pdf_content, doc_format='pdf')
-        # 清理资源
-        pdf_buffer.close()
-
-        _logger.info("成功打印PDF")
-        return True

jikimo_printing/models/maintenance_printing.py

@@ -1,69 +0,0 @@
-from odoo import models, fields, api
-
-class MaintenancePrinting(models.Model):
-    _inherit = 'maintenance.equipment'
-
-    def print_single_method(self):
-
-        print('self.name========== %s' % self.name)
-        self.ensure_one()
-        # maintenance_equipment_id = self.id
-        # # host = "192.168.50.110"  # 可以根据实际情况修改
-        # # port = 9100  # 可以根据实际情况修改
-
-        # # 获取默认打印机配置
-        # printer_config = self.env['printer.configuration'].sudo().search([('model', '=', self._name)], limit=1)
-        # if not printer_config:
-        #     raise UserError('请先配置打印机')
-        # host = printer_config.printer_id.ip_address
-        # port = printer_config.printer_id.port
-        # self.print_qr_code(maintenance_equipment_id, host, port)
-
-        # 切换成A4打印机
-        
-        try:
-            self.env['jikimo.printing'].print_qr_code(self.MTcode)
-        except Exception as e:
-            raise UserError(f"打印失败: {str(e)}")
-
-
-    # def generate_zpl_code(self, code):
-    #     """生成ZPL代码用于打印二维码标签
-    #     Args:
-    #         code: 需要编码的内容
-    #     Returns:
-    #         str: ZPL指令字符串
-    #     """
-    #     zpl_code = "^XA\n"  # 开始ZPL格式
-        
-    #     # 设置打印参数
-    #     zpl_code += "^LH0,0\n"  # 设置标签起始位置
-    #     zpl_code += "^CI28\n"  # 设置中文编码
-    #     zpl_code += "^PW400\n"  # 设置打印宽度为400点
-    #     zpl_code += "^LL300\n"  # 设置标签长度为300点
-        
-    #     # 打印标题
-    #     zpl_code += "^FO10,20\n"  # 设置标题位置
-    #     zpl_code += "^A0N,30,30\n"  # 设置字体大小
-    #     zpl_code += "^FD机床二维码^FS\n"  # 打印标题文本
-        
-    #     # 打印二维码
-    #     zpl_code += "^FO50,60\n"  # 设置二维码位置
-    #     zpl_code += f"^BQN,2,8\n"  # 设置二维码参数:模式2,放大倍数8
-    #     zpl_code += f"^FDLA,{code}^FS\n"  # 二维码内容
-        
-    #     # 打印编码文本
-    #     zpl_code += "^FO50,220\n"  # 设置编码文本位置
-    #     zpl_code += "^A0N,25,25\n"  # 设置字体大小
-    #     zpl_code += f"^FD编码: {code}^FS\n"  # 打印编码文本
-        
-    #     # 打印日期
-    #     zpl_code += "^FO50,260\n"
-    #     zpl_code += "^A0N,20,20\n"
-    #     zpl_code += f"^FD打印日期: {fields.Date.today()}^FS\n"
-        
-    #     zpl_code += "^PQ1\n"  # 打印1份
-    #     zpl_code += "^XZ\n"  # 结束ZPL格式
-        
-    #     return zpl_code
-

jikimo_printing/models/workorder_printing.py

@@ -1,31 +0,0 @@
-
-import logging
-from odoo import models, fields, api
-
-_logger = logging.getLogger(__name__)
-
-class MrpWorkorder(models.Model):
-    _name = 'mrp.workorder'
-    _inherit = ['mrp.workorder']
-
-    def _compute_state(self):
-        super(MrpWorkorder, self)._compute_state()
-        for workorder in self:
-            work_ids = workorder.production_id.workorder_ids.filtered(lambda w: w.routing_type == '装夹预调' or w.routing_type == '人工线下加工')
-            for wo in work_ids:
-                if wo.state == 'ready' and not wo.production_id.product_id.is_print_program:
-                    # 触发打印程序
-                    pdf_data = workorder.processing_drawing
-                    if pdf_data:
-                        try:
-                            # 执行打印
-                            self.env['jikimo.printing'].print_pdf(pdf_data)
-                            wo.production_id.product_id.is_print_program = True
-                        except Exception as e:
-                            _logger.error(f"工单 {wo.name} 的PDF打印失败: {str(e)}")
-
-class ProductTemplate(models.Model):
-    _inherit = 'product.template'
-
-    is_print_program = fields.Boolean(string='是否打印程序', default=False)
-

jikimo_printing/views/maintenance_views.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="sf_maintenance_equipment_view_form_qrcode_print" model="ir.ui.view">
-        <field name="name">sf_equipment.form</field>
-        <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='qr_code_image']" position="after">
-                <label for="print_single_method"/>
-                <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
-                    <button type="object" class="oe_highlight" name='print_single_method' string="打印机床二维码"
-                            attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
-                </div>
-            </xpath>
-        </field>
-    </record>
-</odoo>
-
-                    

jikimo_purchase_request/__manifest__.py

@@ -8,22 +8,16 @@
     'category': 'purchase',
     'depends': ['sf_manufacturing', 'purchase_request'],
     'data': [
-        'security/ir.model.access.csv',
         'views/sale_order_view.xml',
-        'views/purchase_order.xml',
         'views/mrp_production.xml',
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',
-        '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/static/src/**/*'
-        ],
-    },
+    # 'assets': {
+    #           'web.assets_backend': [
+    #               'jikimo_purchase_request/static/src/**/*'
+    #           ],
+    #       },
     'application': True,
     'installable': True,
     'auto_install': False,

jikimo_purchase_request/i18n/zh_CN.po

@@ -410,7 +410,7 @@ msgstr "显示名称"
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_search
 msgid "Done"
-msgstr "关闭"
+msgstr "完成"
 
 #. module: purchase_request
 #: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__move_dest_ids
@@ -1043,7 +1043,7 @@ msgstr "询价单"
 #. module: purchase_request
 #: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__purchased_qty
 msgid "RFQ/PO Qty"
-msgstr "已订购数"
+msgstr ""
 
 #. module: purchase_request
 #. odoo-python

jikimo_purchase_request/models/__init__.py

@@ -5,5 +5,3 @@ from . import sale_order
 from . import mrp_production
 from . import purchase_order
 from . import stock_rule
-from . import stock_picking
-from . import product_product

jikimo_purchase_request/models/mrp_production.py

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

jikimo_purchase_request/models/product_product.py

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

jikimo_purchase_request/models/purchase_order.py

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

jikimo_purchase_request/models/purchase_request.py

@@ -1,22 +1,19 @@
 import re
 import ast
-from odoo import models, fields, api, _
-from itertools import groupby
-from odoo.tools import float_compare
+from odoo import models, fields, api
 
 
 class PurchaseRequest(models.Model):
     _inherit = 'purchase.request'
     _description = '采购申请'
 
-    # 为state添加取消状态
+     # 为state添加取消状态
     state = fields.Selection(
         selection_add=[('cancel', '已取消')],
         ondelete={'cancel': 'set default'}  # 添加 ondelete 策略
     )
 
     rule_new_add = fields.Boolean('采购请求为规则创建', default=False, compute='_compute_state', store=True)
-    rule_purchase_to_request = fields.Boolean('采购单根据规则创建坯料采购申请', default=False)
 
     @api.depends('state')
     def _compute_state(self):
@@ -32,57 +29,6 @@ class PurchaseRequest(models.Model):
         action['context'] = origin_context
         return action
 
-    def button_done(self):
-        product_qty_map = {key: sum(line.product_qty for line in group) for key, group in
-                           groupby(self.line_ids, key=lambda x: x.product_id.id)}
-        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:
-                    if line_item.state == 'purchase':
-                        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:
-                            product_summary[product_id] = qty
-
-        # 校验产品数量
-        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:
-                    discrepancies.append((product_id, qty, product_summary[product_id]))
-            else:
-                discrepancies.append((product_id, qty, 0))
-
-        if discrepancies:
-            # 弹出提示框
-            message = "产品与采购数量不一致:\n"
-            for product_id, required_qty, order_qty in discrepancies:
-                product_name = self.env['product.product'].browse(product_id).display_name  # 获取产品名称
-                message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单确认的数量 {order_qty}。\n"
-                # 添加确认框
-            message += "确认关闭？"
-            return {
-                'name': _('采购申请'),
-                'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
-                    'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
-                           'form')],
-                'res_model': 'purchase.request.wizard',
-                'target': 'new',
-                'context': {
-                    'default_purchase_request_id': self.id,
-                    'default_message': message,
-                }}
-        return super(PurchaseRequest, self).button_done()
-
-
 class PurchaseRequestLine(models.Model):
     _inherit = 'purchase.request.line'
     _description = '采购申请明细'
@@ -101,20 +47,6 @@ class PurchaseRequestLine(models.Model):
         ('outsourcing', "委外加工"),
     ], string='供货方式', compute='_compute_supply_method', store=True)
 
-    purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count',
-                                            readonly=True)
-    purchase_count = fields.Integer(string="采购订单数量", compute="_compute_purchase_count", readonly=True)
-
-    @api.depends("purchase_lines")
-    def _compute_purchase_count(self):
-        for rec in self:
-            rec.purchase_count = len(rec.mapped("purchase_lines.order_id"))
-
-    @api.depends('request_id')
-    def _compute_purchase_request_count(self):
-        for order in self:
-            order.purchase_request_count = len(order.request_id)
-
     @api.depends('origin')
     def _compute_supply_method(self):
         for prl in self:
@@ -147,12 +79,10 @@ class PurchaseRequestLine(models.Model):
                 continue
             if record.product_id.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
-                else:
-                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:
@@ -168,36 +98,3 @@ class PurchaseRequestLine(models.Model):
             else:
                 record.part_number = record.product_id.part_number
                 record.part_name = record.product_id.part_name
-
-    def _compute_qty_to_buy(self):
-        for pr in self:
-            qty_to_buy = sum(pr.mapped("product_qty"))
-            if pr.purchase_count > 0:
-                qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
-                    "product_qty"))
-            pr.qty_to_buy = qty_to_buy > 0.0
-            pr.pending_qty_to_receive = qty_to_buy
-
-    def action_view_purchase_request(self):
-        action = self.env["ir.actions.actions"]._for_xml_id("purchase_request.purchase_request_form_action")
-        action.update({
-            'res_id': self.request_id.id,
-            'views': [[False, 'form']],
-        })
-        return action
-
-    def action_view_purchase_order(self):
-        action = self.env["ir.actions.actions"]._for_xml_id("purchase.purchase_rfq")
-        lines = self.mapped("purchase_lines.order_id")
-        if len(lines) > 1:
-            action["domain"] = [("id", "in", lines.ids)]
-        elif lines:
-            action["views"] = [
-                (self.env.ref("purchase.purchase_order_form").id, "form")
-            ]
-            action["res_id"] = lines.id
-        origin_context = ast.literal_eval(action['context'])
-        if 'search_default_draft' in origin_context:
-            origin_context.pop('search_default_draft')
-        action['context'] = origin_context
-        return action

jikimo_purchase_request/models/sale_order.py

@@ -44,7 +44,7 @@ class StatusChange(models.Model):
         else:
             action.update({
                 'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids.ids)],
+                'domain': [('id', 'in', pr_ids)],
                 'view_mode': 'tree,form',
             })
         return action

jikimo_purchase_request/models/stock_picking.py

@@ -1,60 +0,0 @@
-from odoo import fields, api, models, _
-
-
-class StockPicking(models.Model):
-    _inherit = "stock.picking"
-
-    purchase_request_count = fields.Integer('采购订单数量', compute='_compute_purchase_request')
-
-    @api.depends('name')
-    def _compute_purchase_request(self):
-        for record in self:
-            purchase_request_ids = self.env['purchase.request'].search([('origin', '=', record.name)])
-            record.purchase_request_count = len(purchase_request_ids)
-
-    def action_view_purchase_request(self):
-        self.ensure_one()
-
-        purchase_request_ids = self.env['purchase.request'].search([('origin', '=', self.name)])
-
-        action = {
-            'res_model': 'purchase.request',
-            'type': 'ir.actions.act_window',
-        }
-        if len(purchase_request_ids) == 1:
-            action.update({
-                'view_mode': 'form',
-                'res_id': purchase_request_ids[0].id,
-            })
-        else:
-            action.update({
-                'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', purchase_request_ids.ids)],
-                'view_mode': 'tree,form',
-            })
-        return action
-
-    def _action_done(self):
-        res = super(StockPicking, self)._action_done()
-        # 将新产生的backorder对应上原来的采购申请明细行
-        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 = [
-                    (4, x.id) for x in backorder_ids.move_ids if
-                    x.product_id.id in purchase_request_lines.mapped('product_id.id') and \
-                    not x.created_purchase_request_line_id
-                ]
-        return res
-
-    def _subcontracted_produce(self, subcontract_details):
-        super()._subcontracted_produce(subcontract_details)
-
-        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
-        if self:
-            pr_ids = self.env["purchase.request"].sudo().search(
-                [('origin', 'like', self.name), ('rule_purchase_to_request', '=', True), ('state', '=', 'draft')])
-            if pr_ids:
-                pr_ids.write({'need_validation': False})
-                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})

jikimo_purchase_request/models/stock_rule.py

@@ -1,5 +1,4 @@
 from odoo import api, fields, models
-from collections import defaultdict
 
 
 class StockRule(models.Model):
@@ -26,7 +25,7 @@ class StockRule(models.Model):
             request_data = rule._prepare_purchase_request(
                 procurement.origin, procurement.values
             )
-            request_data = self._update_request_data(procurement, request_data)
+            request_data.update({'rule_new_add': True})
             pr = purchase_request_model.create(request_data)
             cache[domain] = pr
         elif (
@@ -44,51 +43,14 @@ class StockRule(models.Model):
         request_line_data.update({'origin': procurement.origin})
         purchase_request_line_model.create(request_line_data)
 
-    def _update_request_data(self, procurement, request_data):
-        sp = self.env['stock.picking'].sudo().search([('name', '=', procurement.origin)])
-        if len(sp) == 1:
-            po = self.env['purchase.order'].sudo().search(
-                [('name', '=', sp.origin), ('purchase_type', '=', 'outsourcing')])
-            if po:
-                request_data.update({'rule_purchase_to_request': True})
-        else:
-            request_data.update({'rule_new_add': True})
-        return request_data
-
-
     def _run_buy(self, procurements):
-        # 如果补货组相同，并且产品相同，则合并
-        procurements_dict = defaultdict()
-        for procurement, rule in procurements:
-            if (procurement.product_id.id, procurement.values['group_id'], rule.id) not in procurements_dict:
-                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)] = {
-                    'product_id': procurement.product_id, 
-                    'product_qty': procurement.product_qty,
-                    'product_uom': procurement.product_uom,
-                    'location_id': procurement.location_id,
-                    'name': procurement.name,
-                    'origin': procurement.origin,
-                    'company_id': procurement.company_id,
-                    'values': procurement.values,
-                    'rule': rule
-                }
-            else:
-                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['product_qty'] += procurement.product_qty
-                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['values']['move_dest_ids'] |= procurement.values['move_dest_ids']
-        new_procurements = []
-        for k, p in procurements_dict.items():
-            new_procurements.append((
-                self.env['procurement.group'].Procurement(
-                    product_id=p['product_id'],
-                    product_qty=p['product_qty'],
-                    product_uom=p['product_uom'],
-                    location_id=p['location_id'],
-                    name=p['name'],
-                    origin=p['origin'],
-                    company_id=p['company_id'],
-                    values=p['values']
-                ), p['rule'])
-            )
-
-        res = super(StockRule, self)._run_buy(new_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_request/security/ir.model.access.csv

@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_purchase_request_wizard_group_user,purchase.request.wizard,model_purchase_request_wizard,base.group_user,1,1,1,1

jikimo_purchase_request/static/src/change.scss

@@ -1,3 +0,0 @@
-th[data-name=keep_description] {
-    min-width: 220px;
-}

jikimo_purchase_request/views/purchase_order.xml

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

jikimo_purchase_request/views/purchase_request_line_view.xml

@@ -1,22 +0,0 @@
-<odoo>
-    <record id="purchase_request_line_form_sf" model="ir.ui.view">
-        <field name="name">purchase.request.line.sf.form</field>
-        <field name="model">purchase.request.line</field>
-        <field name="inherit_id" ref="purchase_request.purchase_request_line_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//h1" position="before">
-                <div class="oe_button_box" name="button_box">
-                    <button type="object" name="action_view_purchase_request" class="oe_stat_button"
-                            icon="fa-file">
-                        <field name="purchase_request_count" widget="statinfo" string="采购申请"/>
-                    </button>
-                    <button type="object" name="action_view_purchase_order" class="oe_stat_button"
-                            attrs="{'invisible': [('purchase_count', '=', 0)]}" icon="fa-shopping-cart">
-                        <field name="purchase_count" widget="statinfo" string="采购订单"/>
-                    </button>
-                </div>
-            </xpath>
-
-        </field>
-    </record>
-</odoo>

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,26 +15,6 @@
                 <field name="part_number"/>
                 <field name="part_name"/>
             </xpath>
-             <xpath expr="//button[@name='button_done']" position="attributes">
-                <attribute name="class"/>
-            </xpath>
-              <xpath expr="//button[@name='button_in_progress']" 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>
 
@@ -67,16 +47,6 @@
                 <field name="part_number"/>
                 <field name="part_name" invisible="1"/>
             </xpath>
-            <xpath expr="//tree" position="inside">
-                <header>
-                    <button
-                            name="%(purchase_request.action_purchase_request_line_make_purchase_order)d"
-                            string="创建询价单"
-                            type="action"
-                            class="btn-primary"
-                    />
-                </header>
-            </xpath>
         </field>
     </record>
 
@@ -93,9 +63,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/views/stock_picking_views.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="stock_pikcing_inherited_form_jikimo_purchase_request" model="ir.ui.view">
-        <field name="name">stock.pikcing.inherited.form.jikimo.purchase.request</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']/button" position="before">
-                <button class="oe_stat_button" name="action_view_purchase_request" type="object" icon="fa-credit-card"
-                        attrs="{'invisible': [('purchase_request_count', '=', 0)]}">
-                    <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="purchase_request_count"/>
-                        </span>
-                        <span class="o_stat_text">采购申请</span>
-                    </div>
-                </button>
-            </xpath>
-        </field>
-    </record>
-</odoo>

jikimo_purchase_request/wizard/__init__.py

@@ -1,4 +1,3 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
 
 from . import purchase_request_line_make_purchase_order
-from . import purchase_request_wizard

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order.py

@@ -32,7 +32,6 @@ class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
                     line.company_id,
                     line.request_id.origin,
                 )
-                # po_data.update({'related_product':line.related_product.id})
                 purchase = purchase_obj.create(po_data)
 
             # Look for any other PO line in the selected PO with same
@@ -64,8 +63,6 @@ class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
                 po_line_data = self._prepare_purchase_order_line(purchase, item)
                 if item.keep_description:
                     po_line_data["name"] = item.name
-                if line.related_product:
-                    po_line_data.update({'related_product': line.related_product.id})
                 po_line = po_line_obj.create(po_line_data)
                 po_line_product_uom_qty = po_line.product_uom._compute_quantity(
                     po_line.product_uom_qty, alloc_uom
@@ -103,27 +100,9 @@ class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
     def check_group(self, request_lines):
         # 去掉合并必须同一采购组的限制
         pass
-
-    def get_items(self, request_line_ids):
-        request_line_obj = self.env["purchase.request.line"]
-        items = []
-        request_lines = request_line_obj.browse(request_line_ids).filtered(lambda line: line.pending_qty_to_receive > 0)
-        self._check_valid_request_line(request_line_ids)
-        self.check_group(request_lines)
-        for line in request_lines:
-            items.append([0, 0, self._prepare_item(line)])
-        return items
-
+        
 
 class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):
     _inherit = "purchase.request.line.make.purchase.order.item"
 
     supply_method = fields.Selection(related='line_id.supply_method', string='供货方式')
-
-    wiz_id = fields.Many2one(
-        comodel_name="purchase.request.line.make.purchase.order",
-        string="Wizard",
-        required=False,
-        ondelete="cascade",
-        readonly=True,
-    )

jikimo_purchase_request/wizard/purchase_request_wizard.py

@@ -1,12 +0,0 @@
-from odoo import models, fields, api
-
-
-class PurchaseRequestWizard(models.TransientModel):
-    _name = 'purchase.request.wizard'
-    _description = '采购申请向导'
-
-    purchase_request_id = fields.Many2one('purchase.request', string='采购申请')
-    message = fields.Char(string='提示', readonly=True)
-
-    def confirm(self):
-        return self.purchase_request_id.write({"state": "done"})

jikimo_purchase_request/wizard/purchase_request_wizard_views.xml

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

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 stock_rule
+from . import models

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,17 +0,0 @@
-from odoo import models, api
-
-class StockRule(models.Model):
-    _inherit = 'stock.rule'
-
-    def _run_buy(self, procurements):
-        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
-        origins = list(set([procurement[0].origin for procurement in procurements]))
-        res = super(StockRule, self)._run_buy(procurements)
-        # 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",

jikimo_test_generate_product_name/__init__.py

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

jikimo_test_generate_product_name/__manifest__.py

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

jikimo_test_generate_product_name/models/__init__.py

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

jikimo_test_generate_product_name/models/product_template.py

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

jikimo_work_reporting_api/__init__.py

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

jikimo_work_reporting_api/__manifest__.py

@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': '机企猫 报工系统API',
-    'version': '1.0.0',
-    'summary': """ 机企猫 报工系统API """,
-    'author': '机企猫',
-    'website': 'https://xt.sf.jikimo.com',
-    'category': 'sf',
-    'depends': ['base', 'sf_maintenance', 'jikimo_mini_program'],
-    'data': [
-    ],
-    
-    'application': True,
-    'installable': True,
-    'auto_install': False,
-    'license': 'LGPL-3',
-}

jikimo_work_reporting_api/controllers/__init__.py

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

jikimo_work_reporting_api/controllers/main.py

@@ -1,69 +0,0 @@
-import json
-from odoo import http
-from odoo.http import request
-from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_files
-from odoo.addons.sf_base.decorators.api_log import api_log
-
-class MainController(http.Controller):
-
-    @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='wechat_token', cors='*')
-    @api_log('人工线下加工编程文件传输', requester='报工系统')
-    def manual_download_program(self):
-        """
-            人工线下加工传输编程文件
-        """
-        data = json.loads(request.httprequest.data)
-        maintenance_equipment_id = data.get('maintenance_equipment_id')
-        model_id = data.get('model_id')
-        if not maintenance_equipment_id or not model_id:
-            return {'code': 400, 'message': '参数错误'}
-        try:
-            model_id = int(model_id)
-        except Exception as e:
-            return {'code': 400, 'message': '参数类型错误'}
-        maintenance_equipment = request.env['maintenance.equipment'].sudo().search(
-            [('MTcode', '=', maintenance_equipment_id), ('category_id.equipment_type', '=', '机床')],
-            limit=1
-        )
-        if not maintenance_equipment:
-            return {'code': 400, 'message': '机台不存在，请扫描正确的机台二维码'}
-        product = request.env['product.template'].sudo().search([('model_id', '=', model_id)], limit=1)
-        if not product:
-            return {'code': 400, 'message': '请扫描正确的图纸'}
-        # 获取刀具组
-        tool_groups_id = request.env['sf.tool.groups'].sudo().search([('equipment_ids', 'in', maintenance_equipment.id)], limit=1)
-        if not tool_groups_id:
-            return {'code': 400, 'message': '刀具组不存在'}
-
-        ftp_resconfig = request.env['res.config.settings'].sudo().get_values()
-        if not ftp_resconfig['ftp_host'] or not ftp_resconfig['ftp_port'] or not ftp_resconfig['ftp_user'] or not ftp_resconfig['ftp_password']:
-            return {'code': 400, 'message': '编程文件FTP配置错误'}
-        source_ftp_info = {
-            'host': ftp_resconfig['ftp_host'],
-            'port': int(ftp_resconfig['ftp_port']),
-            'username': ftp_resconfig['ftp_user'],
-            'password': ftp_resconfig['ftp_password']
-        }
-        if not maintenance_equipment.ftp_host or not maintenance_equipment.ftp_port or not maintenance_equipment.ftp_username or not maintenance_equipment.ftp_password:
-            return {'code': 400, 'message': '机台FTP配置错误'}
-        target_ftp_info = {
-            'host': maintenance_equipment.ftp_host,
-            'port': int(maintenance_equipment.ftp_port),
-            'username': maintenance_equipment.ftp_username,
-            'password': maintenance_equipment.ftp_password
-        }
-        # 传输nc文件
-        try:
-            result = transfer_files(
-                source_ftp_info,
-                target_ftp_info,
-                '/' + str(model_id),
-                '/',
-                match_str=r'^\d*-' + tool_groups_id.name + r'-\w{2}-all\.nc$'
-                )
-            if len(result) > 0:
-                return {'code': 200, 'message': '传输成功', 'file_list': result}
-            else:
-                return {'code': 404, 'message': '未找到编程文件'}
-        except Exception as e:
-            return {'code': 500, 'message': str(e)}

jikimo_work_reporting_api/models/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

jikimo_workorder_exception/controllers/main.py

@@ -4,7 +4,6 @@ import json
 import logging
 from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
 from odoo.addons.sf_manufacturing.controllers.controllers import Manufacturing_Connect
-from odoo.addons.sf_base.decorators.api_log import api_log
 from datetime import datetime
 
 _logger = logging.getLogger(__name__)
@@ -13,7 +12,6 @@ class WorkorderExceptionConroller(http.Controller):
 
     @http.route('/AutoDeviceApi/BillError', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    @api_log('工单对接错误', requester='中控系统')
     def workder_exception(self, **kw):
         """
             记录工单异常

jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py

@@ -52,10 +52,10 @@ class JikimoWorkorderException(models.Model):
 
     def _get_message(self, message_queue_ids):
         contents, _ = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
-        base_url = self.env['ir.config_parameter'].get_param('web.base.url')
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('mrp.mrp_production_action').id
         for index, content in enumerate(contents):
             exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
-            url = base_url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
+            url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
             contents[index] = content.replace('{{url}}', url)
         return contents, message_queue_ids

quality_control/models/quality.py

@@ -133,7 +133,6 @@ class QualityCheck(models.Model):
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
     material_name = fields.Char('材料名称', compute='_compute_material_name')
-    model_id = fields.Char('模型ID', related='product_id.model_id')
 
     # # 总数量，值为调拨单_产品明细_数量
     # total_qty = fields.Float('总数量', compute='_compute_total_qty', readonly=True)
@@ -142,7 +141,7 @@ class QualityCheck(models.Model):
     # # 出厂检验报告编号
     # report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
     # 总数量，值为调拨单_产品明细_数量
-    total_qty = fields.Char('总数量', compute='_compute_total_qty', store=True)
+    total_qty = fields.Char('总数量', compute='_compute_total_qty')
 
     column_nums = fields.Integer('测量值列数', default=1)
 
@@ -154,9 +153,9 @@ class QualityCheck(models.Model):
                 for move in record.picking_id.move_ids_without_package:
                     if move.product_id == record.product_id:
                         total_qty = int(move.product_uom_qty)
-                record.total_qty = total_qty if total_qty > 0 else 0
+                record.total_qty = total_qty if total_qty > 0 else ''
             else:
-                record.total_qty = 0
+                record.total_qty = ''
 
     # 检验数
     check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
@@ -207,7 +206,7 @@ class QualityCheck(models.Model):
         ('NG', 'NG')
     ], string='出厂检验报告结果', default='OK')
     measure_operator = fields.Many2one('res.users', string='操机员')
-    quality_manager = fields.Many2one('res.users', string='质检员', compute='_compute_quality_manager')
+    quality_manager = fields.Many2one('res.users', string='质检员', compute='_compute_quality_manager', store=True)
 
     @api.depends('measure_line_ids')
     def _compute_quality_manager(self):
@@ -259,23 +258,6 @@ class QualityCheck(models.Model):
                     line[field_name] = False
             self.column_nums = self.column_nums - 1
 
-    def upload_measure_line(self):
-        """
-        上传测量值
-        """
-
-        for record in self:
-            if not record.part_name or not record.part_number:
-                raise UserError(_('零件名称和零件图号均不能为空'))
-
-                # 如果验证通过，返回原动作
-            action = self.env.ref('quality_control.import_complex_model_wizard').read()[0]
-            action['context'] = {
-                'default_model_name': 'quality.check.measure.line',
-                'default_check_id': self.id,
-            }
-            return action
-
     def do_preview(self):
         """
         预览出厂检验报告
@@ -339,7 +321,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
         )
@@ -736,9 +718,8 @@ class QualityCheck(models.Model):
     def _compute_qty_to_test(self):
         for qc in self:
             if qc.is_lot_tested_fractionally:
-                rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
                 qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100,
-                                             precision_rounding=rounding, rounding_method="UP")
+                                             precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
             else:
                 qc.qty_to_test = qc.qty_line
 

quality_control/views/quality_views.xml

@@ -267,7 +267,7 @@
                             <field name="company_id" invisible="1"/>
                             <field name="categ_type" invisible="1"/>
                             <field name="product_id" attrs="{'invisible' : [('measure_on', '=', 'operation')]}"/>
-                            <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
+                            <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                             <field name="part_number" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
                             <field name="material_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                             <field name="total_qty" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)]}"/>
@@ -334,15 +334,11 @@
                             <div class="o_row">
                             <button name="add_measure_line" type="object" class="btn-primary" string="添加测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
                             <button name="remove_measure_line" type="object" class="btn-primary" string="删除测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
-<!--                             <button name="%(quality_control.import_complex_model_wizard)d" string="上传111" -->
-<!--                                 type="action" -->
-<!--                                 class="btn-primary" -->
-<!--                                 attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}" -->
-<!--                                 context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/> -->
-                            <button name="upload_measure_line" string="上传"
-                                type="object"
+                            <button name="%(quality_control.import_complex_model_wizard)d" string="上传"
+                                type="action"
                                 class="btn-primary"
-                                attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}"/>
+                                attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}"
+                                context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
                             </div>
                             <br/>
                             <div class="o_row">
@@ -493,9 +489,6 @@
                 <field name="picking_id"/>
                 <field name="lot_id"/>
                 <field name="team_id"/>
-                <field name="part_number"/>
-                <field name="part_name"/>
-                <field name="model_id"/>
                 <filter string="In Progress" name="progress" domain="[('quality_state', '=', 'none')]"/>
                 <filter string="Passed" name="passed" domain="[('quality_state', '=', 'pass')]"/>
                 <filter string="Failed" name="failed" domain="[('quality_state', '=', 'fail')]"/>

quality_control/wizard/import_complex_model.py

@@ -22,7 +22,6 @@ _logger = logging.getLogger(__name__)
 class ImportComplexModelWizard(models.TransientModel):
     _name = 'quality.check.import.complex.model.wizard'
     file_data = fields.Binary("数据文件")
-    filename = fields.Char(string='文件名')
     model_name = fields.Char(string='Model Name')
     field_basis = fields.Char(string='Field Basis')
     check_id = fields.Many2one(string='质检单', comodel_name='quality.check')
@@ -94,16 +93,11 @@ class ImportComplexModelWizard(models.TransientModel):
 
         return repeats
 
-    def convert_float(self, value):
-        if isinstance(value, float) and value.is_integer():
-            return int(value)
-        return value
-
     def import_data(self):
         """导入Excel数据"""
         if not self.file_data:
             raise UserError(_('请先上传Excel文件'))
-
+        
         if self.check_id.measure_line_ids:
             self.sudo().check_id.measure_line_ids.unlink()
 
@@ -167,20 +161,6 @@ class ImportComplexModelWizard(models.TransientModel):
 
             # 从第二行开始读取数据（跳过表头）
             max_columns = 1
-            for row_index in range(1, sheet.nrows):
-                row = sheet.row_values(row_index)
-                # 检查行是否有数据
-                if not any(row):
-                    continue
-
-                if row[2] == '':
-                    continue
-                logging.info('================%s, %s==' % (row[1], type(row[1])))
-
-                compare_value = self.convert_float(row[1])
-                if str(compare_value) != quality_check.part_number:
-                    print(sheet.row_values(row_index))
-                    raise UserError(_('上传内容图号错误，请修改'))
             for row_index in range(1, sheet.nrows):
                 row = sheet.row_values(row_index)
 
@@ -197,14 +177,14 @@ class ImportComplexModelWizard(models.TransientModel):
                     'sequence': len(quality_check.measure_line_ids) + 1,
                     'product_name': str(row[0]) if row[0] else '',  # 产品名称列
                     'drawing_no': str(row[1]) if row[1] else '',  # 图号列
-                    'measure_item': str(self.convert_float(row[2])) or '',  # 检测项目列
-                    'measure_value1': str(self.convert_float(row[4])) if row[4] else '',  # 测量值1
-                    'measure_value2': str(self.convert_float(row[5])) if row[5] else '',  # 测量值2
-                    'measure_value3': str(self.convert_float(row[6])) if len(row) > 6 and row[6] else '',  # 测量值3
-                    'measure_value4': str(self.convert_float(row[7])) if len(row) > 7 and row[7] else '',  # 测量值4
-                    'measure_value5': str(self.convert_float(row[8])) if len(row) > 8 and row[8] else '',  # 测量值5
+                    'measure_item': row[2] or '',  # 检测项目列
+                    'measure_value1': str(row[4]) if row[4] else '',  # 测量值1
+                    'measure_value2': str(row[5]) if row[5] else '',  # 测量值2
+                    'measure_value3': str(row[6]) if len(row) > 6 and row[6] else '',  # 测量值3
+                    'measure_value4': str(row[7]) if len(row) > 7 and row[7] else '',  # 测量值4
+                    'measure_value5': str(row[8]) if len(row) > 8 and row[8] else '',  # 测量值5
                     'measure_result': 'NG' if row[9] == 'NG' else 'OK',  # 判定列
-                    'remark': self.convert_float(row[10]) if len(row) > 10 and row[10] else '',  # 备注列
+                    'remark': row[10] if len(row) > 10 and row[10] else '',  # 备注列
                 }
 
                 for i in range(1, 6):
@@ -214,7 +194,7 @@ class ImportComplexModelWizard(models.TransientModel):
 
                 self.env['quality.check.measure.line'].create(measure_line_vals)
                 valid_data_imported = True
-
+            
             quality_check.column_nums = max_columns
 
             # 检查是否有有效数据被导入
@@ -444,8 +424,7 @@ class ImportComplexModelWizard(models.TransientModel):
         # )
 
     def download_excel_template(self):
-        base_url = self.env['ir.config_parameter'].sudo().get_param(
-            'web.base.url') + '/quality_control/static/src/binary/出厂检验报告上传模版.xlsx'
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') + '/quality_control/static/src/binary/出厂检验报告上传模版.xlsx'
 
         # 只有当原始 URL 使用 http 时才替换为 https
         if base_url.startswith("http://"):

quality_control/wizard/import_complex_model.xml

@@ -6,8 +6,7 @@
             <field name="arch" type="xml">
                  <form>
                      <group>
-                        <field name="file_data" widget="binary" filename="filename" options="{'accepted_file_extensions': '.xls,.xlsx'}"/>
-                        <field name="filename" invisible="1"/>
+                        <field name="file_data" widget="binary" options="{'accepted_file_extensions': '.xlsx'}"/>
                      </group>
                      <footer>
                          <button string="确认导入" name="import_data" type="object" class="btn-primary"/>

quality_control/wizard/quality_check_wizard.py

@@ -23,8 +23,8 @@ class QualityCheckWizard(models.TransientModel):
     lot_name = fields.Char(related='current_check_id.lot_name')
     lot_line_id = fields.Many2one(related='current_check_id.lot_line_id')
     qty_line = fields.Float(related='current_check_id.qty_line')
-    qty_to_test = fields.Float(related='current_check_id.qty_to_test', string='待检')
-    qty_tested = fields.Float(related='current_check_id.qty_tested', string='已检', readonly=False)
+    qty_to_test = fields.Float(related='current_check_id.qty_to_test')
+    qty_tested = fields.Float(related='current_check_id.qty_tested', readonly=False)
     measure = fields.Float(related='current_check_id.measure', readonly=False)
     measure_on = fields.Selection(related='current_check_id.measure_on')
     quality_state = fields.Selection(related='current_check_id.quality_state')

requirements.txt

@@ -1,7 +1,3 @@
 pystrich
-cpca==0.5.5
-wechatpy==1.8.18
-pycryptodome==3.22.0
-openupgradelib==3.10.0
-opcua==0.98.13
-openpyxl
+cpca
+pycryptodome==3.20

sf_base/__init__.py

@@ -1,4 +1,3 @@
 from . import models
 from . import commons
 from . import controllers
-from . import decorators

sf_base/__manifest__.py

@@ -25,7 +25,7 @@
         'views/menu_fixture_view.xml',
         'views/change_base_view.xml',
         'views/Printer.xml',
-        'views/api_log_views.xml',
+
     ],
     'demo': [
     ],

sf_base/commons/Printer.py

@@ -9,6 +9,7 @@ class Printer(models.Model):
     ip_address = fields.Char(string='IP 地址', required=True)
     port = fields.Integer(string='端口', default=9100)
 
+
 class TableStyle(models.Model):
     _name = 'table.style'
     _description = '标签样式'

sf_base/commons/common.py

@@ -2,16 +2,7 @@
 import time, datetime
 import hashlib
 from odoo import models
-from typing import Optional
 import socket
-import os
-import logging
-import qrcode
-from reportlab.pdfgen import canvas
-from reportlab.lib.units import inch
-from PyPDF2 import PdfFileReader, PdfFileWriter
-from reportlab.pdfbase import pdfmetrics
-from reportlab.pdfbase.ttfonts import TTFont
 
 class Common(models.Model):
     _name = 'sf.sync.common'
@@ -101,145 +92,3 @@ class PrintingUtils(models.AbstractModel):
         # host = "192.168.50.110"  # 可以作为参数传入，或者在此配置
         # port = 9100  # 可以作为参数传入，或者在此配置
         self.send_to_printer(host, port, zpl_code)
-
-
-    def add_qr_code_to_pdf(
-            self,
-            pdf_path:str,
-            content:str,
-            qr_code_buttom_text:Optional[str]=False,
-            buttom_text:Optional[str]=False,
-    ):
-        """
-        在PDF文件中添加二维码
-        :param pdf_path: PDF文件路径
-        :param content: 二维码内容
-        :param qr_code_buttom_text: 二维码下方文字
-        :param buttom_text: 正文下方文字
-        :return: 是否成功
-        """
-        if not os.path.exists(pdf_path):
-            logging.warning(f'PDF文件不存在: {pdf_path}')
-            return False
-            
-        # 生成二维码
-        qr = qrcode.QRCode(version=1, box_size=10, border=5)
-        qr.add_data(str(content))
-        qr.make(fit=True)
-        qr_img = qr.make_image(fill_color="black", back_color="white")
-        
-        # 保存二维码为临时文件
-        qr_temp_path = '/tmp/qr_temp.png'
-        qr_img.save(qr_temp_path)
-        
-        # 创建一个临时PDF文件路径
-        output_temp_path = '/tmp/output_temp.pdf'
-        
-        try:
-            # 使用reportlab创建一个新的PDF
-  
-            
-            # 注册中文字体
-            font_paths = [
-                "/usr/share/fonts/chinese/simsun.ttc",  # Windows系统宋体
-                "c:/windows/fonts/simsun.ttc",  # Windows系统宋体另一个位置
-                "/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf",  # Linux Droid字体
-                "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",  # 文泉驿正黑
-                "/usr/share/fonts/chinese/TrueType/simsun.ttc",  # 某些Linux发行版位置
-            ]
-            
-            font_found = False
-            for font_path in font_paths:
-                if os.path.exists(font_path):
-                    try:
-                        pdfmetrics.registerFont(TTFont('SimSun', font_path))
-                        font_found = True
-                        break
-                    except:
-                        continue
-            
-            # 读取原始PDF
-            with open(pdf_path, "rb") as original_file:
-                existing_pdf = PdfFileReader(original_file)
-                output = PdfFileWriter()
-                
-                # 处理最后一页
-                last_page = existing_pdf.getNumPages() - 1
-                page = existing_pdf.getPage(last_page)
-                # 获取页面尺寸
-                page_width = float(page.mediaBox.getWidth())
-                page_height = float(page.mediaBox.getHeight())
-                
-                # 创建一个新的PDF页面用于放置二维码
-                c = canvas.Canvas(output_temp_path, pagesize=(page_width, page_height))
-                
-                # 设置字体
-                if font_found:
-                    c.setFont('SimSun', 10)  # 增大字体大小到14pt
-                else:
-                    # 如果没有找到中文字体，使用默认字体
-                    c.setFont('Helvetica', 10)
-                    logging.warning("未找到中文字体，将使用默认字体")
-                
-                # 在右下角绘制二维码，预留边距
-                qr_size = 1.5 * inch  # 二维码大小为2英寸
-                margin = 0.1 * inch  # 边距为0.4英寸
-                qr_y = margin + 20  # 将二维码向上移动一点，为文字留出空间
-                c.drawImage(qr_temp_path, page_width - qr_size - margin, qr_y, width=qr_size, height=qr_size)
-                
-                if qr_code_buttom_text:
-                    # 在二维码下方绘制文字
-                    text = qr_code_buttom_text
-                    text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 10)  # 准确计算文字宽度
-                    text_x = page_width - qr_size - margin + (qr_size - text_width) / 2  # 文字居中对齐
-                    text_y = margin + 20  # 文字位置靠近底部
-                    c.drawString(text_x, text_y, text)
-
-                # 设置字体
-                if font_found:
-                    c.setFont('SimSun', 12)  # 增大字体大小到14pt
-                else:
-                    # 如果没有找到中文字体，使用默认字体
-                    c.setFont('Helvetica', 120)
-                    logging.warning("未找到中文字体，将使用默认字体")
-
-                if buttom_text:
-                    # 在下方中间添加文字
-                    text = buttom_text
-                    text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 12)  # 准确计算文字宽度
-                    text_x = (page_width - text_width) / 2  # 文字居中对齐
-                    text_y = margin + 20  # 文字位置靠近底部
-                    c.drawString(text_x, text_y, text)
-                
-                c.save()
-                
-                # 读取带有二维码的临时PDF
-                with open(output_temp_path, "rb") as qr_file:
-                    qr_pdf = PdfFileReader(qr_file)
-                    qr_page = qr_pdf.getPage(0)
-                    
-                    # 合并原始页面和二维码页面
-                    page.mergePage(qr_page)
-                    
-                    # 添加剩余的页面
-                    for i in range(0, last_page):
-                        output.addPage(existing_pdf.getPage(i))
-
-                    output.addPage(page)
-                    
-                    # 保存最终的PDF到一个临时文件
-                    final_temp_path = pdf_path + '.tmp'
-                    with open(final_temp_path, "wb") as output_file:
-                        output.write(output_file)
-            
-            # 替换原始文件
-            os.replace(final_temp_path, pdf_path)
-            
-            return True
-            
-        finally:
-            # 清理临时文件
-            if os.path.exists(qr_temp_path):
-                os.remove(qr_temp_path)
-            if os.path.exists(output_temp_path):
-                os.remove(output_temp_path)

sf_base/controllers/controllers.py

@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
 import logging
 import json
-import logging
+import base64
 from odoo import http
 from odoo.http import request
-from odoo.addons.sf_base.decorators.api_log import api_log
 
-_logger = logging.getLogger(__name__)
 
 class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    @api_log('机床刀具组', requester='中控系统')
     def get_maintenance_tool_groups_Info(self, **kw):
         """
         机床刀具组接口

sf_base/decorators/__init__.py

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

sf_base/decorators/api_log.py

@@ -1,65 +0,0 @@
-
-import functools
-import json
-import logging
-from datetime import datetime
-from odoo.http import request
-
-_logger = logging.getLogger(__name__)
-
-def api_log(name=None, requester=None):
-    """记录API请求日志的装饰器"""
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            start_time = datetime.now()
-        
-            # 获取请求信息
-            try:
-                # 获取请求数据
-                request_data = json.loads(request.httprequest.data) if request.httprequest.data else {}
-                # 获取请求路径
-                path = request.httprequest.path
-                # 获取请求方法
-                method = request.httprequest.method
-                # 获取客户端IP
-                remote_addr = request.httprequest.remote_addr
-                
-                # 执行原始函数
-                result = func(*args, **kwargs)
-                origin_result = result
-                if isinstance(result, str):
-                    result = json.loads(result)
-                
-                # 计算响应时间
-                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(),
-                    '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,
-                    'requester': requester,
-                    'responser': '智能工厂'
-                }
-                
-                # 异步创建日志记录
-                request.env['api.request.log'].sudo().with_context(tracking_disable=True).create(log_vals)
-                
-                return origin_result
-                
-            except Exception as e:
-                _logger.error(f"API日志记录失败: {str(e)}")
-                # 即使日志记录失败，也要返回原始结果
-                return func(*args, **kwargs)
-        return wrapper
-    return decorator

sf_base/models/__init__.py

@@ -6,4 +6,3 @@ from . import functional_fixture
 from . import tool_other_features
 from . import basic_parameters_fixture
 from . import ir_sequence
-from . import api_log

sf_base/models/api_log.py

@@ -1,72 +0,0 @@
-from odoo import models, fields, api
-import json, ast
-import logging
-import requests
-
-_logger = logging.getLogger(__name__)
-
-
-class ApiRequestLog(models.Model):
-    _name = 'api.request.log'
-    _description = '接口请求日志'
-    _order = 'id desc'
-
-    name = fields.Char('接口名称')
-    path = fields.Char('请求路径')
-    method = fields.Char('请求方法')
-    request_data = fields.Text('请求数据')
-    response_data = fields.Text('响应数据')
-    remote_addr = fields.Char('客户端IP')
-    response_time = fields.Float('响应时间(秒)', digits=(16, 6))
-    status = fields.Integer('状态码')
-    requester = fields.Char('请求方')
-    responser = fields.Char('响应方')
-
-    @api.model
-    def log_request(self, method, url, name=None, responser=None, **kwargs):
-        # Log the request
-        request_headers = kwargs.get('headers', {})
-        request_body = kwargs.get('json') or kwargs.get('params') or {}
-        
-        _logger.info(f"Request: {method} {url} Headers: {request_headers} Body: {request_body}")
-
-        # Make the actual request
-        response = requests.request(method, url, **kwargs)
-
-        # Log the response
-        response_status = response.status_code
-        response_headers = response.headers
-        response_body = response.text
-        response_time = response.elapsed.total_seconds()
-
-        _logger.info(f"Response: Status: {response_status} Headers: {response_headers} Body: {response_body}")
-
-        try:
-            # 如果是字符串，先尝试用 ast.literal_eval 安全地转换成 Python 对象
-            if isinstance(response_body, str):
-                
-                response_body_obj = json.loads(response_body)
-            else:
-                response_body_obj = response_body
-                
-            # 再使用 json.dumps 转换成标准的 JSON 字符串
-            response_body = json.dumps(response_body_obj, ensure_ascii=False)
-        except Exception as e:
-            _logger.warning(f"转换 response_body 到标准 JSON 失败: {str(e)}")
-            # 如果转换失败，保持原样
-
-        # Save to database
-        self.sudo().create({
-            'name': name,
-            'path': url,
-            'method': method.upper(),
-            'request_data': request_body,
-            'response_data': response_body,
-            'remote_addr': None,
-            'response_time': response_time,
-            'status': response_status,
-            'requester': '智能工厂',
-            'responser': responser
-        })
-
-        return response

sf_base/models/basic_parameters_fixture.py

@@ -67,77 +67,6 @@ class BasicParametersFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
-        # ‘磁吸托盘’ 字段
-    magnet_tray_length = fields.Float('磁吸托盘长度(mm)', digits=(16, 2))
-    magnet_tray_width = fields.Float('磁吸托盘宽度(mm)', digits=(16, 2))
-    magnet_tray_height = fields.Float('磁吸托盘厚度(mm)', digits=(16, 2))
-    magnet_tray_diameter = fields.Float('磁吸托盘直径(mm)', digits=(16, 2))
-    magnet_tray_weight = fields.Float('磁吸托盘重量(kg)', digits=(16, 2))
-
-    magnet_max_adsorp_length = fields.Float('磁吸托盘最大吸附长度(mm)', digits=(16, 2))
-    magnet_max_adsorp_width = fields.Float('磁吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    magnet_max_adsorp_height = fields.Float('磁吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    magnet_max_adsorp_diameter = fields.Float('磁吸托盘最大吸附直径(mm)', digits=(16, 2))
-    magnet_max_adsorp_force = fields.Float('磁吸托盘最大吸附力(N)', digits=(16, 2))
-
-    magnet_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='磁吸托盘锁紧方式'
-    )
-    magnet_flatness = fields.Char('磁吸托盘平面精度(mm)', size=20)
-    magnet_max_load = fields.Float('磁吸托盘最大负载(kg)', digits=(16, 2))
-
-    # --- 定位隔板字段 ---
-    partition_length_outer = fields.Float('外框长度(mm)', digits=(16, 2))
-    partition_width_outer = fields.Float('外框宽度(mm)', digits=(16, 2))
-    partition_length_inner = fields.Float('内框长度(mm)', digits=(16, 2))
-    partition_width_inner = fields.Float('内框宽度(mm)', digits=(16, 2))
-    partition_left_margin = fields.Float('左边距(mm)', digits=(16, 2))
-    partition_bottom_margin = fields.Float('下边距(mm)', digits=(16, 2))
-    partition_unit_length = fields.Float('定位单元长度(mm)', digits=(16, 2))
-    partition_unit_width = fields.Float('定位单元宽度(mm)', digits=(16, 2))
-    partition_unit_row_spacing = fields.Float('单元行间距(mm)', digits=(16, 2))
-    partition_unit_col_spacing = fields.Float('单元列间距(mm)', digits=(16, 2))
-    partition_unit_rows = fields.Integer('单元行数')
-    partition_unit_cols = fields.Integer('单元列数')
-    partition_base_unit_row_spacing = fields.Float('基准单元行间距(mm)', digits=(16, 2))
-    partition_base_unit_col_spacing = fields.Float('基准单元列间距(mm)', digits=(16, 2))
-    partition_offset_x = fields.Float('X方向偏移(mm)', digits=(16, 2))
-    partition_offset_y = fields.Float('Y方向偏移(mm)', digits=(16, 2))
-    partition_materials_model_id = fields.Many2one('sf.materials.model', '定位隔板材质')
-    partition_joint_type = fields.Selection([
-        ('bolt', '螺栓连接'),
-        ('magnet', '磁吸连接'),
-        ('snap', '卡扣连接'),
-    ], string='连接方式')
-    partition_partner_id = fields.Many2one('res.partner', string='供应商/客户')
-
-    # ‘气吸托盘’ 字段
-    air_tray_length = fields.Float('气吸托盘长度(mm)', digits=(16, 2))
-    air_tray_width = fields.Float('气吸托盘宽度(mm)', digits=(16, 2))
-    air_tray_height = fields.Float('气吸托盘高度(mm)', digits=(16, 2))
-    air_tray_diameter = fields.Float('气吸托盘直径(mm)', digits=(16, 2))
-    air_tray_weight = fields.Float('气吸托盘重量(kg)', digits=(16, 2))
-
-    air_max_adsorp_length = fields.Float('气吸托盘最大吸附长度(mm)', digits=(16, 2))
-    air_max_adsorp_width = fields.Float('气吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    air_max_adsorp_height = fields.Float('气吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    air_max_adsorp_diameter = fields.Float('气吸托盘最大吸附直径(mm)', digits=(16, 2))
-    air_max_adsorp_force = fields.Float('气吸托盘最大吸附力(N)', digits=(16, 2))
-
-    air_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='气吸托盘锁紧方式'
-    )
-    air_flatness = fields.Char('气吸托盘平面精度(mm)', size=20)
-    air_max_load = fields.Float('气吸托盘最大负载(kg)', digits=(16, 2))
-    air_boolean_chip_blowing_function = fields.Boolean('气吸托盘是否有吹屑功能')
-    air_way_to_install = fields.Selection(
-        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')],
-        string='气吸托盘安装方式'
-    )
-
-
     code = fields.Char('编码')
     active = fields.Boolean('有效', default=True)
 
@@ -156,12 +85,6 @@ class BasicParametersFixture(models.Model):
             return self._json_adapter_board_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '三爪卡盘':
             return self._json_scroll_chuck_param(fixture_materials_data)
-        elif fixture_materials_name == '磁吸托盘':
-            return self._json_magnet_tray_param(fixture_materials_data)
-        elif fixture_materials_name == '定位隔板':
-            return self._json_positioning_partition_param(fixture_materials_data)
-        elif fixture_materials_name == '气吸托盘':
-            return self._json_air_tray_param(fixture_materials_data)
         return {}
 
     def _json_zero_chuck_param(self, obj):
@@ -361,90 +284,3 @@ class BasicParametersFixture(models.Model):
                 'centering_diameter': obj['centering_diameter'],
                 'type_of_drive': obj['type_of_drive'],
                 'active': obj['active']}
-
-    def _json_magnet_tray_param(self, obj):
-        """磁吸托盘：将data数据转换成list数据"""
-        return {
-            'code': obj['code'],
-            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
-                [('code', '=', obj.get('fixture_model_code'))]).id,
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'max_adsorp_length': obj['max_adsorp_length'],
-            'max_adsorp_width': obj['max_adsorp_width'],
-            'max_adsorp_height': obj['max_adsorp_height'],
-            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
-            'max_adsorp_force': obj['max_adsorp_force'],
-            'flatness': obj.get('flatness'),
-            'max_load': obj.get('max_load'),
-            'unlocking_method': obj.get('unlocking_method'),
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
-            ).id if obj.get('materials_model_id') else False,
-            'active': obj.get('active', True),
-        }
-    
-    def _json_positioning_partition_param(self, obj):
-        """定位隔板：将data数据转换成字段字典"""
-        return {
-            'code': obj.get('code'),
-            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
-                [('code', '=', obj.get('fixture_model_code'))], limit=1).id,
-            'name': obj.get('name'),
-            'partition_length_outer': obj.get('length_outer'),
-            'partition_width_outer': obj.get('width_outer'),
-            'partition_length_inner': obj.get('length_inner'),
-            'partition_width_inner': obj.get('width_inner'),
-            'partition_left_margin': obj.get('left_margin'),
-            'partition_bottom_margin': obj.get('bottom_margin'),
-            'partition_unit_length': obj.get('unit_length'),
-            'partition_unit_width': obj.get('unit_width'),
-            'partition_unit_row_spacing': obj.get('unit_row_spacing'),
-            'partition_unit_col_spacing': obj.get('unit_col_spacing'),
-            'partition_unit_rows': obj.get('unit_rows'),
-            'partition_unit_cols': obj.get('unit_cols'),
-            'partition_base_unit_row_spacing': obj.get('base_unit_row_spacing'),
-            'partition_base_unit_col_spacing': obj.get('base_unit_col_spacing'),
-            'partition_offset_x': obj.get('offset_x'),
-            'partition_offset_y': obj.get('offset_y'),
-            'partition_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj.get('materials_model_id')), ('active', '=', True)], limit=1).id
-            if obj.get('materials_model_id') else False,
-            'partition_partner_id': self.env['res.partner'].sudo().search(
-                [('name', '=', obj.get('partner_name'))], limit=1).id
-            if obj.get('partner_name') else False,
-            'partition_joint_type': obj.get('joint_type'),
-            'active': obj.get('active', True),
-        }
-
-    def _json_air_tray_param(self, obj):
-        """气吸托盘：将data数据转换成list数据"""
-        return {
-            'code': obj['code'],
-            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
-                [('code', '=', obj.get('fixture_model_code'))]).id,
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'max_adsorp_length': obj['max_adsorp_length'],
-            'max_adsorp_width': obj['max_adsorp_width'],
-            'max_adsorp_height': obj['max_adsorp_height'],
-            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
-            'max_adsorp_force': obj['max_adsorp_force'],
-            'flatness': obj.get('flatness'),
-            'max_load': obj.get('max_load'),
-            'unlocking_method': obj.get('unlocking_method'),
-            'boolean_chip_blowing_function': obj.get('blowing_function', False),
-            'way_to_install': obj.get('way_to_install'),
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
-            ).id if obj.get('materials_model_id') else False,
-            'active': obj.get('active', True),
-        }

sf_base/models/fixture.py

@@ -35,7 +35,6 @@ class FixtureModel(models.Model):
     glb_url = fields.Char(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
-    code = fields.Char(string='编码', readonly=True)
 
     zero_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                      string='零点卡盘基本参数')
@@ -47,16 +46,11 @@ class FixtureModel(models.Model):
                                            string='虎钳夹具基本参数')
     magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                          string='磁吸夹具基本参数')
-    magnet_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
-                                     string='磁吸托盘基本参数')
-    positioning_partition_ids = fields.One2many('sf.fixture.materials.basic.parameters','fixture_model_id',
-                                                string='定位隔板基本参数')
     adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                                 string='转接板(锁板)夹具基本参数')
     scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                        string='三爪卡盘基本参数')
-    air_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
-                                    string='气吸托盘基本参数')
+    code = fields.Char(string='编码', readonly=True)
 
     # def _get_code(self, fixture_model_type_code):
     #     fixture_model = self.env['sf.fixture.model'].sudo().search(

sf_base/security/ir.model.access.csv

@@ -254,6 +254,3 @@ access_sf_machining_accuracy_admin,sf_machining_accuracy_admin,model_sf_machinin
 
 access_sf_embryo_redundancy,sf_embryo_redundancy,model_sf_embryo_redundancy,base.group_user,1,0,0,0
 access_sf_embryo_redundancy_admin,sf_embryo_redundancy_admin,model_sf_embryo_redundancy,base.group_system,1,0,0,0
-
-access_api_request_log_user,api.request.log.user,model_api_request_log,base.group_user,1,0,0,0
-access_api_request_log_admin,api.request.log.admin,model_api_request_log,base.group_system,1,1,1,1

sf_base/static/src/scss/test.scss

@@ -148,17 +148,12 @@ td.o_required_modifier {
   color: #aaa;
 }
 
-// .o_kanban_primary_left {
-//   display: flex;
-//   flex-direction: row-reverse;
-//   justify-content: flex-start;
-// }
-.o_list_button {
-  min-width: 32px;
-}
-.o_list_record_remove {
-  padding-left: 0px !important;
+.o_kanban_primary_left {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: flex-start;
 }
+
 .diameter:before {
   content:"Ф";
   display:inline;

sf_base/views/api_log_views.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_api_request_log_tree" model="ir.ui.view">
-        <field name="name">api.request.log.tree</field>
-        <field name="model">api.request.log</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="path"/>
-                <field name="method"/>
-                <field name="remote_addr"/>
-                <field name="response_time" sum="0"/>
-                <field name="requester"/>
-                <field name="responser"/>
-                <field name="create_date" string="请求时间"/>
-                <field name="status" sum="0"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_api_request_log_form" model="ir.ui.view">
-        <field name="name">api.request.log.form</field>
-        <field name="model">api.request.log</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="path"/>
-                            <field name="method"/>
-                            <field name="remote_addr"/>
-                        </group>
-                        <group>
-                            <field name="response_time"/>
-                            <field name="status"/>
-                            <field name="requester"/>
-                            <field name="responser"/>
-                            <field name="create_date" string="请求时间"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="请求数据">
-                            <field name="request_data"/>
-                        </page>
-                        <page string="响应数据">
-                            <field name="response_data"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </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>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <menuitem id="menu_api_request_log"
-              name="API请求日志"
-              parent="base.next_id_9"
-              action="action_api_request_log"
-              sequence="100"/>
-</odoo>

sf_base/views/common_view.xml

@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="mrs_production_process_parameter_tree">
             <field name="model">sf.production.process.parameter</field>
             <field name="arch" type="xml">
-                <tree string="工艺可选参数" create="0" delete="0">
+                <tree string="表面工艺可选参数" create="0" delete="0">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="gain_way"/>
@@ -15,7 +15,7 @@
         <record model="ir.ui.view" id="mrs_production_process_parameter_form">
             <field name="model">sf.production.process.parameter</field>
             <field name="arch" type="xml">
-                <form string="工艺可选参数" create="0" delete="0" >
+                <form string="表面工艺可选参数" create="0" delete="0" >
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -104,7 +104,7 @@
         <record model="ir.ui.view" id="sf_production_process_category_form">
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
-                <form string="工艺类别" create="0" edit="0" delete="1">
+                <form string="表面工艺类别" create="0" edit="0" delete="1">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -120,7 +120,7 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="工艺">
+                            <page string="表面工艺">
                                 <field name='production_process_ids' widget="ony2many">
                                     <tree editable="bottom">
                                         <field name="code" string="编码号" readonly="1" force_save="1"/>
@@ -139,7 +139,7 @@
         <record model="ir.ui.view" id="sf_production_process_category_tree">
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
-                <tree string="工艺类别" default_order="sequence, id" create="0" edit="0" delete="1">
+                <tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="1">
                     <field name="sequence" widget="handle" string="序号" readonly="1"/>
                     <field name="code"/>
                     <field name="name" string="名称"/>
@@ -163,7 +163,7 @@
         <record model="ir.ui.view" id="sf_production_process_tree">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <tree string="工艺" create="0" edit="0" delete="0">
+                <tree string="表面工艺" create="0" edit="0" delete="0">
                     <field name="sequence"  string="加工顺序"  readonly="1"/>
                     <field name="code"/>
                     <field name="name" string="名称"/>
@@ -175,7 +175,7 @@
         <record model="ir.ui.view" id="sf_production_process_form">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <form string="工艺" create="0"  delete="0">
+                <form string="表面工艺" create="0"  delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -395,7 +395,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <record id="sf_production_process" model="ir.actions.act_window">
-            <field name="name">工艺</field>
+            <field name="name">表面工艺</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.process</field>
             <field name="view_mode">tree,form</field>
@@ -414,13 +414,13 @@
         <!--        </record>-->
 
         <record id="sf_production_process_category" model="ir.actions.act_window">
-            <field name="name">工艺类别</field>
+            <field name="name">表面工艺类别</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.process.category</field>
             <field name="view_mode">tree,form</field>
         </record>
         <record id="mrs_production_process_parameter_action" model="ir.actions.act_window">
-            <field name="name">工艺可选参数</field>
+            <field name="name">表面工艺可选参数</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.process.parameter</field>
             <field name="view_mode">tree,form</field>

sf_base/views/fixture_view.xml

@@ -328,80 +328,6 @@
                                     <field name="type_of_drive"/>
                                 </tree>
                             </field>
-                            <field name="air_tray_ids"
-                                attrs="{'invisible': [('fixture_material_type', '!=', '气吸托盘')]}">
-                                <tree editable="bottom" class="center" delete="0">
-                                    <field name="code" invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="length"/>
-                                    <field name="width"/>
-                                    <field name="height"/>
-                                    <field name="diameter"/>
-                                    <field name="weight" string="重量(kg)"/>
-                                    <field name="max_adsorp_length"/>
-                                    <field name="max_adsorp_width"/>
-                                    <field name="max_adsorp_height"/>
-                                    <field name="max_adsorp_diameter"/>
-                                    <field name="max_adsorp_force"/>
-                                    <field name="flatness"/>
-                                    <field name="max_load"/>
-                                    <field name="unlocking_method"/>
-                                    <field name="boolean_chip_blowing_function"/>
-                                    <field name="way_to_install"/>
-                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="active" invisible="1"/>
-                                </tree>
-                            </field>
-                            <field name="magnet_tray_ids"
-                                attrs="{'invisible': [('fixture_material_type', '!=', '磁吸托盘')]}">
-                                <tree editable="bottom" class="center" delete="0">
-                                    <field name="code" invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="length"/>
-                                    <field name="width"/>
-                                    <field name="height"/>
-                                    <field name="diameter"/>
-                                    <field name="weight" string="重量(kg)"/>
-                                    <field name="max_adsorp_length"/>
-                                    <field name="max_adsorp_width"/>
-                                    <field name="max_adsorp_height"/>
-                                    <field name="max_adsorp_diameter"/>
-                                    <field name="max_adsorp_force"/>
-                                    <field name="flatness"/>
-                                    <field name="max_load"/>
-                                    <field name="unlocking_method"/>
-                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="active" invisible="1"/>
-                                </tree>
-                            </field>
-                            <field name="positioning_partition_ids"
-                                attrs="{'invisible': [('fixture_material_type', '!=', '定位隔板')]}">
-                                <tree editable="bottom" class="center" delete="0">
-                                    <field name="code" invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="partition_length_outer"/>
-                                    <field name="partition_width_outer"/>
-                                    <field name="partition_length_inner"/>
-                                    <field name="partition_width_inner"/>
-                                    <field name="partition_left_margin"/>
-                                    <field name="partition_bottom_margin"/>
-                                    <field name="partition_unit_length"/>
-                                    <field name="partition_unit_width"/>
-                                    <field name="partition_unit_row_spacing"/>
-                                    <field name="partition_unit_col_spacing"/>
-                                    <field name="partition_unit_rows"/>
-                                    <field name="partition_unit_cols"/>
-                                    <field name="station_count" readonly="1"/>
-                                    <field name="partition_base_unit_row_spacing"/>
-                                    <field name="partition_base_unit_col_spacing"/>
-                                    <field name="partition_offset_x"/>
-                                    <field name="partition_offset_y"/>
-                                    <field name="partition_joint_type"/>
-                                    <field name="partition_partner_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="partition_materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="active" invisible="1"/>
-                                </tree>
-                            </field>
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">

sf_base/views/menu_view.xml

@@ -78,7 +78,7 @@
 
         <menuitem
                 id="menu_sf_production_process"
-                name="工艺"
+                name="表面工艺"
                 parent="menu_sf_production_process_1"
                 sequence="2"
                 action="sf_production_process"
@@ -86,7 +86,7 @@
 
         <menuitem
                 id="menu_sf_production_process_category"
-                name="工艺类别"
+                name="表面工艺类别"
                 parent="menu_sf_production_process_1"
                 sequence="1"
                 action="sf_production_process_category"
@@ -113,7 +113,7 @@
 
 		 <menuitem
                 id="mrs_production_process_parameter_view"
-                name="工艺可选参数"
+                name="表面工艺可选参数"
                 parent="menu_sf_production_process_1"
                 sequence="2"
                 action="mrs_production_process_parameter_action"

sf_bf_connect/models/http.py

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

sf_demand_plan/__init__.py

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

sf_demand_plan/__manifest__.py

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

sf_demand_plan/data/stock_route_group.xml

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

sf_demand_plan/migrations/1.1/post-migrate.py

@@ -1,25 +0,0 @@
-# migrations/1.1.0/post-migrate.py
-import os
-import csv
-import logging
-from odoo import api, SUPERUSER_ID
-
-_logger = logging.getLogger(__name__)
-
-
-def migrate(cr, version):
-    # 获取环境
-    env = api.Environment(cr, SUPERUSER_ID, {})
-
-    ProductionLine = env['sf.production.demand.plan']
-    DemandPlan = env['sf.demand.plan']
-
-    lines = ProductionLine.search([('demand_plan_id', '=', False)])
-    for line in lines:
-        vals = {
-            'sale_order_id': line.sale_order_id.id,
-            'sale_order_line_id': line.sale_order_line_id.id,
-            'line_ids': line.ids
-        }
-        new_plan = DemandPlan.create(vals)
-        line.write({'demand_plan_id': new_plan.id})

sf_demand_plan/models/__init__.py

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

sf_demand_plan/models/mrp_bom.py

@@ -1,29 +0,0 @@
-from odoo import models, fields
-
-
-class MrpBom(models.Model):
-    _inherit = 'mrp.bom'
-
-    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-    def bom_create(self, product, bom_type, product_type, code=None):
-        bom_id = self.env['mrp.bom'].create({
-            'product_tmpl_id': product.product_tmpl_id.id,
-            'type': bom_type,
-            # 'subcontractor_id': '' or subcontract.partner_id.id,
-            'product_qty': 1,
-            'product_uom_id': 1,
-            'code': code
-        })
-        if bom_type == 'subcontract' and product_type is not False:
-            subcontract = self.get_supplier(product.materials_type_id)
-            bom_id.subcontractor_id = subcontract.partner_id.id
-        return bom_id
-    
-    def name_get(self):
-        """重写name_get方法，只显示BOM编码"""
-        result = []
-        for record in self:
-            # 只显示BOM编码，如果编码为空则显示产品名称
-            display_name = record.code or record.product_tmpl_id.name or f'BOM-{record.id}'
-            result.append((record.id, display_name))
-        return result

sf_demand_plan/models/mrp_production.py

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models, api
-
-
-class MrpProduction(models.Model):
-    _inherit = 'mrp.production'
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.depends('demand_plan_line_id')
-    def _compute_production_type(self):
-        for production in self:
-            if production.demand_plan_line_id.supply_method == 'automation':
-                production.production_type = '自动化产线加工'
-            elif production.demand_plan_line_id.supply_method == 'manual':
-                production.production_type = '人工线下加工'
-            else:
-                production.production_type = None
-
-    def _get_purchase_request(self):
-        """获取跟制造订单相关的采购申请单（根据采购申请单行项目的产品匹配）"""
-        pr_ids = self.env['purchase.request'].sudo().search(
-            [('line_ids.demand_plan_line_id', 'in', self.demand_plan_line_id.ids)])
-        return pr_ids
-
-    @api.depends('procurement_group_id', 'procurement_group_id.stock_move_ids.group_id')
-    def _compute_picking_ids(self):
-        for order in self:
-            if order.product_id.product_tmpl_id.single_manufacturing == True and not order.is_remanufacture:
-                first_order = self.env['mrp.production'].search(
-                    [('demand_plan_line_id', '=', order.demand_plan_line_id.id), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', first_order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(first_order.picking_ids)
-            else:
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(order.picking_ids)

sf_demand_plan/models/purchase_order.py

@@ -1,48 +0,0 @@
-from odoo import api, fields, models, _
-from odoo.tools import float_compare
-
-
-class PurchaseOrder(models.Model):
-    _inherit = 'purchase.order'
-
-    def button_confirm(self):
-        if self.order_line[0].demand_plan_line_id:
-            self = self.with_context(
-                demand_plan_line_id=self.order_line[0].demand_plan_line_id.id
-            )
-        res = super(PurchaseOrder, self).button_confirm()
-        return res
-
-    @api.depends('origin')
-    def _compute_purchase_type(self):
-        for purchase in self:
-            if purchase.order_line[0].product_id.categ_id.name == '坯料':
-                if purchase.order_line[0].product_id.materials_type_id.gain_way == '外协':
-                    purchase.purchase_type = 'outsourcing'
-            else:
-                if purchase.order_line[0].demand_plan_line_id.supply_method == 'outsourcing':
-                    purchase.purchase_type = 'outsourcing'
-
-                elif purchase.order_line[0].demand_plan_line_id.supply_method == 'purchase':
-                    purchase.purchase_type = 'outside'
-
-
-class PurchaseOrderLine(models.Model):
-    _inherit = 'purchase.order.line'
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.model
-    def create(self, vals):
-        res = super(PurchaseOrderLine, self).create(vals)
-        if not res.demand_plan_line_id:
-            origin = [origin.replace(' ', '') for origin in res.order_id.origin.split(',')]
-            if self.env.context.get('demand_plan_line_id'):
-                res.demand_plan_line_id = self.env.context.get('demand_plan_line_id')
-            elif 'MO' in res.order_id.origin:
-                # 原单据是制造订单
-                mp_ids = self.env['mrp.production'].sudo().search([('name', 'in', origin)])
-                if mp_ids:
-                    res.demand_plan_line_id = mp_ids[0].demand_plan_line_id.id
-        return res

sf_demand_plan/models/purchase_request.py

@@ -1,35 +0,0 @@
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError, ValidationError
-
-
-class PurchaseRequestLine(models.Model):
-    _inherit = 'purchase.request.line'
-    _description = '采购申请明细'
-
-    supply_method = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式', readonly=True)
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.depends('demand_plan_line_id')
-    def _compute_supply_method(self):
-        for prl in self:
-            if prl.demand_plan_line_id:
-                prl.supply_method = prl.demand_plan_line_id.supply_method
-            else:
-                prl.supply_method = None
-
-
-class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
-    _inherit = "purchase.request.line.make.purchase.order"
-
-    @api.model
-    def _prepare_purchase_order_line(self, po, item):
-        ret = super(PurchaseRequestLineMakePurchaseOrder, self)._prepare_purchase_order_line(po, item)
-        ret['demand_plan_line_id'] = item.line_id.demand_plan_line_id.id
-        return ret

sf_demand_plan/models/sale_order.py

@@ -1,74 +0,0 @@
-from odoo import models, fields, api, _
-
-
-class ReSaleOrder(models.Model):
-    _inherit = 'sale.order'
-
-    mrp_production_ids = fields.Many2many(
-        'mrp.production',
-        compute='_compute_mrp_production_ids',
-        string='与此销售订单相关联的制造订单',
-        groups='mrp.group_mrp_user', store=True)
-
-    demand_plan_ids = fields.Many2many(comodel_name="sf.demand.plan",
-                                       string="需求计划", readonly=True)
-
-    demand_plan_count = fields.Integer(
-        string="需求计划生成计数",
-        compute='_compute_demand_plan_count'
-    )
-
-    @api.depends('demand_plan_ids.line_ids.status')
-    def _compute_purchase_request_count(self):
-        for so in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', so.name)])
-            if pr_ids:
-                so.purchase_request_purchase_order_count = len(pr_ids)
-            else:
-                so.purchase_request_purchase_order_count = 0
-
-    @api.depends('demand_plan_ids.line_ids')
-    def _compute_demand_plan_count(self):
-        for line in self:
-            demand_plan = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', line.id)])
-            line.demand_plan_count = len(demand_plan)
-
-    def sale_order_create_line(self, product, item):
-        ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
-        vals = {
-            'sale_order_id': ret.order_id.id,
-            'sale_order_line_id': ret.id,
-        }
-        demand_plan_info = self.env['sf.demand.plan'].sudo().create(vals)
-        vals.update({'demand_plan_id': demand_plan_info.id, 'plan_uom_qty': ret.product_uom_qty,
-                     'new_supply_method': 'custom_made', 'custom_made_type': 'manual'})
-        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
-        demand_plan_info.write({'line_ids': demand_plan.ids})
-        if demand_plan.product_id.machining_drawings_name:
-            filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
-            wizard_vals = {
-                'model_id': demand_plan.model_id,
-                'filename_url': filename_url,
-                'machining_drawings': product.machining_drawings,
-                'type': '1',
-            }
-            self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
-        ret.order_id.demand_plan_ids = [(4, demand_plan_info.id)]
-        return ret
-
-    def confirm_to_supply_method(self):
-        self.state = 'sale'
-        for line in self.order_line:
-            if line.product_id.auto_machining:
-                line.supply_method = 'automation'
-
-    def action_view_demand_plan(self):
-        self.ensure_one()
-        demand_plan_ids = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', self.id)]).ids
-        return {
-            'res_model': 'sf.production.demand.plan',
-            'type': 'ir.actions.act_window',
-            'name': _("需求计划"),
-            'domain': [('id', 'in', demand_plan_ids)],
-            'view_mode': 'tree',
-        }

sf_demand_plan/models/sf_demand_plan.py

@@ -1,260 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-from odoo.tools import float_compare
-from odoo.exceptions import ValidationError
-import re
-
-
-class SfDemandPlan(models.Model):
-    _name = 'sf.demand.plan'
-    _description = 'sf_demand_plan'
-
-    state = fields.Selection([
-        ('10', '待工艺设计'),
-        ('30', '部分下达'),
-        ('40', '已下达'),
-        ('50', '取消'),
-    ], string='状态', default='10', compute='_compute_state', store=True)
-
-    line_ids = fields.One2many(comodel_name='sf.production.demand.plan',
-                               inverse_name='demand_plan_id', string="需求计划", copy=True)
-
-    sale_order_id = fields.Many2one(comodel_name="sale.order",
-                                    string="销售订单", readonly=True)
-    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
-                                         string="销售订单明细", readonly=True)
-
-    product_id = fields.Many2one(
-        comodel_name='product.product',
-        related='sale_order_line_id.product_id',
-        string='产品', store=True, index=True)
-
-    part_name = fields.Char('零件名称', related='product_id.part_name')
-    part_number = fields.Char('零件图号', compute='_compute_part_number', store=True)
-    materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
-
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
-                                  related='product_id.blank_type')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
-                                       related='product_id.blank_precision')
-    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
-    embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long', store=True)
-    is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
-    pending_qty = fields.Float(
-        string="待计划",
-        compute='_compute_pending_qty', store=True)
-    planned_qty = fields.Float(
-        string="已计划",
-        compute='_compute_planned_qty', store=True)
-    model_id = fields.Char('模型ID', related='product_id.model_id')
-    customer_name = fields.Char('客户', related='sale_order_id.customer_name')
-    product_uom_qty = fields.Float(
-        string="需求数量",
-        related='sale_order_line_id.product_uom_qty', store=True)
-    deadline_of_delivery = fields.Date('客户交期', related='sale_order_line_id.delivery_end_date', store=True)
-    contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
-    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
-
-    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter',
-                                                    'demand_plan_process_parameter_rel',
-                                                    string='表面工艺',
-                                                    compute='_compute_model_process_parameters_ids'
-                                                    , store=True
-                                                    )
-    model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
-    inventory_quantity_auto_apply = fields.Float(
-        string="成品库存",
-        compute='_compute_inventory_quantity_auto_apply'
-    )
-
-    priority = fields.Selection([
-        ('1', '紧急'),
-        ('2', '高'),
-        ('3', '中'),
-        ('4', '低'),
-    ], string='优先级', default='3')
-
-    overdelivery_allowed = fields.Boolean('可超量发货', default=False)
-
-    hide_button_release_plan = fields.Boolean(
-        string='显示下达计划按钮',
-        compute='_compute_hide_button_release_plan',
-        default=False
-    )
-
-    readonly_custom_made_type = fields.Boolean(
-        string='字段自制类型只读',
-        compute='_compute_readonly_custom_made_type',
-        default=False
-    )
-    demand_plan_number = fields.Char('需求计划号', compute='_compute_demand_plan_number', readonly=True, store=True)
-    origin = fields.Char('来源', related='sale_order_id.name', readonly=True, store=True)
-
-    @api.depends('product_id.part_number', 'product_id.model_name')
-    def _compute_part_number(self):
-        for line in self:
-            if line.product_id:
-                if line.product_id.part_number:
-                    line.part_number = line.product_id.part_number
-                else:
-                    if line.product_id.model_name:
-                        line.part_number = line.product_id.model_name.rsplit('.', 1)[0]
-            else:
-                line.part_number = None
-
-    @api.depends('product_id.materials_id')
-    def _compute_materials_id(self):
-        for line in self:
-            if line.product_id:
-                line.materials_id = f"{line.product_id.materials_id.name}/{line.product_id.materials_type_id.name}"
-            else:
-                line.materials_id = None
-
-    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height')
-    def _compute_embryo_long(self):
-        for line in self:
-            if line.product_id:
-                if line.product_id.blank_type == '圆料':
-                    line.embryo_long = f"Ø{round(line.product_id.model_width, 3)}*{round(line.product_id.model_long, 3)}"
-                else:
-                    line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
-            else:
-                line.embryo_long = None
-
-    @api.depends('product_id.model_process_parameters_ids')
-    def _compute_model_process_parameters_ids(self):
-        for line in self:
-            if line.product_id and line.product_id.model_process_parameters_ids:
-                line.model_process_parameters_ids = [(6, 0, line.product_id.model_process_parameters_ids.ids)]
-            else:
-                line.model_process_parameters_ids = [(5, 0, 0)]
-
-    def _compute_inventory_quantity_auto_apply(self):
-        location_id = self.env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id
-        product_ids = self.mapped('product_id').ids
-        if product_ids:
-            quant_data = self.env['stock.quant'].read_group(
-                domain=[
-                    ('product_id', 'in', product_ids),
-                    ('location_id', '=', location_id)
-                ],
-                fields=['product_id', 'inventory_quantity_auto_apply'],
-                groupby=['product_id']
-            )
-            quantity_map = {item['product_id'][0]: item['inventory_quantity_auto_apply'] for item in quant_data}
-        else:
-            quantity_map = {}
-        for line in self:
-            if line.product_id:
-                line.inventory_quantity_auto_apply = quantity_map.get(line.product_id.id, 0.0)
-            else:
-                line.inventory_quantity_auto_apply = 0.0
-
-    @api.depends('product_uom_qty', 'line_ids.plan_uom_qty')
-    def _compute_pending_qty(self):
-        for line in self:
-            sum_plan_uom_qty = sum(line.line_ids.mapped('plan_uom_qty'))
-            pending_qty = line.product_uom_qty - sum_plan_uom_qty
-            if float_compare(pending_qty, 0,
-                             precision_rounding=line.product_id.uom_id.rounding) == -1:
-                line.pending_qty = 0
-            else:
-                line.pending_qty = pending_qty
-
-    @api.depends('line_ids.plan_uom_qty')
-    def _compute_planned_qty(self):
-        for line in self:
-            line.planned_qty = sum(line.line_ids.mapped('plan_uom_qty'))
-
-    @api.depends('line_ids.status')
-    def _compute_hide_button_release_plan(self):
-        for line in self:
-            line.hide_button_release_plan = bool(line.line_ids.filtered(
-                lambda p: p.status == '30'))
-
-    @api.depends('line_ids.status', 'sale_order_id.state')
-    def _compute_state(self):
-        for line in self:
-            status_line = line.line_ids.filtered(lambda p: p.status == '60')
-            if not line.line_ids:
-                line.state = '10'
-            elif line.sale_order_id.state == 'cancel':
-                line.state = '50'
-                line.line_ids.status = '100'
-            elif len(line.line_ids) == len(status_line):
-                line.state = '40'
-            elif bool(status_line):
-                line.state = '30'
-            else:
-                line.state = '10'
-
-    @api.depends('line_ids.status')
-    def _compute_readonly_custom_made_type(self):
-        for line in self:
-            production_demand_plan = line.line_ids.filtered(
-                lambda p: p.status in ('50', '60') and p.new_supply_method == 'custom_made')
-            line.readonly_custom_made_type = bool(production_demand_plan)
-
-    @api.constrains('line_ids')
-    def check_line_ids(self):
-        for item in self:
-            if not item.line_ids:
-                raise ValidationError('计划不能为空！')
-
-    def write(self, vals):
-        res = super(SfDemandPlan, self).write(vals)
-        if 'line_ids' in vals:
-            for line in self.line_ids:
-                if not line.sale_order_id:
-                    line.sale_order_id = self.sale_order_id
-                if not line.sale_order_line_id:
-                    line.sale_order_line_id = self.sale_order_line_id
-        return res
-
-    def name_get(self):
-        result = []
-        for plan in self:
-            result.append((plan.id, plan.demand_plan_number))
-        return result
-
-    def button_production_release_plan(self):
-        line_ids = self.line_ids.filtered(lambda p: p.status == '30')
-        sum_product_uom_qty = sum(line_ids.mapped('plan_uom_qty'))
-        customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-        if not self.overdelivery_allowed and line_ids.filtered(lambda p: p.location_id.id == customer_location_id):
-            if float_compare(sum_product_uom_qty, self.product_uom_qty,
-                             precision_rounding=self.product_id.uom_id.rounding) == 1:
-                raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-        elif float_compare(sum_product_uom_qty, self.product_uom_qty,
-                           precision_rounding=self.product_id.uom_id.rounding) == 1:
-            return {
-                'name': _('需求计划'),
-                'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
-                           'form')],
-                'res_model': 'sf.release.plan.wizard',
-                'target': 'new',
-                'context': {
-                    'default_demand_plan_line_id': line_ids.ids,
-                    'default_release_message': f"您正在下达计划量 {sum_product_uom_qty}，需求数量为 {self.product_uom_qty}，已超过需求数量，是否继续？",
-                }}
-        else:
-            for demand_plan_line_id in line_ids:
-                demand_plan_line_id.action_confirm()
-
-    # 需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位，所以这里也直接截取product_id.name
-    @api.depends('product_id.name')
-    def _compute_demand_plan_number(self):
-        for line in self:
-            product_name = line.product_id.name or ''
-            plan_no = None
-            if line.product_id:
-                # 使用正则表达式匹配P-后面的所有字符
-                match = re.search(r'P-(.*)', product_name)
-                if match:
-                    plan_no = match.group(1)
-                line.demand_plan_number = plan_no
-            else:
-                line.demand_plan_number = None

sf_demand_plan/models/sf_production_demand_plan.py

@@ -1,913 +0,0 @@
-# -*- 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
-import re
-
-
-class SfProductionDemandPlan(models.Model):
-    _name = 'sf.production.demand.plan'
-    _description = 'sf_production_demand_plan'
-
-    def get_location_id(self):
-        stock_location = self.env['stock.location'].sudo().search([('name', '=', '客户')], limit=1)
-        return stock_location.id
-
-    priority = fields.Selection(related='demand_plan_id.priority', string='优先级')
-    status = fields.Selection([
-        ('10', '草稿'),
-        ('20', '待确认'),
-        ('30', '待工艺设计'),
-        ('50', '待下达生产'),
-        ('60', '已下达'),
-        ('100', '取消'),
-    ], string='状态', default='30', readonly=True)
-    demand_plan_id = fields.Many2one(comodel_name="sf.demand.plan",
-                                     string="物料需求", readonly=True)
-    sale_order_id = fields.Many2one(comodel_name="sale.order", string="销售订单", readonly=True)
-    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line", string="销售订单明细", readonly=True)
-    sale_order_line_number = fields.Char(string='销售订单行', compute='_compute_sale_order_line_number', store=True)
-    company_id = fields.Many2one(
-        related='sale_order_id.company_id',
-        store=True, index=True, precompute=True)
-    customer_name = fields.Char('客户', related='sale_order_id.customer_name')
-    order_remark = fields.Text(related='sale_order_id.remark',
-                               string="订单备注", store=True)
-    glb_url = fields.Char(related='sale_order_line_id.glb_url', string='glb文件地址')
-    product_id = fields.Many2one(
-        comodel_name='product.product',
-        related='sale_order_line_id.product_id',
-        string='产品', store=True, index=True)
-    model_id = fields.Char('模型ID', related='product_id.model_id')
-    part_name = fields.Char('零件名称', related='product_id.part_name')
-    part_number = fields.Char('零件图号', related='demand_plan_id.part_number')
-    is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
-
-    new_supply_method = fields.Selection([
-        ('custom_made', "自制"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式', required=True)
-
-    custom_made_type = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-    ], string='产线类型', compute='_compute_custom_made_type', store=True)
-
-    supply_method = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式', compute='_compute_supply_method', store=True, readonly=True)
-    product_uom_qty = fields.Float(
-        string="需求数量",
-        related='sale_order_line_id.product_uom_qty', store=True)
-    deadline_of_delivery = fields.Date('客户交期', related='sale_order_line_id.delivery_end_date', store=True)
-    inventory_quantity_auto_apply = fields.Float(
-        string="成品库存",
-        related='demand_plan_id.inventory_quantity_auto_apply'
-    )
-    qty_delivered = fields.Float(
-        "交货数量", related='sale_order_line_id.qty_delivered')
-    qty_to_deliver = fields.Float(
-        "待交货数量", compute='_compute_qty_to_deliver', store=True)
-    model_long = fields.Char('尺寸(mm)', compute='_compute_model_long')
-    blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
-                                  related='product_id.blank_type')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
-                                       related='product_id.blank_precision')
-    unit_number = fields.Float('单件用量', digits=(16, 3), related='product_id.unit_number')
-    embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
-    materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
-    model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
-    model_process_parameters_ids = fields.Many2many(related='demand_plan_id.model_process_parameters_ids',
-                                                    string='表面工艺', )
-    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_ids = fields.Many2many('stock.route', 'stock_route_demand_plan', 'demand_plan_id', 'route_id', '库存路线',
-                                 domain=[('demand_plan_selectable', '=', True)], compute='_compute_route_ids',
-                                 store=True)
-    contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
-    date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
-    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
-    plan_remark = fields.Text("计划备注")
-    material_check = fields.Selection([
-        ('0', "未齐套"),
-        ('1', "已齐套"),
-    ], string='投料齐套检查', compute='_compute_material_check', store=True)
-    processing_time = fields.Char('程序工时', readonly=True)
-    planned_start_date = fields.Date('计划开工日期')
-    actual_start_date = fields.Datetime('实际开工日期', compute='_compute_actual_start_date', store=True)
-    actual_end_date = fields.Datetime('实际完工日期', compute='_compute_actual_end_date', store=True)
-    print_count = fields.Char('打印次数', default='T0C0', readonly=True)
-    sequence = fields.Integer('序号')
-
-    mrp_production_ids = fields.Many2many(
-        'mrp.production',
-        compute='_compute_mrp_production_ids',
-        string='与此相需求计划关联的制造订单',
-        store=True)
-
-    hide_release_production_order = fields.Boolean(
-        string='显示下发生产按钮',
-        compute='_compute_hide_release_production_order',
-        default=False
-    )
-
-    readonly_custom_made_type = fields.Boolean(
-        related='demand_plan_id.readonly_custom_made_type',
-        string='字段自制类型只读'
-    )
-
-    # 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('委外采购申请单')
-
-    plan_uom_qty = fields.Float(string="计划量", required=True)
-    procurement_reason = fields.Selection([
-        ('销售订单', "销售订单"),
-        ('需求预测', "需求预测"),
-        ('生产报废', "生产报废"),
-    ], string='补货原因', default='销售订单', readonly=True)
-
-    blank_arrival_date = fields.Date('采购计划到货(坯料)')
-    finished_product_arrival_date = fields.Date('采购计划到货(成品)')
-    bom_id = fields.Many2one('mrp.bom', string="BOM", readonly=True)
-    location_id = fields.Many2one('stock.location', string='需求位置', default=get_location_id, readonly=True)
-    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
-
-    @api.constrains('plan_uom_qty')
-    def _check_plan_uom_qty(self):
-        line_ids = self.filtered(lambda p: p.plan_uom_qty == 0 or p.plan_uom_qty < 0)
-        if line_ids:
-            raise ValidationError(_("计划量不能小于等于0"))
-
-    @api.constrains('supply_method')
-    def _check_supply_method(self):
-        product_name = []
-        product = []
-        for line in self:
-            if line.supply_method == 'purchase' and line.is_incoming_material:
-                product_name.append(line.product_id.display_name)
-            if line.supply_method == 'automation' and line.manual_quotation:
-                product.append(line.product_id.display_name)
-
-        if product_name:
-            unique_product_names = list(set(product_name))
-            raise UserError('当前（%s）产品为客供料，不能选择外购' % ','.join(unique_product_names))
-        if product:
-            unique_product = list(set(product))
-            raise UserError('当前（%s）产品为人工编程，不能选择自动化产线加工' % ','.join(unique_product))
-
-    @api.depends('new_supply_method')
-    def _compute_custom_made_type(self):
-        DemandPlan = self.env['sf.production.demand.plan'].sudo()
-        for line in self:
-            if line.new_supply_method != "custom_made":
-                line.custom_made_type = False
-            else:
-                demand_plan_id = line.demand_plan_id._origin.id
-                demand_plan = DemandPlan.search([
-                    ('demand_plan_id', '=', demand_plan_id),
-                    ('new_supply_method', '=', 'custom_made'),
-                    ('status', 'in', ('50', '60'))
-                ], limit=1)
-                if demand_plan:
-                    line.custom_made_type = demand_plan.custom_made_type
-
-    @api.depends('new_supply_method', 'custom_made_type')
-    def _compute_supply_method(self):
-        for line in self:
-            if line.new_supply_method == 'custom_made':
-                line.supply_method = line.custom_made_type
-            else:
-                line.supply_method = line.new_supply_method
-
-    @api.depends('sale_order_line_id.qty_to_deliver')
-    def _compute_qty_to_deliver(self):
-        for line in self:
-            if float_compare(line.sale_order_line_id.qty_to_deliver, 0,
-                             precision_rounding=line.product_id.uom_id.rounding) == -1:
-                line.qty_to_deliver = 0
-            else:
-                line.qty_to_deliver = line.sale_order_line_id.qty_to_deliver
-
-    @api.depends('supply_method')
-    def _compute_route_ids(self):
-        for pdp in self:
-            if pdp.supply_method:
-                group_id = self.env['stock.route.group'].sudo().search([('code', '=', pdp.supply_method)])
-                route_ids = self.env['stock.route'].sudo().search(
-                    [('demand_plan_selectable', '=', True), ('stock_route_group_ids', '=', group_id.id)])
-                if route_ids:
-                    pdp.route_ids = route_ids.ids
-                    continue
-            pdp.route_ids = None
-
-    @api.depends('sale_order_line_id.product_id.name')
-    def _compute_sale_order_line_number(self):
-        for line in self:
-            if line.product_id:
-                line.sale_order_line_number = line.sale_order_line_id.product_id.name[-1]
-            else:
-                line.sale_order_line_number = None
-
-    @api.depends('product_id.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('mrp_production_ids.workorder_ids.date_start')
-    def _compute_actual_start_date(self):
-        for record in self:
-            if record.mrp_production_ids:
-                start_dates = [
-                    workorder.date_start for mo in record.mrp_production_ids
-                    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
-
-    @api.depends('mrp_production_ids.workorder_ids.state',
-                 'mrp_production_ids.workorder_ids.date_finished')
-    def _compute_actual_end_date(self):
-        for record in self:
-            if record.mrp_production_ids:
-                finished_orders = record.mrp_production_ids.filtered(lambda mo: mo.state == 'done')
-                sum_product_qty = sum(finished_orders.mapped('product_qty'))
-                if finished_orders and float_compare(sum_product_qty, record.plan_uom_qty,
-                                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
-                    end_dates = [
-                        workorder.date_finished for mo in finished_orders
-                        for workorder in mo.workorder_ids if workorder.date_finished
-                    ]
-                    record.actual_end_date = max(end_dates) if end_dates else None
-                else:
-                    record.actual_end_date = None
-            else:
-                record.actual_end_date = None
-
-    @api.depends('mrp_production_ids.move_raw_ids.reserved_availability')
-    def _compute_material_check(self):
-        for record in self:
-            if record.mrp_production_ids and record.mrp_production_ids.move_raw_ids:
-                # 获取完成的制造订单
-                done_manufacturing = record.mrp_production_ids.filtered(lambda mo: mo.state == 'done')
-                product_qty = sum(done_manufacturing.mapped('product_qty'))
-                # 需求数量-完成数量
-                product_uom_qty = record.plan_uom_qty - product_qty
-                total_reserved_availability = sum(
-                    record.mrp_production_ids.mapped('move_raw_ids.reserved_availability'))
-                if float_compare(total_reserved_availability, product_uom_qty,
-                                 precision_rounding=record.product_id.uom_id.rounding) >= 0:
-                    record.material_check = '1'  # 已齐套
-                else:
-                    record.material_check = '0'  # 未齐套
-            else:
-                record.material_check = None
-
-    @api.depends('status')
-    def _compute_mrp_production_ids(self):
-        for record in self:
-            if record.status in ('50', '60'):
-                record.mrp_production_ids = self.env['mrp.production'].sudo().search(
-                    [('demand_plan_line_id', '=', record.id)]).ids
-            else:
-                record.mrp_production_ids = None
-
-    @api.depends('mrp_production_ids.state')
-    def _compute_hide_release_production_order(self):
-        for record in self:
-            # 检查这条需求计划所有制造订单的排程单状态,有一个为待排程状态,就显示改按钮
-            record.hide_release_production_order = bool(record.mrp_production_ids.filtered(
-                lambda p: p.state == 'confirmed'
-            ))
-
-    @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 button_release_production(self):
-        self.ensure_one()
-        if not self.planned_start_date:
-            raise ValidationError("请先填写计划开工日期")
-        pro_plan_list = self.env['sf.production.plan'].sudo().search(
-            [('production_id', 'in', self.mrp_production_ids.ids), ('state', '=', 'draft')])
-        sf_production_line = self.env['sf.production.line'].sudo().search(
-            [('name', '=', '1#CNC自动生产线')], limit=1)
-        if sf_production_line:
-            now = datetime.now()
-            time_part = (now + timedelta(hours=2)).time()
-            date_part = fields.Date.from_string(self.planned_start_date)
-            date_planned_start = datetime.combine(date_part, time_part)
-            pro_plan_list.production_line_id = sf_production_line.id
-            pro_plan_list.date_planned_start = date_planned_start
-            self._do_production_schedule(pro_plan_list)
-        self.status = '60'
-        self.update_sale_order_state()
-
-    def _do_production_schedule(self, pro_plan_list):
-        for pro_plan in pro_plan_list:
-            pro_plan.do_production_schedule()
-
-    def update_sale_order_state(self):
-        # demand_plan = self.env['sf.demand.plan'].sudo().search([('sale_order_id', '=', self.sale_order_id.id)])
-        # demand_plan_state = demand_plan.filtered(lambda line: line.state != '40')
-        production_demand_plan = self.env['sf.production.demand.plan'].sudo().search(
-            [('sale_order_id', '=', self.sale_order_id.id)])
-        production_demand_plan_state = production_demand_plan.filtered(lambda line: line.status in ('10', '20', '30'))
-        if not production_demand_plan_state:
-            # 修改销售订单为加工中
-            self.sale_order_id.state = 'processing'
-
-    def edit_button(self):
-        self.ensure_one()
-        action = {
-            'name': _("需求计划"),
-            'type': 'ir.actions.act_window',
-            'view_mode': 'form',
-            'views': [[self.env.ref('sf_demand_plan.view_sf_demand_plan_form').id, 'form']],
-            'res_model': 'sf.demand.plan',
-            'res_id': self.demand_plan_id.id,
-        }
-        if self.demand_plan_id.state == '40':
-            action.update({'flags': {'mode': 'readonly'}})
-        return action
-
-    def button_action_print(self):
-        model_id = self.mapped('model_id')
-        return {
-            'res_model': 'sf.demand.plan.print.wizard',
-            'type': 'ir.actions.act_window',
-            'name': _("打印"),
-            'domain': [('model_id', 'in', model_id)],
-            'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
-            'target': 'new',
-        }
-
-    # @api.depends('sale_order_id.mrp_production_ids.state', 'sale_order_id.mrp_production_ids.programming_state')
-    # def _compute_hid_button(self):
-    #     for record in self:
-    #         mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
-    #             lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == record.product_id.id
-    #         )
-    #         record.hide_action_open_mrp_production = bool(mrp_production_ids) and record.supply_method in (
-    #             'automation', 'manual')
-    #         programming_mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
-    #             lambda p: p.programming_state == '编程中' and p.product_id.id == record.product_id.id
-    #         )
-    #         record.hide_action_view_programming = bool(programming_mrp_production_ids)
-    #
-    # def _compute_hide_action_purchase_orders(self):
-    #     for record in self:
-    #         record.hide_action_purchase_orders = False
-    #         outsourcing_purchase_request = []
-    #         if record.supply_method in ('automation',
-    #                                     'manual') and record.material_check == '0' and not record.sale_order_line_id.is_incoming_material:
-    #             mrp_production = record.sale_order_id.mrp_production_ids.filtered(
-    #                 lambda p: p.product_id.id == record.product_id.id
-    #             ).sorted(key=lambda p: p.id)
-    #             if mrp_production:
-    #                 raw_materials = mrp_production.mapped('move_raw_ids.product_id')
-    #                 if raw_materials:
-    #                     purchase_orders = self.env['purchase.order'].sudo().search([
-    #                         ('state', '=', 'purchase'),
-    #                         ('order_line.product_id', 'in', raw_materials.ids)
-    #                     ])
-    #                     total_purchase_quantity = sum(
-    #                         sum(
-    #                             order.order_line.filtered(
-    #                                 lambda line: line.product_id in raw_materials
-    #                             ).mapped('product_qty')
-    #                         )
-    #                         for order in purchase_orders
-    #                     )
-    #                     if float_compare(total_purchase_quantity, record.product_uom_qty,
-    #                                      precision_rounding=record.product_id.uom_id.rounding) == -1:
-    #                         pr_ids = self.env['purchase.request'].sudo().search(
-    #                             [('line_ids.product_id', 'in', raw_materials.ids), ('state', '!=', 'done')])
-    #                         outsourcing_purchase_request.extend(pr_ids.ids)
-    #         elif record.supply_method in ('purchase', 'outsourcing'):
-    #             purchase_orders = self.env['purchase.order'].sudo().search([
-    #                 ('state', 'in', ('purchase', 'done')),
-    #                 ('order_line.product_id', '=', record.product_id.id)
-    #             ])
-    #             total_purchase_quantity = sum(
-    #                 sum(
-    #                     order.order_line.filtered(
-    #                         lambda line: line.product_id in record.product_id
-    #                     ).mapped('product_qty')
-    #                 )
-    #                 for order in purchase_orders
-    #             )
-    #
-    #             if float_compare(total_purchase_quantity, record.product_uom_qty,
-    #                              precision_rounding=record.product_id.uom_id.rounding) == -1:
-    #                 pr_ids = self.env['purchase.request'].sudo().search(
-    #                     [('origin', 'like', record.sale_order_id.name), ('state', '!=', 'done')])
-    #                 outsourcing_purchase_request.extend(pr_ids.ids)
-    #             if record.supply_method == 'outsourcing' and not record.sale_order_line_id.is_incoming_material:
-    #                 bom_line_ids = record.product_id.bom_ids.bom_line_ids
-    #                 if bom_line_ids:
-    #                     # BOM_数量
-    #                     total_product_qty = sum(line.product_qty for line in bom_line_ids)
-    #                     bom_product_ids = bom_line_ids.mapped('product_id')
-    #                     product_purchase_orders = self.env['purchase.order'].sudo().search([
-    #                         ('state', 'in', ('purchase', 'done')),
-    #                         ('order_line.product_id', 'in', bom_product_ids.ids)
-    #                     ])
-    #                     # 购订单_数量
-    #                     total_outsourcing_purchase_quantity = sum(
-    #                         sum(
-    #                             order.order_line.filtered(
-    #                                 lambda line: line.product_id in bom_product_ids
-    #                             ).mapped('product_qty')
-    #                         )
-    #                         for order in product_purchase_orders
-    #                     )
-    #                     quantity = total_outsourcing_purchase_quantity / total_product_qty
-    #                     if float_compare(quantity, record.product_uom_qty,
-    #                                      precision_rounding=record.product_id.uom_id.rounding) == -1:
-    #                         purchase_request = self.env['purchase.request'].sudo().search(
-    #                             [('line_ids.product_id', 'in', bom_product_ids.ids),
-    #                              ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
-    #                         outsourcing_purchase_request.extend(purchase_request.ids)
-    #         record.outsourcing_purchase_request = json.dumps(outsourcing_purchase_request)
-    #         if outsourcing_purchase_request:
-    #             record.hide_action_purchase_orders = True
-    #
-    # @api.depends('sale_order_id.mrp_production_ids.picking_ids.state', 'sale_order_id.picking_ids.state')
-    # def _compute_hide_action_stock_picking(self):
-    #     for record in self:
-    #         record.hide_action_stock_picking = False
-    #         record.hide_action_outsourcing_stock_picking = False
-    #         if record.supply_method in ('automation', 'manual'):
-    #             manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
-    #                 lambda p: p.product_id.id == record.product_id.id
-    #             )
-    #             record.hide_action_stock_picking = bool(manufacturing_orders.mapped('picking_ids').filtered(
-    #                 lambda p: p.state == 'assigned'))
-    #         elif record.supply_method in ('purchase', 'outsourcing'):
-    #             assigned_picking_ids = record.sale_order_id.picking_ids.filtered(
-    #                 lambda
-    #                     p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in record.product_id)
-    #             if record.supply_method == 'outsourcing':
-    #                 outsourcing_assigned_picking_ids = record.get_outsourcing_picking_ids()
-    #                 record.hide_action_outsourcing_stock_picking = outsourcing_assigned_picking_ids
-    #                 record.hide_action_stock_picking = assigned_picking_ids or outsourcing_assigned_picking_ids
-    #             else:
-    #                 record.hide_action_stock_picking = assigned_picking_ids
-    #
-    # def get_outsourcing_picking_ids(self):
-    #     order_ids = self.env['purchase.order'].sudo().search(
-    #         [('order_line.product_id', 'in', self.product_id.ids),
-    #          ('purchase_type', '=', 'outsourcing')])
-    #     outsourcing_picking_ids = order_ids._get_subcontracting_resupplies()
-    #     outsourcing_assigned_picking_ids = outsourcing_picking_ids.filtered(lambda p: p.state == 'assigned')
-    #     return outsourcing_assigned_picking_ids
-
-    # def action_open_sale_order(self):
-    #     self.ensure_one()
-    #     return {
-    #         'type': 'ir.actions.act_window',
-    #         'res_model': 'sale.order',
-    #         'res_id': self.sale_order_id.id,
-    #         'view_mode': 'form',
-    #     }
-
-    # def action_open_mrp_production(self):
-    #     self.ensure_one()
-    #     mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
-    #         lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == self.product_id.id
-    #     )
-    #     action = {
-    #         'res_model': 'mrp.production',
-    #         'type': 'ir.actions.act_window',
-    #     }
-    #     if len(mrp_production_ids) == 1:
-    #         action.update({
-    #             'view_mode': 'form',
-    #             'res_id': mrp_production_ids.id,
-    #         })
-    #     else:
-    #         action.update({
-    #             'name': _("制造订单列表"),
-    #             'domain': [('id', 'in', mrp_production_ids.ids)],
-    #             'view_mode': 'tree,form',
-    #         })
-    #     return action
-
-    # def action_view_purchase_request(self):
-    #     self.ensure_one()
-    #     pr_ids = self.env['purchase.request'].sudo().search(
-    #         [('id', 'in', ast.literal_eval(self.outsourcing_purchase_request))])
-    #     action = {
-    #         'res_model': 'purchase.request',
-    #         'type': 'ir.actions.act_window',
-    #     }
-    #     if len(pr_ids) == 1:
-    #         action.update({
-    #             'view_mode': 'form',
-    #             'res_id': pr_ids[0].id,
-    #         })
-    #     else:
-    #         action.update({
-    #             'name': _("采购申请"),
-    #             'domain': [('id', 'in', pr_ids.ids)],
-    #             'view_mode': 'tree,form',
-    #         })
-    #     return action
-
-    # def action_view_stock_picking(self):
-    #     self.ensure_one()
-    #     action = self.env["ir.actions.actions"]._for_xml_id("stock.action_picking_tree_all")
-    #     picking_ids = None
-    #     if self.supply_method in ('automation', 'manual'):
-    #         mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
-    #             lambda p: p.product_id.id == self.product_id.id
-    #         )
-    #         picking_ids = mrp_production_ids.mapped('picking_ids').filtered(
-    #             lambda p: p.state == 'assigned')
-    #     elif self.supply_method in ('purchase', 'outsourcing'):
-    #         picking_ids = self.sale_order_id.picking_ids.filtered(
-    #             lambda
-    #                 p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in self.product_id)
-    #         if self.supply_method == 'outsourcing' and self.hide_action_outsourcing_stock_picking:
-    #             picking_ids = picking_ids.union(self.get_outsourcing_picking_ids())
-    #     if picking_ids:
-    #         if len(picking_ids) > 1:
-    #             action['domain'] = [('id', 'in', picking_ids.ids)]
-    #         elif picking_ids:
-    #             action['res_id'] = picking_ids.id
-    #             action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
-    #             if 'views' in action:
-    #                 action['views'] += [(state, view) for state, view in action['views'] if view != 'form']
-    #         return action
-
-    # def action_view_programming(self):
-    #     self.ensure_one()
-    #     programming_mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
-    #         lambda p: p.programming_state == '编程中' and p.product_id.id == self.product_id.id
-    #     ).mapped('programming_no')
-    #     if programming_mrp_production_ids:
-    #         programming_no = list(set(programming_mrp_production_ids))
-    #         numbers_str = "、".join(programming_no)
-    #         raise ValidationError(f"编程单号：{numbers_str}，请去云平台处理")
-    @api.model
-    def unlink(self):
-        for item in self:
-            if item.status not in ('10', '20', '30'):
-                raise ValidationError(u'只能删除状态为【草稿,待确认，待工艺设计】的需求计划。')
-            else:
-                super(SfProductionDemandPlan, item).unlink()
-
-    def button_batch_release_plan(self):
-        filtered_plan = self.filtered(lambda mo: mo.status == '30')
-        if not filtered_plan:
-            raise UserError(_("没有需要下达的计划！"))
-        check_overdelivery_allowed = False
-        if not self.demand_plan_id.overdelivery_allowed:
-            customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-            if self.location_id.id == customer_location_id:
-                check_overdelivery_allowed = True
-        # 按产品分组并计算总数
-        product_data = {}
-        for plan in filtered_plan:
-            check_overdelivery_allowed = False
-            if not plan.demand_plan_id.overdelivery_allowed:
-                customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-                if plan.location_id.id == customer_location_id:
-                    check_overdelivery_allowed = True 
-            if plan.product_id not in product_data:
-                # 初始化产品数据，从产品上获取需求量
-                product_data[plan.product_id] = {
-                    'plan_uom_qty': 0.0,
-                    'product_uom_qty': plan.product_uom_qty
-                }
-
-            # 累加计划数量
-            product_data[plan.product_id]['plan_uom_qty'] += plan.plan_uom_qty
-            product_data[plan.product_id]['overdelivery_allowed'] = check_overdelivery_allowed
-        # 检查需求超过计划数量的产品
-        warning_messages = []
-        error_messages = []
-        for product, data in product_data.items():
-            if data['overdelivery_allowed'] and float_compare(data['plan_uom_qty'], data['product_uom_qty'],precision_rounding=product.uom_id.rounding) == 1:
-                error_messages.append(f"您正在下达的产品 {product.display_name},已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-            elif float_compare(data['plan_uom_qty'], data['product_uom_qty'],
-                             precision_rounding=product.uom_id.rounding) == 1:
-                warning_messages.append(
-                    _("您正在下达的产品 %s，计划量%s，需求数量为%s，已超过需求数量") %
-                    (product.display_name, data['plan_uom_qty'], data['product_uom_qty'])
-                )
-        if error_messages:
-            error_message = "\n".join(error_messages)
-            raise ValidationError(error_message)
-        elif warning_messages:
-            warning_message = "\n".join(warning_messages)
-            return {
-                'name': _('需求计划'),
-                'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
-                           'form')],
-                'res_model': 'sf.release.plan.wizard',
-                'target': 'new',
-                'context': {
-                    'default_demand_plan_line_id': self.ids,
-                    'default_release_message': warning_message,
-                }}
-
-    def button_release_plan(self):
-        self.ensure_one()
-        check_overdelivery_allowed = False
-        if not self.demand_plan_id.overdelivery_allowed:
-            customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-            if self.location_id.id == customer_location_id:
-                check_overdelivery_allowed = True
-        if check_overdelivery_allowed:
-            if float_compare(self.plan_uom_qty, self.product_uom_qty,
-                             precision_rounding=self.product_id.uom_id.rounding) == 1:
-                raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-        elif float_compare(self.plan_uom_qty, self.product_uom_qty,
-                           precision_rounding=self.product_id.uom_id.rounding) == 1:
-            return {
-                'name': _('需求计划'),
-                'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
-                           'form')],
-                'res_model': 'sf.release.plan.wizard',
-                'target': 'new',
-                'context': {
-                    'default_demand_plan_line_id': self.ids,
-                    'default_release_message': f"您正在下达计划量 {self.plan_uom_qty}，需求数量为 {self.product_uom_qty}，已超过需求数量，是否继续？",
-                }}
-        self.action_confirm()
-
-    def action_confirm(self):
-        self = self.with_context(
-            demand_plan_line_id=self.id
-        )
-        self.mrp_bom_create()
-        self._action_launch_stock_rule()
-        if self.supply_method in ('automation', 'manual'):
-            self.write({'status': '50'})
-            self.update_sale_order_state()
-        else:
-            self.write({'status': '60'})
-            self.update_sale_order_state()
-
-    def mrp_bom_create(self):
-        if self.supply_method in ('automation', 'manual'):
-            line_ids = self.demand_plan_id.line_ids.filtered(
-                lambda p: p.supply_method in ('automation', 'manual') and p.status in ('50', '60'))
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
-        elif self.supply_method == 'outsourcing':
-            line_ids = self.demand_plan_id.line_ids.filtered(
-                lambda p: p.supply_method == 'outsourcing' and p.status == '60')
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
-        bom_type = ''
-        # 根据供货方式修改成品模板
-        if self.supply_method == 'automation':
-            bom_type = 'normal'
-            product_template_id = self.env.ref('sf_dlm.product_template_sf').sudo().product_tmpl_id
-        elif self.supply_method == 'outsourcing':
-            bom_type = 'subcontract'
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_outsourcing').sudo()
-        elif self.supply_method == 'purchase':
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_purchase').sudo()
-        elif self.supply_method == 'manual':
-            bom_type = 'normal'
-            product_template_id = self.env.ref(
-                'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
-
-        # 复制成品模板上的属性
-        self.product_id.product_tmpl_id.copy_template(product_template_id)
-        future_time = datetime.now() + timedelta(hours=8)
-        # 生成BOM单据编码
-        code = f"{self.product_id.default_code}-{bom_type}-{future_time.strftime('%Y%m%d%H%M%S')}"
-
-        order_id = self.sale_order_id
-        product = self.product_id
-        # 拼接方法需要的item结构，成品的模型数据信息就是坯料的数据信息
-        item = {
-            'texture_code': product.materials_id.materials_no,
-            'texture_type_code': product.materials_type_id.materials_no,
-            'model_long': product.length,
-            'model_width': product.width,
-            'model_height': product.height,
-            'blank_volume': product.model_volume,
-            'blank_area': product.model_area,
-            'price': product.list_price,
-            'embryo_redundancy_id': self.sale_order_line_id.embryo_redundancy_id,
-            'model_id': self.model_id
-        }
-        product_name = ''
-        match = re.search(r'(S\d{5}-\d+)', product.name)
-        product_seria = 0
-        # 如果匹配成功，提取结果
-        if match:
-            product_name = match.group(0)
-            # 获取成品名结尾-n的n
-            product_seria = int(product_name.split('-')[-1])
-
-        # 成品供货方式为采购则不生成bom
-        if self.supply_method != 'purchase':
-            # 当成品上带有客供料选项时，生成坯料时选择“客供料”路线
-            if self.sale_order_line_id.embryo_redundancy_id:
-                # 将成品模板的内容复制到成品上
-                customer_provided_embryo = self.env.ref(
-                    'jikimo_sale_multiple_supply_methods.product_template_embryo_customer_provided').sudo()
-                # 创建坯料，客供料的批量不需要创建bom
-                material_customer_provided_embryo = self.env['product.template'].sudo().no_bom_product_create(
-                    customer_provided_embryo.with_context(active_test=False).product_variant_id,
-                    item,
-                    order_id, 'material_customer_provided', product_seria, product)
-                # 成品配置bom
-                product_bom_material_customer_provided = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    product, bom_type, 'product', code)
-                product_bom_material_customer_provided.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line_has(
-                    material_customer_provided_embryo)
-                self.bom_id = product_bom_material_customer_provided.id
-            elif self.product_id.materials_type_id.gain_way == '自加工':
-                self_machining_id = self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo()
-                # 创建坯料
-                self_machining_embryo = self.env['product.template'].sudo().no_bom_product_create(
-                    self_machining_id,
-                    item,
-                    order_id, 'self_machining', product_seria, product)
-                # 创建坯料的bom
-                self_machining_bom = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    self_machining_embryo, 'normal', False)
-                # 创建坯料里bom的组件
-                self_machining_bom_line = self_machining_bom.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line(
-                    self_machining_embryo)
-                if not self_machining_bom_line:
-                    raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                # 产品配置bom
-                product_bom_self_machining = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(
-                    product, bom_type, 'product', code)
-                product_bom_self_machining.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                    self_machining_embryo)
-                self.bom_id = product_bom_self_machining.id
-            elif self.product_id.materials_type_id.gain_way == '外协':
-                outsource_id = self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo()
-                # 创建坯料
-                outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id,
-                                                                                             item,
-                                                                                             order_id,
-                                                                                             'subcontract',
-                                                                                             product_seria,
-                                                                                             product)
-                if outsource_embryo == -3:
-                    raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                # 创建坯料的bom
-                outsource_bom = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).bom_create(
-                    outsource_embryo,
-                    'subcontract', True)
-                # 创建坯料的bom的组件
-                outsource_bom_line = outsource_bom.with_user(
-                    self.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
-                if not outsource_bom_line:
-                    raise UserError('该订单模型的材料型号暂未有原材料,请先配置再进行分配')
-                # 产品配置bom
-                product_bom_outsource = self.env['mrp.bom'].with_user(
-                    self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product', code)
-                product_bom_outsource.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                    outsource_embryo)
-                self.bom_id = product_bom_outsource.id
-            elif self.product_id.materials_type_id.gain_way == '采购':
-                purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
-                purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id,
-                                                                                            item,
-                                                                                            order_id,
-                                                                                            'purchase',
-                                                                                            product_seria,
-                                                                                            product)
-                if purchase_embryo and purchase_embryo == -3:
-                    raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
-                else:
-                    # 产品配置bom
-                    product_bom_purchase = self.env['mrp.bom'].with_user(
-                        self.env.ref("base.user_admin")).bom_create(product, bom_type, 'product', code)
-                    product_bom_purchase.with_user(self.env.ref("base.user_admin")).bom_create_line_has(
-                        purchase_embryo)
-                    self.bom_id = product_bom_purchase.id
-
-    def _action_launch_stock_rule(self):
-        procurements = []
-        group_id = self.sale_order_id.procurement_group_id
-        if not group_id:
-            group_id = self.env['procurement.group'].create(self._prepare_procurement_group_vals())
-            self.sale_order_id.procurement_group_id = group_id
-        else:
-            updated_vals = {}
-            if group_id.partner_id != self.sale_order_id.partner_shipping_id:
-                updated_vals.update({'partner_id': self.sale_order_id.partner_shipping_id.id})
-            if group_id.move_type != self.sale_order_id.picking_policy:
-                updated_vals.update({'move_type': self.sale_order_id.picking_policy})
-            if updated_vals:
-                group_id.write(updated_vals)
-        values = self._prepare_procurement_values(group_id=group_id)
-        line_uom = self.sale_order_line_id.product_uom
-        quant_uom = self.product_id.uom_id
-        plan_uom_qty, procurement_uom = line_uom._adjust_uom_quantities(self.plan_uom_qty, quant_uom)
-        procurements.append(self.env['procurement.group'].Procurement(
-            self.product_id, plan_uom_qty, procurement_uom,
-            self.sale_order_id.partner_shipping_id.property_stock_customer,
-            self.product_id.display_name, self.sale_order_id.name, self.sale_order_id.company_id, values))
-        if procurements:
-            procurement_group = self.env['procurement.group']
-            if self.env.context.get('import_file'):
-                procurement_group = procurement_group.with_context(import_file=False)
-            procurement_group.run(procurements)
-        orders = self.mapped('sale_order_id')
-        for order in orders:
-            pickings_to_confirm = order.picking_ids.filtered(lambda p: p.state not in ['cancel', 'done'])
-            if pickings_to_confirm:
-                pickings_to_confirm.action_confirm()
-        return True
-
-    def _prepare_procurement_group_vals(self):
-        return {
-            'name': self.sale_order_id.name,
-            'move_type': self.sale_order_id.picking_policy,
-            'sale_id': self.sale_order_id.id,
-            'partner_id': self.sale_order_id.partner_shipping_id.id,
-        }
-
-    def _prepare_procurement_values(self, group_id=False):
-        self.ensure_one()
-        date_deadline = self.sale_order_id.commitment_date or (
-                self.sale_order_id.date_order + timedelta(days=self.sale_order_line_id.customer_lead or 0.0))
-        date_planned = date_deadline - timedelta(days=self.sale_order_id.company_id.security_lead)
-        values = {
-            'group_id': group_id,
-            'sale_line_id': self.sale_order_line_id.id,
-            'date_planned': date_planned,
-            'date_deadline': date_deadline,
-            'route_ids': self.route_ids,
-            'warehouse_id': self.sale_order_id.warehouse_id or False,
-            'partner_id': self.sale_order_id.partner_shipping_id.id,
-            'product_description_variants': self.sale_order_line_id.with_context(
-                lang=self.sale_order_id.partner_id.lang)._get_sale_order_line_multiline_description_variants(),
-            'company_id': self.sale_order_id.company_id,
-            'product_packaging_id': self.sale_order_line_id.product_packaging_id,
-            'sequence': self.sale_order_line_id.sequence,
-            'demand_plan_line_id': self.id
-        }
-        return values

sf_demand_plan/models/stock_route.py

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

sf_demand_plan/models/stock_rule.py

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

sf_demand_plan/security/ir.model.access.csv

@@ -1,16 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sf_production_demand_plan,sf.production.demand.plan,model_sf_production_demand_plan,base.group_user,1,0,0,0
-access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for dispatch,model_sf_production_demand_plan,sf_base.group_plan_dispatch,1,1,1,1
-
-access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
-access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0
-
-
-access_sf_demand_plan,sf.demand.plan,model_sf_demand_plan,base.group_user,1,0,0,0
-access_sf_demand_plan_for_dispatch,sf.demand.plan for dispatch,model_sf_demand_plan,sf_base.group_plan_dispatch,1,1,0,0
-
-access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
-access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
-
-access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0
-access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1

sf_demand_plan/static/src/js/print_demand.js

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

sf_demand_plan/static/src/scss/style.css

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

sf_demand_plan/views/demand_plan.xml

@@ -1,140 +0,0 @@
-<odoo>
-    <record id="view_sf_production_demand_plan_tree" model="ir.ui.view">
-        <field name="name">sf.production.demand.plan.tree</field>
-        <field name="model">sf.production.demand.plan</field>
-        <field name="arch" type="xml">
-            <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
-                  class="demand_plan_tree freeze-columns-before-part_number" create="false" delete="false">
-                <header>
-                    <button string="打印" name="button_action_print" type="object"
-                            class="btn-primary"/>
-                    <button string="下达计划" name="button_batch_release_plan" type="object"
-                            class="btn-primary"
-                    />
-                </header>
-                <field name="sequence" widget="handle"/>
-                <field name="id" optional="hide"/>
-                <field name="status"/>
-                <field name="customer_name"/>
-                <field name="order_remark"/>
-                <field name="glb_url" optional="hide"/>
-                <field name="product_id"/>
-                <field name="model_id" optional="hide"/>
-                <field name="part_name"/>
-                <field name="part_number"/>
-                <field name="manual_quotation" optional="hide"/>
-                <field name="is_incoming_material"/>
-                <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                <field name="readonly_custom_made_type" invisible="1"/>
-                <field name="custom_made_type"
-                       attrs="{'readonly': ['|',('status', '!=', '30'),('readonly_custom_made_type', '=', True)],
-                                           'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                <field name="product_uom_qty"/>
-                <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                <field name="deadline_of_delivery"/>
-                <field name="inventory_quantity_auto_apply" optional="hide"/>
-                <field name="qty_delivered" optional="hide"/>
-                <field name="qty_to_deliver" optional="hide"/>
-                <field name="model_long"/>
-                <field name="blank_type" optional="hide"/>
-                <field name="blank_precision"/>
-                <field name="embryo_long"/>
-                <field name="unit_number" optional="hide"/>
-                <field name="materials_id"/>
-                <field name="model_machining_precision"/>
-                <field name="model_process_parameters_ids" widget="many2many_tags"/>
-                <field name="product_remark" optional="hide"/>
-                <field name="order_code" optional="hide"/>
-                <field name="sale_order_id" optional="hide"/>
-                <field name="sale_order_line_number" optional="hide"/>
-                <field name="order_state"/>
-                <field name="route_ids" widget="many2many_tags" optional="hide"
-                       context="{'demand_plan_search_stock_route_id': id}"/>
-                <field name="contract_date"/>
-                <field name="date_order"/>
-                <field name="contract_code"/>
-                <field name="plan_remark" attrs="{'readonly': [('status', 'in', ('60','100'))]}"/>
-                <field name="priority" decoration-danger="priority == '1'"
-                       decoration-warning="priority == '2'"
-                       decoration-info="priority == '3'"
-                       decoration-success="priority == '4'"/>
-                <field name="material_check" optional="hide"/>
-                <!--                <field name="hide_action_open_mrp_production" invisible="1"/>-->
-                <!--                <field name="hide_action_purchase_orders" invisible="1"/>-->
-                <!--                <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" attrs="{'readonly': [('status',  'in', ('60','100'))]}"/>
-                <field name="actual_start_date"/>
-                <field name="actual_end_date"/>
-                <field name="processing_time"/>
-                <field name="create_date" optional="hide" string="创建时间"/>
-                <field name="create_uid" optional="hide" string="创建人"/>
-                <field name="write_date" string="更新时间"/>
-                <field name="write_uid" optional="hide" string="更新人"/>
-                <field name="print_count"/>
-                <field name="hide_release_production_order" invisible="1"/>
-                <button string="下达计划" name="button_release_plan" type="object"
-                        class="btn-primary"
-                        attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                />
-                <button name="button_release_production" type="object" string="下发生产" class="btn-primary"
-                        attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                />
-                <button name="edit_button" type="object" string="拆分" class="btn-primary"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_sf_production_demand_plan_search" model="ir.ui.view">
-        <field name="name">sf.production.demand.plan.search</field>
-        <field name="model">sf.production.demand.plan</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="order_remark"/>
-                <field name="product_id"/>
-                <field name="part_name"/>
-                <field name="part_number"/>
-                <field name="customer_name"/>
-                <field name="supply_method"/>
-                <field name="materials_id"/>
-                <field name="model_process_parameters_ids"/>
-                <field name="plan_remark"/>
-                <field name="contract_code"/>
-                <group expand="0" string="Group By">
-                    <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
-                    <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
-                    <filter name="group_by_customer_name" string="客户" domain="[]"
-                            context="{'group_by': 'customer_name'}"/>
-                    <filter name="group_by_is_incoming_material" string="客供料" domain="[]"
-                            context="{'group_by': 'is_incoming_material'}"/>
-                    <filter name="group_by_supply_method" string="供货方式" domain="[]"
-                            context="{'group_by': 'supply_method'}"/>
-                    <filter name="group_by_deadline_of_delivery" string="客户交期" domain="[]"
-                            context="{'group_by': 'deadline_of_delivery'}"/>
-                    <filter name="group_by_materials_id" string="材料" domain="[]"
-                            context="{'group_by': 'materials_id'}"/>
-                    <filter name="group_by_contract_code" string="合同号" domain="[]"
-                            context="{'group_by': 'contract_code'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="sf_production_demand_plan_action" model="ir.actions.act_window">
-        <field name="name">需求计划</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.production.demand.plan</field>
-        <field name="view_mode">tree</field>
-    </record>
-
-</odoo>

sf_demand_plan/views/demand_plan_info.xml

@@ -1,120 +0,0 @@
-<odoo>
-    <record id="view_sf_demand_plan_form" model="ir.ui.view">
-        <field name="name">sf.demand.plan.form</field>
-        <field name="model">sf.demand.plan</field>
-        <field name="arch" type="xml">
-            <form>
-                <header>
-                    <field name="state" widget="statusbar"/>
-                    <field name="hide_button_release_plan" invisible="1"/>
-                    <button string="下达计划" name="button_production_release_plan" type="object"
-                            class="btn-primary"
-                            attrs="{'invisible': [('hide_button_release_plan', '=', False)]}"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="demand_plan_number"/>
-                            <field name="product_id"/>
-                            <field name="part_name"/>
-                            <field name="part_number"/>
-                            <field name="materials_id"/>
-                            <field name="blank_type"/>
-                            <field name="blank_precision"/>
-                            <field name="embryo_long"/>    
-                            <field name="manual_quotation"/>                      
-                            <field name="is_incoming_material"/>
-                            <field name="pending_qty"/>
-                            <field name="planned_qty"/>
-                            <field name="model_id"/>
-                        </group>
-                        <group>
-                            <field name="customer_name"/>
-                            <field name="product_uom_qty"/>
-                            <field name="deadline_of_delivery"/>
-                            <field name="contract_date"/>
-                            <field name="contract_code"/>
-                            <field name="model_process_parameters_ids" widget="many2many_tags"/>
-                            <field name="model_machining_precision"/>
-                            <field name="inventory_quantity_auto_apply"/>
-                            <field name="priority" attrs="{'readonly': [('state',  'in', ('40','50'))]}"/>
-                            <field name="overdelivery_allowed"/>
-                            <field name="origin"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="计划">
-                            <field name="line_ids" attrs="{'invisible': [('state', 'in', ('40','50'))]}">
-                                <tree editable="bottom" create="false" delete="false">
-                                    <field name="status"/>
-                                    <field name="readonly_custom_made_type" invisible="1"/>
-                                    <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="custom_made_type"
-                                           attrs="{
-                                             'readonly': ['|', '|', ('new_supply_method', '!=', 'custom_made'), ('status', '!=', '30'), ('readonly_custom_made_type', '=', True)],
-                                             'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide"/>
-                                    <field name="processing_time" optional="hide"/>
-                                    <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                                    />
-                                    <button name="button_release_production" type="object" string="下发生产"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                                    />
-                                </tree>
-                            </field>
-                            <field name="line_ids" attrs="{'invisible': [('state', 'not in', ('40','50'))]}">
-                                <tree editable="bottom">
-                                    <field name="status"/>
-                                    <field name="readonly_custom_made_type" invisible="1"/>
-                                    <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="custom_made_type"
-                                           attrs="{
-                                             'readonly': ['|', '|', ('new_supply_method', '!=', 'custom_made'), ('status', '!=', '30'), ('readonly_custom_made_type', '=', True)],
-                                             'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide" readonly="1" options="{'no_create': True}"/>
-                                    <field name="processing_time" optional="hide"/>
-                                    <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                                    />
-                                    <button name="button_release_production" type="object" string="下发生产"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                                    />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-</odoo>

sf_demand_plan/views/menu_view.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <menuitem
-                id="demand_plan_menu"
-                name="需求计划"
-                sequence="140"
-                action="sf_demand_plan.sf_production_demand_plan_action"
-                parent="sf_plan.sf_production_plan_menu"
-        />
-
-        <!--    调拨动作中屏蔽验证-->
-        <record id="stock.action_validate_picking" model="ir.actions.server">
-            <field name="binding_model_id" eval="False"/>
-        </record>
-    </data>
-</odoo>

sf_demand_plan/views/sale_order_views.xml

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

sf_demand_plan/views/stock_route.xml

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

sf_demand_plan/wizard/__init__.py

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -1,89 +0,0 @@
-# -*- 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'打印向导'
-
-    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加工图纸')
-
-    cnc_worksheet = fields.Binary('程序单')
-
-    @api.model
-    def demand_plan_print(self, print_ids):
-        plan_print_ids = self.env['sf.demand.plan.print.wizard'].sudo().search(
-            [('id', 'in', print_ids)])
-        if not plan_print_ids:
-            return {'message': '记录不存在'}
-        success_records = []
-        failed_records = []
-        for record in plan_print_ids:
-            pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
-            if pdf_data:
-                try:
-                    # 执行打印
-                    self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
-                    record.status = 'success'
-                    production_demand_plan_id = self.env['sf.production.demand.plan'].sudo().search(
-                        [('model_id', '=', record.model_id)])
-                    for production_demand_plan in production_demand_plan_id:
-                        t_part, c_part = production_demand_plan.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
-                        production_demand_plan.print_count = f"T{t_num}C{c_num}"
-                    success_records.append({
-                        'filename_url': record.filename_url,
-                    })
-                except Exception as e:
-                    record.status = 'fail'
-                    _logger.error(f"文件{record.filename_url}打印失败: {str(e)}")
-                    failed_records.append({
-                        'filename_url': record.filename_url,
-                    })
-        if failed_records:
-            message = f"成功打印 {len(success_records)} 个文件，失败 {len(failed_records)} 个"
-        else:
-            message = f"所有 {len(success_records)} 个文件打印成功"
-        return {'message': message}
-
-
-class MrpWorkorder(models.Model):
-    _inherit = 'mrp.workorder'
-
-    def write(self, vals):
-        res = super(MrpWorkorder, self).write(vals)
-        for record in self:
-            if 'cnc_worksheet' in vals:
-                demand_plan_print = self.env['sf.demand.plan.print.wizard'].sudo().search(
-                    [('model_id', '=', record.model_id), ('type', '=', '2')])
-                if demand_plan_print:
-                    demand_plan_print.write(
-                        {'cnc_worksheet': record.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
-                else:
-                    wizard_vals = {
-                        'model_id': record.model_id,
-                        'type': '2',
-                        'cnc_worksheet': record.cnc_worksheet,
-                        'filename_url': record.cnc_worksheet_name
-                    }
-                    self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
-        return res

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

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

sf_demand_plan/wizard/sf_release_plan_wizard.py

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