sf-制造-工艺外协的采购订单确认后，外协的调拨单的作业详情的预留数量跟完成数量不对

# Conflicts:
#	sf_manufacturing/models/purchase_order.py

jikimo_purchase_request/models/mrp_production.py

@@ -19,8 +19,9 @@ class MrpProduction(models.Model):
             #     item.pr_mp_count = len(pr_ids)
             # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
             first_mp = self.env['mrp.production'].search(
-                    [('origin', '=', item.origin)], limit=1, order='id asc')
+                [('origin', '=', item.origin)], limit=1, order='id asc')
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
+            pr_ids = self.env['purchase.request'].sudo().search(
+                [('origin', 'like', first_mp.name), ('is_subcontract', '!=', 'True')])
             item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
@@ -29,18 +30,10 @@ class MrpProduction(models.Model):
         采购请求
         """
         self.ensure_one()
-        # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
-        # if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
-        #     first_order = self.env['mrp.production'].search(
-        #         [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
-        # else:
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
-        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
         first_mp = self.env['mrp.production'].search(
                     [('origin', '=', self.origin)], limit=1, order='id asc')
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
+        pr_ids = self.env['purchase.request'].sudo().search(
-
+            [('origin', 'like', first_mp.name), ('is_subcontract', '!=', 'True')])
 
         action = {
             'res_model': 'purchase.request',
@@ -54,7 +47,7 @@ class MrpProduction(models.Model):
         else:
             action.update({
                 'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids)],
+                'domain': [('id', 'in', pr_ids.ids)],
                 'view_mode': 'tree,form',
             })
         return action

jikimo_purchase_request/models/product_template.py

@@ -13,11 +13,7 @@ class ProductTemplate(models.Model):
         template_id.purchase_request = product_id.purchase_request
         return template_id
 
-
-class ProdcutProduct(models.Model):
-    _inherit = 'product.product'
-
     def copy_template(self, product_template_id):
         """ 复制成品模板时，复制采购申请 """
-        super(ProdcutProduct, self).copy_template(product_template_id)
+        super(ProductTemplate, self).copy_template(product_template_id)
         self.purchase_request = product_template_id.purchase_request

jikimo_sale_multiple_supply_methods/models/product_template.py

@@ -6,10 +6,6 @@ class ProductTemplate(models.Model):
     is_manual_processing = fields.Boolean(string='人工线下加工')
     is_customer_provided = fields.Boolean(string='客供料')
 
-
-class ProductProduct(models.Model):
-    _inherit = 'product.product'
-
     def copy_template(self, product_template_id):
         if not isinstance(product_template_id, ProductTemplate):
             raise ValueError('%s必须是ProductTemplate类型' % product_template_id)

jikimo_workorder_exception/controllers/main.py

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

sf_base/commons/common.py

@@ -103,19 +103,12 @@ class PrintingUtils(models.AbstractModel):
         self.send_to_printer(host, port, zpl_code)
 
 
-    def add_qr_code_to_pdf(
+    def add_qr_code_to_pdf(self, pdf_path:str, content:str, buttom_text:Optional[str]=False):
-            self,
-            pdf_path:str,
-            content:str,
-            qr_code_buttom_text:Optional[str]=False,
-            buttom_text:Optional[str]=False,
-    ):
         """
         在PDF文件中添加二维码
         :param pdf_path: PDF文件路径
         :param content: 二维码内容
-        :param qr_code_buttom_text: 二维码下方文字
+        :param buttom_text: 二维码下方文字
-        :param buttom_text: 正文下方文字
         :return: 是否成功
         """
         if not os.path.exists(pdf_path):
@@ -163,9 +156,8 @@ class PrintingUtils(models.AbstractModel):
                 existing_pdf = PdfFileReader(original_file)
                 output = PdfFileWriter()
                 
-                # 处理最后一页
+                # 处理第一页
-                last_page = existing_pdf.getNumPages() - 1
+                page = existing_pdf.getPage(0)
-                page = existing_pdf.getPage(last_page)
                 # 获取页面尺寸
                 page_width = float(page.mediaBox.getWidth())
                 page_height = float(page.mediaBox.getHeight())
@@ -187,21 +179,13 @@ class PrintingUtils(models.AbstractModel):
                 qr_y = margin + 20  # 将二维码向上移动一点，为文字留出空间
                 c.drawImage(qr_temp_path, page_width - qr_size - margin, qr_y, width=qr_size, height=qr_size)
                 
-                if qr_code_buttom_text:
+                if buttom_text:
                     # 在二维码下方绘制文字
-                    text = qr_code_buttom_text
+                    text = buttom_text
                     text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 10)  # 准确计算文字宽度
                     text_x = page_width - qr_size - margin + (qr_size - text_width) / 2  # 文字居中对齐
                     text_y = margin + 20  # 文字位置靠近底部
                     c.drawString(text_x, text_y, text)
-
-                if buttom_text:
-                    # 在下方中间添加文字
-                    text = button_text
-                    text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 10)  # 准确计算文字宽度
-                    text_x = (page_width - text_width) / 2  # 文字居中对齐
-                    text_y = margin + 20  # 文字位置靠近底部
-                    c.drawString(text_x, text_y, text)
                 
                 c.save()
                 
@@ -212,12 +196,11 @@ class PrintingUtils(models.AbstractModel):
                     
                     # 合并原始页面和二维码页面
                     page.mergePage(qr_page)
+                    output.addPage(page)
                     
                     # 添加剩余的页面
-                    for i in range(0, last_page):
+                    for i in range(1, existing_pdf.getNumPages()):
                         output.addPage(existing_pdf.getPage(i))
-
-                    output.addPage(page)
                     
                     # 保存最终的PDF到一个临时文件
                     final_temp_path = pdf_path + '.tmp'

sf_dlm_management/models/sf_production_common.py

@@ -24,6 +24,8 @@ class SfProductionProcessParameter(models.Model):
         obj = super(SfProductionProcessParameter, self).create(vals)
         return obj
     def create_service_product(self):
+        if not self.active:
+            return
         service_categ = self.env.ref(
             'sf_dlm.product_category_surface_technics_sf').sudo()
 

sf_dlm_management/views/product_template_management_view.xml

@@ -41,7 +41,9 @@
                            attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
                     <field name="server_product_process_parameters_id" string="工艺参数"
                            options="{'no_create': True}"
-                           attrs="{'invisible': ['|',('detailed_type', '!=', 'service'),('detailed_type', '=', False)]}"/>
+                           attrs="{'invisible': ['|',('detailed_type', '!=', 'service'),('detailed_type', '=', False)]}"
+                           domain="[('active', '=', 'True'),('outsourced_service_products', '!=', 'True')]"
+                    />
                     <field name="cutting_tool_material_id" class="custom_required"
                            options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"

sf_manufacturing/__manifest__.py

@@ -20,7 +20,6 @@
         'data/sf_work_individuation_page.xml',
         'data/agv_scheduling_data.xml',
         'data/product_data.xml',
-        'data/automation_folder_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'wizard/workpiece_delivery_views.xml',

sf_manufacturing/controllers/controllers.py

@@ -2,18 +2,16 @@
 import logging
 import json
 from datetime import datetime
-import base64
 
 from odoo.addons.sf_manufacturing.models.agv_scheduling import RepeatTaskException
 from odoo import http
 from odoo.http import request
-from odoo.exceptions import MissingError
 from odoo.addons.sf_base.decorators.api_log import api_log
 
 
 class Manufacturing_Connect(http.Controller):
 
-    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     @api_log('获取工单', requester='中控系统')
     def get_Work_Info(self, **kw):
@@ -56,9 +54,8 @@ class Manufacturing_Connect(http.Controller):
             logging.info('get_Work_Info error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    @api_log('获取日计划', requester='中控系统')
     def get_ShiftPlan(self, **kw):
         """
         自动化每天获取机台日计划
@@ -110,7 +107,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('get_ShiftPlan error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/QcCheck', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     @api_log('工件预调(前置三元检测)', requester='中控系统')
     def get_qcCheck(self, **kw):
@@ -706,59 +703,3 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
-
-    @http.route('/api/upload_three_check_data', type='http', auth='public', methods=['POST'], csrf=False, cros='*')
-    def upload_three_check_data(self):
-
-        res = {'Succeed': True, 'ErrorCode': 200, 'Messages': '上传成功'}
-        uploaded_files = request.httprequest.files.getlist('file')
-        if uploaded_files:
-
-            try:
-                for uploaded_file in uploaded_files:
-                    file_content = uploaded_file.read()
-                    file_name = uploaded_file.filename
-
-                    production_name = '/'.join(file_name.split('_')[:-1])
-                    processing_panel = file_name.split('_')[-1].split('.')[0]
-                    # 找到对应的工单
-                    production_id = request.env['mrp.production'].sudo().search([('name', '=', production_name)])
-                    wo = production_id.workorder_ids.filtered(lambda wo: wo.processing_panel == processing_panel and wo.routing_type == '装夹预调')
-
-                    if not wo:
-                        raise MissingError('工单不存在')
-                    
-                    folder_id = request.env.ref('sf_manufacturing.documents_pre_three_element_detection_folder')
-                    
-                    document = request.env['documents.document'].sudo().search([('res_model', '=', 'mrp.workorder'), ('res_id', '=', wo.id)])
-                    if document and document.attachment_id:
-                        attachment = request.env['ir.attachment'].sudo().create({
-                            'name': file_name,
-                            'type': 'binary',
-                            'datas': base64.b64encode(file_content),
-                            'res_model': 'mrp.workorder',
-                            'res_id': wo.id,
-                            })
-                        document.write({'attachment_id': attachment.id})
-                    else:
-                        # Create ir.attachment record
-                        attachment = request.env['ir.attachment'].sudo().create({
-                            'name': file_name,
-                            'type': 'binary',
-                            'datas': base64.b64encode(file_content),
-                            'res_model': 'mrp.workorder',
-                            'res_id': wo.id,
-                            })
-
-                        # 创建 documents.document 记录
-                        request.env['documents.document'].sudo().create({
-                            'name': file_name,
-                            'attachment_id': attachment.id,
-                            'folder_id': folder_id.id,
-                            'res_model': 'mrp.workorder',
-                            'res_id': wo.id,
-                        })
-            except Exception as e:
-                res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
-
-        return json.JSONEncoder().encode(res)

sf_manufacturing/data/automation_folder_data.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <!-- 创建自动化文件夹 -->
-        <record id="documents_automation_folder" model="documents.folder">
-            <field name="name">自动化</field>
-            <field name="description">存放自动化生产流程相关文件</field>
-            <field name="sequence">20</field>
-        </record>
-        <record id="documents_pre_three_element_detection_folder" model="documents.folder">
-            <field name="name">前置三元检测报告</field>
-            <field name="parent_folder_id" ref="documents_automation_folder"/>
-            <field name="sequence">1</field>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/models/mrp_production.py

@@ -928,6 +928,8 @@ class MrpProduction(models.Model):
                             '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]
+                if cur_request_line['product_qty'] == 1:
+                    cur_request_line['product_qty'] = len(request_line_list)
                 # cur_request_line['product_qty'] = cur_request_line['product_qty']
                 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')})

sf_manufacturing/models/mrp_workorder.py

@@ -6,7 +6,6 @@ import urllib.parse
 from datetime import date
 from datetime import datetime, timedelta
 import requests
-import tempfile
 import os
 import math
 from lxml import etree
@@ -444,21 +443,11 @@ class ResMrpWorkOrder(models.Model):
     @api.depends('state', 'production_id.name')
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
-            if order.routing_type == '表面工艺' and order.state not in ['cancel']:
+            pr_ids = self.env['purchase.request'].sudo().search(
-                # domain = [('group_id', '=', self.production_id.procurement_group_id.id),
+                [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-                #           ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
+                 ('state', '!=', 'rejected')])
-                domain = [('purchase_type', '=', 'consignment'),
+            if pr_ids.purchase_count:
-                          ('origin', 'like', '%' + self.production_id.name + '%'),
+                order.surface_technics_purchase_count = pr_ids.purchase_count
-                          ('state', '!=', 'cancel')]
-                purchase = self.env['purchase.order'].search(domain)
-                order.surface_technics_purchase_count = 0
-                if not purchase:
-                    order.surface_technics_purchase_count = 0
-                for po in purchase:
-                    if any(
-                            line.product_id and line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id
-                            for line in po.order_line):
-                        order.surface_technics_purchase_count = 1
             else:
                 order.surface_technics_purchase_count = 0
 
@@ -503,16 +492,19 @@ class ResMrpWorkOrder(models.Model):
         # if technology_design.is_auto is False:
         #     domain = [('origin', '=', self.production_id.name)]
         # else:
-        purchase_orders_id = self._get_surface_technics_purchase_ids()
+        pr_ids = self.env['purchase.request'].sudo().search(
-        result = {
+            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-            "type": "ir.actions.act_window",
+             ('state', '!=', 'rejected')])
-            "res_model": "purchase.order",
+        # purchase_orders_id = self._get_surface_technics_purchase_ids()
-            "res_id": purchase_orders_id.id,
+        # result = {
-            # "domain": [['id', 'in', self.purchase_id]],
+        #     "type": "ir.actions.act_window",
-            "name": _("Purchase Orders"),
+        #     "res_model": "purchase.order",
-            'view_mode': 'form',
+        #     "res_id": purchase_orders_id.id,
-        }
+        #     # "domain": [['id', 'in', self.purchase_id]],
-        return result
+        #     "name": _("Purchase Orders"),
+        #     'view_mode': 'form',
+        # }
+        return pr_ids.action_view_purchase_order()
 
     def _get_surface_technics_purchase_ids(self):
         domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
@@ -772,170 +764,146 @@ class ResMrpWorkOrder(models.Model):
     # 获取三次元检测点数据
     def get_three_check_datas(self):
         ftp_resconfig = self.env['res.config.settings'].get_values()
-        # ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
+        ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
-        #                     ftp_resconfig['ftp_user'],
+                            ftp_resconfig['ftp_user'],
-        #                     ftp_resconfig['ftp_password'])
+                            ftp_resconfig['ftp_password'])
 
-        # local_dir_path = '/ftp/before'
+        local_dir_path = '/ftp/before'
-        # os.makedirs(local_dir_path, exist_ok=True)
+        os.makedirs(local_dir_path, exist_ok=True)
         local_filename = self.save_name + '.xls'
-        # local_file_path = os.path.join(local_dir_path, local_filename)
+        local_file_path = os.path.join(local_dir_path, local_filename)
-        # logging.info('local_file_path:%s' % local_file_path)
+        logging.info('local_file_path:%s' % local_file_path)
-        # # remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
+        # remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
-        # remote_path = '/ThreeTest/XT/Before/' + local_filename
+        remote_path = '/ThreeTest/XT/Before/' + local_filename
-        # logging.info('remote_path:%s' % remote_path)
+        logging.info('remote_path:%s' % remote_path)
-        # is_get_detection_file = self.env['ir.config_parameter'].sudo().get_param('is_get_detection_file')
+        is_get_detection_file = self.env['ir.config_parameter'].sudo().get_param('is_get_detection_file')
-        # if not is_get_detection_file:
+        if not is_get_detection_file:
-        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+            paload_data = {
-        paload_data = {
+                "filename": local_filename
-            "filename": local_filename,
+            }
-            "sf_host": base_url
+            if not ftp_resconfig['get_check_file_path']:
-        }
+                raise UserError('请先配置获取检测报告地址')
-        if not ftp_resconfig['get_check_file_path']:
+            url = ftp_resconfig['get_check_file_path'] + '/get/check/report'
-            raise UserError('请先配置获取检测报告地址')
+            response = requests.post(url, json=paload_data)
-        url = ftp_resconfig['get_check_file_path'] + '/get/check/report'
+            logging.info('response:%s' % response.json())
-        response = requests.post(url, json=paload_data)
+            if response.json().get('detail'):
-        #     logging.info('response:%s' % response.json())
+                raise UserError(response.json().get('detail'))
-        #     if response.json().get('detail'):
-        #         raise UserError(response.json().get('detail'))
 
-        # if not ftp.file_exists(remote_path):
+        if not ftp.file_exists(remote_path):
-        #     raise UserError(f"文件不存在: {remote_path}")
+            raise UserError(f"文件不存在: {remote_path}")
 
-        # with open(local_file_path, 'wb') as local_file:
+        with open(local_file_path, 'wb') as local_file:
-        #     ftp.ftp.retrbinary('RETR ' + remote_path, local_file.write)
+            ftp.ftp.retrbinary('RETR ' + remote_path, local_file.write)
-        # logging.info('下载文件成功')
+        logging.info('下载文件成功')
-           
+        # 解析本地文件
-        document = self.env['documents.document'].sudo().search([('res_model', '=', 'mrp.workorder'), ('res_id', '=', self.id)])
+        # file_path = 'WH_MO_00099.xls'  # 使用下载的实际文件路径
-        if not document:
+        parser = etree.XMLParser(recover=True)  # Using recover to handle errors
-            raise UserError(f"未获取到检测数据")
+        tree = etree.parse(local_file_path, parser)
-        binary_data = base64.b64decode(document.attachment_id.datas)
+        logging.info('tree:%s' % tree)
+        root = tree.getroot()
+        logging.info('root:%s' % root)
 
-        # 创建临时文件保存响应内容
+        # 准备一个外部字典来存储以PT为键的坐标字典
-        with tempfile.NamedTemporaryFile(delete=False, suffix='.xls') as temp_file:
+        pt_coordinates = {}
-            temp_file.write(binary_data)
+        # 遍历每个工作表和行
-            temp_file_path = temp_file.name
+        for worksheet in root.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Worksheet'):
-            
+            sheet_name = worksheet.attrib.get('{urn:schemas-microsoft-com:office:spreadsheet}Name')
-        try:
+            logging.info('sheet_name:%s' % sheet_name)
-            # 使用临时文件进行解析
+            if sheet_name == "Sheet1":  # 确保我们只查看包含数据的工作表
-            parser = etree.XMLParser(recover=True)
+                current_pt = None
-            tree = etree.parse(temp_file_path, parser)
+                for row in worksheet.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Row'):
-            logging.info('tree:%s' % tree)
+                    cells = list(row.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Cell'))
-            root = tree.getroot()
+                    for i, cell in enumerate(cells):
-            logging.info('root:%s' % root)
+                        data_cell = cell.find('.//{urn:schemas-microsoft-com:office:spreadsheet}Data')
-            
+                        if data_cell is not None and data_cell.text is not None:  # 添加检查以确保data_cell.text不为空
+                            # 检查是否是PT标识
+                            logging.info(f"Data in cell: {data_cell.text}")  # 输出单元格数据
+                            if "PT" in data_cell.text:
+                                current_pt = data_cell.text
+                                pt_coordinates[current_pt] = []
+                            elif data_cell.text in ["X", "Y", "Z"] and current_pt is not None:
+                                # 确保当前单元格后面还有单元格存在，以获取理论值
+                                if i + 1 < len(cells):
+                                    next_cell = cells[i + 1]
+                                    theory_value = next_cell.find(
+                                        './/{urn:schemas-microsoft-com:office:spreadsheet}Data')
+                                    if theory_value is not None:
+                                        # 为当前PT键添加坐标数据
+                                        pt_coordinates[current_pt].append({
+                                            data_cell.text: float(theory_value.text)
+                                        })
+                                        logging.info(f"PT: {current_pt} - {data_cell.text}: {theory_value.text}")
+        logging.info('pt_coordinates=====%s' % pt_coordinates)
+        # pt_coordinates:{'PT1': [{'X': 38.9221}, {'Y': -18.7304}, {'Z': 128.0783}],
+        #                         'PT2': [{'X': 39.2456}, {'Y': -76.9169}, {'Z': 123.7541}]}
 
-            # 准备一个外部字典来存储以PT为键的坐标字典
+        # 检查是否存在PT1等键
-            pt_coordinates = {}
+        if 'PT1' in pt_coordinates and pt_coordinates['PT1']:
-            # 遍历每个工作表和行
+            self.X1_axis = pt_coordinates['PT3'][0]['X']
-            for worksheet in root.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Worksheet'):
+            self.Y1_axis = pt_coordinates['PT3'][1]['Y']
-                sheet_name = worksheet.attrib.get('{urn:schemas-microsoft-com:office:spreadsheet}Name')
+            self.Z1_axis = pt_coordinates['PT3'][2]['Z']
-                logging.info('sheet_name:%s' % sheet_name)
+        else:
-                if sheet_name == "Sheet1":  # 确保我们只查看包含数据的工作表
+            raise UserError('PT1点未测或数据错误')
-                    current_pt = None
+        if 'PT2' in pt_coordinates and pt_coordinates['PT2']:
-                    for row in worksheet.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Row'):
+            self.X2_axis = pt_coordinates['PT4'][0]['X']
-                        cells = list(row.iterfind('.//{urn:schemas-microsoft-com:office:spreadsheet}Cell'))
+            self.Y2_axis = pt_coordinates['PT4'][1]['Y']
-                        for i, cell in enumerate(cells):
+            self.Z2_axis = pt_coordinates['PT4'][2]['Z']
-                            data_cell = cell.find('.//{urn:schemas-microsoft-com:office:spreadsheet}Data')
+        else:
-                            if data_cell is not None and data_cell.text is not None:  # 添加检查以确保data_cell.text不为空
+            raise UserError('PT2点未测或数据错误')
-                                # 检查是否是PT标识
+        if 'PT3' in pt_coordinates and pt_coordinates['PT3']:
-                                logging.info(f"Data in cell: {data_cell.text}")  # 输出单元格数据
+            self.X3_axis = pt_coordinates['PT5'][0]['X']
-                                if "PT" in data_cell.text:
+            self.Y3_axis = pt_coordinates['PT5'][1]['Y']
-                                    current_pt = data_cell.text
+            self.Z3_axis = pt_coordinates['PT5'][2]['Z']
-                                    pt_coordinates[current_pt] = []
+        else:
-                                elif data_cell.text in ["X", "Y", "Z"] and current_pt is not None:
+            raise UserError('PT3点未测或数据错误')
-                                    # 确保当前单元格后面还有单元格存在，以获取理论值
+        if 'PT4' in pt_coordinates and pt_coordinates['PT4']:
-                                    if i + 1 < len(cells):
+            self.X4_axis = pt_coordinates['PT6'][0]['X']
-                                        next_cell = cells[i + 1]
+            self.Y4_axis = pt_coordinates['PT6'][1]['Y']
-                                        theory_value = next_cell.find(
+            self.Z4_axis = pt_coordinates['PT6'][2]['Z']
-                                            './/{urn:schemas-microsoft-com:office:spreadsheet}Data')
+        else:
-                                        if theory_value is not None:
+            raise UserError('PT4点未测或数据错误')
-                                            # 为当前PT键添加坐标数据
+        if 'PT5' in pt_coordinates and pt_coordinates['PT5']:
-                                            pt_coordinates[current_pt].append({
+            self.X5_axis = pt_coordinates['PT7'][0]['X']
-                                                data_cell.text: float(theory_value.text)
+            self.Y5_axis = pt_coordinates['PT7'][1]['Y']
-                                            })
+            self.Z5_axis = pt_coordinates['PT7'][2]['Z']
-                                            logging.info(f"PT: {current_pt} - {data_cell.text}: {theory_value.text}")
+        else:
-            logging.info('pt_coordinates=====%s' % pt_coordinates)
+            raise UserError('PT5点未测或数据错误')
-            # pt_coordinates:{'PT1': [{'X': 38.9221}, {'Y': -18.7304}, {'Z': 128.0783}],
+        if 'PT6' in pt_coordinates and pt_coordinates['PT6']:
-            #                         'PT2': [{'X': 39.2456}, {'Y': -76.9169}, {'Z': 123.7541}]}
+            self.X6_axis = pt_coordinates['PT8'][0]['X']
+            self.Y6_axis = pt_coordinates['PT8'][1]['Y']
+            self.Z6_axis = pt_coordinates['PT8'][2]['Z']
+        else:
+            raise UserError('PT6点未测或数据错误')
+        if 'PT7' in pt_coordinates and pt_coordinates['PT7']:
+            self.X7_axis = pt_coordinates['PT9'][0]['X']
+            self.Y7_axis = pt_coordinates['PT9'][1]['Y']
+            self.Z7_axis = pt_coordinates['PT9'][2]['Z']
+        else:
+            raise UserError('PT7点未测或数据错误')
+        if 'PT8' in pt_coordinates and pt_coordinates['PT8']:
+            self.X8_axis = pt_coordinates['PT10'][0]['X']
+            self.Y8_axis = pt_coordinates['PT10'][1]['Y']
+            self.Z8_axis = pt_coordinates['PT10'][2]['Z']
+        else:
+            raise UserError('PT8点未测或数据错误')
+        if 'PT9' in pt_coordinates and pt_coordinates['PT9']:
+            self.X9_axis = pt_coordinates['PT1'][0]['X']
+            self.Y9_axis = pt_coordinates['PT1'][1]['Y']
+            self.Z9_axis = pt_coordinates['PT1'][2]['Z']
+        else:
+            raise UserError('PT9点未测或数据错误')
+        if 'PT10' in pt_coordinates and pt_coordinates['PT10']:
+            self.X10_axis = pt_coordinates['PT2'][0]['X']
+            self.Y10_axis = pt_coordinates['PT2'][1]['Y']
+            self.Z10_axis = pt_coordinates['PT2'][2]['Z']
+        else:
+            raise UserError('PT10点未测或数据错误')
 
-            # 检查是否存在PT1等键
+        self.data_state = True
-            if 'PT1' in pt_coordinates and pt_coordinates['PT1']:
+        self.getcenter()
-                self.X1_axis = pt_coordinates['PT3'][0]['X']
-                self.Y1_axis = pt_coordinates['PT3'][1]['Y']
-                self.Z1_axis = pt_coordinates['PT3'][2]['Z']
-            else:
-                raise UserError('PT1点未测或数据错误')
-            if 'PT2' in pt_coordinates and pt_coordinates['PT2']:
-                self.X2_axis = pt_coordinates['PT4'][0]['X']
-                self.Y2_axis = pt_coordinates['PT4'][1]['Y']
-                self.Z2_axis = pt_coordinates['PT4'][2]['Z']
-            else:
-                raise UserError('PT2点未测或数据错误')
-            if 'PT3' in pt_coordinates and pt_coordinates['PT3']:
-                self.X3_axis = pt_coordinates['PT5'][0]['X']
-                self.Y3_axis = pt_coordinates['PT5'][1]['Y']
-                self.Z3_axis = pt_coordinates['PT5'][2]['Z']
-            else:
-                raise UserError('PT3点未测或数据错误')
-            if 'PT4' in pt_coordinates and pt_coordinates['PT4']:
-                self.X4_axis = pt_coordinates['PT6'][0]['X']
-                self.Y4_axis = pt_coordinates['PT6'][1]['Y']
-                self.Z4_axis = pt_coordinates['PT6'][2]['Z']
-            else:
-                raise UserError('PT4点未测或数据错误')
-            if 'PT5' in pt_coordinates and pt_coordinates['PT5']:
-                self.X5_axis = pt_coordinates['PT7'][0]['X']
-                self.Y5_axis = pt_coordinates['PT7'][1]['Y']
-                self.Z5_axis = pt_coordinates['PT7'][2]['Z']
-            else:
-                raise UserError('PT5点未测或数据错误')
-            if 'PT6' in pt_coordinates and pt_coordinates['PT6']:
-                self.X6_axis = pt_coordinates['PT8'][0]['X']
-                self.Y6_axis = pt_coordinates['PT8'][1]['Y']
-                self.Z6_axis = pt_coordinates['PT8'][2]['Z']
-            else:
-                raise UserError('PT6点未测或数据错误')
-            if 'PT7' in pt_coordinates and pt_coordinates['PT7']:
-                self.X7_axis = pt_coordinates['PT9'][0]['X']
-                self.Y7_axis = pt_coordinates['PT9'][1]['Y']
-                self.Z7_axis = pt_coordinates['PT9'][2]['Z']
-            else:
-                raise UserError('PT7点未测或数据错误')
-            if 'PT8' in pt_coordinates and pt_coordinates['PT8']:
-                self.X8_axis = pt_coordinates['PT10'][0]['X']
-                self.Y8_axis = pt_coordinates['PT10'][1]['Y']
-                self.Z8_axis = pt_coordinates['PT10'][2]['Z']
-            else:
-                raise UserError('PT8点未测或数据错误')
-            if 'PT9' in pt_coordinates and pt_coordinates['PT9']:
-                self.X9_axis = pt_coordinates['PT1'][0]['X']
-                self.Y9_axis = pt_coordinates['PT1'][1]['Y']
-                self.Z9_axis = pt_coordinates['PT1'][2]['Z']
-            else:
-                raise UserError('PT9点未测或数据错误')
-            if 'PT10' in pt_coordinates and pt_coordinates['PT10']:
-                self.X10_axis = pt_coordinates['PT2'][0]['X']
-                self.Y10_axis = pt_coordinates['PT2'][1]['Y']
-                self.Z10_axis = pt_coordinates['PT2'][2]['Z']
-            else:
-                raise UserError('PT10点未测或数据错误')
 
-            self.data_state = True
+        return True
-            self.getcenter()
 
-            return True
-            
-        except Exception as e:
-            logging.error('解析文件失败: %s' % str(e))
-            raise UserError(f'解析文件失败: {str(e)}')
-            
-        finally:
-            # 清理临时文件
-            try:
-                os.unlink(temp_file_path)
-            except Exception as e:
-                logging.warning(f'清理临时文件失败: {str(e)}')
         # ftp.download_file('three_check_datas.xls', '/home/ftpuser/three_check_datas.xls')
         # ftp.close()
         # data = xlrd.open_workbook('/home/ftpuser/three_check_datas.xls')
@@ -1308,20 +1276,27 @@ class ResMrpWorkOrder(models.Model):
             #     for move_line in move.move_line_ids
             # )
             if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'):
+                    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'
                         continue
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
-                    if purchase_orders_id.state == 'purchase':
+                    purchase_count = 0
+                    for purchase_order in purchase_orders_id:
+                        for purchase_order_line in purchase_order.order_line:
+                            if purchase_order_line.product_id.server_product_process_parameters_id.id == workorder.surface_technics_parameters_id.id:
+                                purchase_count = purchase_order_line.product_qty
+                    if purchase_orders_id.state == 'purchase' and purchase_count>=workorder.production_id.product_qty:
                         workorder.state = 'ready'
                         picking_id = workorder.production_id.picking_ids.filtered(
                             lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
                         move_out = picking_id.move_ids
                         # move_out = workorder.move_subcontract_workorder_ids[1]
                         for mo in move_out:
+                            if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                                continue
                             if mo.state != 'done':
                                 mo.write({'state': 'assigned', 'production_id': False})
                                 if not mo.move_line_ids:
@@ -1337,6 +1312,7 @@ class ResMrpWorkOrder(models.Model):
                 else:
                     workorder.state = 'ready'
                     continue
+                continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'
@@ -1352,9 +1328,7 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
-                    if len(workorder.production_id.picking_ids.filtered(
+                    if workorder.production_id.programming_state == '已编程':
-                            lambda w: w.state not in ['done',
-                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
                         purchase_orders_id = self._get_surface_technics_purchase_ids()
                         if purchase_orders_id:
                             if purchase_orders_id.state == 'purchase':
@@ -1364,6 +1338,8 @@ class ResMrpWorkOrder(models.Model):
                                         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
                                 move_out = picking_id.move_ids
                                 for mo in move_out:
+                                    if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                                        continue
                                     if mo.state != 'done':
                                         mo.write({'state': 'assigned', 'production_id': False})
                                         if not mo.move_line_ids:
@@ -1412,7 +1388,16 @@ class ResMrpWorkOrder(models.Model):
                     boolean = True
             if not boolean:
                 raise UserError('制造订单【%s】缺少组件的序列号信息！' % self.production_id.name)
-            self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
+            self.pro_code = False  # 默认值
+            if (
+                    self.production_id
+                    and self.production_id.move_raw_ids
+                    and len(self.production_id.move_raw_ids) > 0
+                    and self.production_id.move_raw_ids[0].move_line_ids
+                    and len(self.production_id.move_raw_ids[0].move_line_ids) > 0
+                    and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id
+            ):
+                self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
             # cnc校验
             if self.production_id.production_type == '自动化产线加工':
                 cnc_workorder = self.search(
@@ -1447,6 +1432,8 @@ class ResMrpWorkOrder(models.Model):
                 #          [('barcode', 'ilike', 'VL-SPOC')]).id),
                 #      ('origin', '=', self.production_id.name), ('state', 'not in', ['cancel', 'done'])])
                 for mo in move_out:
+                    if self.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                        continue
                     if mo.state != 'done':
                         mo.write({'state': 'assigned', 'production_id': False})
                         if not mo.move_line_ids:
@@ -1579,7 +1566,8 @@ class ResMrpWorkOrder(models.Model):
                     lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
                 if self == subcontract_workorders[-1]:
                     # 给下一个库存移动就绪
-                    self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
+                    if self.move_subcontract_workorder_ids:
+                        self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
                     # self.production_id.button_mark_done()
             tem_date_planned_finished = record.date_planned_finished
             tem_date_finished = record.date_finished

sf_manufacturing/models/purchase_order.py

@@ -126,11 +126,13 @@ class PurchaseOrder(models.Model):
                 if not work_ids:
                     continue
                 min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
-                if min_sequence_wk.is_subcontract:
+                if min_sequence_wk.is_subcontract and min_sequence_wk.state == 'ready':
                     picking_id = production_id.picking_ids.filtered(
                     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
                     move_out = picking_id.move_ids
                     for mo in move_out:
+                        if production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                            continue
                         if mo.state != 'done':
                             mo.write({'state': 'assigned', 'production_id': False})
                             if not mo.move_line_ids:
@@ -152,6 +154,8 @@ class PurchaseOrder(models.Model):
 
         for line in self.order_line:
             # 将产品不追踪序列号的行项目设置qty_done
+            if not line.move_ids:
+                continue
             if line.move_ids and line.move_ids[0].product_id.tracking == 'none':
                 line.move_ids[0].quantity_done = line.move_ids[0].product_qty
         return res
@@ -224,6 +228,24 @@ class PurchaseOrderLine(models.Model):
                     )
                     record.part_number = filtered_order_line.product_id.part_number
                     record.part_name = filtered_order_line.product_id.part_name
+            elif record.order_id.purchase_type == 'consignment':
+                product_name = ''
+                match = re.search(r'(S\d{5}-\d)', record.related_product.name)
+                # 如果匹配成功，提取结果
+                if match:
+                    product_name = match.group(0)
+                sale_order_name = ''
+                match_sale = re.search(r'S(\d+)', record.related_product.name)
+                if match_sale:
+                    sale_order_name = match_sale.group(0)
+                sale_order = self.env['sale.order'].sudo().search(
+                    [('name', '=', sale_order_name)])
+                if sale_order:
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
+                    )
+                    record.part_number = filtered_order_line.product_id.part_number
+                    record.part_name = filtered_order_line.product_id.part_name
             else:
                 record.part_number = record.product_id.part_number
                 record.part_name = record.product_id.part_name

sf_manufacturing/models/sale_order.py

@@ -56,10 +56,10 @@ class SaleOrder(models.Model):
                     'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
 
             # 复制成品模板上的属性
-            line.product_id.copy_template(product_template_id)
+            line.product_id.product_tmpl_id.copy_template(product_template_id)
             # 将模板上的single_manufacturing属性复制到成品上
-            # line.product_id.single_manufacturing = product_template_id.single_manufacturing
+            line.product_id.single_manufacturing = product_template_id.single_manufacturing
-            # line.product_id.tracking = product_template_id.tracking
+            line.product_id.tracking = product_template_id.tracking
 
             order_id = self
             product = line.product_id
@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
                 'embryo_redundancy_id': line.embryo_redundancy_id,
             }
             product_name = ''
-            match = re.search(r'(S\d{5}-\d*)', product.name)
+            match = re.search(r'(S\d{5}-\d)', product.name)
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)

sf_manufacturing/models/sf_production_common.py

@@ -20,13 +20,6 @@ class SfProductionProcessParameter(models.Model):
     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.ids if record.outsourced_service_products else False
-
     def _inverse_service_products(self):
         for record in self:
             if record.service_products:
@@ -34,6 +27,12 @@ class SfProductionProcessParameter(models.Model):
                 record.outsourced_service_products = record.service_products.ids if record.service_products else False
             else:
                 record.outsourced_service_products = False
+    @api.depends('outsourced_service_products')
+    def _compute_service_products(self):
+        for record in self:
+            # 假设取第一条作为主明细
+            record.service_products = record.outsourced_service_products[0].id if record.outsourced_service_products else False
+
     def name_get(self):
         result = []
         for record in self:

sf_manufacturing/models/stock.py

@@ -930,6 +930,8 @@ class ReStockMove(models.Model):
         }
 
     def get_move_line(self, production_id, sorted_workorders):
+        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+        qty = production_id.product_qty
         return {
             'move_id': self.id,
             'product_id': self.product_id.id,
@@ -937,7 +939,7 @@ class ReStockMove(models.Model):
             'location_id': self.picking_id.location_id.id,
             'location_dest_id': self.picking_id.location_dest_id.id,
             'picking_id': self.picking_id.id,
-            'reserved_uom_qty': 1.0,
+            'reserved_uom_qty': qty,
             'lot_id': production_id.move_line_raw_ids.lot_id.id,
             'company_id': self.env.company.id,
             # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,

sf_mrs_connect/controllers/controllers.py

@@ -3,6 +3,9 @@ import logging
 import os
 import json
 import base64
+import traceback
+
+
 from odoo import http, fields, models
 from odoo.http import request
 from odoo.addons.sf_base.controllers.controllers import MultiInheritController
@@ -273,7 +276,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
         except Exception as e:
             res = {'status': -1, 'message': '系统解析失败'}
             request.cr.rollback()
-            logging.info('get_cnc_processing_create error:%s' % e)
+            traceback_error = traceback.format_exc()
+            logging.error("get_cnc_processing_create error:%s" % traceback_error)
             return json.JSONEncoder().encode(res)
 
 

sf_tool_management/controllers/controllers.py

@@ -41,7 +41,6 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    @api_log('功能刀具清单', requester='中控系统')
     def get_functional_tool_inventory_Info(self, **kw):
         """
         功能刀具清单接口
@@ -71,7 +70,6 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/ToolEntity', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    @api_log('功能刀具', requester='中控系统')
     def get_functional_tool_entity_Info(self, **kw):
         """
         功能刀具列表接口