解决冲突

jikimo_printing/__init__.py

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

jikimo_printing/__manifest__.py

@@ -0,0 +1,18 @@
+# -*- 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

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

jikimo_printing/models/jikimo_printing.py

@@ -0,0 +1,56 @@
+from io import BytesIO
+import qrcode
+from reportlab.pdfgen import canvas
+from reportlab.lib.pagesizes import A4
+from PIL import Image
+from reportlab.lib.utils import ImageReader
+from odoo import models, fields, api
+
+class JikimoPrinting(models.AbstractModel):
+    _name = 'jikimo.printing'
+
+    def print_qr_code(self, data):
+        """
+            打印二维码
+        """
+        # 生成二维码
+        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()
+        printer = self.env['printing.printer'].get_default()
+        printer.print_document(report=None, content=pdf_content, doc_format='pdf')
+
+        # 清理资源
+        pdf_buffer.close()
+        temp_image.close()
+
+    def print_pdf(self, pdf_data):
+        """
+            打印PDF
+        """
+        printer = self.env['printing.printer'].get_default()
+        printer.print_document(report=None, content = pdf_data, doc_format='pdf') 

jikimo_printing/models/maintenance_printing.py

@@ -0,0 +1,69 @@
+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.id)
+        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,8 +1,6 @@
 
 import logging
-from io import BytesIO
 from odoo import models, fields, api
-from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
 
@@ -21,9 +19,7 @@ class MrpWorkorder(models.Model):
                     if pdf_data:
                         try:
                             # 执行打印
-                            printer = self.env['printing.printer'].get_default()
+                            self.env['jikimo.printing'].print_pdf(pdf_data)
-                            printer.print_document(report=None, content = pdf_data, doc_format='pdf') 
-
                             wo.production_id.product_id.is_print_program = True
                             _logger.info(f"工单 {wo.name} 的PDF已成功打印")     
 

jikimo_printing/views/maintenance_views.xml

@@ -0,0 +1,19 @@
+<?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_work_reporting_api/__manifest__.py

@@ -8,7 +8,6 @@
     'category': 'sf',
     'depends': ['base', 'sf_maintenance', 'jikimo_mini_program'],
     'data': [
-        
     ],
     
     'application': True,

jikimo_work_reporting_api/controllers/main.py

@@ -2,20 +2,30 @@ import json
 from odoo import http
 from odoo.http import request
 from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_nc_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='public', cors='*')
+    @api_log('人工线下加工编程文件传输', requester='报工系统')
     def manual_download_program(self):
         """
             人工线下加工传输编程文件
         """
         data = json.loads(request.httprequest.data)
-        maintenance_equipment_name = data.get('maintenance_equipment_name')
+        maintenance_equipment_id = data.get('maintenance_equipment_id')
         model_id = data.get('model_id')
-        if not maintenance_equipment_name or not model_id:
+        if not maintenance_equipment_id or not model_id:
             return {'code': 400, 'message': '参数错误'}
-        maintenance_equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', maintenance_equipment_name)], limit=1)
+        try:
+            maintenance_equipment_id = int(maintenance_equipment_id)
+            model_id = int(model_id)
+        except Exception as e:
+            return {'code': 400, 'message': '参数类型错误'}
+        maintenance_equipment = request.env['maintenance.equipment'].sudo().search(
+            [('id', '=', 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)

sf_base/__init__.py

@@ -1,3 +1,4 @@
 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/controllers/controllers.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 import logging
 import json
-import base64
+import logging
 from odoo import http
 from odoo.http import request
 
+_logger = logging.getLogger(__name__)
 
 class Manufacturing_Connect(http.Controller):
 

sf_base/decorators/__init__.py

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

sf_base/decorators/api_log.py

@@ -0,0 +1,59 @@
+
+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)
+                
+                # 计算响应时间
+                end_time = datetime.now()
+                response_time = (end_time - start_time).total_seconds()
+                
+                # 创建日志记录
+                log_vals = {
+                    'name': name or func.__name__,
+                    'path': path,
+                    'method': method,
+                    'request_data': json.dumps(request_data, ensure_ascii=False),
+                    'response_data': json.dumps(result, ensure_ascii=False),
+                    'remote_addr': remote_addr,
+                    'response_time': response_time,
+                    'status': result.get('code', 500),
+                    'requester': requester,
+                    'responser': '智能工厂'
+                }
+                
+                # 异步创建日志记录
+                request.env['api.request.log'].sudo().with_context(tracking_disable=True).create(log_vals)
+                
+                return 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,3 +6,4 @@ 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

@@ -0,0 +1,18 @@
+from odoo import models, fields, api
+
+
+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('响应方')

sf_base/security/ir.model.access.csv

@@ -254,3 +254,6 @@ 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/views/api_log_views.xml

@@ -0,0 +1,62 @@
+<?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="create_date"/>
+                <field name="name"/>
+                <field name="path"/>
+                <field name="method"/>
+                <field name="remote_addr"/>
+                <field name="response_time"/>
+                <field name="status"/>
+            </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="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 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_maintenance/models/__init__.py

@@ -4,4 +4,3 @@ from . import sf_maintenance_oee
 from . import sf_maintenance_logs
 from . import sf_equipment_maintenance_standards
 from . import sf_maintenance_requests
-from . import maintenance_printer

sf_maintenance/models/maintenance_printer.py

@@ -1,92 +0,0 @@
-import qrcode
-import base64
-from io import BytesIO
-from odoo import models, fields, api
-
-class MaintenanceEquipment(models.Model):
-    _name = 'maintenance.equipment'
-    _inherit = ['maintenance.equipment', 'printing.utils']
-
-    qr_code_image = fields.Binary(string='二维码', compute='_generate_qr_code')
-
-    @api.depends('name')
-    def _generate_qr_code(self):
-        for record in self:
-            # Generate QR code
-            qr = qrcode.QRCode(
-                version=1,
-                error_correction=qrcode.constants.ERROR_CORRECT_L,
-                box_size=10,
-                border=4,
-            )
-            qr.add_data(record.name)
-            qr.make(fit=True)
-            qr_image = qr.make_image(fill_color="black", back_color="white")
-
-            # Encode the image data in base64
-            image_stream = BytesIO()
-            qr_image.save(image_stream, format="PNG")
-            encoded_image = base64.b64encode(image_stream.getvalue())
-
-            record.qr_code_image = encoded_image
-
-    def print_single_method(self):
-
-        print('self.name========== %s' % self.name)
-        self.ensure_one()
-        qr_code_data = self.qr_code_image
-        if not qr_code_data:
-            raise UserError("没有找到二维码数据。")
-        maintenance_equipment_name = self.name
-        # 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_name, host, port)
-
-
-    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
-

sf_maintenance/models/sf_maintenance.py

@@ -2,6 +2,8 @@
 import json
 import base64
 import logging
+import qrcode
+from io import BytesIO
 from datetime import timedelta
 import requests
 from odoo.addons.sf_base.commons.common import Common
@@ -831,6 +833,29 @@ class SfMaintenanceEquipment(models.Model):
     ftp_username = fields.Char('FTP 用户名')
     ftp_password = fields.Char('FTP 密码')
 
+    qr_code_image = fields.Binary(string='二维码', compute='_generate_qr_code')
+
+    @api.depends('name')
+    def _generate_qr_code(self):
+        for record in self:
+            # Generate QR code
+            qr = qrcode.QRCode(
+                version=1,
+                error_correction=qrcode.constants.ERROR_CORRECT_L,
+                box_size=10,
+                border=4,
+            )
+            qr.add_data(record.id)
+            qr.make(fit=True)
+            qr_image = qr.make_image(fill_color="black", back_color="white")
+
+            # Encode the image data in base64
+            image_stream = BytesIO()
+            qr_image.save(image_stream, format="PNG")
+            encoded_image = base64.b64encode(image_stream.getvalue())
+
+            record.qr_code_image = encoded_image
+
 
 class SfRobotAxisNum(models.Model):
     _name = 'sf.robot.axis.num'

sf_maintenance/views/maintenance_views.xml

@@ -1055,11 +1055,6 @@
 
                 <xpath expr="//group/field[@name='location']" position="after">
                     <field name="qr_code_image" widget="image" readonly="1" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" />
-                    <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> 
                 <xpath expr="//page[@name='maintenance']" position="after">
                     <page name="network_config" string="网络配置" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" >

sf_manufacturing/models/__init__.py

@@ -18,4 +18,3 @@ from . import quick_easy_order
 from . import purchase_order
 from . import quality_check
 from . import purchase_request_line
-from . import workorder_printer

sf_manufacturing/models/mrp_production.py

@@ -1821,7 +1821,7 @@ class MrpProduction(models.Model):
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")
         
-    model_id = fields.Char('模型id', related='product_id.model_id')
+    model_id = fields.Char('模型ID', related='product_id.model_id')
 
 
 # 编程记录

sf_manufacturing/models/mrp_workorder.py

@@ -1814,7 +1814,7 @@ class ResMrpWorkOrder(models.Model):
             lazy=lazy
         )
     
-    model_id = fields.Char('模型id', related='production_id.model_id')
+    model_id = fields.Char('模型ID', related='production_id.model_id')
 
 
 class CNCprocessing(models.Model):

sf_manufacturing/models/product_template.py

@@ -787,7 +787,7 @@ class ResProductMo(models.Model):
     glb_url = fields.Char('glb文件地址')
     area = fields.Float('表面积(m²)')
     auto_machining = fields.Boolean('自动化加工（模型识别）', default=False)
-    model_id = fields.Char('模型id')
+    model_id = fields.Char('模型ID')
 
 
     @api.depends('name')

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -110,12 +110,12 @@
                 </xpath>
                 <xpath expr="//sheet//group//group[2]//label" position="before">
                     <!--                     <field name="process_state"/> -->
+                    <field name="production_type" readonly="1"/>
                     <field name="state" readonly="1"/>
                     <!--                     <field name="process_state"/> -->
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
-                    <field name="production_type" readonly="1"/>
                     <field name="production_product_type" invisible="1"/>
                     <field name="manual_quotation" readonly="1"
                            attrs="{'invisible': ['|', ('production_type', 'not in', ['自动化产线加工', '人工线下加工']), ('production_product_type', '!=', '成品')]}"/>
@@ -455,7 +455,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_workorder_tree_editable_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//tree" position="attributes">
-                    <attribute name="default_order">create_date desc</attribute>
+                    <attribute name="default_order">sequence,create_date desc</attribute>
                     <attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
                     <attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
                 </xpath>

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- 工作中心看板 -->
-    <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
+    <!-- <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
         <field name="name">mrp.production.view.form.inherit.maintenance</field>
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
-        <field name="arch" type="xml">
+        <field name="arch" type="xml"> -->
             <!--             <button name="action_cancel" position="before"> -->
             <!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
             <!--             </button> -->
-            <div name="button_box" position="inside">
+            <!-- <div name="button_box" position="inside">
                 <button name="open_maintenance_request_mo" type="object" class="oe_stat_button" icon="fa-wrench"
                         attrs="{'invisible': [('maintenance_count', '=', 0)]}"
                         context="{'search_default_production_id': active_id}">
@@ -22,7 +22,7 @@
                 </button>
             </div>
         </field>
-    </record>
+    </record> -->
 
     <record id="custom_model_form_view_inherit" model="ir.ui.view">
         <field name="name">custom.model.form.view.inherit</field>
@@ -451,6 +451,7 @@
             </div>
             <field name="product_id" position="after">
                 <field name="model_file" string="产品模型" readonly="1" widget="Viewer3D" attrs="{'invisible': [('model_file', '=', False)]}"/>
+                <field name="model_id" readonly="1"/>
                 <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': [('glb_url', '=', False)]}"/>
             </field>

sf_manufacturing/views/product_template_views.xml

@@ -6,7 +6,7 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="sf_sale.view_product_template_form_inherit_sf"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='general_information']/group/group[@name='group_standard_price']/field[@name='barcode']" position="after">
+                <xpath expr="//page[@name='general_information']/group/group[@name='group_standard_price']/field[@name='product_tag_ids']" position="after">
                     <field name="model_id" readonly="1" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                 </xpath>
             </field>

sf_plan/models/custom_plan.py

@@ -224,11 +224,11 @@ class sf_production_plan(models.Model):
 
         return num
 
-    def do_production_schedule(self):
+    def do_production_schedule(self, date_planned_start):
         """
         排程方法
         """
-        self.deal_processing_schedule(self.date_planned_start)
+        self.deal_processing_schedule(date_planned_start)
         for record in self:
             if not record.production_line_id:
                 raise ValidationError("未选择生产线")

sf_plan/wizard/action_plan_some.py

@@ -40,5 +40,5 @@ class Action_Plan_All_Wizard(models.TransientModel):
         self.plan_ids.date_planned_start = self.date_planned_start
         # 在这里添加您的逻辑来处理这些ID
         # 判断能否排成
-        self.plan_ids.do_production_schedule()
+        self.plan_ids.do_production_schedule(self.date_planned_start)
         _logger.info('处理计划: %s 完成', self.plan_ids.ids)

sf_sale/models/sale_order.py

@@ -271,7 +271,7 @@ class ResaleOrderLine(models.Model):
     embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')
-    model_id = fields.Char('模型id')
+    model_id = fields.Char('模型ID')
 
     delivery_end_date = fields.Date('交货截止日期')
 

sf_sale/views/sale_order_view.xml

@@ -107,6 +107,7 @@
                     <field name="glb_url" widget="Viewer3D" optional="show"
                            string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')], 'isInList': True}"/>
                     <field name="part_name" optional="show"/>
+                    <field name="model_id" optional="hide"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
                     <field name="remark"/>
@@ -359,10 +360,10 @@
                 <field name="categ_id" position="replace">
                     <field name='categ_id' invisible="1"/>
                 </field>
-                <field name="product_tag_ids" position="after">
+                <!-- <field name="product_tag_ids" position="after">
                     <field name="default_code" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
                     <field name="barcode" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
-                </field>
+                </field> -->
             </field>
         </record>
         <record id="sale.product_template_action" model="ir.actions.act_window">