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

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;

jikimo_purchase_request/models/mrp_production.py

@@ -9,7 +9,7 @@ class MrpProduction(models.Model):
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
             if pr_ids:
                 item.pr_mp_count = len(pr_ids)
             else:
@@ -20,7 +20,7 @@ class MrpProduction(models.Model):
         采购请求
         """
         self.ensure_one()
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
         action = {
             'res_model': 'purchase.request',
             'type': 'ir.actions.act_window',

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order.py

@@ -100,7 +100,6 @@ class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
     def check_group(self, request_lines):
         # 去掉合并必须同一采购组的限制
         pass
-
         
 
 class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):

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,18 +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,60 +0,0 @@
-import json
-from odoo import http
-from odoo.http import request
-from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_nc_files
-
-class MainController(http.Controller):
-
-    @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='public', cors='*')
-    def manual_download_program(self):
-        """
-            人工线下加工传输编程文件
-        """
-        data = json.loads(request.httprequest.data)
-        maintenance_equipment_name = data.get('maintenance_equipment_name')
-        model_id = data.get('model_id')
-        if not maintenance_equipment_name or not model_id:
-            return {'code': 400, 'message': '参数错误'}
-        maintenance_equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', maintenance_equipment_name)], 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_nc_files(
-                source_ftp_info,
-                target_ftp_info,
-                '/' + str(model_id),
-                '/',
-                match_str=r'^\d*_\d*-' + tool_groups_id.name + r'-\w{2}-all\.nc$'
-                )
-            if result:
-                return {'code': 200, 'message': 'success'}
-            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_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

@@ -206,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):
@@ -258,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):
         """
         预览出厂检验报告

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">

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"/>

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,120 +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, buttom_text:Optional[str]=False):
-        """
-        在PDF文件中添加二维码
-        :param pdf_path: PDF文件路径
-        :param content: 二维码内容
-        :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/windows/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()
-                
-                # 处理第一页
-                page = existing_pdf.getPage(0)
-                # 获取页面尺寸
-                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', 14)  # 增大字体大小到14pt
-                else:
-                    # 如果没有找到中文字体，使用默认字体
-                    c.setFont('Helvetica', 14)
-                    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 buttom_text:
-                    # 在二维码下方绘制文字
-                    text = buttom_text
-                    text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 14)  # 准确计算文字宽度
-                    text_x = page_width - qr_size - margin + (qr_size - 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)
-                    output.addPage(page)
-                    
-                    # 添加剩余的页面
-                    for i in range(1, existing_pdf.getNumPages()):
-                        output.addPage(existing_pdf.getPage(i))
-                    
-                    # 保存最终的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/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/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/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_dlm/data/product_data.xml

@@ -14,12 +14,10 @@
             <field name="name">原材料</field>
             <field name="type">原材料</field>
         </record>
+
         <record id="product_category_surface_technics_sf" model="product.category">
             <field name="name">表面工艺</field>
             <field name="type">表面工艺</field>
-            <field name="parent_id" ref="sf_manufacturing.product_category_outsource_process"/>
-            <field name="property_cost_method">fifo</field>
-            <field name="property_valuation">manual_periodic</field>
         </record>
 
         <record id="product_category_cutting_tool_sf" model="product.category">
@@ -42,10 +40,10 @@
             <!--            <field name="company_id" ref="base.main_company"/>-->
         </record>
 
-        <!--        <record id="res_users_bfm" model="res.users">-->
-        <!--            <field name="name">业务平台</field>-->
-        <!--&lt;!&ndash;            <field name="partner_id" ref="res_partner_bfm"/>&ndash;&gt;-->
-        <!--        </record>-->
+<!--        <record id="res_users_bfm" model="res.users">-->
+<!--            <field name="name">业务平台</field>-->
+<!--&lt;!&ndash;            <field name="partner_id" ref="res_partner_bfm"/>&ndash;&gt;-->
+<!--        </record>-->
 
         <record id="product_functional_tool_sf" model="product.product">
             <field name="name">功能刀具</field>

sf_dlm_management/__init__.py

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

sf_dlm_management/__manifest__.py

@@ -9,9 +9,8 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing', 'jikimo_attachment_viewer'],
+    'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing','jikimo_attachment_viewer'],
     'data': [
-        'data/sequence.xml',
         'data/stock_data.xml',
         'views/product_template_management_view.xml',
     ],

sf_dlm_management/data/sequence.xml

@@ -1,10 +0,0 @@
-<odoo>
-    <data>
-        <record id="sequence_production_process_parameter" model="ir.sequence">
-            <field name="name">工艺可选参数编码序列</field>
-            <field name="code">sf.production.process.parameter</field>
-            <field name="padding">3</field>
-            <field name="number_increment">1</field>
-        </record>
-    </data>
-</odoo>

sf_dlm_management/models/__init__.py

@@ -1,4 +1,2 @@
 # from . import product_template
 # from . import product_supplierinfo
-from . import sf_production_common
-from . import mrp_routing_workcenter

sf_dlm_management/models/mrp_routing_workcenter.py

@@ -1,16 +0,0 @@
-import logging
-from odoo import fields, models, api
-from odoo.exceptions import UserError
-from odoo.tools import str2bool
-
-
-class ResMrpRoutingWorkcenter(models.Model):
-    _inherit = 'mrp.routing.workcenter'
-    def init(self):
-        super(ResMrpRoutingWorkcenter, self).init()
-        # 在模块初始化时触发计算字段的更新
-        records = self.search([])
-        if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_workcenter',default='False')):
-            return
-        records.optional_process_parameters_date()
-        self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_workcenter', True)

sf_dlm_management/models/sf_production_common.py

@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-from odoo import fields, models, api
-from odoo.exceptions import UserError
-from odoo.tools import str2bool
-
-
-class SfProductionProcessParameter(models.Model):
-    _inherit = 'sf.production.process.parameter'
-
-
-    @api.model
-    def create(self, vals):
-        # if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
-        #     vals['code'] = '101'+self.routing_id.code +self.env['ir.sequence'].next_by_code('sf.production.process.parameter')
-        if  vals.get('routing_id'):
-            # vals['gain_way'] = '外协'
-            routing_id = self.env['mrp.routing.workcenter'].browse(vals.get('routing_id'))
-            if routing_id.surface_technics_id and not vals.get('process_id'):
-                vals['process_id'] = routing_id.surface_technics_id.id
-            if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
-                vals['code'] = '101' + routing_id.code + self.env['ir.sequence'].next_by_code(
-                    'sf.production.process.parameter')
-        obj = super(SfProductionProcessParameter, self).create(vals)
-        return obj
-    def create_service_product(self):
-        service_categ = self.env.ref(
-            'sf_dlm.product_category_surface_technics_sf').sudo()
-
-        product_name = f"{self.process_id.name}_{self.name}"
-        product_id = self.env['product.template'].search(
-            [("name", '=', product_name)])
-        if product_id:
-            product_id.server_product_process_parameters_id = self.id
-        else:
-            res_partner = self.env['res.partner'].search([('name','=','湖南傲派自动化设备有限公司')])
-            self.env['product.template'].create({
-                'detailed_type': 'service',
-                'name': product_name,
-                'invoice_policy': 'delivery',
-                'categ_id': service_categ.id,
-                'description': f"基于{self.name}创建的服务产品",
-                'sale_ok': True,  # 可销售
-                'purchase_ok': True,  # 可采购
-                'server_product_process_parameters_id': self.id,
-                'seller_ids': [(0, 0, {
-                    # 'delay': 1,
-                    'partner_id': res_partner.id,
-                    'price': 1, })],
-            })
-
-    def create_work_center(self):
-        production_process_parameter = self
-        if not production_process_parameter.process_id:
-            return
-        if not production_process_parameter.routing_id:
-            workcenter_id = self.env['mrp.routing.workcenter'].search(
-                [("surface_technics_id", '=', production_process_parameter.process_id.id)])
-            if not workcenter_id:
-                outsourcing_work_center = self.env['mrp.workcenter'].search(
-                    [("name", '=', '外协工作中心')])
-                routing_id = self.env['mrp.routing.workcenter'].create({
-                    'workcenter_ids': [(6, 0, outsourcing_work_center.ids)],
-                    'routing_tag': 'special',
-                    'routing_type': '表面工艺',
-                    'is_outsource': True,
-                    'surface_technics_id': production_process_parameter.process_id.id,
-                    'name': production_process_parameter.process_id.name,
-                })
-                production_process_parameter.routing_id = routing_id.id
-            else:
-                production_process_parameter.routing_id = workcenter_id.id
-
-    def init(self):
-        super(SfProductionProcessParameter, self).init()
-        # 在模块初始化时触发计算字段的更新
-        records = self.search([])
-        if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_process',
-                                                              default='False')):
-            return
-        for record in records:
-            if not record.outsourced_service_products:
-                record.create_service_product()
-            record.create_work_center()
-        self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_process', True)

sf_dlm_management/views/product_template_management_view.xml

@@ -39,9 +39,9 @@
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
                     <field name="materials_type_id" string="型号" placeholder="请选择" options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
-                    <field name="server_product_process_parameters_id" string="工艺参数"
+                    <field name="server_product_process_parameters_id" string="表面工艺参数"
                            options="{'no_create': True}"
-                           attrs="{'invisible': ['|',('detailed_type', '!=', 'service'),('detailed_type', '=', False)]}"/>
+                           attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id" class="custom_required"
                            options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"

sf_machine_connect/controllers/controllers.py

@@ -5,7 +5,7 @@ import json
 import base64
 import logging
 import psycopg2
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from odoo import http, fields
 from odoo.http import request
 
@@ -414,7 +414,7 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 # 工单计划量切换为CNC工单
                 plan_data_total_counts = work_order_obj.search_count(
-                    [('production_line_id.name', '=', line), ('id', '!=', 8061),
+                    [('production_id.production_line_id.name', '=', line),
                      ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
 
                 # # 工单完成量
@@ -423,13 +423,13 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 # 工单完成量切换为CNC工单
                 plan_data_finish_counts = work_order_obj.search_count(
-                    [('production_line_id.name', '=', line),
+                    [('production_id.production_line_id.name', '=', line),
                      ('state', 'in', ['done']), ('routing_type', '=', 'CNC加工')])
 
                 # 超期完成量
                 # 搜索所有已经完成的工单
                 plan_data_overtime = work_order_obj.search([
-                    ('production_line_id.name', '=', line),
+                    ('production_id.production_line_id.name', '=', line),
                     ('state', 'in', ['done']),
                     ('routing_type', '=', 'CNC加工')
                 ])
@@ -448,14 +448,9 @@ class Sf_Dashboard_Connect(http.Controller):
                 ])
 
                 # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
-                # faulty_plans = plan_data.filtered(lambda p: any(
-                #     result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
-                # ))
-
-                faulty_plans = request.env['quality.check'].sudo().search([
-                    ('operation_id.name', '=', 'CNC加工'),
-                    ('quality_state', 'in', ['fail'])
-                ])
+                faulty_plans = plan_data.filtered(lambda p: any(
+                    result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
+                ))
 
                 # 查找制造订单取消与归档的数量
                 cancel_order_count = production_obj.search_count(
@@ -572,7 +567,7 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         res = {'status': 1, 'message': '成功', 'data': {}}
         # plan_obj = request.env['sf.production.plan'].sudo()
-        # plan_obj = request.env['mrp.workorder'].sudo().search([('routing_type', '=', 'CNC加工')])
+        plan_obj = request.env['mrp.workorder'].sudo().search([('routing_type', '=', 'CNC加工')])
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
@@ -622,19 +617,11 @@ class Sf_Dashboard_Connect(http.Controller):
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
 
-                    # orders = plan_obj.search([
-                    #     ('production_line_id.name', '=', line),
-                    #     ('state', 'in', ['done']),
-                    #     (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                    #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
-                    # ])
-
-                    orders = request.env['mrp.workorder'].sudo().search([
-                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
-                        ('production_line_id.name', '=', line),
+                    orders = plan_obj.search([
+                        ('production_id.production_line_id.name', '=', line),
                         ('state', 'in', ['done']),
                         (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
                     ])
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
@@ -651,22 +638,18 @@ class Sf_Dashboard_Connect(http.Controller):
 
             for date in date_list:
                 next_day = date + timedelta(days=1)
-                orders = request.env['mrp.workorder'].sudo().search(
-                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
-                     ('routing_type', '=', 'CNC加工'),
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                     ])
+                orders = plan_obj.search([('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                                          (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                                          (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                                          ])
 
-                rework_orders = request.env['mrp.workorder'].sudo().search(
+                rework_orders = plan_obj.search(
                     [('production_id.production_line_id.name', '=', line), ('state', 'in', ['rework']),
-                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])
-                not_passed_orders = request.env['mrp.workorder'].sudo().search(
+                not_passed_orders = plan_obj.search(
                     [('production_id.production_line_id.name', '=', line), ('state', 'in', ['scrap', 'cancel']),
-                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])
@@ -768,14 +751,11 @@ class Sf_Dashboard_Connect(http.Controller):
 
         for line in line_list:
             # 未完成订单
-            # not_done_orders = plan_obj.search(
-            #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
-            #      ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
-            #      ])
-            not_done_orders = request.env['mrp.workorder'].sudo().search(
-                [('production_line_id.name', '=', line), ('state', 'in', ['ready', 'progress']),
-                 ('routing_type', '=', 'CNC加工')
+            not_done_orders = plan_obj.search(
+                [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
+                 ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
                  ])
+            # print(not_done_orders)
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
@@ -827,18 +807,16 @@ class Sf_Dashboard_Connect(http.Controller):
                     'draft': '待排程',
                     'done': '已排程',
                     'processing': '生产中',
-                    'finished': '已完成',
-                    'ready': '待加工',
-                    'progress': '生产中',
+                    'finished': '已完成'
                 }
 
                 line_dict = {
                     'sequence': id_to_sequence[order.id],
-                    'workorder_name': order.production_id.name,
+                    'workorder_name': order.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': 1,
+                    'order_qty': order.product_qty,
                     'state': state_dict[order.state],
 
                 }
@@ -919,17 +897,15 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 cur.execute(sql2, (item,))
                 result2 = cur.fetchall()
-
+                # print('result2========', result2)
+                #
                 for row in result:
                     res['data'][item] = {'idle_count': row[0]}
                 alarm_count = []
                 for row in result2:
                     alarm_count.append(row[1])
                     if row[0]:
-                        if float(row[0]) >= 28800:
-                            continue
-                        # total_alarm_time += abs(float(row[0]))
-                        total_alarm_time += float(row[0])
+                        total_alarm_time += abs(float(row[0]))
                     else:
                         total_alarm_time += 0.0
                 if len(list(set(alarm_count))) == 1:
@@ -939,7 +915,6 @@ class Sf_Dashboard_Connect(http.Controller):
                         alarm_count_num = 1
                 else:
                     alarm_count_num = len(list(set(alarm_count)))
-
                 res['data'][item]['total_alarm_time'] = total_alarm_time / 3600
                 res['data'][item]['alarm_count_num'] = alarm_count_num
 
@@ -1122,169 +1097,169 @@ class Sf_Dashboard_Connect(http.Controller):
             return request.not_found()
 
     # 设备运行率
-    # @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    # def RunningTime(self, **kw):
-    #     """
-    #     获取设备运行时长
-    #     """
-    #     res = {'status': 1, 'message': '成功', 'data': {}}
-    #     # 连接数据库
-    #     conn = psycopg2.connect(**db_config)
-    #     # 获取请求的机床数据
-    #     machine_list = ast.literal_eval(kw['machine_list'])
-    #
-    #     def fetch_result_as_dict(cursor):
-    #         """辅助函数：将查询结果转为字典"""
-    #         columns = [desc[0] for desc in cursor.description]
-    #         return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
-    #
-    #     # 初始化当天、当月和有记录以来的总时长
-    #     day_total_running_time = 0
-    #     day_total_process_time = 0
-    #     day_work_rate = 0
-    #     month_total_running_time = 0
-    #     month_total_process_time = 0
-    #     month_work_rate = 0
-    #     all_time_total_running_time = 0
-    #     all_time_total_process_time = 0
-    #     all_time_work_rate = 0
-    #
-    #     for item in machine_list:
-    #         # 获取当天第一条记录（排除device_state等于‘离线’的记录）
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND time >= CURRENT_DATE          -- 今日 00:00:00
-    #                 AND time < CURRENT_DATE + 1      -- 明日 00:00:00
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time ASC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             first_today = fetch_result_as_dict(cur)
-    #             # print("当天第一条记录（非离线）:", first_today)
-    #
-    #         # 获取当天最新一条记录（排除device_state等于‘离线’的记录）
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND time >= CURRENT_DATE          -- 今日 00:00:00
-    #                 AND time < CURRENT_DATE + 1      -- 明日 00:00:00
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time DESC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             last_today = fetch_result_as_dict(cur)
-    #             # print("当天最新一条记录（非离线）:", last_today)
-    #
-    #         # 计算当天运行时长
-    #         if first_today and last_today:
-    #             running_time = convert_to_seconds(last_today['run_time']) - convert_to_seconds(first_today['run_time'])
-    #             process_time = convert_to_seconds(last_today['process_time']) - convert_to_seconds(
-    #                 first_today['process_time'])
-    #             day_total_running_time += abs(running_time)
-    #             day_total_process_time += abs(process_time)
-    #
-    #         # 获取当月第一条记录（排除device_state等于‘离线’的记录）
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
-    #                 AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time ASC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             first_month = fetch_result_as_dict(cur)
-    #             # print("当月第一条记录:", first_month)
-    #
-    #         # 获取当月最新一条记录
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
-    #                 AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time DESC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             last_month = fetch_result_as_dict(cur)
-    #             # print("当月最新一条记录（非离线）:", last_month)
-    #
-    #         # 计算当月运行时长
-    #         if first_month and last_month:
-    #             month_running_time = convert_to_seconds(last_month['run_time']) - convert_to_seconds(
-    #                 first_month['run_time'])
-    #             month_process_time = convert_to_seconds(last_month['process_time']) - convert_to_seconds(
-    #                 first_month['process_time'])
-    #             month_total_running_time += abs(month_running_time)
-    #             month_total_process_time += abs(month_process_time)
-    #
-    #         # 获取有记录以来的第一条记录（排除device_state等于‘离线’的记录）
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time ASC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             first_all_time = fetch_result_as_dict(cur)
-    #             # print("有记录以来的第一条记录（非离线）:", first_all_time)
-    #
-    #         # 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                 SELECT * FROM device_data
-    #                 WHERE device_name = %s
-    #                 AND device_state in ('待机', '警告', '运行中')
-    #                 ORDER BY time DESC
-    #                 LIMIT 1;
-    #             """, (item,))
-    #             last_all_time = fetch_result_as_dict(cur)
-    #             # print("有记录以来的最新一条记录（非离线）:", last_all_time)
-    #
-    #         # 计算有记录以来的运行时长
-    #         if first_all_time and last_all_time:
-    #             all_time_running_time = convert_to_seconds(last_all_time['run_time']) - convert_to_seconds(
-    #                 first_all_time['run_time'])
-    #             all_time_process_time = convert_to_seconds(last_all_time['process_time']) - convert_to_seconds(
-    #                 first_all_time['process_time'])
-    #             all_time_total_running_time += abs(all_time_running_time)
-    #             all_time_total_process_time += abs(all_time_process_time)
-    #
-    #     # 计算当天工作效率
-    #     if day_total_running_time > day_total_process_time:
-    #         day_work_rate = day_total_process_time / day_total_running_time if day_total_running_time != 0 else 0
-    #     else:
-    #         day_work_rate = day_total_running_time / day_total_process_time if day_total_process_time != 0 else 0
-    #     print("当天工作效率: %s" % day_work_rate)
-    #
-    #     # 计算当月工作效率
-    #     if month_total_running_time > month_total_process_time:
-    #         month_work_rate = month_total_process_time / month_total_running_time if month_total_running_time != 0 else 0
-    #     else:
-    #         month_work_rate = month_total_running_time / month_total_process_time if month_total_process_time != 0 else 0
-    #     print("当月工作效率: %s" % month_work_rate)
-    #
-    #     # 计算有记录以来的工作效率
-    #     if all_time_total_running_time > all_time_total_process_time:
-    #         all_time_work_rate = all_time_total_process_time / all_time_total_running_time if all_time_total_running_time != 0 else 0
-    #     else:
-    #         all_time_work_rate = all_time_total_running_time / all_time_total_process_time if all_time_total_process_time != 0 else 0
-    #     print("有记录以来的工作效率: %s" % all_time_work_rate)
-    #
-    #     conn.close()
-    #
-    #     # 返回数据
-    #     res['data']['day_work_rate'] = day_work_rate
-    #     res['data']['month_work_rate'] = month_work_rate
-    #     res['data']['all_time_work_rate'] = all_time_work_rate
-    #
-    #     return json.dumps(res)
+    @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def RunningTime(self, **kw):
+        """
+        获取设备运行时长
+        """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+
+        def fetch_result_as_dict(cursor):
+            """辅助函数：将查询结果转为字典"""
+            columns = [desc[0] for desc in cursor.description]
+            return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
+
+        # 初始化当天、当月和有记录以来的总时长
+        day_total_running_time = 0
+        day_total_process_time = 0
+        day_work_rate = 0
+        month_total_running_time = 0
+        month_total_process_time = 0
+        month_work_rate = 0
+        all_time_total_running_time = 0
+        all_time_total_process_time = 0
+        all_time_work_rate = 0
+
+        for item in machine_list:
+            # 获取当天第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_today = fetch_result_as_dict(cur)
+                # print("当天第一条记录（非离线）:", first_today)
+
+            # 获取当天最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_today = fetch_result_as_dict(cur)
+                # print("当天最新一条记录（非离线）:", last_today)
+
+            # 计算当天运行时长
+            if first_today and last_today:
+                running_time = convert_to_seconds(last_today['run_time']) - convert_to_seconds(first_today['run_time'])
+                process_time = convert_to_seconds(last_today['process_time']) - convert_to_seconds(
+                    first_today['process_time'])
+                day_total_running_time += abs(running_time)
+                day_total_process_time += abs(process_time)
+
+            # 获取当月第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
+                    AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_month = fetch_result_as_dict(cur)
+                # print("当月第一条记录:", first_month)
+
+            # 获取当月最新一条记录
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
+                    AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_month = fetch_result_as_dict(cur)
+                # print("当月最新一条记录（非离线）:", last_month)
+
+            # 计算当月运行时长
+            if first_month and last_month:
+                month_running_time = convert_to_seconds(last_month['run_time']) - convert_to_seconds(
+                    first_month['run_time'])
+                month_process_time = convert_to_seconds(last_month['process_time']) - convert_to_seconds(
+                    first_month['process_time'])
+                month_total_running_time += abs(month_running_time)
+                month_total_process_time += abs(month_process_time)
+
+            # 获取有记录以来的第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_all_time = fetch_result_as_dict(cur)
+                # print("有记录以来的第一条记录（非离线）:", first_all_time)
+
+            # 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state in ('待机', '警告', '运行中')
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_all_time = fetch_result_as_dict(cur)
+                # print("有记录以来的最新一条记录（非离线）:", last_all_time)
+
+            # 计算有记录以来的运行时长
+            if first_all_time and last_all_time:
+                all_time_running_time = convert_to_seconds(last_all_time['run_time']) - convert_to_seconds(
+                    first_all_time['run_time'])
+                all_time_process_time = convert_to_seconds(last_all_time['process_time']) - convert_to_seconds(
+                    first_all_time['process_time'])
+                all_time_total_running_time += abs(all_time_running_time)
+                all_time_total_process_time += abs(all_time_process_time)
+
+        # 计算当天工作效率
+        if day_total_running_time > day_total_process_time:
+            day_work_rate = day_total_process_time / day_total_running_time if day_total_running_time != 0 else 0
+        else:
+            day_work_rate = day_total_running_time / day_total_process_time if day_total_process_time != 0 else 0
+        print("当天工作效率: %s" % day_work_rate)
+
+        # 计算当月工作效率
+        if month_total_running_time > month_total_process_time:
+            month_work_rate = month_total_process_time / month_total_running_time if month_total_running_time != 0 else 0
+        else:
+            month_work_rate = month_total_running_time / month_total_process_time if month_total_process_time != 0 else 0
+        print("当月工作效率: %s" % month_work_rate)
+
+        # 计算有记录以来的工作效率
+        if all_time_total_running_time > all_time_total_process_time:
+            all_time_work_rate = all_time_total_process_time / all_time_total_running_time if all_time_total_running_time != 0 else 0
+        else:
+            all_time_work_rate = all_time_total_running_time / all_time_total_process_time if all_time_total_process_time != 0 else 0
+        print("有记录以来的工作效率: %s" % all_time_work_rate)
+
+        conn.close()
+
+        # 返回数据
+        res['data']['day_work_rate'] = day_work_rate
+        res['data']['month_work_rate'] = month_work_rate
+        res['data']['all_time_work_rate'] = all_time_work_rate
+
+        return json.dumps(res)
 
     # 设备运行时长
     @http.route('/api/RunningTimeDetail', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
@@ -1357,7 +1332,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 for result in results:
                     alarm_last_24_nums.append(result[1])
                     if result[0]:
-                        if float(result[0]) >= 28800:
+                        if float(result[0]) >= 1000:
                             continue
                         alarm_last_24_time += float(result[0])
                     else:
@@ -1375,7 +1350,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 for result in results:
                     alarm_all_nums.append(result[1])
                     if result[0]:
-                        if float(result[0]) >= 28800:
+                        if float(result[0]) >= 1000:
                             continue
                         alarm_all_time += float(result[0])
                     else:
@@ -1410,384 +1385,3 @@ class Sf_Dashboard_Connect(http.Controller):
         conn.close()
 
         return json.dumps(res)
-
-    # @http.route('/api/utilization/rate', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    # def UtilizationRate(self, **kw):
-    #     """
-    #     获取稼动率
-    #     """
-    #     logging.info("kw=:%s" % kw)
-    #     res = {'status': 1, 'message': '成功', 'data': {}}
-    #     # 获取请求的机床数据
-    #     machine_list = ast.literal_eval(kw['machine_list'])
-    #     line = kw['line']
-    #     orders = request.env['mrp.workorder'].sudo().search([
-    #         ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
-    #         ('production_line_id.name', '=', line),
-    #         ('state', 'in', ['done'])
-    #     ])
-    #
-    #     faulty_plans = request.env['quality.check'].sudo().search([
-    #         ('operation_id.name', '=', 'CNC加工'),
-    #         ('quality_state', 'in', ['fail'])
-    #     ])
-    #
-    #     # 计算时间范围
-    #     now = datetime.now()
-    #     today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
-    #     month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-    #
-    #     total_power_on_time = 0
-    #     month_power_on_time = 0
-    #     today_power_on_time = 0
-    #     today_power_on_dict = {}
-    #     today_alarm_dict = {}
-    #     single_machine_dict = {}
-    #
-    #     today_order_data = []
-    #     month_order_data = []
-    #     today_check_ng = []
-    #     month_check_ng = []
-    #
-    #     total_alarm_time = 0
-    #     today_alarm_time = 0
-    #     month_alarm_time = 0
-    #
-    #     for order in orders:
-    #         time = order.date_finished
-    #         if time >= today_start:
-    #             today_order_data.append(order)
-    #         if time >= month_start:
-    #             month_order_data.append(order)
-    #
-    #     for faulty_plan in faulty_plans:
-    #         time = faulty_plan.write_date
-    #         if time >= today_start:
-    #             today_check_ng.append(faulty_plan)
-    #         if time >= month_start:
-    #             month_check_ng.append(faulty_plan)
-    #
-    #     # 连接数据库
-    #     conn = psycopg2.connect(**db_config)
-    #     for item in machine_list:
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #             (
-    #                 SELECT power_on_time, 'latest' AS record_type
-    #                 FROM device_data
-    #                 WHERE device_name = %s
-    #                     AND power_on_time IS NOT NULL
-    #                 ORDER BY time DESC
-    #                 LIMIT 1
-    #             )
-    #             UNION ALL
-    #             (
-    #                 SELECT power_on_time, 'month_first' AS record_type
-    #                 FROM device_data
-    #                 WHERE device_name = %s
-    #                     AND power_on_time IS NOT NULL
-    #                     AND time >= date_trunc('month', CURRENT_DATE)  -- ✅ 修复日期函数
-    #                     AND time < (date_trunc('month', CURRENT_DATE) + INTERVAL '1 month')::date
-    #                 ORDER BY time ASC
-    #                 LIMIT 1
-    #             )
-    #             UNION ALL
-    #             (
-    #                 SELECT power_on_time, 'day_first' AS record_type
-    #                 FROM device_data
-    #                 WHERE device_name = %s
-    #                     AND power_on_time IS NOT NULL
-    #                     AND time::date = CURRENT_DATE  -- ✅ 更高效的写法
-    #                 ORDER BY time ASC
-    #                 LIMIT 1
-    #             );
-    #                     """, (item, item, item))
-    #             results = cur.fetchall()
-    #             if len(results) >= 1:
-    #                 total_power_on_time += convert_to_seconds(results[0][0])
-    #             else:
-    #                 total_power_on_time += 0
-    #             if len(results) >= 2:
-    #                 month_power_on_time += convert_to_seconds(results[1][0])
-    #             else:
-    #                 month_power_on_time += 0
-    #             if len(results) >= 3:
-    #                 today_power_on_time += convert_to_seconds(results[2][0])
-    #                 today_power_on_dict[item] = today_power_on_time
-    #             else:
-    #                 today_power_on_time += 0
-    #                 today_power_on_dict[item] = 0
-    #
-    #         with conn.cursor() as cur:
-    #             cur.execute("""
-    #                          SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
-    #                 FROM device_data
-    #                 WHERE device_name = %s AND alarm_start_time IS NOT NULL
-    #                 ORDER BY alarm_start_time, time;
-    #                                     """, (item,))
-    #             results = cur.fetchall()
-    #             today_data = []
-    #             month_data = []
-    #
-    #             for record in results:
-    #                 if record[0]:
-    #                     if float(record[0]) >= 28800:
-    #                         continue
-    #                     total_alarm_time += float(record[0])
-    #                 else:
-    #                     total_alarm_time += 0.0
-    #                 alarm_start = datetime.strptime(record[1], "%Y-%m-%d %H:%M:%S")
-    #                 if alarm_start >= today_start:
-    #                     today_data.append(record)
-    #                 if alarm_start >= month_start:
-    #                     month_data.append(record)
-    #             if today_data:
-    #                 for today in today_data:
-    #                     if today[0]:
-    #                         if float(today[0]) >= 28800:
-    #                             continue
-    #                         today_alarm_time += float(today[0])
-    #                         today_alarm_dict[item] = today_alarm_time
-    #                     else:
-    #                         today_alarm_time += 0.0
-    #                         today_alarm_dict[item] = 0
-    #             else:
-    #                 today_alarm_dict[item] = 0
-    #             for month in month_data:
-    #                 if month[0]:
-    #                     if float(month[0]) >= 28800:
-    #                         continue
-    #                     month_alarm_time += float(month[0])
-    #                 else:
-    #                     month_alarm_time += 0.0
-    #
-    #     conn.close()
-    #
-    #     logging.info('报警时间总月日=============%s, %s, %s' % (total_alarm_time, month_alarm_time, today_alarm_time))
-    #     # 计算时间开动率（累计、月、日）
-    #     if total_power_on_time:
-    #         total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time
-    #     else:
-    #         total_power_on_rate = 0
-    #     if month_power_on_time:
-    #         month_power_on_rate = (total_power_on_time - month_power_on_time - month_alarm_time) / (
-    #                 total_power_on_time - month_power_on_time)
-    #     else:
-    #         month_power_on_rate = 0
-    #     if today_power_on_time:
-    #         today_power_on_rate = (total_power_on_time - today_power_on_time - today_alarm_time) / (
-    #                 total_power_on_time - today_power_on_time)
-    #     else:
-    #         today_power_on_rate = 0
-    #     logging.info("总开动率: %s" % total_power_on_rate)
-    #     logging.info("月开动率: %s" % month_power_on_rate)
-    #     logging.info("日开动率: %s" % today_power_on_rate)
-    #
-    #     # 计算性能开动率（累计、月、日）
-    #     logging.info('完成工单数量: %s' % len(orders))
-    #     total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - total_alarm_time)
-    #     month_performance_rate = len(month_data) * 30 * 60 / (
-    #             total_power_on_time - month_power_on_time - month_alarm_time)
-    #     today_performance_rate = len(today_data) * 30 * 60 / (
-    #             total_power_on_time - today_power_on_time - today_alarm_time) if today_power_on_time != 0 else 0
-    #     logging.info("总性能率: %s" % total_performance_rate)
-    #     logging.info("月性能率: %s" % month_performance_rate)
-    #     logging.info("日性能率: %s" % today_performance_rate)
-    #
-    #     # 计算累计合格率
-    #     total_pass_rate = (len(orders) - len(today_check_ng)) / len(orders) if len(orders) != 0 else 0
-    #     month_pass_rate = (len(month_order_data) - len(month_check_ng)) / len(month_order_data) if len(month_order_data) != 0 else 0
-    #     today_pass_rate = (len(today_order_data) - len(today_check_ng)) / len(today_order_data) if len(today_order_data) != 0 else 0
-    #     logging.info("总合格率: %s" % total_pass_rate)
-    #     logging.info("月合格率: %s" % month_pass_rate)
-    #     logging.info("日合格率: %s" % today_pass_rate)
-    #
-    #     # # 返回数据
-    #     # res['data'][item] = {
-    #     #     'total_utilization_rate': total_power_on_rate * total_performance_rate * total_pass_rate,
-    #     #     'month_utilization_rate': month_power_on_rate * month_performance_rate * month_pass_rate,
-    #     #     'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate,
-    #     # }
-    #     for i in machine_list:
-    #         single_machine_utilization_rate = total_power_on_time - today_power_on_dict[i] - today_alarm_dict[i] / (
-    #                     total_power_on_time - today_power_on_dict[i])
-    #         single_machine_dict[i] = single_machine_utilization_rate * today_performance_rate * today_pass_rate
-    #
-    #     res['data'] = {
-    #         'total_utilization_rate': total_power_on_rate * total_performance_rate * total_pass_rate,
-    #         'month_utilization_rate': month_power_on_rate * month_performance_rate * month_pass_rate,
-    #         'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate,
-    #         'single_machine_dict': single_machine_dict
-    #     }
-    #
-    #     return json.dumps(res)
-
-    @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def UtilizationRate(self, **kw):
-        """
-        获取稼动率
-        """
-        logging.info("kw=:%s" % kw)
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        # 获取请求的机床数据
-        machine_list = ast.literal_eval(kw['machine_list'])
-
-        faulty_plans = request.env['quality.check'].sudo().search([
-            ('operation_id.name', '=', 'CNC加工'),
-            ('quality_state', 'in', ['fail'])
-        ])
-
-        # 计算时间范围
-        now = datetime.now()
-        today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
-        month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-
-        total_power_on_time = 0
-        month_power_on_time = 0
-        today_power_on_time = 0
-        today_power_on_dict = {}
-        today_alarm_dict = {}
-        single_machine_dict = {}
-
-        today_order_data = []
-        month_order_data = []
-        today_check_ng = []
-        month_check_ng = []
-
-        total_alarm_time = 0
-        today_alarm_time = 0
-        month_alarm_time = 0
-
-        # 连接数据库
-        conn = psycopg2.connect(**db_config)
-        for item in machine_list:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    (
-                        SELECT power_on_time, 'latest' AS record_type
-                        FROM device_data
-                        WHERE device_name = %s
-                            AND power_on_time IS NOT NULL
-                        ORDER BY time DESC
-                        LIMIT 1
-                    )
-                    UNION ALL
-                    (
-                        SELECT power_on_time, 'month_first' AS record_type
-                        FROM device_data
-                        WHERE device_name = %s
-                            AND power_on_time IS NOT NULL
-                            AND time >= date_trunc('month', CURRENT_DATE)  -- ✅ 修复日期函数
-                            AND time < (date_trunc('month', CURRENT_DATE) + INTERVAL '1 month')::date
-                        ORDER BY time ASC
-                        LIMIT 1
-                    )
-                    UNION ALL
-                    (
-                        SELECT power_on_time, 'day_first' AS record_type
-                        FROM device_data
-                        WHERE device_name = %s
-                            AND power_on_time IS NOT NULL
-                            AND time >= CURRENT_DATE
-                            AND time < CURRENT_DATE + INTERVAL '1 day'
-                        ORDER BY time ASC
-                        LIMIT 1
-                    );
-                            """, (item, item, item))
-                results = cur.fetchall()
-                logging.info('====================%s' % results)
-                if len(results) >= 1:
-                    total_power_on_time += convert_to_seconds(results[0][0])
-                else:
-                    total_power_on_time += 0
-                if len(results) >= 2:
-                    month_power_on_time += convert_to_seconds(results[1][0])
-                else:
-                    month_power_on_time += 0
-                if len(results) >= 3:
-                    today_power_on_time += convert_to_seconds(results[2][0])
-                    # today_power_on_dict[item] = today_power_on_time
-                else:
-                    today_power_on_time += convert_to_seconds(results[0][0])
-                    # today_power_on_dict[item] = 0
-
-                if results[0][0] == '0H0M':
-                    logging.info('=woshide=%s' % results[0][0])
-                    logging.info(type(results[0][0]))
-                    total_power_on_time += convert_to_seconds(results[1][0])
-                    today_power_on_time += convert_to_seconds(results[1][0])
-
-            with conn.cursor() as cur:
-                cur.execute("""
-                                 SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
-                        FROM device_data
-                        WHERE device_name = %s AND alarm_start_time IS NOT NULL
-                        ORDER BY alarm_start_time, time;
-                                            """, (item,))
-                results = cur.fetchall()
-                today_data = []
-                month_data = []
-
-                for record in results:
-                    if record[0]:
-                        if float(record[0]) >= 86400:
-                            continue
-                        total_alarm_time += abs(float(record[0]))
-                    else:
-                        total_alarm_time += 0.0
-                    alarm_start = datetime.strptime(record[1], "%Y-%m-%d %H:%M:%S")
-                    if alarm_start >= today_start:
-                        today_data.append(record)
-                    if alarm_start >= month_start:
-                        month_data.append(record)
-                if today_data:
-                    for today in today_data:
-                        if today[0]:
-                            if float(today[0]) >= 28800:
-                                continue
-                            today_alarm_time += abs(float(today[0]))
-                            today_alarm_dict[item] = today_alarm_time
-                        else:
-                            today_alarm_time += 0.0
-                            today_alarm_dict[item] = 0
-                else:
-                    today_alarm_dict[item] = 0
-                for month in month_data:
-                    if month[0]:
-                        if float(month[0]) >= 28800:
-                            continue
-                        month_alarm_time += abs(float(month[0]))
-                    else:
-                        month_alarm_time += 0.0
-
-        conn.close()
-
-        logging.info('在线时间总月日=============%s, %s, %s' % (total_power_on_time, month_power_on_time, today_power_on_time))
-
-        logging.info('报警时间总月日=============%s, %s, %s' % (total_alarm_time, month_alarm_time, today_alarm_time))
-        # 计算时间开动率（累计、月、日）
-        if total_power_on_time:
-            total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time
-        else:
-            total_power_on_rate = 0
-        if month_power_on_time:
-            month_power_on_rate = (total_power_on_time - month_power_on_time - month_alarm_time) / (
-                    total_power_on_time - month_power_on_time)
-        else:
-            month_power_on_rate = 0
-        if today_power_on_time:
-            today_power_on_rate = (total_power_on_time - today_power_on_time - today_alarm_time) / (
-                    total_power_on_time - today_power_on_time)
-        else:
-            today_power_on_rate = 0
-        logging.info("总开动率: %s" % total_power_on_rate)
-        logging.info("月开动率: %s" % month_power_on_rate)
-        logging.info("日开动率: %s" % today_power_on_rate)
-
-        res['data'] = {
-            'all_time_work_rate': total_power_on_rate,
-            'month_work_rate': month_power_on_rate,
-            'day_work_rate': today_power_on_rate,
-        }
-
-        return json.dumps(res)

sf_machine_connect/models/ftp_operate.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-import os
-import re
-from ftplib import FTP, error_perm
+from ftplib import FTP
 
 _logger = logging.getLogger(__name__)
 
@@ -54,8 +52,8 @@ class FtpController:
         print(self.username, self.port, self.host, self.password)
         ftp = FTP_P()
         _logger.info("===================connect==================")
-        # ftp.set_debuglevel(2) #打开调试级别2，显示详细信息
-        # ftp.set_pasv(1)  # 0主动模式 1 #被动模式
+        # self.ftp.set_debuglevel(2) #打开调试级别2，显示详细信息
+        ftp.set_pasv(0)  # 0主动模式 1 #被动模式
         try:
             ftp.connect(self.host, self.port)
             ftp.login(self.username, self.password)
@@ -130,145 +128,3 @@ class FtpController:
         :return:
         """
         self.ftp.delete(delpath)
-
-
-
-def transfer_nc_files(
-        source_ftp_info,
-        target_ftp_info,
-        source_dir,
-        target_dir,
-        end_with=None,
-        match_str=None,
-        keep_dir=False):
-    """
-    从源FTP服务器下载所有{end_with}结尾的文件并上传到目标FTP服务器,保持目录结构
-    
-    Args:
-        source_ftp_info: dict, 源FTP连接信息 {host, port, username, password}
-        target_ftp_info: dict, 目标FTP连接信息 {host, port, username, password} 
-        source_dir: str, 源FTP上的起始目录
-        target_dir: str, 目标FTP上的目标目录
-        keep_dir: bool, 是否保持目录结构,默认False
-    """
-    trans_status = [False]
-    try:
-        # 连接源FTP
-        source_ftp = FtpController(
-            source_ftp_info['host'],
-            source_ftp_info['port'],
-            source_ftp_info['username'],
-            source_ftp_info['password']
-        )
-        if not source_ftp.ftp:
-            raise Exception("编程文件FTP连接失败")
-        source_ftp.ftp.set_pasv(1)
-        
-        # 连接目标FTP
-        target_ftp = FtpController(
-            target_ftp_info['host'],
-            target_ftp_info['port'],
-            target_ftp_info['username'],
-            target_ftp_info['password']
-        )
-        if not source_ftp.ftp:
-            raise Exception("机床FTP连接失败")
-        source_ftp.ftp.set_pasv(1)
-
-        # 递归遍历源目录
-        def traverse_dir(current_dir, relative_path=''):
-            source_ftp.ftp.cwd(current_dir)
-            file_list = source_ftp.ftp.nlst()
-            
-            for item in file_list:
-                try:
-                    # 尝试进入目录
-                    source_ftp.ftp.cwd(f"{current_dir}/{item}")
-                    # 如果成功则是目录
-                    new_relative_path = os.path.join(relative_path, item)
-                    # 在目标FTP创建对应目录
-                    try:
-                        if keep_dir:
-                            target_ftp.ftp.mkd(f"{target_dir}/{new_relative_path}")
-                    except:
-                        pass # 目录可能已存在
-                    # 递归遍历子目录
-                    traverse_dir(f"{current_dir}/{item}", new_relative_path)
-                    source_ftp.ftp.cwd('..')
-                except:
-                    matched = False
-                    # 文件名匹配字符串BT30-(两个字符)-all.nc, 例6667_20250422-BT30-ZM-all.nc
-                    if match_str and re.match(match_str, item):
-                        matched = True
-                    elif end_with and item.lower().endswith(end_with):
-                        matched = True
-                    
-                    if matched:
-                        # 下载到临时文件
-                        temp_path = f"/tmp/{item}"
-                        with open(temp_path, 'wb') as f:
-                            source_ftp.ftp.retrbinary(f'RETR {item}', f.write)
-                        
-                        # 上传到目标FTP对应目录
-                        if keep_dir:
-                            target_path = f"{target_dir}/{relative_path}/{item}"
-                        else:
-                            target_path = f"{target_dir}/{item}"
-                        with open(temp_path, 'rb') as f:
-                            target_ftp.ftp.storbinary(f'STOR {target_path}', f)
-                        
-                        trans_status[0] = True
-                        # 删除临时文件
-                        os.remove(temp_path)
-                        logging.info(f"已传输文件: {item}")
-
-        # 清空目标目录下的所有内容
-        try:
-            target_ftp.ftp.cwd(target_dir)
-            files = target_ftp.ftp.nlst()
-            
-            for f in files:
-                try:
-                    # 尝试删除文件
-                    target_ftp.ftp.delete(f)
-                except:
-                    try:
-                        # 如果删除失败,可能是目录,递归删除目录
-                        def remove_dir(path):
-                            target_ftp.ftp.cwd(path)
-                            sub_files = target_ftp.ftp.nlst()
-                            for sf in sub_files:
-                                try:
-                                    target_ftp.ftp.delete(sf)
-                                except:
-                                    remove_dir(f"{path}/{sf}")
-                            target_ftp.ftp.cwd('..')
-                            target_ftp.ftp.rmd(path)
-                            
-                        remove_dir(f"{target_dir}/{f}")
-                    except:
-                        logging.error(f"无法删除 {f}")
-                        pass
-            
-            logging.info(f"已清空目标目录 {target_dir}")
-        except Exception as e:
-            logging.error(f"清空目标目录失败: {str(e)}")
-            raise Exception(f"清空目标目录失败: {str(e)}")
-
-        # 开始遍历
-        traverse_dir(source_dir)
-        
-        logging.info("所有文件传输完成")
-        return trans_status[0]
-        
-    except Exception as e:
-        logging.error(f"传输过程出错: {str(e)}")
-        raise e
-        
-    finally:
-        # 关闭FTP连接
-        try:
-            source_ftp.ftp.quit()
-            target_ftp.ftp.quit()
-        except:
-            pass

sf_maintenance/models/sf_maintenance.py

@@ -34,8 +34,7 @@ class SfMaintenanceEquipmentAGVLog(models.Model):
 
 
 class SfMaintenanceEquipment(models.Model):
-    _name = 'maintenance.equipment'
-    _inherit = ['maintenance.equipment', 'printing.utils']
+    _inherit = 'maintenance.equipment'
     _description = '设备'
 
     crea_url = "/api/machine_tool/create"
@@ -827,94 +826,6 @@ class SfMaintenanceEquipment(models.Model):
     image_lq_id = fields.Many2many('maintenance.equipment.image', 'equipment_lq_id', string='冷却方式',
                                    domain="[('type', '=', '冷却方式')]")
 
-    ftp_host = fields.Char('FTP 主机')
-    ftp_port = fields.Char('FTP 端口')
-    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
-
-    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
-
 
 class SfRobotAxisNum(models.Model):
     _name = 'sf.robot.axis.num'

sf_maintenance/views/maintenance_views.xml

@@ -1053,26 +1053,6 @@
                     </page>
                 </xpath>
 
-                <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', '!=', '机床')]}" >
-                        <group>
-                            <group string="ftp配置">
-                                <field name="ftp_host" string="主机"/>
-                                <field name="ftp_port" string="端口"/>
-                                <field name="ftp_username" string="用户名"/>
-                                <field name="ftp_password" string="密码" password="True"/>
-                            </group>
-                        </group>
-                    </page>
-                </xpath>
             </data>
         </field>
     </record>

sf_manufacturing/__manifest__.py

@@ -10,8 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse', 'jikimo_attachment_viewer',
-                'jikimo_sale_multiple_supply_methods', 'product'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
     'data': [
         'data/cron_data.xml',
         'data/stock_data.xml',
@@ -19,7 +18,6 @@
         'data/panel_data.xml',
         'data/sf_work_individuation_page.xml',
         'data/agv_scheduling_data.xml',
-        'data/product_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'wizard/workpiece_delivery_views.xml',
@@ -30,7 +28,6 @@
         'wizard/mrp_workorder_batch_replan_wizard_views.xml',
         'wizard/sf_programming_reason_views.xml',
         'wizard/sale_order_cancel_views.xml',
-        'wizard/process_outsourcing.xml',
         'views/mrp_views_menus.xml',
         'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',
@@ -47,7 +44,6 @@
         'views/sale_order_views.xml',
         'views/mrp_workorder_batch_replan.xml',
         'views/purchase_order_view.xml',
-        'views/product_template_views.xml',
     ],
     'assets': {
 

sf_manufacturing/data/product_data.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="product_category_service" model="product.category">
-            <field name="name">服务</field>
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="property_cost_method">fifo</field>
-            <field name="property_valuation">manual_periodic</field>
-        </record>
-        <record id="product_category_outsource_process" model="product.category">
-            <field name="name">工序外协</field>
-            <field name="parent_id" ref="sf_manufacturing.product_category_service"/>
-            <field name="property_cost_method">fifo</field>
-            <field name="property_valuation">manual_periodic</field>
-        </record>
-        <record id="product_category_outsource_other_process" model="product.category">
-            <field name="name">其他</field>
-            <field name="parent_id" ref="sf_manufacturing.product_category_outsource_process"/>
-            <field name="property_cost_method">fifo</field>
-            <field name="property_valuation">manual_periodic</field>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/models/__init__.py

@@ -16,6 +16,4 @@ from . import sf_production_common
 from . import sale_order
 from . import quick_easy_order
 from . import purchase_order
-from . import quality_check
-from . import purchase_request_line
-from . import workorder_printer
+from . import quality_check

sf_manufacturing/models/agv_scheduling.py

@@ -87,12 +87,11 @@ class AgvScheduling(models.Model):
                 agv_route_type: AGV任务类型
                 workorders: 工单
         """
-        scheduling = None
         _logger.info('创建AGV调度任务\r\n起点为【%s】，任务类型为【%s】，工单为【%s】' % (agv_start_site_name, agv_route_type, workorders))
         if not workorders:
             raise UserError(_('工单不能为空'))
-        agv_start_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)])
-        if not agv_start_sites:
+        agv_start_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)], limit=1)
+        if not agv_start_site:
             raise UserError(_('不存在名称为【%s】的接驳站，请先创建！' % agv_start_site_name))
         # 如果存在相同任务类型工单的AGV调度任务，则提示错误
         agv_scheduling = self.sudo().search([
@@ -108,32 +107,24 @@ class AgvScheduling(models.Model):
                 (','.join(repetitive_workorders.mapped('production_id.name')), agv_scheduling.name)
             )
 
-        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
-        agv_routes = self.env['sf.agv.task.route'].sudo().search([
-            ('route_type', '=', agv_route_type),
-            ('start_site_id', 'in', agv_start_sites.ids)
-        ])
         vals = {
+            'start_site_id': agv_start_site.id,
             'agv_route_type': agv_route_type,
             'workorder_ids': workorders.ids,
             # 'workpiece_delivery_ids': deliveries.mapped('id') if deliveries else [],
             'task_create_time': fields.Datetime.now()
         }
+        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
+        agv_routes = self.env['sf.agv.task.route'].sudo().search([
+            ('route_type', '=', agv_route_type),
+            ('start_site_id', '=', agv_start_site.id)
+        ])
         if not agv_routes:
             raise UserError(_('不存在起点为【%s】的【%s】任务路线，请先创建！' % (agv_start_site_name, agv_route_type)))
-        # 如果路线中包含起点与终点相同的接驳站，则不创建AGV调度任务
-        if agv_routes.filtered(lambda r: r.start_site_id.name == r.end_site_id.name):
-            return True
-        # 配送类型相同的接驳站为同一个，取第一个即可
-        vals.update({
-            'start_site_id': agv_routes[0].start_site_id.id,
-        })
         idle_route = None
         if len(agv_routes) == 1:
             idle_route = agv_routes[0]
-            vals.update({
-                'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
-            })
+            vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
         else:
             # 判断终点接驳站是否为空闲
             idle_routes = agv_routes.filtered(lambda r: r.end_site_id.state == '空闲')
@@ -141,10 +132,7 @@ class AgvScheduling(models.Model):
                 # 将空闲的路线按照终点接驳站名称排序
                 idle_routes = sorted(idle_routes, key=lambda r: r.end_site_id.name)
                 idle_route = idle_routes[0]
-                vals.update({
-                    'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id
-                })
-
+                vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
         try:
             scheduling = self.env['sf.agv.scheduling'].sudo().create(vals)
             # 触发空闲接驳站状态更新，触发新任务下发
@@ -154,7 +142,7 @@ class AgvScheduling(models.Model):
         except Exception as e:
             _logger.error('添加AGV调度任务失败: %s', e)
             raise UserError(_('添加AGV调度任务失败: %s', e))
-        
+
         return scheduling
 
     def on_site_state_change(self, agv_site_id, agv_site_state):

sf_manufacturing/models/agv_setting.py

@@ -24,7 +24,7 @@ class AgvSetting(models.Model):
 
     # name必须唯一
     _sql_constraints = [
-        ('name_uniq', 'unique (name, workcenter_id)', '同一工作中心的站点编号必须唯一!'),
+        ('name_uniq', 'unique (name)', '站点编号必须唯一!'),
     ]
 
     # def update_site_state(self):
@@ -68,12 +68,11 @@ class AgvSetting(models.Model):
         """
         if isinstance(agv_site_state_arr, dict):
             for agv_site_name, is_occupy in agv_site_state_arr.items():
-                agv_sites = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
-                if agv_sites:
-                    agv_sites.state = is_occupy
+                agv_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
+                if agv_site:
+                    agv_site.state = is_occupy
                     if notify:
-                        for agv_site in agv_sites:
-                            self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
+                        self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
                 else:
                     _logger.error("更新失败：接驳站站点错误！%s" % agv_site_name)
                     raise UserError("更新失败：接驳站站点错误！")

sf_manufacturing/models/mrp_production.py

@@ -6,7 +6,6 @@ import json
 import os
 import re
 import traceback
-from operator import itemgetter
 
 import requests
 from itertools import groupby
@@ -239,8 +238,7 @@ class MrpProduction(models.Model):
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
     programming_state = fields.Selection(
-        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'), ('已下发', '已下发'),
-         ('已取消', '已取消')],
+        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'), ('已下发', '已下发'), ('已取消', '已取消')],
         string='编程状态',
         tracking=True)
     glb_file = fields.Binary("glb模型文件")
@@ -269,7 +267,6 @@ class MrpProduction(models.Model):
     quality_standard = fields.Binary('质检标准', related='product_id.quality_standard', readonly=True)
 
     part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
-
     @api.depends('product_id')
     def _compute_part_info(self):
         try:
@@ -403,10 +400,8 @@ class MrpProduction(models.Model):
                     and production.schedule_state == '已排' and production.is_rework is False):
                 production.state = 'pending_cam'
             if any((wo.test_results == '返工' and wo.state == 'done' and
-                    (production.programming_state in ['已编程'] or (
-                            wo.individuation_page_list and 'PTD' in wo.individuation_page_list)))
-                   or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中',
-                                                                                                        '已编程'])
+                    (production.programming_state in ['已编程'] or(wo.individuation_page_list and 'PTD' in wo.individuation_page_list)))
+                   or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
                    for wo in production.workorder_ids) or production.is_rework is True:
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
@@ -622,7 +617,7 @@ class MrpProduction(models.Model):
                             for rp in reproduction:
                                 if rp.programming_no == item['programming_no']:
                                     rp.write({'programming_state': '已编程未下发' if item[
-                                                                                         'programming_state'] == '已编程' else '编程中'})
+                                                                                   'programming_state'] == '已编程' else '编程中'})
 
                         else:
                             return item
@@ -894,47 +889,11 @@ class MrpProduction(models.Model):
                             workorders_values.append(
                                 self.env[
                                     'mrp.workorder']._json_workorder_surface_process_str(
-                                    production, route, product_production_process.seller_ids[
-                                        0].partner_id.id if product_production_process.seller_ids else False))
+                                    production, route, product_production_process.seller_ids[0].partner_id.id))
             production.workorder_ids = workorders_values
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
-    def _create_subcontract_purchase_request(self, purchase_request_line):
-        sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
-        grouped_purchase_request_line = {
-            k: list(g)
-            for k, g in groupby(sorted_list, key=itemgetter('name'))
-        }
-        for name, request_line in grouped_purchase_request_line.items():
-            request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
-            grouped_purchase_request_line_sorted_list = {
-                k: list(g)
-                for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
-            }
-            purchase_request_model = self.env["purchase.request"]
-            origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
-            pr = purchase_request_model.create({
-                "origin": origin,
-                "company_id": self.company_id.id,
-                "picking_type_id": self.env.ref('stock.picking_type_in').id,
-                "group_id": request_line[0].get('group_id'),
-                "requested_by": self.env.context.get("uid", self.env.uid),
-                "assigned_to": False,
-                "bom_id": self[0].bom_id.id,
-                "is_subcontract":True,
-            })
-            self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
-                            'sf_stock.stock_route_process_outsourcing').id)]
-            for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
-                cur_request_line = request_line_list[0]
-                cur_request_line['product_qty'] = len(request_line_list)
-                cur_request_line['request_id'] = pr.id
-                cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
-                cur_request_line.pop('group_id', None)
-                cur_request_line.pop('production_name', None)
-                self.env["purchase.request.line"].create(cur_request_line)
-
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
         production_all = self.sorted(lambda x: x.id)
@@ -944,8 +903,6 @@ class MrpProduction(models.Model):
         for product_id, pd in grouped_product_ids.items():
             product_id_to_production_names[product_id] = [p.name for p in pd]
         sorted_workorders = None
-        purchase_request_line = []
-        all_workorders = []
         for production in production_all:
             proc_workorders = []
             process_parameter_workorder = self.env['mrp.workorder'].search(
@@ -962,13 +919,8 @@ class MrpProduction(models.Model):
                 return
             for workorders in reversed(sorted_workorders):
                 self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
-                # self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
-                purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
-                    workorders, production)
-                all_workorders += workorders
-        self._create_subcontract_purchase_request(purchase_request_line)
-        for workorder in all_workorders:
-            workorder._compute_pr_mp_count()
+                self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
+
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
@@ -1389,7 +1341,7 @@ class MrpProduction(models.Model):
                 'default_reprogramming_num': cloud_programming.get('reprogramming_num') if cloud_programming else '',
                 'default_programming_state': cloud_programming.get('programming_state') if cloud_programming else '',
                 'default_is_reprogramming': True if cloud_programming and (
-                        cloud_programming.get('programming_state') in ['已下发']) else False
+                            cloud_programming.get('programming_state') in ['已下发']) else False
             }
         }
 
@@ -1776,8 +1728,7 @@ class MrpProduction(models.Model):
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
             if production.state not in ['confirmed', 'pending_cam'] or production.programming_state != '已编程':
-                raise UserError(
-                    '不可操作。所选制造订单必须同时满足如下条件：\n1、制造订单状态：待排程 或 待加工；\n2、制造订单编程状态：已编程。\n请检查！')
+                raise UserError('不可操作。所选制造订单必须同时满足如下条件：\n1、制造订单状态：待排程 或 待加工；\n2、制造订单编程状态：已编程。\n请检查！')
             cloud_programming = production._cron_get_programming_state()
             if cloud_programming['programming_state'] in ['待编程', '已编程', '编程中']:
                 raise UserError("当前编程单正在重新编程，请注意查看当前制造订单的“编程记录”确认进度!")
@@ -1820,8 +1771,6 @@ class MrpProduction(models.Model):
         except Exception as e:
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")
-        
-    model_id = fields.Char('模型id', related='product_id.model_id')
 
 
 # 编程记录

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -1,7 +1,6 @@
 import logging
 from odoo import fields, models, api
 from odoo.exceptions import UserError
-from odoo.tools import str2bool
 
 
 class ResMrpRoutingWorkcenter(models.Model):
@@ -25,41 +24,10 @@ class ResMrpRoutingWorkcenter(models.Model):
     workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
-    optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
     reserved_duration = fields.Float('预留时长', default=30, tracking=True)
     is_outsource = fields.Boolean('外协', default=False)
     individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录')
 
-    @api.onchange('surface_technics_id')
-    def optional_process_parameters_date(self):
-        for record in self:
-            if not record.surface_technics_id:
-                continue
-            parameter_ids = self.env['sf.production.process.parameter'].search([
-                ('process_id', '=', record.surface_technics_id.id),
-            ])
-            record.optional_process_parameters = parameter_ids.ids
-
-    # @api.model
-    # def _auto_init(self):
-    #     # 先执行标准初始化
-    #     res = super(ResMrpRoutingWorkcenter, self)._auto_init()
-    #     # 然后执行自定义初始化
-    #     records = self.search([])
-    #     if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_workcenter',
-    #                                                           default='False')):
-    #         return
-    #     records.optional_process_parameters_date()
-    #     self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_workcenter', True)
-    #     return res
-    # def init(self):
-    #     super(ResMrpRoutingWorkcenter, self).init()
-    #     # 在模块初始化时触发计算字段的更新
-    #     records = self.search([])
-    #     if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_workcenter',default='False')):
-    #         return
-    #     records.optional_process_parameters_date()
-    #     self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_workcenter', True)
     def get_no(self):
         international_standards = self.search(
             [('code', '!=', ''), ('active', 'in', [True, False])],

sf_manufacturing/models/mrp_workcenter.py

@@ -21,16 +21,7 @@ class ResWorkcenter(models.Model):
                                          related='equipment_id.production_line_id', store=True)
     is_process_outsourcing = fields.Boolean('工艺外协')
     users_ids = fields.Many2many("res.users", 'users_workcenter', tracking=True)
-    @api.constrains('name')
-    def _check_unique_name_code(self):
-        for record in self:
-            # 检查是否已经存在相同的 name 和 code 组合
-            existing = self.search([
-                ('name', '=', record.name),
-                ('id', '!=', record.id)  # 排除当前记录
-            ])
-            if existing:
-                raise ValueError('记录已存在')
+
     def write(self, vals):
         if 'users_ids' in vals:
             old_users = self.users_ids
@@ -256,12 +247,14 @@ class ResWorkcenter(models.Model):
                                                                   date_planned_end),
                                                                  ('state', 'not in', ['draft', 'cancel'])])
 
-        sum_qty = sum([p.product_qty for p in plan_ids]) if plan_ids else count
-        production_line_hour_capacity = self.production_line_hour_capacity
-        if sum_qty > production_line_hour_capacity:
-            message = '当前计划开始时间不能预约排程,超过生产线小时产能(%d件)%d件' % (
-                production_line_hour_capacity, count)
-            raise UserError(message)
+        if plan_ids:
+            sum_qty = sum([p.product_qty for p in plan_ids])
+            production_line_hour_capacity = self.production_line_hour_capacity
+            if sum_qty >= production_line_hour_capacity:
+                message = '当前计划开始时间不能预约排程,超过生产线小时产能(%d件)%d件' % (
+                    production_line_hour_capacity, count)
+                raise UserError(message)
+                return False
         return True
 
 

sf_manufacturing/models/mrp_workorder.py

@@ -19,8 +19,8 @@ from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
+    _order = 'sequence asc'
     _description = '工单'
-    _order = 'sequence'
 
     product_tmpl_name = fields.Char('坯料产品名称', related='production_bom_id.bom_line_ids.product_id.name')
 
@@ -70,21 +70,7 @@ class ResMrpWorkOrder(models.Model):
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
-    pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
 
-    @api.depends('state')
-    def _compute_pr_mp_count(self):
-        for item in self:
-            if not item.is_subcontract:
-                item.pr_mp_count = 0
-                continue
-            pr_ids = self.env['purchase.request'].sudo().search(
-                [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
-                 ('state', '!=', 'rejected')])
-            if pr_ids:
-                item.pr_mp_count = len(pr_ids)
-            else:
-                item.pr_mp_count = 0
     @api.depends('state')
     def _compute_back_button_display(self):
         for record in self:
@@ -120,11 +106,11 @@ class ResMrpWorkOrder(models.Model):
                         record.back_button_display = False
                 # tag_type
                 if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any(
-                        detection_result.processing_panel == cur_workorder.processing_panel and
-                        detection_result.routing_type == cur_workorder.routing_type and
-                        cur_workorder.tag_type != '重新加工' and
-                        detection_result.test_results != '合格'
-                        for detection_result in cur_workorder.production_id.detection_result_ids
+                    detection_result.processing_panel == cur_workorder.processing_panel and
+                    detection_result.routing_type == cur_workorder.routing_type and
+                    cur_workorder.tag_type !='重新加工' and
+                    detection_result.test_results != '合格'
+                    for detection_result in cur_workorder.production_id.detection_result_ids
                 ):
                     record.back_button_display = False
             else:
@@ -136,11 +122,11 @@ class ResMrpWorkOrder(models.Model):
                 else:
                     record.back_button_display = False
                 if cur_workorder.is_subcontract or cur_workorder.routing_type == '解除装夹' or cur_workorder.routing_type == '切割' or any(
-                        detection_result.processing_panel == cur_workorder.processing_panel and
-                        detection_result.routing_type == cur_workorder.routing_type and
-                        cur_workorder.tag_type != '重新加工' and
-                        detection_result.test_results != '合格'
-                        for detection_result in cur_workorder.production_id.detection_result_ids
+                    detection_result.processing_panel == cur_workorder.processing_panel and
+                    detection_result.routing_type == cur_workorder.routing_type and
+                    cur_workorder.tag_type !='重新加工' and
+                    detection_result.test_results != '合格'
+                    for detection_result in cur_workorder.production_id.detection_result_ids
                 ):
                     record.back_button_display = False
 
@@ -443,8 +429,6 @@ class ResMrpWorkOrder(models.Model):
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
             if order.routing_type == '表面工艺' and order.state not in ['cancel']:
-                # domain = [('group_id', '=', self.production_id.procurement_group_id.id),
-                #           ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
                 domain = [('purchase_type', '=', 'consignment'),
                           ('origin', 'like', '%' + self.production_id.name + '%'),
                           ('state', '!=', 'cancel')]
@@ -460,30 +444,6 @@ class ResMrpWorkOrder(models.Model):
             else:
                 order.surface_technics_purchase_count = 0
 
-    def action_view_pr_mrp_workorder(self):
-        """
-        采购请求
-        """
-        self.ensure_one()
-        pr_ids = self.env['purchase.request'].sudo().search(
-            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-             ('state', '!=', 'rejected')])
-        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': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids)],
-                'view_mode': 'tree,form',
-            })
-        return action
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -513,14 +473,13 @@ class ResMrpWorkOrder(models.Model):
 
     def _get_surface_technics_purchase_ids(self):
         domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
-        # domain = [('group_id', '=', self.production_id.procurement_group_id.id), ('purchase_type', '=', 'consignment')]
-        purchase_orders = self.env['purchase.order'].search(domain, order='id desc',  # 按创建时间降序（最新的在前）
-                                                            limit=1)
+        purchase_orders = self.env['purchase.order'].search(domain)
         purchase_orders_id = self.env['purchase.order']
         for po in purchase_orders:
             for line in po.order_line:
                 if line.product_id.server_product_process_parameters_id == self.surface_technics_parameters_id:
-                    purchase_orders_id = line.order_id
+                    if line.product_qty == 1:
+                        purchase_orders_id = line.order_id
         return purchase_orders_id
 
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
@@ -1241,7 +1200,6 @@ class ResMrpWorkOrder(models.Model):
             'cmm_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cmm_ids,
         }]
         return workorders_values_str
-
     def _process_compute_state(self):
         for workorder in self:
             # 如果工单的工序没有进行排序则跳出循环
@@ -1266,7 +1224,7 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
-                # and workorder.production_id.programming_state == '已编程'
+                    # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     if workorder.production_id.state == 'rework':
                         workorder.state = 'waiting'
@@ -1329,7 +1287,6 @@ class ResMrpWorkOrder(models.Model):
                                                 mo.get_move_line(workorder.production_id, workorder))
                             else:
                                 workorder.state = 'waiting'
-
     @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
                  'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                  'production_id.programming_state')
@@ -1344,7 +1301,6 @@ class ResMrpWorkOrder(models.Model):
                 for check_id in workorder.check_ids:
                     if not check_id.is_inspect:
                         check_id.quality_state = 'none'
-
     # 重写工单开始按钮方法
     def button_start(self):
         # 判断工单状态是否为等待组件
@@ -1578,7 +1534,7 @@ class ResMrpWorkOrder(models.Model):
                         # workorder.rfid_code_old = rfid_code
                         # workorder.rfid_code = False
                         logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
-
+            
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
@@ -1596,8 +1552,7 @@ class ResMrpWorkOrder(models.Model):
                     # 如果工单包含了外协工序，需要预留数量
                     if self.move_raw_ids.move_orig_ids.subcontract_workorder_id:
                         location_id = self.move_raw_ids.location_id
-                        quant = self.move_raw_ids.lot_ids.quant_ids.filtered(
-                            lambda q: q.location_id.id == location_id.id)
+                        quant = self.move_raw_ids.lot_ids.quant_ids.filtered(lambda q: q.location_id.id == location_id.id)
                         if quant.reserved_quantity == 0:
                             self.env['stock.quant']._update_reserved_quantity(
                                 self.move_raw_ids.product_id,
@@ -1751,8 +1706,7 @@ class ResMrpWorkOrder(models.Model):
                                              store=True, string='工序作业')
     individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录',
                                               related='routing_work_center_id.individuation_page_ids')
-    individuation_page_list = fields.Char('个性化记录', default='', compute='_compute_individuation_page_ids',
-                                          store=True)
+    individuation_page_list = fields.Char('个性化记录', default='', compute='_compute_individuation_page_ids', store=True)
 
     @api.depends('name')
     def _compute_routing_work_center_id(self):
@@ -1773,7 +1727,6 @@ class ResMrpWorkOrder(models.Model):
                     individuation_page_list = [item.code for item in mw.individuation_page_ids]
                     if individuation_page_list:
                         mw.individuation_page_list = list(set(individuation_page_list))
-
     # =============================================================================================
 
     is_inspect = fields.Boolean('需送检', compute='_compute_is_inspect', store=True, default=False)
@@ -1797,25 +1750,6 @@ class ResMrpWorkOrder(models.Model):
         self.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
             {'quality_state': 'none'})
 
-    @api.model
-    def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
-        aggregate_field = 'create_date:max'
-        if aggregate_field not in fields:
-            fields.append(aggregate_field)
-        orderby = "create_date desc"
-
-        return super(ResMrpWorkOrder, self).read_group(
-            domain,
-            fields,
-            groupby,
-            offset=offset,
-            limit=limit,
-            orderby=orderby,
-            lazy=lazy
-        )
-    
-    model_id = fields.Char('模型id', related='production_id.model_id')
-
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
@@ -2106,7 +2040,6 @@ class WorkPieceDelivery(models.Model):
 
     def _get_agv_route_type_selection(self):
         return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
-
     type = fields.Selection(selection=_get_agv_route_type_selection, string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(

sf_manufacturing/models/product_template.py

@@ -51,7 +51,7 @@ class ResProductMo(models.Model):
     #                                     domain="[('materials_id', '=', materials_id)]")
     # cutting_tool_model_id.material_model_id
     server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
-                                                           string='工艺参数(服务产品)')
+                                                           string='表面工艺参数(服务产品)')
     model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
                                                     string='表面工艺参数')
 
@@ -1067,8 +1067,7 @@ class ResProductMo(models.Model):
                 raise UserError('产品名称【%s】已存在' % item.name)
             if item.categ_type == '表面工艺':
                 if len(self.search([('server_product_process_parameters_id', '=',
-                                     item.server_product_process_parameters_id.id),('server_product_process_parameters_id', '!=',
-                                     False)])) > 1:
+                                     item.server_product_process_parameters_id.id)])) > 1:
                     raise UserError('表面工艺参数为【%s】的产品已存在' % item.server_product_process_parameters_id.name)
         if "create_product_product" not in self._context:
             templates._create_variant_ids()

sf_manufacturing/models/purchase_order.py

@@ -66,37 +66,6 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            if record.purchase_type == 'consignment':
-                bom_line_id = record.order_line[0].purchase_request_lines.request_id.bom_id.bom_line_ids
-                replenish = self.env['stock.warehouse.orderpoint'].search([
-                    ('product_id', '=', bom_line_id.product_id.id),
-                    (
-                    'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
-                    # ('state', 'in', ['draft', 'confirmed'])
-                ], limit=1)
-                if not replenish:
-                    replenish_model = self.env['stock.warehouse.orderpoint']
-                    replenish = replenish_model.create({
-                        'product_id': bom_line_id.product_id.id,
-                        'location_id': self.env.ref(
-                            'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-                        'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-                        'group_id': record.group_id.id,
-                        'qty_to_order': 1,
-                        'origin': record.name,
-                    })
-                else:
-                    replenish.write({
-                        'product_id': bom_line_id.product_id.id,
-                        'location_id': self.env.ref(
-                            'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-                        'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-                        'group_id': record.group_id.id,
-                        'qty_to_order': 1 + replenish.qty_to_order,
-                        'origin': record.name + ',' + replenish.origin,
-                    })
-                replenish.action_replenish()
-
         return super(PurchaseOrder, self).button_confirm()
     
 

sf_manufacturing/models/purchase_request_line.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-import base64
-import datetime
-import logging
-import json
-import os
-import re
-import traceback
-from operator import itemgetter
-
-import requests
-from itertools import groupby
-from collections import defaultdict, namedtuple
-
-from odoo import api, fields, models, SUPERUSER_ID, _
-from odoo.exceptions import UserError, ValidationError
-from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
-
-
-class PurchaseRequestLine(models.Model):
-    _inherit = 'purchase.request'
-    is_subcontract = fields.Boolean(string='是否外协',default=False)
-class PurchaseRequestLine(models.Model):
-    _inherit = 'purchase.request.line'
-    is_subcontract = fields.Boolean(string='是否外协')
-
-
-class PurchaseRequest(models.Model):
-    _inherit = 'purchase.request'
-    bom_id = fields.Many2one('mrp.bom')

sf_manufacturing/models/sf_production_common.py

@@ -1,80 +1,12 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import fields, models, api
-from odoo.exceptions import UserError, ValidationError
-from odoo.tools import str2bool
+from odoo.exceptions import UserError
 
 
 class SfProductionProcessParameter(models.Model):
     _inherit = 'sf.production.process.parameter'
-    service_products = fields.Many2one(
-        'product.template',
-        string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
-        store=True
-    )
-    outsourced_service_products = fields.One2many(
-        'product.template',  # 另一个模型的名称
-        'server_product_process_parameters_id',  # 对应的 Many2one 字段名称
-        string='外协服务产品'
-    )
-    is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
-    is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
-    routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
 
-    @api.depends('outsourced_service_products')
-    def _compute_service_products(self):
-        for record in self:
-            # 假设取第一条作为主明细
-            record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
-
-    def _inverse_service_products(self):
-        for record in self:
-            if record.service_products:
-                # 确保关联关系正确
-                record.outsourced_service_products = record.service_products.ids if record.service_products else False
-            else:
-                record.outsourced_service_products = False
-    def name_get(self):
-        result = []
-        for record in self:
-            name = f"{record.process_id.name} - {record.name}"  # 自定义显示格式
-            result.append((record.id, name))
-        return result
-    @api.constrains('outsourced_service_products')
-    def _validate_partner_limit(self):
-        for record in self:
-            if len(record.outsourced_service_products) > 1:
-                raise ValidationError("工艺参数不能与多个产品关联")
-
-    @api.onchange('outsourced_service_products')
-    def _onchange_validate_partner_limit(self):
-        for record in self:
-            if len(record.outsourced_service_products) > 1:
-                raise ValidationError("工艺参数不能与多个产品关联")
-    @api.depends('outsourced_service_products')
-    def _compute_is_product_button(self):
-        for record in self:
-            if record.outsourced_service_products:
-                record.is_product_button = True
-            else:
-                record.is_product_button = False
-
-    def has_wksp_prefix(self):
-        """
-        判断字符串是否以WKSP开头（不区分大小写）
-        :param text: 要检查的字符串
-        :return: True/False
-        """
-        return self.code.upper().startswith('101'+self.routing_id.code)
-    @api.depends('outsourced_service_products','code')
-    def _compute_is_delete_button(self):
-        for record in self:
-            if record.outsourced_service_products and record.has_wksp_prefix():
-                record.is_delete_button = False
-            elif record.outsourced_service_products:
-                record.is_delete_button = True
-            else:
-                record.is_delete_button = True
     @api.model
     def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
         if self._context.get('route_id'):
@@ -89,33 +21,3 @@ class SfProductionProcessParameter(models.Model):
             domain = [('process_id', '=', routing.surface_technics_id.id), ('id', 'not in', parameter)]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         return super()._name_search(name, args, operator, limit, name_get_uid)
-
-    def action_create_service_product(self):
-        if self.id:  # 如果是已存在的记录
-            self.write({})  # 空写入会触发保存
-        else:  # 如果是新记录
-            self = self.create(self._convert_to_write(self.read()[0]))
-        return {
-            'type': 'ir.actions.act_window',
-            'name': '向导名称',
-            'res_model': 'product.creation.wizard',
-            'view_mode': 'form',
-            'target': 'new',
-            'context': {'default_process_parameter_id': self.id},  # 传递当前记录ID
-        }
-        #
-        # return {
-        #     'name': '创建服务产品',
-        #     'type': 'ir.actions.act_window',
-        #     'res_model': 'product.product',
-        #     'view_mode': 'form',
-        #     'view_id': self.env.ref('product.product_normal_form_view').id,
-        #     'target': 'new',  # 关键参数，使窗口以弹窗形式打开
-        #     'context': {
-        #         'default_' + k: v for k, v in default_values.items()
-        #     },
-        # }
-
-    def action_hide_service_products(self):
-        # self.outsourced_service_products.active = False
-        self.active = False

sf_manufacturing/models/stock.py

@@ -755,24 +755,6 @@ class StockPicking(models.Model):
                         if move_id.product_id.tracking in ['serial', 'lot'] and not move_id.move_line_nosuggest_ids:
                             move_id.action_show_details()
 
-    @api.model
-    def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
-        aggregate_field = 'create_date:max'
-        if aggregate_field not in fields:
-            fields.append(aggregate_field)
-
-        orderby = "create_date desc"
-
-        return super(StockPicking, self).read_group(
-            domain,
-            fields,
-            groupby,
-            offset=offset,
-            limit=limit,
-            orderby=orderby,
-            lazy=lazy
-        )
-
 
 class ReStockMove(models.Model):
     _inherit = 'stock.move'

sf_manufacturing/models/workorder_printer.py

@@ -1,37 +0,0 @@
-
-import logging
-from io import BytesIO
-from odoo import models, fields, api
-from odoo.exceptions import UserError
-
-_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:
-                            # 执行打印
-                            printer = self.env['printing.printer'].get_default()
-                            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已成功打印")     
-
-                        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)
-

sf_manufacturing/security/ir.model.access.csv

@@ -193,6 +193,4 @@ access_sf_programming_record,sf_programming_record,model_sf_programming_record,b
 access_sf_work_individuation_page,sf_work_individuation_page,model_sf_work_individuation_page,sf_base.group_sf_mrp_user,1,1,1,0
 access_sf_work_individuation_page_group_plan_dispatch,sf_work_individuation_page_group_plan_dispatch,model_sf_work_individuation_page,sf_base.group_plan_dispatch,1,1,0,0
 access_sf_sale_order_cancel_wizard,sf_sale_order_cancel_wizard,model_sf_sale_order_cancel_wizard,sf_base.group_sf_order_user,1,1,1,0
-access_sf_sale_order_cancel_line,sf_sale_order_cancel_line,model_sf_sale_order_cancel_line,sf_base.group_sf_order_user,1,0,1,1
-
-access_product_creation_wizard,product_creation_wizard,model_product_creation_wizard,base.group_user,1,1,1,0
+access_sf_sale_order_cancel_line,sf_sale_order_cancel_line,model_sf_sale_order_cancel_line,sf_base.group_sf_order_user,1,0,1,1

sf_manufacturing/views/agv_setting_views.xml

@@ -15,23 +15,6 @@
             </field>
         </record>
 
-        <record id="view_agv_site_form" model="ir.ui.view">
-            <field name="name">agv.site.form</field>
-            <field name="model">sf.agv.site</field>
-            <field name="arch" type="xml">
-                <form create="false" edit="false">
-                    <sheet>
-                        <group>
-                            <field name="name" readonly="1" required="1"/>
-                            <field name="workcenter_id" readonly="1" required="1" options="{'no_create': True}"/>
-                            <field name="state" readonly="1" required="1"/>
-                            <field name="divide_the_work" readonly="1" required="1"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
         <record id="action_agv_site_form" model="ir.actions.act_window">
             <field name="name">AGV站点</field>
             <field name="res_model">sf.agv.site</field>
@@ -56,8 +39,7 @@
                     <field name="route_type" string="类型" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"
                            attrs="{'readonly': [('id', '!=', False)]}"/>
-                    <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"
-                           attrs="{'readonly': [('id', '!=', False)]}"/>
+                    <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
 <!--                    <field name="destination_production_line_id" required="1" options="{'no_create': True}"-->
 <!--                           attrs="{'readonly': [('id', '!=', False)]}"/>-->
                     <field name="workcenter_id"/>

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -383,7 +383,7 @@
                                 <field name="process_parameters_id"
                                        attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
                                        string="参数" context="{'route_id':route_id,'production_id': production_id}"
-                                       options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
+                                       options="{'no_create': True}"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"
@@ -455,15 +455,11 @@
             <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</attribute>
                     <attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
                     <attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
                 </xpath>
-<!--                <xpath expr="//field[@name='create_date']" position="before">-->
-<!--                        -->
-<!--                </xpath>-->
                 <xpath expr="//field[@name='state']" position="replace">
-                    <field name="create_date" invisible="True"/>
                     <field name="delivery_warning" invisible="True"/>
                     <field name="state" widget="badge" decoration-warning="state == 'progress'"
                            decoration-success="state == 'done'" decoration-danger="state in ('cancel','rework')"

sf_manufacturing/views/mrp_routing_workcenter_view.xml

@@ -22,26 +22,6 @@
                     <field name="is_repeat"/>
                     <field name="reserved_duration"/>
                 </field>
-                <xpath expr="//notebook/page[1]" position="before">
-                    <page string="可选工艺参数">
-                        <field name="optional_process_parameters">
-                            <tree editable="bottom">
-                                <field name="is_product_button" invisible="1"/>
-                                <field name="is_delete_button" invisible="1"/>
-                                <field name="code" attrs="{'readonly': True}"/>
-                                <field name="name"  required="1"/>
-                                <field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/>
-                                <!-- 按钮列 -->
-                                <button name="action_create_service_product" string="创建服务产品" type="object"
-                                        class="btn-primary"
-                                        attrs="{'invisible': [('is_product_button', '=', True)]}" context="{'default_process_parameter_id':id}"/>
-                                <button name="action_hide_service_products" string="删除" type="object"
-                                        class="oe_highlight"
-                                        attrs="{'invisible': [('is_delete_button', '=', True)]}"/>
-                            </tree>
-                        </field>
-                    </page>
-                </xpath>
             </field>
         </record>
     </data>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -144,17 +144,6 @@
                        statusbar_visible="pending,waiting,ready,progress,to be detected,done,rework"/>
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
-                <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
-                        icon="fa-credit-card"
-                        groups="base.group_user,sf_base.group_sf_order_user"
-                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
-                    <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="pr_mp_count"/>
-                        </span>
-                        <span class="o_stat_text">采购申请</span>
-                    </div>
-                </button>
                 <button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
                         icon="fa-credit-card"
                         groups="base.group_user,sf_base.group_sf_order_user"
@@ -678,7 +667,6 @@
         <field name="arch" type="xml">
             <field name="product_id" position="after">
                 <field name="part_number" string="成品零件图号"/>
-                <field name="model_id" string="模型id"/>
             </field>
             <xpath expr="//filter[@name='progress']" position="after">
                 <filter string="待检测" name="state" domain="[('state','=','to be detected')]"/>

sf_manufacturing/views/product_template_views.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="view_product_template_form_inherit_sf_manufacturing">
-            <field name="name">product.template.product.form.inherit.sf_manufacture</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="sf_dlm_management.view_product_template_only_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">
-                    <field name="model_id" readonly="1"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/views/sale_order_views.xml

@@ -101,7 +101,7 @@
         action="action_quotations_supply_method"
         parent="sale.sale_order_menu"
         groups="sf_base.group_production_engineer"
-        sequence="20"/>
+        sequence="2"/>
 
     <record id="sale.menu_sale_order" model="ir.ui.menu">
         <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>

sf_manufacturing/views/stock_picking_view.xml

@@ -50,9 +50,6 @@
                 <xpath expr="//field[@name='origin']" position="after">
                     <field name="retrospect_ref"/>
                 </xpath>
-                <xpath expr="//tree" position="attributes">
-                    <attribute name="default_order">create_date desc</attribute>
-                </xpath>
             </field>
         </record>
 

sf_manufacturing/wizard/__init__.py

@@ -6,4 +6,3 @@ from . import production_technology_re_adjust_wizard
 from . import mrp_workorder_batch_replan_wizard
 from . import sf_programming_reason
 from . import sale_order_cancel
-from . import process_outsourcing

sf_manufacturing/wizard/process_outsourcing.py

@@ -1,34 +0,0 @@
-from odoo import models, fields, api
-
-class ProductCreationWizard(models.TransientModel):
-    _name = 'product.creation.wizard'
-    _description = '产品创建向导'
-
-    # 唯一需要用户输入的字段：产品类别
-    categ_id = fields.Many2one(
-        'product.category',
-        string='产品类别',
-        required=True,default=lambda self: self.env.ref(
-            'sf_manufacturing.product_category_outsource_other_process',
-            raise_if_not_found=False
-        ).sudo(),
-    )
-    process_parameter_id = fields.Many2one('sf.production.process.parameter')
-    def action_create_product(self):
-        res_partner = self.env['res.partner'].search([('name','=','湖南傲派自动化设备有限公司')])
-        name = self.process_parameter_id.process_id.name or self.process_parameter_id.routing_id.name
-        default_values = {
-            'detailed_type': 'service',
-            'name': f"{name}_{self.process_parameter_id.name}",
-            'invoice_policy': 'delivery',
-            'categ_id': self.categ_id.id,
-            'description': f"基于{self.process_parameter_id.name}创建的服务产品",
-            'sale_ok': True,  # 可销售
-            'purchase_ok': True,  # 可采购
-            'server_product_process_parameters_id': self.process_parameter_id.id,
-            'seller_ids': [(0, 0, {
-                # 'delay': 1,
-                'partner_id': res_partner.id,
-                'price': 1, })],
-        }
-        self.env['product.template'].create(default_values)

sf_manufacturing/wizard/process_outsourcing.xml

@@ -1,37 +0,0 @@
-<odoo>
-    <record id="view_product_creation_wizard_form" model="ir.ui.view">
-        <field name="name">product.creation.wizard.form</field>
-        <field name="model">product.creation.wizard</field>
-        <field name="arch" type="xml">
-            <form string="创建产品">
-                <sheet>
-                    <group>
-                        <field name="categ_id" required="1"/>
-                    </group>
-                </sheet>
-                <footer>
-                    <button
-                        name="action_create_product"
-                        string="创建"
-                        type="object"
-                        class="btn-primary"
-                    />
-                    <button
-                        string="取消"
-                        special="cancel"
-                        class="btn-secondary"
-                    />
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <!-- 向导动作 -->
-    <record id="action_product_creation_wizard" model="ir.actions.act_window">
-        <field name="name">快速创建产品</field>
-        <field name="res_model">product.creation.wizard</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-        <field name="binding_model_id" ref="product.model_product_product"/>
-    </record>
-</odoo>

sf_manufacturing/wizard/production_technology_re_adjust_wizard.py

@@ -2,7 +2,6 @@
 import logging
 from itertools import groupby
 from odoo import models, api, fields, _
-from odoo.exceptions import UserError
 
 
 class ProductionTechnologyReAdjustWizard(models.TransientModel):
@@ -77,11 +76,4 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
                 if workorders[
                     0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
                     workorders[0].state = 'waiting'
-            pr_ids = self.env['purchase.request'].sudo().search(
-                [('origin', 'like', item.name), ('is_subcontract', '=', 'True'), ('state', '!=', 'rejected')])
-            if not pr_ids:
-                continue
-            if not all(pr.state == 'draft' for pr in pr_ids):
-                # 如果发现有记录的 state 不是 'draft'，抛出异常
-                raise UserError("有采购申请的状态不是 '草稿'")
-            pr_ids.state = 'rejected'
+

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -117,30 +117,17 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                     item.button_finish()
 
             # return scheduling.read()[0]
-            if isinstance(scheduling, bool) and scheduling is True:
-                return{
-                    'type': 'ir.actions.client',
-                    'tag': 'display_notification',
-                    'target': 'new',
-                    'params': {
-                        'message': f'解除装夹成功',
-                        'type': 'success',
-                        'sticky': False,
-                        'next': {'type': 'ir.actions.act_window_close'},
-                    }
-                }
-            else:
-                return {
-                    'type': 'ir.actions.client',
-                    'tag': 'display_notification',
-                    'target': 'new',
-                    'params': {
-                        'message': f'任务下发成功！AGV任务调度编号为【{scheduling.name}】',
-                        'type': 'success',
-                        'sticky': False,
-                        'next': {'type': 'ir.actions.act_window_close'},
-                    }
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'display_notification',
+                'target': 'new',
+                'params': {
+                    'message': f'任务下发成功！AGV任务调度编号为【{scheduling.name}】',
+                    'type': 'success',
+                    'sticky': False,
+                    'next': {'type': 'ir.actions.act_window_close'},
                 }
+            }
         except Exception as e:
             logging.info('%s任务下发失败：%s', self.delivery_type, e)
             raise UserError(f'{self.delivery_type}任务下发失败：{e}') from e

sf_mrs_connect/controllers/controllers.py

@@ -8,7 +8,6 @@ from odoo.http import request
 from odoo.addons.sf_base.controllers.controllers import MultiInheritController
 
 
-
 class Sf_Mrs_Connect(http.Controller, MultiInheritController):
 
     @http.route('/api/cnc_processing/create', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
@@ -23,7 +22,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
         try:
             res = {'status': 1, 'message': '成功'}
             datas = request.httprequest.data
-            model_id = None
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
@@ -59,7 +57,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                         return json.JSONEncoder().encode(res)
                 for production in productions:
-                    model_id = production.product_id.model_id # 一个编程单的制造订单对应同一个模型
                     production.write({'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False})
                     for panel in ret['processing_panel'].split(','):
                         # 查询状态为进行中且工序类型为CNC加工的工单
@@ -86,23 +83,19 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         #                                       panel)
                         program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                         files_panel = os.listdir(program_path_tmp_panel)
-                        panel_file_path = ''
                         if files_panel:
                             for file in files_panel:
                                 file_extension = os.path.splitext(file)[1]
                                 if file_extension.lower() == '.pdf':
                                     panel_file_path = os.path.join(program_path_tmp_panel, file)
                                     logging.info('panel_file_path:%s' % panel_file_path)
-                                    
-                            # 向编程单中添加二维码
-                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "扫码获取工单")
-                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
-                            pre_workorder = productions.workorder_ids.filtered(
-                                lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
-                                                                                                'cancel'] and ap.processing_panel == panel)
-                            if pre_workorder:
-                                pre_workorder.write(
-                                    {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                        cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                        pre_workorder = productions.workorder_ids.filtered(
+                            lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
+                                                                                              'cancel'] and ap.processing_panel == panel)
+                        if pre_workorder:
+                            pre_workorder.write(
+                                {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
                 productions.write({'programming_state': '已编程', 'work_state': '已编程'})
                 productions.filtered(lambda p: p.production_type == '人工线下加工').write({'manual_quotation': True})
                 logging.info('已更新制造订单编程状态:%s' % productions.ids)
@@ -275,6 +268,3 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
             request.cr.rollback()
             logging.info('get_cnc_processing_create error:%s' % e)
             return json.JSONEncoder().encode(res)
-
-
-    

sf_mrs_connect/data/ir_cron_data.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <odoo>
-    <data noupdate="1">
-        <record model="ir.cron" id="ir_cron_sf_static_resource_datasync">
-            <field name="name">制造-配置：每日定时同步cloud的静态资源库</field>
-            <field name="model_id" ref="model_res_config_settings"/>
-            <field name="state">code</field>
-            <field name="code">model.sf_all_sync()</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-        </record>
+
+    <record model="ir.cron" id="ir_cron_sf_static_resource_datasync">
+        <field name="name">制造-配置：每日定时同步cloud的静态资源库</field>
+        <field name="model_id" ref="model_res_config_settings"/>
+        <field name="state">code</field>
+        <field name="code">model.sf_all_sync()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
     <!--    <record model="ir.cron" id="sf_cron1">-->
     <!--        <field name="name">同步静态资源库材料</field>-->
     <!--        <field name="model_id" ref="model_sf_production_materials"/>-->
@@ -220,5 +220,4 @@
     <!--        <field name="numbercall">-1</field>-->
     <!--        <field name="doall" eval="False"/>-->
     <!--    </record>-->
-    </data>
 </odoo>

sf_mrs_connect/models/sync_common.py

@@ -1135,10 +1135,8 @@ class sfProductionProcessParameter(models.Model):
                         [("code", '=', item['code']), ('active', 'in', [True, False])])
                     process = self.env['sf.production.process'].search(
                         [('code', '=', item['process_id_code'])], limit=1)
-                    production_process_parameter = self.search(
-                        [("code", '=', item['code']), ('active', 'in', [True, False])])
                     if not production_process_parameter:
-                        production_process_parameter = self.create({
+                        self.create({
                             "name": item['name'],
                             "process_description": item['process_description'],
                             "processing_day": item['processing_day'],
@@ -1148,12 +1146,9 @@ class sfProductionProcessParameter(models.Model):
                             "process_id": process.id,
                             'materials_model_ids': self.env['sf.materials.model'].search(
                                 [('materials_no', 'in', item['materials_model_ids_codes'])]),
-                            'processing_mm': item['processing_mm'],
-                            'gain_way':'外协',
+                            'processing_mm': item['processing_mm']
                         })
-                        production_process_parameter.create_service_product()
                     else:
-                        production_process_parameter.gain_way = '外协'
                         production_process_parameter.name = item['name']
                         production_process_parameter.process_description = item['process_description']
                         production_process_parameter.processing_day = item['processing_day']
@@ -1163,9 +1158,6 @@ class sfProductionProcessParameter(models.Model):
                             [('materials_no', 'in', item['materials_model_ids_codes'])])
                         production_process_parameter.active = item['active']
                         production_process_parameter.processing_mm = item['processing_mm']
-                        if not production_process_parameter.outsourced_service_products:
-                            production_process_parameter.create_service_product()
-                    production_process_parameter.create_work_center()
         else:
             raise ValidationError("表面工艺可选参数认证未通过")
 

sf_plan/__manifest__.py

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

sf_plan/models/custom_plan.py

@@ -228,7 +228,6 @@ class sf_production_plan(models.Model):
         """
         排程方法
         """
-        self.deal_processing_schedule(self.date_planned_start)
         for record in self:
             if not record.production_line_id:
                 raise ValidationError("未选择生产线")

sf_plan/views/view.xml

@@ -24,17 +24,15 @@
                     <field name="production_line_id"/>
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
-                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'"
-                           decoration-success="production_type == '自动化产线加工'"/>
+                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'"/>
                     <field name="actual_start_time" optional='hide'/>
                     <field name="actual_end_time" optional='hide'/>
                     <field name="actual_process_time" optional='hide'/>
                     <field name="schedule_setting" optional='hide'/>
-                    <!--                     <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" -->
-                    <!--                             attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}" -->
-                    <!--                             groups="sf_base.group_plan_dispatch"/> -->
-                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程"
-                            type="object"
+<!--                     <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" -->
+<!--                             attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}" -->
+<!--                             groups="sf_base.group_plan_dispatch"/> -->
+                    <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object"
                             attrs="{'invisible': ['|', ('state', '!=', 'done'), ('actual_start_time', '!=', False)]}"
                             groups="sf_base.group_plan_dispatch"/>
                 </tree>
@@ -50,11 +48,9 @@
                         <!--                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight" icon="fa-step-forward"/> -->
                         <button string="执行排程" name="do_production_schedule" type="object" class="oe_highlight"
                                 options='{"calendar_view": true, "date_begin": "2020-01-01", "date_end": "2020-12-31"}'
-                                groups="sf_base.group_plan_dispatch"
-                                attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}"/>
+                                groups="sf_base.group_plan_dispatch" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}"/>
                         <button string="取消排程" name="cancel_production_schedule" type="object" class="oe_highlight"
-                                groups="sf_base.group_plan_dispatch"
-                                attrs="{'invisible': ['|', ('state', '!=', 'done'), ('actual_start_time', '!=', False)]}"/>
+                                groups="sf_base.group_plan_dispatch" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('actual_start_time', '!=', False)]}"/>
                         <!--                         <button name="archive" type="object" string="归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', False)]}"/> -->
                         <!--                         <button name="unarchive" type="object" string="取消归档" icon="fa-archive" class="oe_highlight" attrs="{'invisible': [('active', '=', True)]}"/> -->
 
@@ -70,13 +66,13 @@
                         </div>
                         <group>
                             <group string="基本信息">
-                                <!--                                 <field name="active" invisible="1"/> -->
+<!--                                 <field name="active" invisible="1"/> -->
                                 <field name="production_id" widget="many2one_button"/>
                                 <field name="product_id"/>
                                 <field name="origin"/>
                                 <field name="product_qty"/>
                                 <field name="order_deadline" widget="date"/>
-                                <!--                                 <field name="process_time"/> -->
+<!--                                 <field name="process_time"/> -->
                                 <field name="schedule_setting"/>
                                 <field name="production_line_id" domain="[('name', 'ilike', 'CNC')]"/>
 
@@ -87,16 +83,15 @@
                                 <!--                                     <field name="message_ids" widget="mail_thread"/> -->
                                 <!--                                     <field name="activity_ids"/> -->
                                 <!--                                 </div> -->
-                                <!--                                 <div class="oe_chatter"> -->
-                                <!--                                     <field name="message_follower_ids"/> -->
-                                <!--                                     <field name="message_ids"/> -->
-                                <!--                                 </div> -->
+<!--                                 <div class="oe_chatter"> -->
+<!--                                     <field name="message_follower_ids"/> -->
+<!--                                     <field name="message_ids"/> -->
+<!--                                 </div> -->
                             </group>
 
                             <group string="加工信息">
 
-                                <field name="date_planned_start"
-                                       placeholder="如果不选择计划开始时间，会取当前时间来做排程" required="1"/>
+                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程" required="1"/>
                                 <field name="date_planned_finished" required="0" invisible="1"/>
                                 <field name="actual_process_time"/>
                                 <field name="actual_start_time"/>
@@ -162,8 +157,8 @@
                 <search string="订单计划">
 
                     <!-- Your other filters go here -->
-                    <!--                     <filter name="archived" string="已归档" domain="[('active','=',False)]"/> -->
-                    <!--                     <filter name="not archived" string="未归档" domain="[('active','=',True)]"/> -->
+<!--                     <filter name="archived" string="已归档" domain="[('active','=',False)]"/> -->
+<!--                     <filter name="not archived" string="未归档" domain="[('active','=',True)]"/> -->
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="part_name"/>
@@ -178,16 +173,13 @@
                         <filter name="group_by_state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
                     </group>
                     <group expand="0" string="Group By">
-                        <filter name="group_by_production_line_id" string="生产线" domain="[]"
-                                context="{'group_by': 'production_line_id'}"/>
+                        <filter name="group_by_production_line_id" string="生产线" domain="[]" context="{'group_by': 'production_line_id'}"/>
                     </group>
                     <searchpanel>
-                        <!--                         <field name="state" icon="fa-filter"/> -->
-                        <field name="production_line_id" select="multi" string="生产线" icon="fa-building"
-                               enable_counters="1"/>
+<!--                         <field name="state" icon="fa-filter"/> -->
+                        <field name="production_line_id" select="multi" string="生产线" icon="fa-building" enable_counters="1"/>
                         <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
-                        <field name="production_type" select="multi" string="制造类型" icon="fa-building"
-                               enable_counters="1"/>
+                        <field name="production_type" select="multi" string="制造类型" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -283,7 +275,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">tree,gantt,form</field>
-            <!--             <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field> -->
+<!--             <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field> -->
             <field name="context">{'search_default_draft': 1, 'display_complete': True}</field>
         </record>
 
@@ -349,7 +341,7 @@
                 parent="mrp.menu_mrp_manufacturing"
         />
 
-        <menuitem
+         <menuitem
                 id="sf_workpiece_delivery__empty_racks_menu"
                 name="空料架配送"
                 sequence="11"
@@ -371,42 +363,6 @@
                 action="sf_production_plan_action1"
                 parent="sf_production_plan_menu"
         />
-        <menuitem
-                id="menu_plan_config_root"
-                name="配置"
-                sequence="190"
-                parent="sf_production_plan_menu"
-        />
 
-        <!-- 二级菜单：工厂日历 -->
-        <menuitem
-                id="menu_factory_calendar"
-                name="工厂日历"
-                parent="menu_plan_config_root"
-                action="resource.action_resource_calendar_form"
-                sequence="10"
-        />
-<!--        <record id="action_resource_calendar_form" model="ir.actions.act_window">-->
-<!--        <field name="name">Working Times</field>-->
-<!--        <field name="res_model">resource.calendar</field>-->
-<!--        <field name="view_mode">tree,form</field>-->
-<!--        <field name="view_id" eval="False"/>-->
-<!--        <field name="search_view_id" ref="view_resource_calendar_search"/>-->
-<!--        <field name="help" type="html">-->
-<!--          <p class="o_view_nocontent_smiling_face">-->
-<!--            Define working hours and time table that could be scheduled to your project members-->
-<!--          </p>-->
-<!--        </field>-->
-<!--    </record>-->
-<!--        <record id="action_factory_calendar" model="ir.actions.act_window">-->
-<!--            <field name="name">工厂日历</field>-->
-<!--            <field name="res_model">resource.calendar</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="help" type="html">-->
-<!--                <p class="o_view_nocontent_smiling_face">-->
-<!--                    创建和管理工厂工作日历-->
-<!--                </p>-->
-<!--            </field>-->
-<!--        </record>-->
     </data>
 </odoo>

sf_plan/wizard/action_plan_some.py

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

sf_quality/data/insepection_report_template.xml

@@ -61,29 +61,6 @@
                 </div>
             </div>
         </template>
-
-        <!-- 定义页脚模板无页码 -->
-        <template id="html_report_quality_footer">
-            <div class="footer">
-                <div style="border-top: 3px solid black;"></div>
-
-                <div class="row">
-                    <div class="col-6">
-                        <p>售后服务: <span t-field="o.company_id.phone"/></p>
-                        <p>公司名称: <span t-field="o.company_id.name"/></p>
-                        <p>加工工厂: <span t-field="o.company_id.factory_name"/></p>
-                    </div>
-                    <div class="col-6">
-                        <p>公司网址: <span t-field="o.company_id.website"/></p>
-                        <p>公司邮箱: <span t-field="o.company_id.email"/></p>
-                    </div>
-                </div>
-                <!-- <div style="border-top: 2px solid black;"></div> -->
-                <div class="text-center">
-                    <span>第<span>1</span> 页/共 <span>1</span>页</span>
-                </div>
-            </div>
-        </template>
     <template id="report_quality_inspection">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="o">
@@ -96,7 +73,7 @@
                         <table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
                             <tr>
                                 <td style="width: 15%; border: 1px solid black;"><strong>产品名称:</strong></td>
-                                <td style="width: 35%; border: 1px solid black;"><span t-field="o.part_name"/></td>
+                                <td style="width: 35%; border: 1px solid black;"><span t-field="o.product_id.name"/></td>
                                 <td style="width: 15%; border: 1px solid black;"><strong>材料:</strong></td>
                                 <td style="width: 35%; border: 1px solid black;"><span t-field="o.material_name"/></td>
                             </tr>
@@ -210,131 +187,4 @@
             </t>
         </t>
     </template>
-
-    <template id="html_report_quality_inspection">
-        <t t-call="web.html_container">
-            <t t-foreach="docs" t-as="o">
-                <t t-call="web.basic_layout">
-                    <t t-call="sf_quality.report_quality_header"/>
-
-
-                    <div class="page" style="min-height: 800px; position: relative; padding-bottom: 250px;">
-
-                        <table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
-                            <tr>
-                                <td style="width: 15%; border: 1px solid black;"><strong>产品名称:</strong></td>
-                                <td style="width: 35%; border: 1px solid black;"><span t-field="o.part_name"/></td>
-                                <td style="width: 15%; border: 1px solid black;"><strong>材料:</strong></td>
-                                <td style="width: 35%; border: 1px solid black;"><span t-field="o.material_name"/></td>
-                            </tr>
-                            <tr>
-                                <td style="border: 1px solid black;"><strong>图号:</strong></td>
-                                <td style="border: 1px solid black;"><span t-field="o.part_number"/></td>
-                                <td style="border: 1px solid black;"><strong>日期:</strong></td>
-                                <td style="border: 1px solid black;"><span t-field="o.write_date"/></td>
-                            </tr>
-                            <tr>
-                                <td style="border: 1px solid black;"><strong>总数量:</strong></td>
-                                <td style="border: 1px solid black;"><span t-field="o.total_qty"/></td>
-                                <td style="border: 1px solid black;"><strong>检验数量:</strong></td>
-                                <td style="border: 1px solid black;"><span t-field="o.check_qty"/></td>
-                            </tr>
-                        </table>
-
-                        <h4 class="text-center mt-4">检验结果</h4>
-                        <div class="" style="position: relative;">
-                        <table class="table table-sm mt-2" style="border: 1px solid black;">
-                            <thead>
-                                <tr>
-                                    <th style="border: 1px solid black;" class="text-center" rowspan="2">检测项目<br/>(图示尺寸)</th>
-                                    <th style="border: 1px solid black;" t-att-colspan="o.column_nums" class="text-center">测量值</th>
-                                    <th style="border: 1px solid black; vertical-align: middle;" class="text-center" rowspan="2">判定</th>
-                                    <th style="border: 1px solid black; vertical-align: middle;" class="text-center" rowspan="2">备注</th>
-                                </tr>
-                                <tr>
-                                    <!-- <th style="border: 1px solid black;"></th> -->
-                                    <th style="border: 1px solid black;" t-if="o.column_nums >= 1" class="text-center">1</th>
-                                    <th style="border: 1px solid black;" t-if="o.column_nums >= 2" class="text-center">2</th>
-                                    <th style="border: 1px solid black;" t-if="o.column_nums >= 3" class="text-center">3</th>
-                                    <th style="border: 1px solid black;" t-if="o.column_nums >= 4" class="text-center">4</th>
-                                    <th style="border: 1px solid black;" t-if="o.column_nums >= 5" class="text-center">5</th>
-                                    <!-- <th style="border: 1px solid black;"></th>
-                                    <th style="border: 1px solid black;"></th> -->
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr t-foreach="o.measure_line_ids" t-as="line">
-                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.measure_item"/></td>
-                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 1" class="text-center"><span t-field="line.measure_value1"/></td>
-                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 2" class="text-center"><span t-field="line.measure_value2"/></td>
-                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 3" class="text-center"><span t-field="line.measure_value3"/></td>
-                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 4" class="text-center"><span t-field="line.measure_value4"/></td>
-                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 5" class="text-center"><span t-field="line.measure_value5"/></td>
-                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.measure_result"/></td>
-                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.remark"/></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <img src="/sf_quality/static/img/pass.png" style="width: 200px; height: 200px;position: absolute; bottom: 20px; right: 20%;"/>
-
-                        </div>
-                        <div style="clear: both; margin-top: 30px; padding-top: 10px;">
-                            <div style="display: inline-block;">
-                                <span style="font-size: 18px; font-weight: bold;">检验结论: </span>
-                                <span t-if="o.report_result == 'OK'" style="margin-left: 30px; display: inline-block;">
-                                    <svg width="20" height="20" style="vertical-align: middle;">
-                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                        <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
-                                    </svg>
-                                    <span style="margin-left: 5px;">合格</span>
-                                </span>
-                                <span t-else="" style="margin-left: 30px; display: inline-block;">
-                                    <svg width="20" height="20" style="vertical-align: middle;">
-                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                    </svg>
-                                    <span style="margin-left: 5px;">合格</span>
-                                </span>
-                                <span t-if="o.report_result == 'NG'" style="margin-left: 50px; display: inline-block;">
-                                    <svg width="20" height="20" style="vertical-align: middle;">
-                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                        <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
-                                    </svg>
-                                    <span style="margin-left: 5px;">不合格</span>
-                                </span>
-                                <span t-else="" style="margin-left: 50px; display: inline-block;">
-                                    <svg width="20" height="20" style="vertical-align: middle;">
-                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                    </svg>
-                                    <span style="margin-left: 5px;">不合格</span>
-                                </span>
-                            </div>
-                        </div>
-
-                        <div class="row mt-4">
-                            <div class="col-6">
-                                <p><strong>操作员: </strong> <span t-field="o.measure_operator"/></p>
-                            </div>
-                            <div class="col-6">
-                                <p><strong>质检员: </strong> <span t-field="o.quality_manager"/></p>
-                            </div>
-                        </div>
-                        <div style="border-top: 3px solid black;"></div>
-
-                        <!-- 添加合格标签 -->
-
-                        <!-- <div class="row mt-5">
-                            <div class="col-12 text-center">
-                                <p></p>
-                            </div>
-                        </div> -->
-
-                        <!-- 页脚固定在底部 -->
-                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-                        <t t-call="sf_quality.html_report_quality_footer"/>
-                    <!-- </div> -->
-                    </div>
-                </t>
-            </t>
-        </t>
-    </template>
 </odoo>

sf_quality/data/report_actions.xml

@@ -18,7 +18,7 @@
         <field name="name">预览检验报告</field>
         <field name="model">quality.check</field>
         <field name="report_type">qweb-html</field>
-        <field name="report_name">sf_quality.html_report_quality_inspection</field>
+        <field name="report_name">sf_quality.report_quality_inspection</field>
         <field name="binding_type">report</field>
     </record>
 </odoo>

sf_sale/models/sale_order.py

@@ -343,11 +343,6 @@ class RePurchaseOrder(models.Model):
                         if order_line.product_id.id in product_list:
                             purchase.purchase_type = 'outsourcing'
                             break
-            request_lines = self.order_line.mapped('purchase_request_lines')
-            # 检查是否存在 is_subcontract 为 True 的行
-            if any(line.is_subcontract for line in request_lines):
-                purchase.purchase_type = 'consignment'
-
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
                                         string='交期状态', default='normal',
@@ -381,28 +376,6 @@ class RePurchaseOrder(models.Model):
                 if not line.taxes_id:
                     raise UserError('请对【产品】中的【税】进行选择')
 
-    def get_purchase_request(self, consecutive_process_parameters, production):
-        result = []
-        for pp in consecutive_process_parameters:
-            server_template = self.env['product.template'].search(
-                [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
-                 ('detailed_type', '=', 'service')])
-            # route_ids
-            result.append({
-                "product_id": server_template.product_variant_id.id,
-                "name": production.procurement_group_id.name,
-                "date_required": fields.Datetime.now(),
-                "product_uom_id":server_template.uom_id.id,
-                "product_qty": 1,
-                "request_id": False,
-                "move_dest_ids": False,
-                "orderpoint_id": False,
-                'is_subcontract':True,
-                'group_id':production.procurement_group_id.id,
-                'production_name':pp.production_id.name,
-            })
-        return result
-
     def get_purchase_order(self, consecutive_process_parameters, production, product_id_to_production_names):
         for pp in consecutive_process_parameters:
             server_product_process = []
@@ -423,14 +396,14 @@ class RePurchaseOrder(models.Model):
                     'manual_part_name': pp.part_name,
                 }))
                 # 获取服务商品最后一个供应商的采购员
-                purchase_user_id = server_template.seller_ids[-1].partner_id.purchase_user_id if server_template.seller_ids else False
+                purchase_user_id = server_template.seller_ids[-1].partner_id.purchase_user_id
                 purchase_order = self.env['purchase.order'].sudo().create({
-                    'partner_id': server_template.seller_ids[0].partner_id.id  if server_template.seller_ids else False,
+                    'partner_id': server_template.seller_ids[0].partner_id.id,
                     'origin': production.name,
                     'state': 'draft',
                     'purchase_type': 'consignment',
                     'order_line': server_product_process,
-                    'user_id': purchase_user_id.id if purchase_user_id else False,
+                    'user_id': purchase_user_id.id
                 })
                 purchase_order.order_line._compute_part_number()
                 pp.purchase_id = [(6, 0, [purchase_order.id])]

sf_sale/views/purchase_order_view.xml

@@ -298,10 +298,6 @@
                 <xpath expr="//field[@name='name']" position="attributes">
                     <attribute name="class">purchase_order_list_name</attribute>
                 </xpath>
-                 <!-- 修改 tree 视图的排序规则 -->
-                <xpath expr="//tree" position="attributes">
-                    <attribute name="default_order">date_approve desc</attribute>
-                </xpath>
             </field>
         </record>
 

sf_sale/views/sale_team.xml

@@ -14,14 +14,16 @@
 <!--            name="Orders"-->
 <!--            sequence="10">-->
 
+<!--            <menuitem id="menu_sale_quotations"-->
+<!--                action="action_quotations_with_onboarding"-->
+<!--                groups="sales_team.group_sale_salesman"-->
+<!--                sequence="10"/>-->
 
-    <menuitem id="sale.menu_sale_quotations"
-              parent="sale.sale_order_menu"
-              sequence="20"/>
-
-    <menuitem id="sale.menu_sale_order"
-              parent="sale.sale_order_menu"
-              sequence="10"/>
+<!--            <menuitem id="menu_sale_order"-->
+<!--                name="Orders"-->
+<!--                action="action_orders"-->
+<!--                groups="sales_team.group_sale_salesman"-->
+<!--                sequence="20"/>-->
 
 
 <!--            <menuitem id="report_sales_team"-->

sf_stock/__manifest__.py

@@ -24,7 +24,6 @@
     # always loaded
     'data': [
         # 'security/ir.model.access.csv',
-        'data/stock_location_data.xml',
         'views/stock_picking.xml',
         'views/stock_product_template.xml',
     ],

sf_stock/data/stock_location_data.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="stock_location_outsourcing_material_receiving_area" model="stock.location">
-            <field name="name">外协收料区</field>
-            <field name="usage">internal</field>
-        </record>
-        <record id="stock_route_process_outsourcing" model='stock.route'>
-            <field name="name">工序外协</field>
-            <field name="company_id"></field>
-        </record>
-    </data>
-</odoo>

sf_stock/models/__init__.py

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

sf_stock/models/stock_warehouse_orderpoint.py

@@ -1,11 +0,0 @@
-import logging
-
-from odoo import models, fields
-
-_logger = logging.getLogger(__name__)
-
-
-class StockWarehouseOrderpoint(models.Model):
-    _inherit = 'stock.warehouse.orderpoint'
-
-    origin = fields.Char('补货来源')

sf_tool_management/__manifest__.py

@@ -38,7 +38,6 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
-            'sf_tool_management/static/src/change.scss'
         ]
 
     },

sf_tool_management/models/base.py

@@ -387,7 +387,7 @@ class FunctionalToolAssembly(models.Model):
                     else:
                         raise ValidationError('刀柄选择错误，请重新确认！！！')
             else:
-                location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode.upper())])
+                location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
                 if location:
                     if location == record.integral_freight_barcode_id:
                         tool_assembly_id.integral_verify = True
@@ -782,48 +782,47 @@ class FunctionalToolAssembly(models.Model):
         """根据BOM对刀具物料进行初始配置"""
         options = bom.get('options')
         # 配置刀柄信息
-        handle_ids = self._get_old_tool_material_lot(bom.get('handle_ids'))
-        for handle_id in handle_ids:
+        for handle_id in bom.get('handle_ids'):
             if handle_id:
                 if not self.handle_product_id:
-                    self.handle_product_id = handle_id.product_id.id
+                    self.handle_product_id = handle_id.id
                 break
 
         # 刀柄之外的物料配置
         if options == '刀柄+整体式刀具':
             # 配置整体式刀具
-            integra_lot_id = self._get_old_tool_material_lot(bom.get('integral_ids'))
-            integra_location_lot_id = self._get_shelf_location_lot(integra_lot_id)
+            integra_lot_ids = self._get_old_tool_material_lot(bom.get('integral_ids'))
+            integra_location_lot_id = self._get_shelf_location_lot(integra_lot_ids)
             self.integral_freight_barcode_id = integra_location_lot_id.shelf_location_id.id
             self.integral_lot_id = integra_location_lot_id.lot_id.id
         else:
             # 配置刀片
-            blade_lot_id = self._get_old_tool_material_lot(bom.get('blade_ids'))
-            blade_location_lot_id = self._get_shelf_location_lot(blade_lot_id)
+            blade_lot_ids = self._get_old_tool_material_lot(bom.get('blade_ids'))
+            blade_location_lot_id = self._get_shelf_location_lot(blade_lot_ids)
             self.blade_freight_barcode_id = blade_location_lot_id.shelf_location_id.id
             self.blade_lot_id = blade_location_lot_id.lot_id.id
 
             if options == '刀柄+刀杆+刀片':
                 # 配置刀杆
-                bar_lot_id = self._get_old_tool_material_lot(bom.get('bar_ids'))
-                bar_location_lot_id = self._get_shelf_location_lot(bar_lot_id)
+                bar_lot_ids = self._get_old_tool_material_lot(bom.get('bar_ids'))
+                bar_location_lot_id = self._get_shelf_location_lot(bar_lot_ids)
                 self.bar_freight_barcode_id = bar_location_lot_id.shelf_location_id.id
                 self.bar_lot_id = bar_location_lot_id.lot_id.id
             elif options == '刀柄+刀盘+刀片':
                 # 配置刀盘
-                pad_lot_id = self._get_old_tool_material_lot(bom.get('pad_ids'))
-                pad_location_lot_id = self._get_shelf_location_lot(pad_lot_id)
+                pad_lot_ids = self._get_old_tool_material_lot(bom.get('pad_ids'))
+                pad_location_lot_id = self._get_shelf_location_lot(pad_lot_ids)
                 self.pad_freight_barcode_id = pad_location_lot_id.shelf_location_id.id
                 self.pad_lot_id = pad_location_lot_id.lot_id.id
 
     def _get_old_tool_material_lot(self, material_ids):
         """ 根据先进先出原则选择物料批次 """
         location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
-        stock_quant = self.env['stock.quant'].sudo().search(
+        stock_quant_ids = self.env['stock.quant'].sudo().search(
             [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],
             order='lot_id')
-        if stock_quant:
-            return [quant.lot_id for quant in stock_quant]
+        if stock_quant_ids:
+            return [stock_quant_id.lot_id for stock_quant_id in stock_quant_ids]
         else:
             raise ValidationError(f'【{material_ids[0].cutting_tool_material_id.name}】物料库存不足，请先进行盘点或采购')
 
@@ -833,8 +832,9 @@ class FunctionalToolAssembly(models.Model):
             location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
             if location_lots:
                 return location_lots[0]
-        raise ValidationError(f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位库存不足，请先进行盘点入库')
-
+        if lot_ids:
+            raise ValidationError(
+                f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位上库存不足，请先进行盘点或采购！')
 
     def _get_inventory_bom(self, inventory_id):
         """获取BOM的刀具物料产品信息"""
@@ -1242,7 +1242,7 @@ class FunctionalToolDismantle(models.Model):
 
     functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True, tracking=True,
                                          domain=[('functional_tool_status', '!=', '已拆除'),
-                                                 ('current_location', 'in', ['刀具房', '线边刀库'])])
+                                                 ('current_location', '=', '刀具房')])
 
     @api.onchange('functional_tool_id')
     def _onchange_functional_tool_id(self):
@@ -1439,26 +1439,14 @@ class FunctionalToolDismantle(models.Model):
     def confirmation_disassembly(self):
         logging.info('%s刀具确认开始拆解' % self.dismantle_cause)
         code = self.code
-        context = self.env.context
         if self.functional_tool_id.functional_tool_status == '已拆除':
             raise ValidationError('Rfid为【%s】名称为【%s】的功能刀具已经拆解，请勿重复操作！' % (
                 self.functional_tool_id.rfid_dismantle, self.name))
         # 对拆解的功能刀具进行校验，只有在刀具房的功能刀具才能拆解
         elif self.functional_tool_id.functional_tool_status != '报警':
-            if self.functional_tool_id.current_location == '机内刀库':
+            if self.functional_tool_id.tool_room_num == 0:
                 raise ValidationError('Rfid为【%s】的功能刀具当前位置为【%s】，不能进行拆解！' % (
                     self.rfid, self.functional_tool_id.current_location))
-            elif not context.get('TRUE_DISASSEMBLE') and self.functional_tool_id.current_location == '线边刀库':
-                return {
-                    'type': 'ir.actions.act_window',
-                    'res_model': 'sf.functional.tool.dismantle.wiard',
-                    'name': '刀具寿命未到期',
-                    'view_mode': 'form',
-                    'target': 'new',
-                    'context': {
-                        'default_functional_tool_dismantle_id': self.id,
-                        'TRUE_DISASSEMBLE': True}
-                }
         # 目标重复校验
         self.location_duplicate_check()
         datas = {'scrap': [], 'picking': []}
@@ -1535,18 +1523,11 @@ class FunctionalToolDismantle(models.Model):
                 'functional_tool_name': self.functional_tool_id.name,
                 'handle_code_id': self.handle_lot_id.id,
                 'handle_product_id': self.handle_product_id.id,
-                'functional_tool_diameter': self.functional_tool_id.functional_tool_diameter,
-                'knife_tip_r_angle': self.functional_tool_id.knife_tip_r_angle,
-                'tool_loading_length': self.functional_tool_id.tool_loading_length,
-                'functional_tool_length': self.functional_tool_id.functional_tool_length,
                 'loading_task_source': '3',
                 'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
                 'reason_for_applying': '刀具寿命到期'
             })
 
-            # 将新的组装单更新到对应的功能刀具安全库存的组装单列表中
-            self.functional_tool_id.safe_inventory_id.sudo().sf_functional_tool_assembly_ids = [(4, assembly_id.id)]
-
             return {
                 'type': 'ir.actions.act_window',
                 'res_model': 'sf.functional.tool.assembly',

sf_tool_management/models/functional_tool.py

@@ -10,7 +10,6 @@ from odoo.exceptions import ValidationError
 
 class FunctionalCuttingToolEntity(models.Model):
     _name = 'sf.functional.cutting.tool.entity'
-    _inherit = ['mail.thread']
     _description = '功能刀具列表'
     _order = 'functional_tool_status'
 
@@ -42,7 +41,7 @@ class FunctionalCuttingToolEntity(models.Model):
     max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
     alarm_value = fields.Integer(string='报警值(min)', readonly=True)
     used_value = fields.Integer(string='已使用值(min)', readonly=True)
-    functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], tracking=True,
+    functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')],
                                               string='状态', store=True, default='正常')
     current_location_id = fields.Many2one('stock.location', string='当前位置', compute='_compute_current_location_id',
                                           store=True)
@@ -63,27 +62,16 @@ class FunctionalCuttingToolEntity(models.Model):
         for item in self:
             if item:
                 if item.functional_tool_status == '报警':
-                    self.create_tool_dismantle()
-
-    def set_functional_tool_status(self):
-        # self.write({
-        #     'functional_tool_status': '报警'
-        # })
-        self.functional_tool_status = '报警'
-        self.create_tool_dismantle()
-
-    def create_tool_dismantle(self):
-        for item in self:
-            # 创建报警刀具拆解单
-            self.env['sf.functional.tool.dismantle'].sudo().create({
-                'functional_tool_id': item.ids[0],
-                'dismantle_cause': '寿命到期报废'
-            })
-            # 创建刀具报警记录
-            self.env['sf.functional.tool.warning'].sudo().create({
-                'rfid': item.rfid,
-                'functional_tool_id': item.ids[0]
-            })
+                    # 创建报警刀具拆解单
+                    self.env['sf.functional.tool.dismantle'].sudo().create({
+                        'functional_tool_id': item.ids[0],
+                        'dismantle_cause': '寿命到期报废'
+                    })
+                    # 创建刀具报警记录
+                    self.env['sf.functional.tool.warning'].sudo().create({
+                        'rfid': item.rfid,
+                        'functional_tool_id': item.ids[0]
+                    })
 
     @api.depends('barcode_id.quant_ids', 'barcode_id.quant_ids.location_id', 'functional_tool_status',
                  'current_shelf_location_id', 'stock_num')
@@ -275,7 +263,7 @@ class FunctionalCuttingToolEntity(models.Model):
             functional_tool_model_ids.append(functional_tool_model.id)
         return [(6, 0, functional_tool_model_ids)]
 
-    dismantle_num = fields.Integer('拆解单数量', compute='_compute_dismantle_num', tracking=True, store=True)
+    dismantle_num = fields.Integer('拆解单数量', compute='_compute_dismantle_num', store=True)
     dismantle_ids = fields.One2many('sf.functional.tool.dismantle', 'functional_tool_id', '拆解单')
 
     @api.depends('dismantle_ids')

sf_tool_management/models/maintenance_equipment.py

@@ -107,17 +107,11 @@ class SfMaintenanceEquipment(models.Model):
                             if functional_tool_id.current_location != '机内刀库':
                                 # 对功能刀具进行移动到生产线
                                 functional_tool_id.tool_inventory_displacement_out()
-                            data_tool = {
-                                    'max_lifetime_value': data['MaxLife'],
-                                    'used_value': data['UseLife'],
-                                    'functional_tool_status': tool_install_time.get(data['State'])
-                                }
-                            if (functional_tool_id.functional_tool_status != '报警'
-                                    and tool_install_time.get(data['State']) == '报警'):
-                                functional_tool_id.write(data_tool)
-                                functional_tool_id.create_tool_dismantle()
-                            else:
-                                functional_tool_id.write(data_tool)
+                            functional_tool_id.write({
+                                'max_lifetime_value': data['MaxLife'],
+                                'used_value': data['UseLife'],
+                                'functional_tool_status': tool_install_time.get(data['State'])
+                            })
                     else:
                         logging.info('获取的【%s】设备不存在！！！' % data['DeviceId'])
             else:

sf_tool_management/security/ir.model.access.csv

@@ -40,7 +40,4 @@ access_sf_functional_tool_dismantle_group_sf_tool_user,sf.functional.tool.disman
 access_sf_functional_tool_dismantle_group_plan_dispatch,sf.functional.tool.dismantle_group_plan_dispatch,model_sf_functional_tool_dismantle,sf_base.group_plan_dispatch,1,0,0,0
 
 access_jikimo_bom,jikimo.bom,model_jikimo_bom,base.group_user,1,1,1,1
-access_jikimo_bom_wizard,jikimo.bom.wizard,model_jikimo_bom_wizard,base.group_user,1,1,1,1
-
-access_sf_functional_tool_dismantle_wiard,sf.functional.tool.dismantle.wiard,model_sf_functional_tool_dismantle_wiard,sf_base.group_sf_tool_user,1,1,1,0
-access_sf_functional_tool_dismantle_wiard_group_plan_dispatch,sf.functional.tool.dismantle.wiard,model_sf_functional_tool_dismantle_wiard,sf_base.group_plan_dispatch,1,0,0,0
+access_jikimo_bom_wizard,jikimo.bom.wizard,model_jikimo_bom_wizard,base.group_user,1,1,1,1

sf_tool_management/static/src/change.scss

@@ -1,47 +1,17 @@
-// .modal-content .o_cp_buttons {
-//     display:none
-// }
+.modal-content .o_cp_buttons {
+    display:none
+}
 
-// .modal-content .o_control_panel {
-//     display:none
-// }
+.modal-content .o_control_panel {
+    display:none
+}
 
-// .modal-content .o_list_button {
-
-// }
-
-// .o_form_view .o_field_widget .o_list_renderer {
-//   width: 100%!important;
-//   margin:0 auto;
-//   overflow: auto;
-// }
-.o_field_widget.o_readonly_modifier.o_field_char.text-success[name=handle_freight_rfid],
-.o_field_widget.o_readonly_modifier.o_field_many2one.text-success[name=integral_freight_barcode_id] {
-  a.text-success{
-    span {
-      color: #999;
-    }
-  }
+.modal-content .o_list_button {
 
 }
-.custom_group:has(.text-success){
-  position: relative;
-  &::after{
-    content: '';
-    display: block;
-    width: 72px;
-    height: 72px;
-    background: url('/sf_tool_management/static/images/replaceIcon.png') no-repeat center center;
-    background-size: 100%;
-    position: absolute;
-    bottom: 20px;
-    left: 300px;
-  }
+
+.o_form_view .o_field_widget .o_list_renderer {
+  width: 100%!important;
+  margin:0 auto;
+  overflow: auto;
 }
-.o_field_widget.o_readonly_modifier.o_field_char.text-success[name=handle_freight_rfid] {
-  display: flex;
-  align-items: center;
-  > span {
-    color: #999;
-  }
-}

sf_tool_management/views/functional_tool_views.xml

@@ -42,7 +42,6 @@
             <field name="arch" type="xml">
                 <form create="0" edit="0" delete="0">
                     <header>
-                        <button name="set_functional_tool_status" string="报警" type="object" invisible="1"/>
                         <!--                        <button name="enroll_functional_tool_entity" string="功能刀具注册" type="object"-->
                         <!--                                class="btn-primary"/>-->
                         <field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>
@@ -193,10 +192,6 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="message_ids"/>
-                    </div>
                 </form>
             </field>
         </record>

sf_tool_management/views/tool_base_views.xml

@@ -432,7 +432,7 @@
             <field name="name">功能刀具组装</field>
             <field name="model">sf.functional.tool.assembly</field>
             <field name="arch" type="xml">
-                <tree create="0" delete="0" default_order="create_date desc">
+                <tree create="0" delete="0">
                     <field name="assembly_order_code"/>
                     <field name="barcode_id" optional="hide"/>
                     <field name="code" optional="hide"/>
@@ -531,10 +531,10 @@
                                             <div>
                                                 <separator string="刀柄:" style="font-size: 13px;"/>
                                             </div>
-                                            <group class="custom_group" >
+                                            <group>
                                                 <field name="handle_code_id" string="序列号" placeholder="请选择"
                                                        options="{'no_create': True, 'no_quick_create': True}"/>
-                                                <field name="handle_freight_rfid" string="Rfid" decoration-success="handle_freight_rfid"/>
+                                                <field name="handle_freight_rfid" string="Rfid"/>
                                                 <field name="handle_product_id" string="名称"/>
                                                 <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
                                                 <field name="handle_specification_id" string="规格"/>
@@ -554,15 +554,15 @@
                                                 <separator string="整体式刀具:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <group class="custom_group">
-                                                    <field name="integral_freight_barcode_id" string="货位" decoration-success="integral_verify == True"/>
+                                                <group>
+                                                    <field name="integral_freight_barcode_id" string="货位"/>
                                                     <field name="integral_lot_id" string="批次"/>
                                                     <field name="integral_product_id" string="名称"/>
                                                     <field name="cutting_tool_integral_model_id" string="型号"/>
                                                     <field name="integral_specification_id" string="规格"/>
                                                     <field name="sf_tool_brand_id_1" string="品牌"/>
                                                 </group>
-                                                <group invisible="1">
+                                                <group>
                                                     <field name="integral_verify" string="" readonly="1"/>
                                                 </group>
                                             </group>
@@ -582,8 +582,8 @@
                                             <separator string="刀片:" style="font-size: 13px;"/>
                                         </div>
                                         <group>
-                                            <group class="custom_group"> 
-                                                <field name="blade_freight_barcode_id" string="货位" decoration-success="blade_verify == True"/>
+                                            <group>
+                                                <field name="blade_freight_barcode_id" string="货位"/>
                                                 <field name="blade_lot_id" string="批次"/>
                                                 <field name="blade_product_id" string="名称"/>
                                                 <field name="cutting_tool_blade_model_id" string="型号"/>
@@ -607,8 +607,8 @@
                                                 <separator string="刀杆:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <group class="custom_group">
-                                                    <field name="bar_freight_barcode_id" string="货位" decoration-success="bar_verify == True"/>
+                                                <group>
+                                                    <field name="bar_freight_barcode_id" string="货位"/>
                                                     <field name="bar_lot_id" string="批次"/>
                                                     <field name="bar_product_id" string="名称"/>
                                                     <field name="cutting_tool_cutterbar_model_id" string="型号"/>
@@ -631,8 +631,8 @@
                                                 <separator string="刀盘:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <group class="custom_group">
-                                                    <field name="pad_freight_barcode_id" string="货位" decoration-success="pad_verify == True"/>
+                                                <group>
+                                                    <field name="pad_freight_barcode_id" string="货位"/>
                                                     <field name="pad_lot_id" string="批次"/>
                                                     <field name="pad_product_id" string="名称"/>
                                                     <field name="cutting_tool_cutterpad_model_id" string="型号"/>

sf_tool_management/wizard/wizard.py

@@ -770,12 +770,3 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     #     }
 
 
-class FunctionalToolDismantle(models.TransientModel):
-    _name = 'sf.functional.tool.dismantle.wiard'
-    _description = '功能刀具拆解二次确认'
-
-    functional_tool_dismantle_id = fields.Many2one('sf.functional.tool.dismantle', '拆解单')
-
-    def confirm(self):
-        self.functional_tool_dismantle_id.confirmation_disassembly()
-        return True

sf_tool_management/wizard/wizard_view.xml

@@ -444,19 +444,4 @@
         <field name="view_id" ref="sf_functional_tool_assembly_order_form"/>
         <field name="target">new</field>
     </record>
-
-
-    <record id="sf_functional_tool_dismantle_wiard_form" model="ir.ui.view">
-        <field name="name">刀具拆解</field>
-        <field name="model">sf.functional.tool.dismantle.wiard</field>
-        <field name="arch" type="xml">
-            <form>
-                <div>刀具寿命未到期，是否继续拆解？</div>
-                <footer>
-                    <button string="确定" name="confirm" type="object" class="btn-primary"/>
-                    <button string="取消" class="btn-secondary" special="cancel"/>
-                </footer>
-            </form>
-        </field>
-    </record>
 </odoo>

sf_warehouse/security/ir.model.access.csv

@@ -150,4 +150,4 @@ access_sf_shelf_lot_group_user,sf.shelf.location.lot.group_user,model_sf_shelf_l
 
 
 access_ir_model_group_sf_stock_user,ir_model_group_sf_stock_user,base.model_ir_model,sf_base.group_sf_stock_user,1,1,0,0
-access_mrp_workorder_group_sf_stock_user,mrp_workorder_group_sf_stock_user,mrp.model_mrp_workorder,sf_base.group_sf_stock_user,1,1,0,0
+access_mrp_workorder_group_sf_stock_user,mrp_workorder_group_sf_stock_user,mrp.model_mrp_workorder,sf_base.group_sf_stock_user,1,0,0,0

tool_service/装夹自动保存检测文件服务/app.py

@@ -6,7 +6,10 @@ import win32gui
 import win32con
 import logging
 import time
-import re
+
+# 配置日志记录
+logging.basicConfig(filename='service.log', level=logging.INFO,
+                    format='%(asctime)s - %(levelname)s - %(message)s')
 
 app = FastAPI()
 
@@ -16,11 +19,11 @@ class FileUploadRequest(BaseModel):
 
 
 # FTP 服务器配置信息
-ftp_host = '47.119.33.43'
-ftp_port = 21
+ftp_host = '110.52.114.162'
+ftp_port = 10021
 ftp_user = 'ftpuser'
-ftp_password = 'FTPftp123'
-ftp_directory = 'ThreeTest/XT/Before/'
+ftp_password = '123456'
+ftp_directory = '/home/ftp/ftp_root/ThreeTest/XT/Before/'
 
 
 def find_child_window(parent_hwnd, class_name):
@@ -60,95 +63,25 @@ def find_child_window_by_title(parent_hwnd, title):
     return child_hwnds
 
 
-# 获取 ComboBox 的句柄
-def get_combobox_handle(parent_handle):
-    combo_handle = win32gui.FindWindowEx(parent_handle, 0, "ComboBox", None)
-    if combo_handle == 0:
-        raise Exception("ComboBox not found")
-    return combo_handle
-
-
-# 获取 ComboBox 中的所有选项
-def get_combobox_items(combo_handle):
-    count = win32gui.SendMessage(combo_handle, win32con.CB_GETCOUNT, 0, 0)
-    items = []
-    for i in range(count):
-        length = win32gui.SendMessage(combo_handle, win32con.CB_GETLBTEXTLEN, i, 0)
-        buffer = win32gui.PyMakeBuffer(length + 1)
-        win32gui.SendMessage(combo_handle, win32con.CB_GETLBTEXT, i, buffer)
-        byte_data = buffer.tobytes()
-
-        # 尝试多种编码方式
-        text = None
-        # 尝试多种编码方式，包括utf-16le
-        for encoding in ['utf-16le', 'utf-8', 'gbk', 'latin-1']:
-            try:
-                decoded_text = byte_data.decode(encoding).rstrip('\x00')
-                # 如果解码后的文本看起来是合理的，就接受它
-                if any(char.isprintable() for char in decoded_text):
-                    text = decoded_text
-                    break
-            except UnicodeDecodeError:
-                continue
-
-        # 如果所有解码方式都失败，或者内容仍有大量乱码，显示为十六进制字符串
-        if text is None or not all(char.isprintable() or char.isspace() for char in text):
-            text = byte_data.hex()
-
-        items.append(text)
-    return items
-
-
-# 获取当前选定项
-def get_combobox_selected(combo_handle):
-    index = win32gui.SendMessage(combo_handle, win32con.CB_GETCURSEL, 0, 0)
-    if index == -1:
-        return None
-    length = win32gui.SendMessage(combo_handle, win32con.CB_GETLBTEXTLEN, index, 0)
-    buffer = win32gui.PyMakeBuffer(1024)  # 调整缓冲区大小
-    win32gui.SendMessage(combo_handle, win32con.CB_GETLBTEXT, index, buffer)
-    
-    # 尝试多种编码方式进行解码
-    for encoding in ['utf-16le', 'utf-8', 'latin-1']:
-        try:
-            # 解码
-            raw_text = buffer.tobytes().decode(encoding, errors='ignore').rstrip('\x00')
-            # 使用正则表达式查找 "数字 + 月" 格式的部分
-            match = re.search(r'\d+月', raw_text)
-            if match:
-                return match.group()
-            # 使用正则表达式提取有效字符（中文、数字、字母和常见标点）
-            filtered_text = re.findall(r'[\w\u4e00-\u9fa5]+', raw_text)
-            # 返回匹配到的第一个有效部分
-            if filtered_text:
-                return filtered_text[0].strip()
-        except UnicodeDecodeError:
-            continue  # 尝试下一个编码方式
-    
-    # 如果所有解码方式都失败，返回 None
-    return None
-
-
-# 设置 ComboBox 的值
-def set_combobox_value(combo_handle, value):
-    items = get_combobox_items(combo_handle)
-    try:
-        index = items.index(value)
-        win32gui.SendMessage(combo_handle, win32con.CB_SETCURSEL, index, 0)
-    except ValueError:
-        raise Exception("Value not found in ComboBox")
-
-
 def set_path_and_save(filename):
-    parent_hwnd = win32gui.FindWindow(None, '保存Excel文件')
+    parent_hwnd = win32gui.FindWindow(None, '另存为')
 
     if parent_hwnd == 0:
         raise HTTPException(status_code=404, detail="没有找到保存报告的窗口，请检查！")
 
-    combo_handle = get_combobox_handle(parent_hwnd)
-    #logging.info(f"ComboBox Items: {get_combobox_items(combo_handle)}")
-    logging.info(f"Current Selected: {get_combobox_selected(combo_handle)}")
-    local_file_path = "C:\\RationalDMIS64\\Output\\" + get_combobox_selected(combo_handle) + "\\" + filename
+    # 这里假设“地址:”是你需要的部分标题
+    address_hwnds = find_child_window_by_partial_title(parent_hwnd, "地址:")
+
+    # 确保找到的窗口句柄有效
+    if not address_hwnds:
+        raise HTTPException(status_code=404, detail="未找到地址框，请联系管理员！")
+
+    # 假设找到的第一个窗口是目标组件
+    address_hwnd = address_hwnds[0]
+    logging.info(f"找到地址框地址: {win32gui.GetWindowText(address_hwnd)}")
+
+    # 设置路径
+    local_file_path = os.path.join(win32gui.GetWindowText(address_hwnd).split(' ')[1], filename)
     logging.info(f"设置路径: {local_file_path}")
 
     path_hwnds = find_child_window(parent_hwnd, 'Edit')
@@ -182,6 +115,7 @@ def wait_for_file_to_save(filepath, timeout=30):
 
 
 def upload_file_to_ftp(local_file):
+
     if not os.path.isfile(local_file):
         raise HTTPException(status_code=204, detail="文件未找到")
 
@@ -223,4 +157,4 @@ async def upload_file(request: FileUploadRequest):
 if __name__ == "__main__":
     import uvicorn
 
-    uvicorn.run(app, host="0.0.0.0", port=8999)
+    uvicorn.run(app, host="0.0.0.0", port=8000)