Merge branch 'feature/6694' into feature/merge-6694

Merge Request: 修复误回退的代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2121?initial=true

jikimo_printing/models/jikimo_printing.py

@@ -17,6 +17,11 @@ class JikimoPrinting(models.AbstractModel):
         """
             打印二维码
         """
+        printer = self.env['printing.printer'].get_default()
+        if not printer:
+            _logger.error("未找到默认打印机")
+            return False
+
         # 生成二维码
         qr = qrcode.QRCode(version=1, box_size=10, border=5)
         qr.add_data(data)
@@ -45,19 +50,23 @@ class JikimoPrinting(models.AbstractModel):
 
         # 获取PDF内容并打印
         pdf_content = pdf_buffer.getvalue()
-        printer = self.env['printing.printer'].get_default()
+        # _logger.info(f"打印内容: {pdf_content}")
-        _logger.info(f"打印内容: {pdf_content}")
         printer.print_document(report=None, content=pdf_content, doc_format='pdf')
 
         # 清理资源
         pdf_buffer.close()
         temp_image.close()
 
+        return True
+
     def print_pdf(self, pdf_data):
         """
             打印PDF
         """
-        _logger.info("PDF打印开始")
+        printer = self.env['printing.printer'].get_default()
+        if not printer:
+            _logger.error("未找到默认打印机")
+            return False
 
         pdf_data_str = pdf_data.decode('ascii', errors='ignore')
         decoded_data = base64.b64decode(pdf_data_str)
@@ -69,15 +78,10 @@ class JikimoPrinting(models.AbstractModel):
         
         # 获取PDF内容
         pdf_content = pdf_buffer.getvalue()
-        _logger.info(f"处理后的内容前20字节: {pdf_content[:20]}")
-        
-        # 获取默认打印机
-        printer = self.env['printing.printer'].get_default()
-        if not printer:
-            _logger.error("未找到默认打印机")
-            return
         
         printer.print_document(report=None, content=pdf_content, doc_format='pdf')
         # 清理资源
         pdf_buffer.close()
-        _logger.info("PDF打印结束") 
+
+        _logger.info("成功打印PDF")
+        return True

jikimo_printing/models/workorder_printing.py

@@ -21,8 +21,6 @@ class MrpWorkorder(models.Model):
                             # 执行打印
                             self.env['jikimo.printing'].print_pdf(pdf_data)
                             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)}")
 

jikimo_purchase_request/i18n/zh_CN.po

@@ -1043,7 +1043,7 @@ msgstr "询价单"
 #. module: purchase_request
 #: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__purchased_qty
 msgid "RFQ/PO Qty"
-msgstr "已订购数"
+msgstr ""
 
 #. module: purchase_request
 #. odoo-python

jikimo_purchase_request/models/mrp_production.py

@@ -9,20 +9,32 @@ 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)])
+            # if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
+            #     first_order = self.env['mrp.production'].search(
+            #         [('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc')
+            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
+            #     item.pr_mp_count = len(pr_ids)
+            # else:
+            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
+            #     item.pr_mp_count = len(pr_ids)
+            # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+            first_mp = self.env['mrp.production'].search(
+                [('origin', '=', item.origin)], limit=1, order='id asc')
+            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')])
-            if pr_ids:
-                item.pr_mp_count = len(pr_ids)
-            else:
-                item.pr_mp_count = 0
 
     def action_view_pr_mp(self):
         """
         采购请求
         """
         self.ensure_one()
-        # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
+        first_mp = self.env['mrp.production'].search(
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
+                    [('origin', '=', self.origin)], limit=1, order='id asc')
+        pr_ids = self.env['purchase.request'].sudo().search(
+            [('origin', 'like', first_mp.name), ('is_subcontract', '!=', 'True')])
+
         action = {
             'res_model': 'purchase.request',
             'type': 'ir.actions.act_window',
@@ -35,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,7 +13,11 @@ 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(ProductTemplate, self).copy_template(product_template_id)
+        super(ProdcutProduct, self).copy_template(product_template_id)
         self.purchase_request = product_template_id.purchase_request

jikimo_purchase_request/models/purchase_request.py

@@ -116,7 +116,7 @@ class PurchaseRequestLine(models.Model):
         for pr in self:
             qty_to_buy = sum(pr.mapped("product_qty"))
             if pr.purchase_count > 0:
-                qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
+                 qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
                     "product_qty"))
             pr.qty_to_buy = qty_to_buy > 0.0
             pr.pending_qty_to_receive = qty_to_buy

jikimo_purchase_request/models/stock_rule.py

@@ -1,4 +1,5 @@
 from odoo import api, fields, models
+from collections import defaultdict
 
 
 class StockRule(models.Model):
@@ -44,7 +45,39 @@ class StockRule(models.Model):
         purchase_request_line_model.create(request_line_data)
 
     def _run_buy(self, procurements):
-        res = super(StockRule, self)._run_buy(procurements)
+        # 如果补货组相同，并且产品相同，则合并
+        procurements_dict = defaultdict()
+        for procurement, rule in procurements:
+            if (procurement.product_id, procurement.values['group_id'], rule) not in procurements_dict:
+                procurements_dict[(procurement.product_id, procurement.values['group_id'], rule)] = {
+                    'product_id': procurement.product_id, 
+                    'product_qty': procurement.product_qty,
+                    'product_uom': procurement.product_uom,
+                    'location_id': procurement.location_id,
+                    'name': procurement.name,
+                    'origin': procurement.origin,
+                    'company_id': procurement.company_id,
+                    'values': procurement.values,
+                    'rule': rule
+                }
+            else:
+                procurements_dict[(procurement.product_id, procurement.values['group_id'], rule)]['product_qty'] += procurement.product_qty
+        new_procurements = []
+        for k, p in procurements_dict.items():
+            new_procurements.append((
+                self.env['procurement.group'].Procurement(
+                    product_id=p['product_id'],
+                    product_qty=p['product_qty'],
+                    product_uom=p['product_uom'],
+                    location_id=p['location_id'],
+                    name=p['name'],
+                    origin=p['origin'],
+                    company_id=p['company_id'],
+                    values=p['values']
+                ), p['rule'])
+            )
+
+        res = super(StockRule, self)._run_buy(new_procurements)
         # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
         origins = list(set([procurement[0].origin for procurement in procurements]))
         for origin in origins:

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order.py

@@ -119,11 +119,3 @@ class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):
     _inherit = "purchase.request.line.make.purchase.order.item"
 
     supply_method = fields.Selection(related='line_id.supply_method', string='供货方式')
-
-    wiz_id = fields.Many2one(
-        comodel_name="purchase.request.line.make.purchase.order",
-        string="Wizard",
-        required=False,
-        ondelete="cascade",
-        readonly=True,
-    )

jikimo_sale_multiple_supply_methods/models/product_template.py

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

sf_base/controllers/controllers.py

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

sf_base/decorators/api_log.py

@@ -27,6 +27,9 @@ def api_log(name=None, requester=None):
                 
                 # 执行原始函数
                 result = func(*args, **kwargs)
+                origin_result = result
+                if isinstance(result, str):
+                    result = json.loads(result)
                 
                 # 计算响应时间
                 end_time = datetime.now()
@@ -41,7 +44,7 @@ def api_log(name=None, requester=None):
                     'response_data': json.dumps(result, ensure_ascii=False),
                     'remote_addr': remote_addr,
                     'response_time': response_time,
-                    'status': result.get('code', 500),
+                    'status': result.get('code') or result.get('ErrorCode') or 500,
                     'requester': requester,
                     'responser': '智能工厂'
                 }
@@ -49,7 +52,7 @@ def api_log(name=None, requester=None):
                 # 异步创建日志记录
                 request.env['api.request.log'].sudo().with_context(tracking_disable=True).create(log_vals)
                 
-                return result
+                return origin_result
                 
             except Exception as e:
                 _logger.error(f"API日志记录失败: {str(e)}")

sf_base/models/api_log.py

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

sf_dlm_management/models/mrp_routing_workcenter.py

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

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

@@ -48,6 +48,7 @@
         'views/mrp_workorder_batch_replan.xml',
         'views/purchase_order_view.xml',
         'views/product_template_views.xml',
+        'views/stock_warehouse_orderpoint.xml',
     ],
     'assets': {
 

sf_manufacturing/controllers/controllers.py

@@ -6,12 +6,14 @@ from datetime import datetime
 from odoo.addons.sf_manufacturing.models.agv_scheduling import RepeatTaskException
 from odoo import http
 from odoo.http import request
+from odoo.addons.sf_base.decorators.api_log import api_log
 
 
 class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('获取工单', requester='中控系统')
     def get_Work_Info(self, **kw):
         """
         自动化传递工单号获取工单信息
@@ -54,6 +56,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('获取日计划', requester='中控系统')
     def get_ShiftPlan(self, **kw):
         """
         自动化每天获取机台日计划
@@ -107,6 +110,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('工件预调(前置三元检测)', requester='中控系统')
     def get_qcCheck(self, **kw):
         """
         工件预调(前置三元检测)
@@ -149,6 +153,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('工单开始', requester='中控系统')
     def button_Work_START(self, **kw):
         """
         工单任务开始
@@ -198,6 +203,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('工单结束', requester='中控系统')
     def button_Work_End(self, **kw):
         """
         工单任务结束
@@ -249,6 +255,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/PartQualityInspect', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('零件检测(后置三元检测)', requester='中控系统')
     def PartQualityInspect(self, **kw):
         """
         零件质检
@@ -295,6 +302,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/CMMProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('CMM测量程序下载', requester='中控系统')
     def CMMProgDolod(self, **kw):
         """
         中控系统传递RFID编号给MES，获取测量程序文件。Ftp下载文件
@@ -335,6 +343,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/NCProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('CAM加工程序下载', requester='中控系统')
     def NCProgDolod(self, **kw):
         """
         中控系统传递RFID编号给MES，获取程序单及程序文件。Ftp下载文件
@@ -376,6 +385,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/LocationChange', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('库位变更', requester='中控系统')
     def LocationChange(self, **kw):
         """
         库位变更
@@ -480,6 +490,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('AGV运送上产线', requester='中控系统')
     def AGVToProduct(self, **kw):
         """
         AGV运送上产线（完成）
@@ -552,6 +563,7 @@ class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('AGV运送下产线', requester='中控系统')
     def AGVDownProduct(self, **kw):
         """
         MES调度AGV，搬运零件AGV托盘到产线接驳站。

sf_manufacturing/models/__init__.py

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

sf_manufacturing/models/mrp_production.py

@@ -900,40 +900,43 @@ class MrpProduction(models.Model):
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
-    # def _create_subcontract_purchase_request(self, purchase_request_line):
+    def _create_subcontract_purchase_request(self, purchase_request_line):
-    #     sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
+        sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
-    #     grouped_purchase_request_line = {
+        grouped_purchase_request_line = {
-    #         k: list(g)
+            k: list(g)
-    #         for k, g in groupby(sorted_list, key=itemgetter('name'))
+            for k, g in groupby(sorted_list, key=itemgetter('name'))
-    #     }
+        }
-    #     for name, request_line in grouped_purchase_request_line.items():
+        for name, request_line in grouped_purchase_request_line.items():
-    #         request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
+            request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
-    #         grouped_purchase_request_line_sorted_list = {
+            grouped_purchase_request_line_sorted_list = {
-    #             k: list(g)
+                k: list(g)
-    #             for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
+                for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
-    #         }
+            }
-    #         purchase_request_model = self.env["purchase.request"]
+            purchase_request_model = self.env["purchase.request"]
-    #         origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
+            origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
-    #         pr = purchase_request_model.create({
+            pr = purchase_request_model.create({
-    #             "origin": origin,
+                "origin": origin,
-    #             "company_id": self.company_id.id,
+                "company_id": self.company_id.id,
-    #             "picking_type_id": self.env.ref('stock.picking_type_in').id,
+                "picking_type_id": self.env.ref('stock.picking_type_in').id,
-    #             "group_id": request_line[0].get('group_id'),
+                "group_id": request_line[0].get('group_id'),
-    #             "requested_by": self.env.context.get("uid", self.env.uid),
+                "requested_by": self.env.context.get("uid", self.env.uid),
-    #             "assigned_to": False,
+                "assigned_to": False,
-    #             "bom_id": self[0].bom_id.id,
+                "bom_id": self[0].bom_id.id,
-    #             "is_subcontract":True,
+                "is_subcontract":True,
-    #         })
+            })
-    #         self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
+            self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
-    #                         'sf_stock.stock_route_process_outsourcing').id)]
+                            'sf_stock.stock_route_process_outsourcing').id)]
-    #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
+            for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
-    #             cur_request_line = request_line_list[0]
+                cur_request_line = request_line_list[0]
-    #             cur_request_line['product_qty'] = len(request_line_list)
+                if cur_request_line['product_qty'] == 1:
-    #             cur_request_line['request_id'] = pr.id
+                    cur_request_line['product_qty'] = len(request_line_list)
-    #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
+                # cur_request_line['product_qty'] = cur_request_line['product_qty']
-    #             cur_request_line.pop('group_id', None)
+                cur_request_line['request_id'] = pr.id
-    #             cur_request_line.pop('production_name', None)
+                cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
-    #             self.env["purchase.request.line"].create(cur_request_line)
+                cur_request_line.pop('group_id', None)
+                cur_request_line.pop('production_name', None)
+                self.env["purchase.request.line"].create(cur_request_line)
+            pr.button_approved()
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
@@ -961,14 +964,14 @@ class MrpProduction(models.Model):
             if not sorted_workorders:
                 return
             for workorders in reversed(sorted_workorders):
-                self.env['stock.picking'].create_outcontract_picking(workorders, production, 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)
+                # 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(
+                purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
-        #             workorders, production)
+                    workorders, production)
-        #         all_workorders += workorders
+                all_workorders += workorders
-        # self._create_subcontract_purchase_request(purchase_request_line)
+        self._create_subcontract_purchase_request(purchase_request_line)
-        # for workorder in all_workorders:
+        for workorder in all_workorders:
-        #     workorder._compute_pr_mp_count()
+            workorder._compute_pr_mp_count()
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -1,7 +1,7 @@
 import logging
 from odoo import fields, models, api
 from odoo.exceptions import UserError
-# from odoo.tools import str2bool
+from odoo.tools import str2bool
 
 
 class ResMrpRoutingWorkcenter(models.Model):
@@ -25,20 +25,20 @@ 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='可选工艺参数')
+    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')
+    @api.onchange('surface_technics_id')
-    # def optional_process_parameters_date(self):
+    def optional_process_parameters_date(self):
-    #     for record in self:
+        for record in self:
-    #         if not record.surface_technics_id:
+            if not record.surface_technics_id:
-    #             continue
+                continue
-    #         parameter_ids = self.env['sf.production.process.parameter'].search([
+            parameter_ids = self.env['sf.production.process.parameter'].search([
-    #             ('process_id', '=', record.surface_technics_id.id),
+                ('process_id', '=', record.surface_technics_id.id),
-    #         ])
+            ])
-    #         record.optional_process_parameters = parameter_ids.ids
+            record.optional_process_parameters = parameter_ids.ids
 
     # @api.model
     # def _auto_init(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -21,16 +21,16 @@ 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')
+    @api.constrains('name')
-    # def _check_unique_name_code(self):
+    def _check_unique_name_code(self):
-    #     for record in self:
+        for record in self:
-    #         # 检查是否已经存在相同的 name 和 code 组合
+            # 检查是否已经存在相同的 name 和 code 组合
-    #         existing = self.search([
+            existing = self.search([
-    #             ('name', '=', record.name),
+                ('name', '=', record.name),
-    #             ('id', '!=', record.id)  # 排除当前记录
+                ('id', '!=', record.id)  # 排除当前记录
-    #         ])
+            ])
-    #         if existing:
+            if existing:
-    #             raise ValueError('记录已存在')
+                raise ValueError('记录已存在')
     def write(self, vals):
         if 'users_ids' in vals:
             old_users = self.users_ids

sf_manufacturing/models/mrp_workorder.py

@@ -70,21 +70,22 @@ 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)
+    pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
-    #
+
-    # @api.depends('state')
+    @api.depends('state')
-    # def _compute_pr_mp_count(self):
+    def _compute_pr_mp_count(self):
-    #     for item in self:
+        for item in self:
-    #         if not item.is_subcontract:
+            if not item.is_subcontract:
-    #             item.pr_mp_count = 0
+                item.pr_mp_count = 0
-    #             continue
+                continue
-    #         pr_ids = self.env['purchase.request'].sudo().search(
+            pr_ids = self.env['purchase.request'].sudo().search(
-    #             [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
+                [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
-    #              ('state', '!=', 'rejected')])
+                 ('state', '!=', 'rejected')])
-    #         if pr_ids:
+            if pr_ids:
-    #             item.pr_mp_count = len(pr_ids)
+                item.pr_mp_count = len(pr_ids)
-    #         else:
+            else:
-    #             item.pr_mp_count = 0
+                item.pr_mp_count = 0
+
     @api.depends('state')
     def _compute_back_button_display(self):
         for record in self:
@@ -442,49 +443,39 @@ 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 = [('purchase_type', '=', 'consignment'),
+                [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-                          ('origin', 'like', '%' + self.production_id.name + '%'),
+                 ('state', '!=', 'rejected')])
-                          ('state', '!=', 'cancel')]
+            if pr_ids.purchase_count:
-                # domain = [('purchase_type', '=', 'consignment'),
+                order.surface_technics_purchase_count = pr_ids.purchase_count
-                #           ('origin', 'like', '%' + self.production_id.name + '%'),
-                #           ('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
 
-    # def action_view_pr_mrp_workorder(self):
+    def action_view_pr_mrp_workorder(self):
-    #     """
+        """
-    #     采购请求
+        采购请求
-    #     """
+        """
-    #     self.ensure_one()
+        self.ensure_one()
-    #     pr_ids = self.env['purchase.request'].sudo().search(
+        pr_ids = self.env['purchase.request'].sudo().search(
-    #         [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
+            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-    #          ('state', '!=', 'rejected')])
+             ('state', '!=', 'rejected')])
-    #     action = {
+        action = {
-    #         'res_model': 'purchase.request',
+            'res_model': 'purchase.request',
-    #         'type': 'ir.actions.act_window',
+            'type': 'ir.actions.act_window',
-    #     }
+        }
-    #     if len(pr_ids) == 1:
+        if len(pr_ids) == 1:
-    #         action.update({
+            action.update({
-    #             'view_mode': 'form',
+                'view_mode': 'form',
-    #             'res_id': pr_ids[0].id,
+                'res_id': pr_ids[0].id,
-    #         })
+            })
-    #     else:
+        else:
-    #         action.update({
+            action.update({
-    #             'name': _("从 %s生成采购请求单", self.name),
+                'name': _("从 %s生成采购请求单", self.name),
-    #             'domain': [('id', 'in', pr_ids)],
+                'domain': [('id', 'in', pr_ids)],
-    #             'view_mode': 'tree,form',
+                'view_mode': 'tree,form',
-    #         })
+            })
-    #     return action
+        return action
+
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -501,19 +492,23 @@ 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'), ('state', '!=', 'cancel')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
         # 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')
@@ -1243,6 +1238,13 @@ class ResMrpWorkOrder(models.Model):
         }]
         return workorders_values_str
 
+    def check_lot_exists(self, picking_id, lot_id):
+        return bool(
+            picking_id.move_ids.move_line_ids.filtered(
+                lambda line: line.lot_id.id == lot_id
+            )
+        )
+
     def _process_compute_state(self):
         sorted_workorders = sorted(self, key=lambda x: x.sequence)
         for workorder in sorted_workorders:
@@ -1264,20 +1266,37 @@ class ResMrpWorkOrder(models.Model):
                         workorder.state = 'pending'
                     continue
             # ================= 如果制造订单制造类型为【人工线下加工】==========================
+            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+            # picking_ids = workorder.production_id.picking_ids.filtered(
+            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+            # exists = any(
+            #     move_line.lot_id == lot_id
+            #     for picking in picking_ids
+            #     for move in picking.move_ids
+            #     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 len(workorder.production_id.picking_ids.filtered(
-                        lambda w: w.state not in ['done', 'cancel'])) == 0):
                 # 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'
-                        move_out = workorder.move_subcontract_workorder_ids[1]
+                        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:
@@ -1293,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 != '已排'
@@ -1308,15 +1328,18 @@ 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':
                                 workorder.state = 'ready'
-                                move_out = workorder.move_subcontract_workorder_ids[1]
+                                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
                                 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:
@@ -1325,7 +1348,6 @@ class ResMrpWorkOrder(models.Model):
                             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')
@@ -1357,16 +1379,25 @@ class ResMrpWorkOrder(models.Model):
             # 判断是否有坯料的序列号信息
             boolean = False
             if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料':
+                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and \
+                        self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
                     if self.production_id.move_raw_ids[0].move_line_ids:
-                        if self.production_id.move_raw_ids[0].move_line_ids:
+                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
-                            if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+                            boolean = True
-                                boolean = True
                 else:
                     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(
@@ -1390,7 +1421,10 @@ class ResMrpWorkOrder(models.Model):
         # 表面工艺外协出库单
         if self.routing_type == '表面工艺':
             if self.is_subcontract is True:
-                move_out = self.move_subcontract_workorder_ids[1]
+                picking_id = self.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 = self.move_subcontract_workorder_ids[1]
                 # move_out = self.env['stock.move'].search(
                 #     [('location_id', '=', self.env['stock.location'].search(
                 #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
@@ -1398,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:
@@ -1530,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
@@ -1809,7 +1846,7 @@ class ResMrpWorkOrder(models.Model):
             orderby=orderby,
             lazy=lazy
         )
-    
+
     model_id = fields.Char('模型ID', related='production_id.model_id')
 
 

sf_manufacturing/models/product_template.py

@@ -1030,6 +1030,7 @@ class ResProductMo(models.Model):
             'single_manufacturing': product_id.single_manufacturing,
             'is_bfm': True,
             'active': True,
+            'tracking': finish_product.tracking,  # 坯料的跟踪方式跟随成品
         }
         # 外协和采购生成的坯料需要根据材料型号绑定供应商
         if route_type == 'subcontract' or route_type == 'purchase':

sf_manufacturing/models/purchase_order.py

@@ -59,6 +59,88 @@ class PurchaseOrder(models.Model):
             production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
             purchase.production_count = len(production_id)
 
+    def process_replenish(self,production,total_qty):
+        record = self
+        bom_line_id = production.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': total_qty,
+                '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': total_qty + replenish.qty_to_order,
+                'origin': record.name + ',' + replenish.origin,
+            })
+        replenish.action_replenish()
+
+    def outsourcing_service_replenishment(self):
+        record = self
+        if record.purchase_type != 'consignment':
+            return
+        grouped_lines = {}
+        for line in record.order_line:
+            if line.related_product.id not in grouped_lines:
+                grouped_lines[line.related_product.id] = []
+            grouped_lines[line.related_product.id].append(line)
+        for product_id,lines in grouped_lines.items():
+            production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            if not production:
+                continue
+            total_qty = sum(line.product_qty for line in lines)
+            record.process_replenish(production,total_qty)
+        for product_id,lines in grouped_lines.items():
+            productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            if not productions:
+                continue
+            # production.bom_id.bom_line_ids.product_id
+            location_id = self.env['stock.location'].search([('name', '=', '制造前')])
+            quants = self.env['stock.quant'].search([
+                ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
+                ('location_id', '=', location_id.id)
+            ])
+            total_qty = sum(quants.mapped('quantity'))  # 计算该位置的总库存量
+            is_available = total_qty > 0
+            if not is_available:
+                raise UserError('请先完成坯料入库')
+            for production_id in productions:
+                work_ids = production_id.workorder_ids.filtered(
+                    lambda wk: wk.state not in ['done', 'rework', 'cancel'])
+                if not work_ids:
+                    continue
+                min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
+                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:
+                                self.env['stock.move.line'].create(
+                                    mo.get_move_line(production_id, min_sequence_wk))
+            # product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            # match = re.search(r'(S\d{5}-\d)',product.name)
+            # pass
     def button_confirm(self):
         for record in self:
             for line in record.order_line:
@@ -66,38 +148,17 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            # if record.purchase_type == 'consignment':
+            record.outsourcing_service_replenishment()        
-            #     bom_line_id = record.order_line[0].purchase_request_lines.request_id.bom_id.bom_line_ids
+        
-            #     replenish = self.env['stock.warehouse.orderpoint'].search([
+        res = super(PurchaseOrder, self).button_confirm()
-            #         ('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()
+        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
     
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', store=True, compute='_compute_origin_sale_id')
@@ -167,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/purchase_request_line.py

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

sf_manufacturing/models/sale_order.py

@@ -56,9 +56,10 @@ class SaleOrder(models.Model):
                     'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
 
             # 复制成品模板上的属性
-            line.product_id.product_tmpl_id.copy_template(product_template_id)
+            line.product_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
 
             order_id = self
             product = line.product_id
@@ -75,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

@@ -7,74 +7,73 @@ from odoo.exceptions import UserError, ValidationError
 
 class SfProductionProcessParameter(models.Model):
     _inherit = 'sf.production.process.parameter'
-    # service_products = fields.Many2one(
+    service_products = fields.Many2one(
-    #     'product.template',
+        'product.template',
-    #     string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
+        string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
-    #     store=True
+        store=True
-    # )
+    )
-    # outsourced_service_products = fields.One2many(
+    outsourced_service_products = fields.One2many(
-    #     'product.template',  # 另一个模型的名称
+        'product.template',  # 另一个模型的名称
-    #     'server_product_process_parameters_id',  # 对应的 Many2one 字段名称
+        'server_product_process_parameters_id',  # 对应的 Many2one 字段名称
-    #     string='外协服务产品'
+        string='外协服务产品'
-    # )
+    )
-    # is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
+    is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
-    # is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
+    is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
-    # routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
+    routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
-    #
+    def _inverse_service_products(self):
-    # @api.depends('outsourced_service_products')
+        for record in self:
-    # def _compute_service_products(self):
+            if record.service_products:
-    #     for record in self:
+                # 确保关联关系正确
-    #         # 假设取第一条作为主明细
+                record.outsourced_service_products = record.service_products.ids if record.service_products else False
-    #         record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
+            else:
-    #
+                record.outsourced_service_products = False
-    # def _inverse_service_products(self):
+    @api.depends('outsourced_service_products')
-    #     for record in self:
+    def _compute_service_products(self):
-    #         if record.service_products:
+        for record in self:
-    #             # 确保关联关系正确
+            # 假设取第一条作为主明细
-    #             record.outsourced_service_products = record.service_products.ids if record.service_products else False
+            record.service_products = record.outsourced_service_products[0].id if record.outsourced_service_products else False
-    #         else:
+
-    #             record.outsourced_service_products = False
+    def name_get(self):
-    # def name_get(self):
+        result = []
-    #     result = []
+        for record in self:
-    #     for record in self:
+            name = f"{record.process_id.name} - {record.name}"  # 自定义显示格式
-    #         name = f"{record.process_id.name} - {record.name}"  # 自定义显示格式
+            result.append((record.id, name))
-    #         result.append((record.id, name))
+        return result
-    #     return result
+    @api.constrains('outsourced_service_products')
-    # @api.constrains('outsourced_service_products')
+    def _validate_partner_limit(self):
-    # def _validate_partner_limit(self):
+        for record in self:
-    #     for record in self:
+            if len(record.outsourced_service_products) > 1:
-    #         if len(record.outsourced_service_products) > 1:
+                raise ValidationError("工艺参数不能与多个产品关联")
-    #             raise ValidationError("工艺参数不能与多个产品关联")
+
-    #
+    @api.onchange('outsourced_service_products')
-    # @api.onchange('outsourced_service_products')
+    def _onchange_validate_partner_limit(self):
-    # def _onchange_validate_partner_limit(self):
+        for record in self:
-    #     for record in self:
+            if len(record.outsourced_service_products) > 1:
-    #         if len(record.outsourced_service_products) > 1:
+                raise ValidationError("工艺参数不能与多个产品关联")
-    #             raise ValidationError("工艺参数不能与多个产品关联")
+    @api.depends('outsourced_service_products')
-    # @api.depends('outsourced_service_products')
+    def _compute_is_product_button(self):
-    # def _compute_is_product_button(self):
+        for record in self:
-    #     for record in self:
+            if record.outsourced_service_products:
-    #         if record.outsourced_service_products:
+                record.is_product_button = True
-    #             record.is_product_button = True
+            else:
-    #         else:
+                record.is_product_button = False
-    #             record.is_product_button = False
+
-    #
+    def has_wksp_prefix(self):
-    # def has_wksp_prefix(self):
+        """
-    #     """
+        判断字符串是否以WKSP开头（不区分大小写）
-    #     判断字符串是否以WKSP开头（不区分大小写）
+        :param text: 要检查的字符串
-    #     :param text: 要检查的字符串
+        :return: True/False
-    #     :return: True/False
+        """
-    #     """
+        return self.code.upper().startswith('101'+self.routing_id.code)
-    #     return self.code.upper().startswith('101'+self.routing_id.code)
+    @api.depends('outsourced_service_products','code')
-    # @api.depends('outsourced_service_products','code')
+    def _compute_is_delete_button(self):
-    # def _compute_is_delete_button(self):
+        for record in self:
-    #     for record in self:
+            if record.outsourced_service_products and record.has_wksp_prefix():
-    #         if record.outsourced_service_products and record.has_wksp_prefix():
+                record.is_delete_button = False
-    #             record.is_delete_button = False
+            elif record.outsourced_service_products:
-    #         elif record.outsourced_service_products:
+                record.is_delete_button = True
-    #             record.is_delete_button = True
+            else:
-    #         else:
+                record.is_delete_button = True
-    #             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'):
@@ -90,19 +89,19 @@ class SfProductionProcessParameter(models.Model):
             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):
+    def action_create_service_product(self):
-    #     if self.id:  # 如果是已存在的记录
+        if self.id:  # 如果是已存在的记录
-    #         self.write({})  # 空写入会触发保存
+            self.write({})  # 空写入会触发保存
-    #     else:  # 如果是新记录
+        else:  # 如果是新记录
-    #         self = self.create(self._convert_to_write(self.read()[0]))
+            self = self.create(self._convert_to_write(self.read()[0]))
-    #     return {
+        return {
-    #         'type': 'ir.actions.act_window',
+            'type': 'ir.actions.act_window',
-    #         'name': '向导名称',
+            'name': '向导名称',
-    #         'res_model': 'product.creation.wizard',
+            'res_model': 'product.creation.wizard',
-    #         'view_mode': 'form',
+            'view_mode': 'form',
-    #         'target': 'new',
+            'target': 'new',
-    #         'context': {'default_process_parameter_id': self.id},  # 传递当前记录ID
+            'context': {'default_process_parameter_id': self.id},  # 传递当前记录ID
-    #     }
+        }
         #
         # return {
         #     'name': '创建服务产品',
@@ -116,6 +115,6 @@ class SfProductionProcessParameter(models.Model):
         #     },
         # }
 
-    # def action_hide_service_products(self):
+    def action_hide_service_products(self):
-    #     # self.outsourced_service_products.active = False
+        # self.outsourced_service_products.active = False
-    #     self.active = False
+        self.active = False

sf_manufacturing/models/stock.py

@@ -631,28 +631,62 @@ class StockPicking(models.Model):
                         move.action_clear_lines_show_details()
                         move.action_show_details()
         res = super().button_validate()
-        picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
+        lot_ids = None
-        if res is True and self.picking_type_id.id == picking_type_in:
+        product_ids = self.move_ids.mapped('product_id')
+        if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+            lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
+        production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
+        if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
             # 如果是最后一张外协入库单，则设置库存位置的预留数量
-            move_in = self.move_ids
+            for production_id in production_ids:
-            if move_in:
+                if lot_ids:
-                workorder = move_in.subcontract_workorder_id
+                    lot_id = production_id.move_raw_ids.move_line_ids.lot_id
-                workorders = workorder.production_id.workorder_ids
+                    # picking_ids = production_id.picking_ids.filtered(
-                subcontract_workorders = workorders.filtered(
+                    #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
-                    lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+                    if lot_id in lot_ids:
-                # if workorder == subcontract_workorders[-1]:
+                        workorder_id = production_id.workorder_ids.filtered(
-                #     self.env['stock.quant']._update_reserved_quantity(
+                            lambda a: a.state == 'progress' and a.is_subcontract)
-                #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+                        if not workorder_id:
-                #         lot_id=move_in.move_line_ids.lot_id,
+                            continue
-                #         package_id=False, owner_id=False, strict=False
+                        workorder_id.button_finish()
-                #     )
+                else:
-                workorder.button_finish()
+                    workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
-        picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
+                    if not workorder_id:
-        if res and self.picking_type_id.id == picking_type_out:
+                        continue
-            move_out = self.move_ids
+                    workorder_id.button_finish()
-            if move_out:
+            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
-                workorder = move_out.subcontract_workorder_id
+            # picking_ids = workorder.production_id.picking_ids.filtered(
-                workorder.button_start()
+            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+
+            # if move_in:
+            #     workorder = move_in.subcontract_workorder_id
+            #     workorders = workorder.production_id.workorder_ids
+            #     subcontract_workorders = workorders.filtered(
+            #         lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+            #     # if workorder == subcontract_workorders[-1]:
+            #     #     self.env['stock.quant']._update_reserved_quantity(
+            #     #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+            #     #         lot_id=move_in.move_line_ids.lot_id,
+            #     #         package_id=False, owner_id=False, strict=False
+            #     #     )
+            #     workorder.button_finish()
+        if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
+            for production_id in production_ids:
+                if lot_ids:
+                    lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+                    # picking_ids = production_id.picking_ids.filtered(
+                    #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+                    if lot_id in lot_ids:
+                        workorder_id = production_id.workorder_ids.filtered(
+                            lambda a: a.state == 'progress' and a.is_subcontract)
+                        if not workorder_id:
+                            continue
+                        workorder_id.button_finish()
+                else:
+                    workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
+                    if not workorder_id:
+                        continue
+                    workorder_id.button_start()
         if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
             sale_id = self.env['sale.order'].sudo().search(
                 [('name', '=', self.origin)])
@@ -675,6 +709,7 @@ class StockPicking(models.Model):
 
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
+        production = workorders[0].production_id
         for workorder in workorders:
             if workorder.move_subcontract_workorder_ids:
                 workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
@@ -706,7 +741,7 @@ class StockPicking(models.Model):
             })
             moves_in = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
-                                                                  procurement_group_id.id, move_dest_id))
+                                                                  procurement_group_id.id, move_dest_id, production.product_uom_qty))
             picking_in = self.create(
                 moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
             # pick_ids.append(picking_in.id)
@@ -716,7 +751,7 @@ class StockPicking(models.Model):
             # self.env.context.get('default_production_id')
             moves_out = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
-                                                                  procurement_group_id.id, moves_in.id))
+                                                                  procurement_group_id.id, moves_in.id, production.product_uom_qty))
             workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
             picking_out = self.create(
                 moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
@@ -848,7 +883,7 @@ class ReStockMove(models.Model):
             traceback_error = traceback.format_exc()
             logging.error("零件图号 零件名称获取失败:%s" % traceback_error)
 
-    def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
+    def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False, product_uom_qty=1.0):
         route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
         stock_rule = self.env['stock.rule'].sudo().search(
             [('route_id', '=', route_id), ('picking_type_id', '=', picking_type_id)])
@@ -857,7 +892,7 @@ class ReStockMove(models.Model):
             'company_id': item.company_id.id,
             'product_id': item.bom_id.bom_line_ids.product_id.id,
             'product_uom': item.bom_id.bom_line_ids.product_uom_id.id,
-            'product_uom_qty': 1.0,
+            'product_uom_qty': product_uom_qty,
             'location_id': stock_rule.location_src_id.id,
             'location_dest_id': stock_rule.location_dest_id.id,
             'origin': item.name,
@@ -895,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,
@@ -902,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_manufacturing/models/stock_warehouse_orderpoint.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of SmartGo. See LICENSE file for full copyright and licensing details.
+import base64
+from io import BytesIO
+from odoo import api, fields, models, SUPERUSER_ID, _
+
+
+class StockWarehouseOrderpoint(models.Model):
+    _inherit = 'stock.warehouse.orderpoint'
+    origin = fields.Char(string='来源')
+    _order = 'create_date DESC'

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}"/>
+                                       options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"

sf_manufacturing/views/mrp_routing_workcenter_view.xml

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

sf_manufacturing/views/mrp_views_menus.xml

@@ -4,30 +4,32 @@
         name="Manufacturing"
         groups="mrp.group_mrp_user,mrp.group_mrp_manager,sf_base.group_sf_mrp_user,sf_base.group_sf_mrp_manager"
         web_icon="mrp,static/description/icon.svg"
-        sequence="145">
+        sequence="145"/>
 
-        <menuitem id="mrp.menu_mrp_manufacturing"
+    <menuitem id="mrp.menu_mrp_manufacturing"
-            name="Operations"
+        name="Operations"
-            sequence="10"/>
+        parent="mrp.menu_mrp_root"
+        sequence="10"/>
 
-        <menuitem id="mrp.mrp_planning_menu_root"
+    <menuitem id="mrp.mrp_planning_menu_root"
-            name="Planning"
+        name="Planning"
-            sequence="15"/>
+        parent="mrp.menu_mrp_root"
+        sequence="15"/>
 
-        <menuitem id="mrp.enu_mrp_bom"
+    <menuitem id="mrp.menu_mrp_bom"
-            name="Products"
+        name="Products"
-            sequence="20"/>
+        parent="mrp.menu_mrp_root"
+        sequence="20"/>
 
-        <menuitem id="mrp.menu_mrp_reporting"
+    <menuitem id="mrp.menu_mrp_reporting"
-              name="Reporting"
+        name="Reporting"
-              sequence="25"/>
+        parent="mrp.menu_mrp_root"
-
+        sequence="25"/>
-        <menuitem id="mrp.menu_mrp_configuration"
-            name="Configuration"
-            groups="mrp.group_mrp_manager,sf_base.group_sf_mrp_manager"
-            sequence="100"/>
-
-    </menuitem>
 
+    <menuitem id="mrp.menu_mrp_configuration"
+        name="Configuration"
+        parent="mrp.menu_mrp_root"
+        groups="mrp.group_mrp_manager,sf_base.group_sf_mrp_manager"
+        sequence="100"/>
 
 </odoo>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -144,17 +144,17 @@
                        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"-->
+                <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
-<!--                        icon="fa-credit-card"-->
+                        icon="fa-credit-card"
-<!--                        groups="base.group_user,sf_base.group_sf_order_user"-->
+                        groups="base.group_user,sf_base.group_sf_order_user"
-<!--                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">-->
+                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
-<!--                    <div class="o_field_widget o_stat_info">-->
+                    <div class="o_field_widget o_stat_info">
-<!--                        <span class="o_stat_value">-->
+                        <span class="o_stat_value">
-<!--                            <field name="pr_mp_count"/>-->
+                            <field name="pr_mp_count"/>
-<!--                        </span>-->
+                        </span>
-<!--                        <span class="o_stat_text">采购申请</span>-->
+                        <span class="o_stat_text">采购申请</span>
-<!--                    </div>-->
+                    </div>
-<!--                </button>-->
+                </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"

sf_manufacturing/views/stock_warehouse_orderpoint.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_warehouse_orderpoint_tree_editable_inherit" model="ir.ui.view">
+            <field name="name">补货</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree_editable"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='qty_to_order']" position="after">
+                    <field name="origin"/>
+                </xpath>
+            </field>
+        </record>
+        <!-- 继承补货单的搜索视图 -->
+    </data>
+</odoo>

sf_manufacturing/wizard/production_technology_re_adjust_wizard.py

@@ -77,11 +77,11 @@ 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(
+            pr_ids = self.env['purchase.request'].sudo().search(
-            #     [('origin', 'like', item.name), ('is_subcontract', '=', 'True'), ('state', '!=', 'rejected')])
+                [('origin', 'like', item.name), ('is_subcontract', '=', 'True'), ('state', '!=', 'rejected')])
-            # if not pr_ids:
+            if not pr_ids:
-            #     continue
+                continue
-            # if not all(pr.state == 'draft' for pr in pr_ids):
+            if not all(pr.state == 'draft' for pr in pr_ids):
-            #     # 如果发现有记录的 state 不是 'draft'，抛出异常
+                # 如果发现有记录的 state 不是 'draft'，抛出异常
-            #     raise UserError("有采购申请的状态不是 '草稿'")
+                raise UserError("有采购申请的状态不是 '草稿'")
-            # pr_ids.state = 'rejected'
+            pr_ids.state = 'rejected'

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_mrs_connect/models/sync_common.py

@@ -1149,7 +1149,7 @@ class sfProductionProcessParameter(models.Model):
                             'processing_mm': item['processing_mm'],
                             'gain_way':'外协',
                         })
-                        # production_process_parameter.create_service_product()
+                        production_process_parameter.create_service_product()
                     else:
                         production_process_parameter.gain_way = '外协'
                         production_process_parameter.name = item['name']
@@ -1161,9 +1161,9 @@ 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:
+                        if not production_process_parameter.outsourced_service_products:
-                    #         production_process_parameter.create_service_product()
+                            production_process_parameter.create_service_product()
-                    # production_process_parameter.create_work_center()
+                    production_process_parameter.create_work_center()
         else:
             raise ValidationError("表面工艺可选参数认证未通过")
 

sf_quality/models/quality.py

@@ -125,7 +125,15 @@ class QualityCheck(models.Model):
         # todo 需修改
         val = ['0037818516']
         logging.info('获取到的工单信息%s' % val)
-        r = requests.post(crea_url, json=val, headers=headers)
+        # r = requests.post(crea_url, json=val, headers=headers)
+        r = self.env['api.request.log'].log_request(
+            'get',
+            crea_url,
+            name='零件特采',
+            responser='中控系统',
+            json=val,
+            headers=headers
+        )
         ret = r.json()
         logging.info('_register_quality_check:%s' % ret)
         if ret['Succeed']:

sf_sale/models/sale_order.py

@@ -346,10 +346,10 @@ class RePurchaseOrder(models.Model):
             if purchase.order_line[0].product_id.categ_id.name == '坯料':
                 if purchase.order_line[0].product_id.materials_type_id.gain_way == '外协':
                     purchase.purchase_type = 'outsourcing'
-            # request_lines = self.order_line.mapped('purchase_request_lines')
+            request_lines = self.order_line.mapped('purchase_request_lines')
-            # # 检查是否存在 is_subcontract 为 True 的行
+            # 检查是否存在 is_subcontract 为 True 的行
-            # if any(line.is_subcontract for line in request_lines):
+            if any(line.is_subcontract for line in request_lines):
-            #     purchase.purchase_type = 'consignment'
+                purchase.purchase_type = 'consignment'
 
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
@@ -384,27 +384,28 @@ class RePurchaseOrder(models.Model):
                 if not line.taxes_id:
                     raise UserError('请对【产品】中的【税】进行选择')
 
-    # def get_purchase_request(self, consecutive_process_parameters, production):
+    def get_purchase_request(self, consecutive_process_parameters, production):
-    #     result = []
+        result = []
-    #     for pp in consecutive_process_parameters:
+        for pp in consecutive_process_parameters:
-    #         server_template = self.env['product.template'].search(
+            server_template = self.env['product.template'].search(
-    #             [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
+                [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
-    #              ('detailed_type', '=', 'service')])
+                 ('detailed_type', '=', 'service')])
-    #         # route_ids
+            # route_ids
-    #         result.append({
+            result.append({
-    #             "product_id": server_template.product_variant_id.id,
+                "product_id": server_template.product_variant_id.id,
-    #             "name": production.procurement_group_id.name,
+                'related_product': production.product_id.id,
-    #             "date_required": fields.Datetime.now(),
+                "name": production.procurement_group_id.name,
-    #             "product_uom_id":server_template.uom_id.id,
+                "date_required": fields.Datetime.now(),
-    #             "product_qty": 1,
+                "product_uom_id":server_template.uom_id.id,
-    #             "request_id": False,
+                "product_qty": production.product_qty,
-    #             "move_dest_ids": False,
+                "request_id": False,
-    #             "orderpoint_id": False,
+                "move_dest_ids": False,
-    #             'is_subcontract':True,
+                "orderpoint_id": False,
-    #             'group_id':production.procurement_group_id.id,
+                'is_subcontract':True,
-    #             'production_name':pp.production_id.name,
+                'group_id':production.procurement_group_id.id,
-    #         })
+                'production_name':pp.production_id.name,
-    #     return result
+            })
+        return result
 
     def get_purchase_order(self, consecutive_process_parameters, production, product_id_to_production_names):
         for pp in consecutive_process_parameters:
@@ -419,7 +420,7 @@ class RePurchaseOrder(models.Model):
                      ('detailed_type', '=', 'service')])
                 server_product_process.append((0, 0, {
                     'product_id': server_template.product_variant_id.id,
-                    'product_qty': 1,
+                    'product_qty': production.product_uom_qty,
                     'product_uom': server_template.uom_id.id,
                     'related_product': production.product_id.id,
                     'manual_part_number': pp.part_number,

sf_tool_management/controllers/controllers.py

@@ -4,12 +4,14 @@ import json
 import base64
 from odoo import http
 from odoo.http import request
+from odoo.addons.sf_base.decorators.api_log import api_log
 
 
 class Manufacturing_Connect(http.Controller):
 
     @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
+    @api_log('刀具组', requester='中控系统')
     def get_functional_tool_groups_Info(self, **kw):
         """
         刀具组接口
@@ -39,6 +41,7 @@ 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):
         """
         功能刀具清单接口
@@ -68,6 +71,7 @@ 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):
         """
         功能刀具列表接口

sf_tool_management/models/maintenance_equipment.py

@@ -51,7 +51,15 @@ class SfMaintenanceEquipment(models.Model):
             headers = {'Authorization': config['center_control_Authorization']}
             crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
             params = {"DeviceId": self.name}
-            r = requests.get(crea_url, params=params, headers=headers)
+            # r = requests.get(crea_url, params=params, headers=headers)
+            r = self.env['api.request.log'].log_request(
+                'get',
+                crea_url,
+                name='机床刀库',
+                responser='中控系统',
+                params=params,
+                headers=headers
+            )
             ret = r.json()
             logging.info('机床刀库register_equipment_tool():%s' % ret)
             datas = ret['Datas']

sf_warehouse/models/model.py

@@ -514,7 +514,15 @@ class ShelfLocation(models.Model):
         crea_url = config['center_control_url'] + "/AutoDeviceApi/GetLocationInfos"
 
         params = {'DeviceId': device_id}
-        r = requests.get(crea_url, params=params, headers=headers)
+        # r = requests.get(crea_url, params=params, headers=headers)
+        r = self.env['api.request.log'].log_request(
+            'get',
+            crea_url,
+            name='库位信息',
+            responser='中控系统',
+            params=params,
+            headers=headers
+        )
 
         ret = r.json()
 
@@ -812,40 +820,49 @@ class SfStockMoveLine(models.Model):
     #         # 从目标stock.move对象获取目标stock.picking对象
     #         dest_picking = dest_move.picking_id if dest_move else False
     #     # 现在，dest_picking就是current_picking的下一步
+    # 添加所有需要的依赖字段
     @api.depends('location_id')
     def _compute_current_location_id(self):
+        # 批量获取所有相关记录的picking
+        pickings = self.mapped('picking_id')
+        
+        # 构建源picking的移库行与目标位置的映射
+        origin_location_map = {}
+        for picking in pickings:
+            # 获取源picking
+            origin_move = picking.move_ids[:1].move_orig_ids[:1]
+            if not origin_move:
+                continue
+                
+            origin_picking = origin_move.picking_id
+            if not origin_picking:
+                continue
+                
+            # 为每个picking构建lot_id到location的映射
+            origin_location_map[picking.id] = {
+                move_line.lot_id.id: move_line.destination_location_id
+                for move_line in origin_picking.move_line_ids.filtered(
+                    lambda ml: ml.destination_location_id and ml.lot_id
+                )
+            }
+        
+        # 批量更新current_location_id
         for record in self:
-            # 使用record代替self来引用当前遍历到的记录
+            current_picking = record.picking_id
-            logging.info('record.picking_id.name: %s' % record.picking_id.name)
+            if not current_picking:
-            logging.info('record.env: %s' % record.env['stock.picking'].search([('name', '=', record.picking_id.name)]))
+                record.current_location_id = False
-
+                continue
-            # 获取当前的stock.picking对象
+                
-            current_picking = record.env['stock.picking'].search([('name', '=', record.picking_id.name)], limit=1)
+            # 获取当前picking对应的lot_location映射
-
+            lot_dest_map = origin_location_map.get(current_picking.id, {})
-            # 获取当前picking的第一个stock.move对象
+            
-            current_move = current_picking.move_ids[0] if current_picking.move_ids else False
+            # 查找匹配的lot_id
-
+            for move_line in current_picking.move_line_ids:
-            # 如果存在相关的stock.move对象
+                if move_line.lot_id and move_line.lot_id.id in lot_dest_map:
-            if current_move:
+                    record.current_location_id = lot_dest_map[move_line.lot_id.id]
-                # 获取源stock.move对象
+                    break
-                origin_move = current_move.move_orig_ids[0] if current_move.move_orig_ids else False
+            else:
-
+                record.current_location_id = False
-                # 从源stock.move对象获取源stock.picking对象
-                origin_picking = origin_move.picking_id if origin_move else False
-
-                # 如果前一个调拨单有目标货位
-                if origin_picking:
-                    for i in current_picking.move_line_ids:
-                        for j in origin_picking.move_line_ids:
-                            if j.destination_location_id and i.lot_id == j.lot_id:
-                                # 更新当前记录的current_location_id字段
-                                record.current_location_id = j.destination_location_id
-                #     # 获取目标stock.move对象
-                #     dest_move = current_move.move_dest_ids[0] if current_move.move_dest_ids else False
-                #
-                #     # 从目标stock.move对象获取目标stock.picking对象
-                #     dest_picking = dest_move.picking_id if dest_move else False
-                # # 现在，dest_picking就是current_picking的下一步
 
     # 是一张单据一张单据往下走的，所以这里的目标货位是上一张单据的当前货位，且这样去计算是可以的。
     @api.depends('location_dest_id')