表面工艺外协调拨单数量问题

Merge Request: 确认接收时，将不追溯的产品的完成数量自动填上

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

jikimo_printing/models/jikimo_printing.py

@@ -3,8 +3,12 @@ import qrcode
 from reportlab.pdfgen import canvas
 from reportlab.lib.pagesizes import A4
 from PIL import Image
+import logging
 from reportlab.lib.utils import ImageReader
 from odoo import models, fields, api
+import base64
+
+_logger = logging.getLogger(__name__)
 
 class JikimoPrinting(models.AbstractModel):
     _name = 'jikimo.printing'
@@ -13,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)
@@ -41,16 +50,38 @@ class JikimoPrinting(models.AbstractModel):
 
         # 获取PDF内容并打印
         pdf_content = pdf_buffer.getvalue()
-        printer = self.env['printing.printer'].get_default()
+        # _logger.info(f"打印内容: {pdf_content}")
         printer.print_document(report=None, content=pdf_content, doc_format='pdf')
 
         # 清理资源
         pdf_buffer.close()
         temp_image.close()
 
+        return True
+
     def print_pdf(self, pdf_data):
         """
             打印PDF
         """
         printer = self.env['printing.printer'].get_default()
-        printer.print_document(report=None, content = pdf_data, doc_format='pdf') 
+        if not printer:
+            _logger.error("未找到默认打印机")
+            return False
+
+        pdf_data_str = pdf_data.decode('ascii', errors='ignore')
+        decoded_data = base64.b64decode(pdf_data_str)
+        
+        # 处理二进制数据
+        pdf_buffer = BytesIO()
+        pdf_buffer.write(decoded_data)
+        pdf_buffer.seek(0)
+        
+        # 获取PDF内容
+        pdf_content = pdf_buffer.getvalue()
+        
+        printer.print_document(report=None, content=pdf_content, doc_format='pdf')
+        # 清理资源
+        pdf_buffer.close()
+
+        _logger.info("成功打印PDF")
+        return True

jikimo_printing/models/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/__manifest__.py

@@ -12,12 +12,14 @@
         'views/mrp_production.xml',
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',
+        'views/purchase_request_line_view.xml',
+        'views/stock_picking_views.xml',
     ],
-    # 'assets': {
-    #           'web.assets_backend': [
-    #               'jikimo_purchase_request/static/src/**/*'
-    #           ],
-    #       },
+    'assets': {
+              'web.assets_backend': [
+                  'jikimo_purchase_request/static/src/**/*'
+              ],
+          },
     'application': True,
     'installable': True,
     'auto_install': False,

jikimo_purchase_request/i18n/zh_CN.po

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

jikimo_purchase_request/models/__init__.py

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

jikimo_purchase_request/models/mrp_production.py

@@ -9,18 +9,39 @@ class MrpProduction(models.Model):
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
-            if pr_ids:
-                item.pr_mp_count = len(pr_ids)
-            else:
-                item.pr_mp_count = 0
+            # 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)])
+            item.pr_mp_count = len(pr_ids)
+            # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
     def action_view_pr_mp(self):
         """
         采购请求
         """
         self.ensure_one()
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
+        # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
+        # if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
+        #     first_order = self.env['mrp.production'].search(
+        #         [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
+        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
+        # else:
+        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
+        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+        first_mp = self.env['mrp.production'].search(
+                    [('origin', '=', self.origin)], limit=1, order='id asc')
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
+
+
         action = {
             'res_model': 'purchase.request',
             'type': 'ir.actions.act_window',

jikimo_purchase_request/models/purchase_request.py

@@ -47,6 +47,19 @@ class PurchaseRequestLine(models.Model):
         ('outsourcing', "委外加工"),
     ], string='供货方式', compute='_compute_supply_method', store=True)
 
+    purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count', readonly=True)
+    purchase_count = fields.Integer(string="采购订单数量", compute="_compute_purchase_count", readonly=True)
+
+    @api.depends("purchase_lines")
+    def _compute_purchase_count(self):
+        for rec in self:
+            rec.purchase_count = len(rec.mapped("purchase_lines.order_id"))
+
+    @api.depends('request_id')
+    def _compute_purchase_request_count(self):
+        for order in self:
+            order.purchase_request_count = len(order.request_id)
+
     @api.depends('origin')
     def _compute_supply_method(self):
         for prl in self:
@@ -98,3 +111,33 @@ class PurchaseRequestLine(models.Model):
             else:
                 record.part_number = record.product_id.part_number
                 record.part_name = record.product_id.part_name
+
+    def _compute_qty_to_buy(self):
+        for pr in self:
+            qty_to_buy = sum(pr.mapped("product_qty")) - sum(pr.mapped("qty_done")) - sum(pr.mapped("qty_in_progress"))
+            pr.qty_to_buy = qty_to_buy > 0.0
+            pr.pending_qty_to_receive = qty_to_buy
+
+    def action_view_purchase_request(self):
+        action = self.env["ir.actions.actions"]._for_xml_id("purchase_request.purchase_request_form_action")
+        action.update({
+            'res_id': self.request_id.id,
+            'views': [[False, 'form']],
+        })
+        return action
+
+    def action_view_purchase_order(self):
+        action = self.env["ir.actions.actions"]._for_xml_id("purchase.purchase_rfq")
+        lines = self.mapped("purchase_lines.order_id")
+        if len(lines) > 1:
+            action["domain"] = [("id", "in", lines.ids)]
+        elif lines:
+            action["views"] = [
+                (self.env.ref("purchase.purchase_order_form").id, "form")
+            ]
+            action["res_id"] = lines.id
+        origin_context = ast.literal_eval(action['context'])
+        if 'search_default_draft' in origin_context:
+            origin_context.pop('search_default_draft')
+        action['context'] = origin_context
+        return action

jikimo_purchase_request/models/stock_picking.py

@@ -0,0 +1,35 @@
+from odoo import fields, api, models, _
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    purchase_request_count = fields.Integer('采购订单数量', compute='_compute_purchase_request')
+
+    @api.depends('name')
+    def _compute_purchase_request(self):
+        for record in self:
+            purchase_request_ids = self.env['purchase.request'].search([('origin', '=', record.name)])
+            record.purchase_request_count = len(purchase_request_ids)
+
+    def action_view_purchase_request(self):
+        self.ensure_one()
+
+        purchase_request_ids = self.env['purchase.request'].search([('origin', '=', self.name)])
+
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_request_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_request_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购请求单", self.name),
+                'domain': [('id', 'in', purchase_request_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

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,40 @@ 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.id, procurement.values['group_id'], rule.id) not in procurements_dict:
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)] = {
+                    'product_id': procurement.product_id, 
+                    'product_qty': procurement.product_qty,
+                    'product_uom': procurement.product_uom,
+                    'location_id': procurement.location_id,
+                    'name': procurement.name,
+                    'origin': procurement.origin,
+                    'company_id': procurement.company_id,
+                    'values': procurement.values,
+                    'rule': rule
+                }
+            else:
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['product_qty'] += procurement.product_qty
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['values']['move_dest_ids'] |= procurement.values['move_dest_ids']
+        new_procurements = []
+        for k, p in procurements_dict.items():
+            new_procurements.append((
+                self.env['procurement.group'].Procurement(
+                    product_id=p['product_id'],
+                    product_qty=p['product_qty'],
+                    product_uom=p['product_uom'],
+                    location_id=p['location_id'],
+                    name=p['name'],
+                    origin=p['origin'],
+                    company_id=p['company_id'],
+                    values=p['values']
+                ), p['rule'])
+            )
+
+        res = super(StockRule, self)._run_buy(new_procurements)
         # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
         origins = list(set([procurement[0].origin for procurement in procurements]))
         for origin in origins:

jikimo_purchase_request/static/src/change.scss

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

jikimo_purchase_request/views/purchase_request_line_view.xml

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

jikimo_purchase_request/views/stock_picking_views.xml

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

jikimo_purchase_request/wizard/purchase_request_line_make_purchase_order.py

@@ -104,9 +104,26 @@ class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
         # 去掉合并必须同一采购组的限制
         pass
 
-        
+    def get_items(self, request_line_ids):
+        request_line_obj = self.env["purchase.request.line"]
+        items = []
+        request_lines = request_line_obj.browse(request_line_ids).filtered(lambda line: line.pending_qty_to_receive > 0)
+        self._check_valid_request_line(request_line_ids)
+        self.check_group(request_lines)
+        for line in request_lines:
+            items.append([0, 0, self._prepare_item(line)])
+        return items
+
 
 class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):
     _inherit = "purchase.request.line.make.purchase.order.item"
 
     supply_method = fields.Selection(related='line_id.supply_method', string='供货方式')
+
+    wiz_id = fields.Many2one(
+        comodel_name="purchase.request.line.make.purchase.order",
+        string="Wizard",
+        required=False,
+        ondelete="cascade",
+        readonly=True,
+    )

jikimo_work_reporting_api/controllers/main.py

@@ -6,7 +6,7 @@ from odoo.addons.sf_base.decorators.api_log import api_log
 
 class MainController(http.Controller):
 
-    @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='public', cors='*')
+    @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='wechat_token', cors='*')
     @api_log('人工线下加工编程文件传输', requester='报工系统')
     def manual_download_program(self):
         """
@@ -59,7 +59,7 @@ class MainController(http.Controller):
                 target_ftp_info,
                 '/' + str(model_id),
                 '/',
-                match_str=r'^\d*_\d*-' + tool_groups_id.name + r'-\w{2}-all\.nc$'
+                match_str=r'^\d*-' + tool_groups_id.name + r'-\w{2}-all\.nc$'
                 )
             if len(result) > 0:
                 return {'code': 200, 'message': '传输成功', 'file_list': result}

quality_control/models/quality.py

@@ -141,7 +141,7 @@ class QualityCheck(models.Model):
     # # 出厂检验报告编号
     # report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
     # 总数量，值为调拨单_产品明细_数量
-    total_qty = fields.Char('总数量', compute='_compute_total_qty', readonly=False, store=True)
+    total_qty = fields.Char('总数量', compute='_compute_total_qty', store=True)
 
     column_nums = fields.Integer('测量值列数', default=1)
 
@@ -153,9 +153,9 @@ class QualityCheck(models.Model):
                 for move in record.picking_id.move_ids_without_package:
                     if move.product_id == record.product_id:
                         total_qty = int(move.product_uom_qty)
-                record.total_qty = total_qty if total_qty > 0 else ''
+                record.total_qty = total_qty if total_qty > 0 else 0
             else:
-                record.total_qty = ''
+                record.total_qty = 0
 
     # 检验数
     check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
@@ -281,42 +281,7 @@ class QualityCheck(models.Model):
         """
         pass
 
-    def check_total_quality(self):
-        """
-        校验总数量是否等于拣货数量
-        """
-        for record in self:
-            if record.picking_id:
-                for move in record.picking_id.move_ids_without_package:
-                    if move.product_id == record.product_id:
-                        picking_qty = int(move.product_uom_qty)
-                        if int(record.total_qty) != picking_qty:
-                            return True
-        return False
-
     def do_publish(self):
-        """打开二次确认弹窗"""
-        self.ensure_one()
-        if self.check_total_quality():
-            return self._show_confirmation_wizard()
-        else:
-            return self._do_actual_publish()
-
-    def _show_confirmation_wizard(self):
-        """显示确认向导的通用方法"""
-        return {
-            'name': _('发布确认'),
-            'type': 'ir.actions.act_window',
-            'res_model': 'quality.check.publish.wizard',
-            'view_mode': 'form',
-            'target': 'new',
-            'context': {
-                'default_check_id': self.id,
-                # 其他默认字段...
-            }
-        }
-
-    def _do_actual_publish(self):
         """发布出厂检验报告"""
         self.ensure_one()
         self._check_part_number()
@@ -770,8 +735,9 @@ class QualityCheck(models.Model):
     def _compute_qty_to_test(self):
         for qc in self:
             if qc.is_lot_tested_fractionally:
+                rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
                 qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100,
-                                             precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
+                                             precision_rounding=rounding, rounding_method="UP")
             else:
                 qc.qty_to_test = qc.qty_line
 

quality_control/wizard/quality_check_wizard.py

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

quality_control/wizard/quality_wizard.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import api, fields, models, _
 
-
 class QualityCheckPublishWizard(models.TransientModel):
     _name = 'quality.check.publish.wizard'
     _description = '质检报告发布确认'
@@ -13,10 +12,9 @@ class QualityCheckPublishWizard(models.TransientModel):
     measure_count = fields.Integer('测量件数', readonly=True)
     item_count = fields.Integer('检验项目数', readonly=True)
     old_report_name = fields.Char('旧出厂检验报告编号', readonly=True)
-    publish_status = fields.Selection([('draft', '草稿'), ('published', '已发布'), ('canceled', '已撤销')], string='发布状态',
-                                      readonly=True)
-
+    publish_status = fields.Selection([('draft', '草稿'), ('published', '已发布'), ('canceled', '已撤销')], string='发布状态', readonly=True)
+    
     def action_confirm_publish(self):
         """确认发布"""
         self.ensure_one()
-        return self.check_id._do_publish_implementation()
+        return self.check_id._do_publish_implementation()

requirements.txt

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

sf_base/commons/common.py

@@ -134,7 +134,7 @@ class PrintingUtils(models.AbstractModel):
             
             # 注册中文字体
             font_paths = [
-                "/usr/share/fonts/windows/simsun.ttc",  # Windows系统宋体
+                "/usr/share/fonts/chinese/simsun.ttc",  # Windows系统宋体
                 "c:/windows/fonts/simsun.ttc",  # Windows系统宋体另一个位置
                 "/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf",  # Linux Droid字体
                 "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",  # 文泉驿正黑
@@ -167,10 +167,10 @@ class PrintingUtils(models.AbstractModel):
                 
                 # 设置字体
                 if font_found:
-                    c.setFont('SimSun', 14)  # 增大字体大小到14pt
+                    c.setFont('SimSun', 10)  # 增大字体大小到14pt
                 else:
                     # 如果没有找到中文字体，使用默认字体
-                    c.setFont('Helvetica', 14)
+                    c.setFont('Helvetica', 10)
                     logging.warning("未找到中文字体，将使用默认字体")
                 
                 # 在右下角绘制二维码，预留边距
@@ -182,7 +182,7 @@ class PrintingUtils(models.AbstractModel):
                 if buttom_text:
                     # 在二维码下方绘制文字
                     text = buttom_text
-                    text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 14)  # 准确计算文字宽度
+                    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)

sf_dlm_management/models/mrp_routing_workcenter.py

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

sf_dlm_management/models/sf_production_common.py

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

sf_machine_connect/controllers/controllers.py

@@ -1360,9 +1360,9 @@ class Sf_Dashboard_Connect(http.Controller):
                     if result[0]:
                         if float(result[0]) >= 28800:
                             continue
-                        alarm_last_24_time = float(result[0])
+                        alarm_last_24_time += float(result[0])
                     else:
-                        alarm_last_24_time = 0.0
+                        alarm_last_24_time += 0.0
 
             alarm_all_nums = []
             with conn.cursor() as cur:

sf_machine_connect/models/ftp_operate.py

@@ -261,8 +261,50 @@ def transfer_files(
                             target_path = f"{target_dir}/{relative_path}/{item}"
                         else:
                             target_path = f"{target_dir}/{item}"
-                        with open(temp_path, 'rb') as f:
-                            target_ftp.ftp.storbinary(f'STOR {target_path}', f)
+                            
+                        # 规范化路径
+                        target_path = target_path.replace('\\', '/').strip('/')
+                        
+                        # 确保目标目录存在
+                        target_dir_path = '/'.join(target_path.split('/')[:-1])
+                        try:
+                            target_ftp.ftp.cwd('/')  # 回到根目录
+                            for dir_part in target_dir_path.split('/'):
+                                if dir_part:
+                                    try:
+                                        target_ftp.ftp.cwd(dir_part)
+                                    except:
+                                        try:
+                                            target_ftp.ftp.mkd(dir_part)
+                                            target_ftp.ftp.cwd(dir_part)
+                                        except Exception as e:
+                                            logging.error(f"创建目录失败 {dir_part}: {str(e)}")
+                                            raise
+                        except Exception as e:
+                            logging.error(f"处理目标目录失败: {str(e)}")
+                            raise
+                            
+                        # 检查FTP连接状态
+                        try:
+                            target_ftp.ftp.voidcmd('NOOP')
+                        except:
+                            logging.error("FTP连接已断开，尝试重新连接")
+                            target_ftp.ftp.connect(target_ftp_info['host'], target_ftp_info['port'])
+                            target_ftp.ftp.login(target_ftp_info['username'], target_ftp_info['password'])
+                            
+                        # 上传文件
+                        try:
+                            with open(temp_path, 'rb') as f:
+                                # 检查文件是否可读
+                                content = f.read()
+                                if not content:
+                                    raise Exception("临时文件为空")
+                                f.seek(0)  # 重置文件指针
+                                target_ftp.ftp.storbinary(f'STOR {target_path}', f)
+                        except Exception as e:
+                            logging.error(f"上传文件失败: {str(e)}")
+                            logging.error(f"目标路径: {target_path}")
+                            raise
                         
                         transfered_file_list.append(item)
                         # 删除临时文件
@@ -270,37 +312,37 @@ def transfer_files(
                         logging.info(f"已传输文件: {item}")
 
         # 清空目标目录下的所有内容
-        try:
-            target_ftp.ftp.cwd(target_dir)
-            files = target_ftp.ftp.nlst()
+        # try:
+        #     target_ftp.ftp.cwd(target_dir)
+        #     files = target_ftp.ftp.nlst()
             
-            for f in files:
-                try:
-                    # 尝试删除文件
-                    target_ftp.ftp.delete(f)
-                except:
-                    try:
-                        # 如果删除失败,可能是目录,递归删除目录
-                        def remove_dir(path):
-                            target_ftp.ftp.cwd(path)
-                            sub_files = target_ftp.ftp.nlst()
-                            for sf in sub_files:
-                                try:
-                                    target_ftp.ftp.delete(sf)
-                                except:
-                                    remove_dir(f"{path}/{sf}")
-                            target_ftp.ftp.cwd('..')
-                            target_ftp.ftp.rmd(path)
+        #     for f in files:
+        #         try:
+        #             # 尝试删除文件
+        #             target_ftp.ftp.delete(f)
+        #         except:
+        #             try:
+        #                 # 如果删除失败,可能是目录,递归删除目录
+        #                 def remove_dir(path):
+        #                     target_ftp.ftp.cwd(path)
+        #                     sub_files = target_ftp.ftp.nlst()
+        #                     for sf in sub_files:
+        #                         try:
+        #                             target_ftp.ftp.delete(sf)
+        #                         except:
+        #                             remove_dir(f"{path}/{sf}")
+        #                     target_ftp.ftp.cwd('..')
+        #                     target_ftp.ftp.rmd(path)
                             
-                        remove_dir(f"{target_dir}/{f}")
-                    except:
-                        logging.error(f"无法删除 {f}")
-                        pass
+        #                 remove_dir(f"{target_dir}/{f}")
+        #             except:
+        #                 logging.error(f"无法删除 {f}")
+        #                 pass
             
-            logging.info(f"已清空目标目录 {target_dir}")
-        except Exception as e:
-            logging.error(f"清空目标目录失败: {str(e)}")
-            raise Exception(f"清空目标目录失败: {str(e)}")
+        #     logging.info(f"已清空目标目录 {target_dir}")
+        # except Exception as e:
+        #     logging.error(f"清空目标目录失败: {str(e)}")
+        #     raise Exception(f"清空目标目录失败: {str(e)}")
 
         # 开始遍历
         traverse_dir(source_dir)

sf_manufacturing/models/mrp_production.py

@@ -900,41 +900,40 @@ 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):
-        sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
-        grouped_purchase_request_line = {
-            k: list(g)
-            for k, g in groupby(sorted_list, key=itemgetter('name'))
-        }
-        for name, request_line in grouped_purchase_request_line.items():
-            request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
-            grouped_purchase_request_line_sorted_list = {
-                k: list(g)
-                for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
-            }
-            purchase_request_model = self.env["purchase.request"]
-            origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
-            pr = purchase_request_model.create({
-                "origin": origin,
-                "company_id": self.company_id.id,
-                "picking_type_id": self.env.ref('stock.picking_type_in').id,
-                "group_id": request_line[0].get('group_id'),
-                "requested_by": self.env.context.get("uid", self.env.uid),
-                "assigned_to": False,
-                "bom_id": self[0].bom_id.id,
-                "is_subcontract":True,
-            })
-            self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
-                            'sf_stock.stock_route_process_outsourcing').id)]
-            for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
-                cur_request_line = request_line_list[0]
-                cur_request_line['product_qty'] = len(request_line_list)
-                cur_request_line['request_id'] = pr.id
-                cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
-                cur_request_line.pop('group_id', None)
-                cur_request_line.pop('production_name', None)
-                self.env["purchase.request.line"].create(cur_request_line)
-            pr.button_approved()
+    # def _create_subcontract_purchase_request(self, purchase_request_line):
+    #     sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
+    #     grouped_purchase_request_line = {
+    #         k: list(g)
+    #         for k, g in groupby(sorted_list, key=itemgetter('name'))
+    #     }
+    #     for name, request_line in grouped_purchase_request_line.items():
+    #         request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
+    #         grouped_purchase_request_line_sorted_list = {
+    #             k: list(g)
+    #             for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
+    #         }
+    #         purchase_request_model = self.env["purchase.request"]
+    #         origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
+    #         pr = purchase_request_model.create({
+    #             "origin": origin,
+    #             "company_id": self.company_id.id,
+    #             "picking_type_id": self.env.ref('stock.picking_type_in').id,
+    #             "group_id": request_line[0].get('group_id'),
+    #             "requested_by": self.env.context.get("uid", self.env.uid),
+    #             "assigned_to": False,
+    #             "bom_id": self[0].bom_id.id,
+    #             "is_subcontract":True,
+    #         })
+    #         self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
+    #                         'sf_stock.stock_route_process_outsourcing').id)]
+    #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
+    #             cur_request_line = request_line_list[0]
+    #             cur_request_line['product_qty'] = len(request_line_list)
+    #             cur_request_line['request_id'] = pr.id
+    #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
+    #             cur_request_line.pop('group_id', None)
+    #             cur_request_line.pop('production_name', None)
+    #             self.env["purchase.request.line"].create(cur_request_line)
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
@@ -962,14 +961,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['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
-                purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
-                    workorders, production)
-                all_workorders += workorders
-        self._create_subcontract_purchase_request(purchase_request_line)
-        for workorder in all_workorders:
-            workorder._compute_pr_mp_count()
+                self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
+                self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
+        #         purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
+        #             workorders, production)
+        #         all_workorders += workorders
+        # self._create_subcontract_purchase_request(purchase_request_line)
+        # for workorder in all_workorders:
+        #     workorder._compute_pr_mp_count()
     # 工单排序
     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')
-    def optional_process_parameters_date(self):
-        for record in self:
-            if not record.surface_technics_id:
-                continue
-            parameter_ids = self.env['sf.production.process.parameter'].search([
-                ('process_id', '=', record.surface_technics_id.id),
-            ])
-            record.optional_process_parameters = parameter_ids.ids
+    # @api.onchange('surface_technics_id')
+    # def optional_process_parameters_date(self):
+    #     for record in self:
+    #         if not record.surface_technics_id:
+    #             continue
+    #         parameter_ids = self.env['sf.production.process.parameter'].search([
+    #             ('process_id', '=', record.surface_technics_id.id),
+    #         ])
+    #         record.optional_process_parameters = parameter_ids.ids
 
     # @api.model
     # def _auto_init(self):

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

sf_manufacturing/models/mrp_workorder.py

@@ -70,21 +70,21 @@ class ResMrpWorkOrder(models.Model):
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
-    pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
-
-    @api.depends('state')
-    def _compute_pr_mp_count(self):
-        for item in self:
-            if not item.is_subcontract:
-                item.pr_mp_count = 0
-                continue
-            pr_ids = self.env['purchase.request'].sudo().search(
-                [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
-                 ('state', '!=', 'rejected')])
-            if pr_ids:
-                item.pr_mp_count = len(pr_ids)
-            else:
-                item.pr_mp_count = 0
+    # pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
+    #
+    # @api.depends('state')
+    # def _compute_pr_mp_count(self):
+    #     for item in self:
+    #         if not item.is_subcontract:
+    #             item.pr_mp_count = 0
+    #             continue
+    #         pr_ids = self.env['purchase.request'].sudo().search(
+    #             [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
+    #              ('state', '!=', 'rejected')])
+    #         if pr_ids:
+    #             item.pr_mp_count = len(pr_ids)
+    #         else:
+    #             item.pr_mp_count = 0
     @api.depends('state')
     def _compute_back_button_display(self):
         for record in self:
@@ -443,11 +443,12 @@ class ResMrpWorkOrder(models.Model):
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
             if order.routing_type == '表面工艺' and order.state not in ['cancel']:
-                # domain = [('group_id', '=', self.production_id.procurement_group_id.id),
-                #           ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
                 domain = [('purchase_type', '=', 'consignment'),
                           ('origin', 'like', '%' + self.production_id.name + '%'),
                           ('state', '!=', 'cancel')]
+                # domain = [('purchase_type', '=', 'consignment'),
+                #           ('origin', 'like', '%' + self.production_id.name + '%'),
+                #           ('state', '!=', 'cancel')]
                 purchase = self.env['purchase.order'].search(domain)
                 order.surface_technics_purchase_count = 0
                 if not purchase:
@@ -460,30 +461,30 @@ class ResMrpWorkOrder(models.Model):
             else:
                 order.surface_technics_purchase_count = 0
 
-    def action_view_pr_mrp_workorder(self):
-        """
-        采购请求
-        """
-        self.ensure_one()
-        pr_ids = self.env['purchase.request'].sudo().search(
-            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-             ('state', '!=', 'rejected')])
-        action = {
-            'res_model': 'purchase.request',
-            'type': 'ir.actions.act_window',
-        }
-        if len(pr_ids) == 1:
-            action.update({
-                'view_mode': 'form',
-                'res_id': pr_ids[0].id,
-            })
-        else:
-            action.update({
-                'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids)],
-                'view_mode': 'tree,form',
-            })
-        return action
+    # def action_view_pr_mrp_workorder(self):
+    #     """
+    #     采购请求
+    #     """
+    #     self.ensure_one()
+    #     pr_ids = self.env['purchase.request'].sudo().search(
+    #         [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
+    #          ('state', '!=', 'rejected')])
+    #     action = {
+    #         'res_model': 'purchase.request',
+    #         'type': 'ir.actions.act_window',
+    #     }
+    #     if len(pr_ids) == 1:
+    #         action.update({
+    #             'view_mode': 'form',
+    #             'res_id': pr_ids[0].id,
+    #         })
+    #     else:
+    #         action.update({
+    #             'name': _("从 %s生成采购请求单", self.name),
+    #             'domain': [('id', 'in', pr_ids)],
+    #             'view_mode': 'tree,form',
+    #         })
+    #     return action
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -512,10 +513,10 @@ class ResMrpWorkOrder(models.Model):
         return result
 
     def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
+        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',  # 按创建时间降序（最新的在前）
-                                                            limit=1)
+        purchase_orders = self.env['purchase.order'].search(domain, order='id desc')
         purchase_orders_id = self.env['purchase.order']
         for po in purchase_orders:
             for line in po.order_line:
@@ -1356,11 +1357,10 @@ 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:
-                                boolean = True
+                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+                            boolean = True
                 else:
                     boolean = True
             if not boolean:

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,86 +59,6 @@ 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', '=', product_id),
-                ('location_id', '=', location_id.id)
-            ])
-            total_qty = sum(quants.mapped('quantity'))  # 计算该位置的总库存量
-            is_available = total_qty > 0
-            if not is_available:
-                continue
-            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:
-                    picking_id = production_id.picking_ids.filtered(
-                    lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                    move_out = picking_id.move_id
-                    for mo in move_out:
-                        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:
@@ -146,8 +66,42 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            record.outsourcing_service_replenishment()
-        return super(PurchaseOrder, self).button_confirm()
+            # if record.purchase_type == 'consignment':
+            #     bom_line_id = record.order_line[0].purchase_request_lines.request_id.bom_id.bom_line_ids
+            #     replenish = self.env['stock.warehouse.orderpoint'].search([
+            #         ('product_id', '=', bom_line_id.product_id.id),
+            #         (
+            #         'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
+            #         # ('state', 'in', ['draft', 'confirmed'])
+            #     ], limit=1)
+            #     if not replenish:
+            #         replenish_model = self.env['stock.warehouse.orderpoint']
+            #         replenish = replenish_model.create({
+            #             'product_id': bom_line_id.product_id.id,
+            #             'location_id': self.env.ref(
+            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+            #             'group_id': record.group_id.id,
+            #             'qty_to_order': 1,
+            #             'origin': record.name,
+            #         })
+            #     else:
+            #         replenish.write({
+            #             'product_id': bom_line_id.product_id.id,
+            #             'location_id': self.env.ref(
+            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+            #             'group_id': record.group_id.id,
+            #             'qty_to_order': 1 + replenish.qty_to_order,
+            #             'origin': record.name + ',' + replenish.origin,
+            #         })
+            #     replenish.action_replenish()
+        res = super(PurchaseOrder, self).button_confirm()
+        for line in self.order_line:
+            # 将产品不追踪序列号的行项目设置qty_done
+            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')

sf_manufacturing/models/purchase_request_line.py

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

sf_manufacturing/models/sale_order.py

@@ -59,6 +59,7 @@ class SaleOrder(models.Model):
             line.product_id.product_tmpl_id.copy_template(product_template_id)
             # 将模板上的single_manufacturing属性复制到成品上
             line.product_id.single_manufacturing = product_template_id.single_manufacturing
+            line.product_id.tracking = product_template_id.tracking
 
             order_id = self
             product = line.product_id

sf_manufacturing/models/sf_production_common.py

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

sf_manufacturing/models/stock.py

@@ -675,6 +675,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 +707,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 +717,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 +849,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 +858,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,
@@ -902,7 +903,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': self.product_uom_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/views/mrp_production_addional_change.xml

@@ -383,7 +383,7 @@
                                 <field name="process_parameters_id"
                                        attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
                                        string="参数" context="{'route_id':route_id,'production_id': production_id}"
-                                       options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
+                                       options="{'no_create': True}"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"

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

sf_manufacturing/views/mrp_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"
-            name="Operations"
-            sequence="10"/>
+    <menuitem id="mrp.menu_mrp_manufacturing"
+        name="Operations"
+        parent="mrp.menu_mrp_root"
+        sequence="10"/>
 
-        <menuitem id="mrp.mrp_planning_menu_root"
-            name="Planning"
-            sequence="15"/>
+    <menuitem id="mrp.mrp_planning_menu_root"
+        name="Planning"
+        parent="mrp.menu_mrp_root"
+        sequence="15"/>
 
-        <menuitem id="mrp.enu_mrp_bom"
-            name="Products"
-            sequence="20"/>
+    <menuitem id="mrp.menu_mrp_bom"
+        name="Products"
+        parent="mrp.menu_mrp_root"
+        sequence="20"/>
 
-        <menuitem id="mrp.menu_mrp_reporting"
-              name="Reporting"
-              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_reporting"
+        name="Reporting"
+        parent="mrp.menu_mrp_root"
+        sequence="25"/>
 
+    <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"
-                        icon="fa-credit-card"
-                        groups="base.group_user,sf_base.group_sf_order_user"
-                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
-                    <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="pr_mp_count"/>
-                        </span>
-                        <span class="o_stat_text">采购申请</span>
-                    </div>
-                </button>
+<!--                <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"-->
+<!--                        icon="fa-credit-card"-->
+<!--                        groups="base.group_user,sf_base.group_sf_order_user"-->
+<!--                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">-->
+<!--                    <div class="o_field_widget o_stat_info">-->
+<!--                        <span class="o_stat_value">-->
+<!--                            <field name="pr_mp_count"/>-->
+<!--                        </span>-->
+<!--                        <span class="o_stat_text">采购申请</span>-->
+<!--                    </div>-->
+<!--                </button>-->
                 <button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
                         icon="fa-credit-card"
                         groups="base.group_user,sf_base.group_sf_order_user"

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

sf_manufacturing/wizard/rework_wizard.py

@@ -213,11 +213,11 @@ class ReworkWizard(models.TransientModel):
                                     self.production_id.get_new_program(panel_name)
                             if self.reprogramming_num >= 0 and self.programming_state == '已下发':
                                 # ============= 处理CNC加工加工工单的 CNC程序和cmm程序 信息=============
-                                for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工'):
+                                for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
                                     ret = {'programming_list': []}
                                     old_cnc_rework = max(self.production_id.workorder_ids.filtered(
                                         lambda crw: crw.processing_panel == cnc_work.processing_panel
-                                                    and crw.state == 'rework' and crw.routing_type == 'CNC加工'),
+                                                    and crw.state == 'rework' and (crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
                                         key=lambda w: w.create_date
                                     )
                                     # 获取当前工单的CNC程序和cmm程序
@@ -259,7 +259,7 @@ class ReworkWizard(models.TransientModel):
                                     new_cnc_workorder = self.production_id.workorder_ids.filtered(
                                         lambda ap1: ap1.processing_panel == cnc_work.processing_panel
                                                     and ap1.state not in (
-                                                        'rework', 'done') and ap1.routing_type == 'CNC加工'
+                                                        'rework', 'done') and (ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
                                     )
                                     if not new_cnc_workorder.cnc_ids:
                                         new_cnc_workorder.write({
@@ -268,6 +268,8 @@ class ReworkWizard(models.TransientModel):
                                             'cmm_ids': new_cnc_workorder.cmm_ids.sudo()._json_cmm_program(
                                                 cnc_work.processing_panel, ret),
                                             'cnc_worksheet': old_cnc_rework.cnc_worksheet})
+                                    # 复制装夹图纸
+                                    new_cnc_workorder.processing_drawing = old_cnc_rework.processing_drawing
                                 # ========== 处理装夹预调 【装夹图纸】 数据 ================
                                 for new_pre_work in new_pre_workorder_ids:
                                     pre_rework = max(self.production_id.workorder_ids.filtered(
@@ -303,18 +305,22 @@ class ReworkWizard(models.TransientModel):
     @api.onchange('production_id')
     def onchange_processing_panel_id(self):
         for item in self:
+            panel_ids = []
             domain = [('id', '=', False)]
             production_id = item.production_id
             if production_id:
                 if self.env.user.has_group('sf_base.group_sf_order_user'):
-                    panel_ids = []
+
                     panel_arr = production_id.product_id.model_processing_panel
                     if panel_arr is False:
                         break
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
                         if p.processing_panel is not False and p.processing_panel not in panel_arr:
-                            panel_arr += ','.join(p.processing_panel)
+                            if len(panel_arr)>0:
+                                panel_arr += ','.join(p.processing_panel)
+                            else:
+                                panel_arr = p.processing_panel
                     for item in panel_arr.split(','):
                         panel = self.env['sf.processing.panel'].search(
                             [('name', 'ilike', item)])

sf_mrs_connect/controllers/controllers.py

@@ -95,7 +95,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                     logging.info('panel_file_path:%s' % panel_file_path)
                                     
                             # 向编程单中添加二维码
-                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "扫码获取工单")
+                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "模型ID：%s" % model_id)
                             cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'

sf_mrs_connect/models/sync_common.py

@@ -1135,8 +1135,6 @@ class sfProductionProcessParameter(models.Model):
                         [("code", '=', item['code']), ('active', 'in', [True, False])])
                     process = self.env['sf.production.process'].search(
                         [('code', '=', item['process_id_code'])], limit=1)
-                    production_process_parameter = self.search(
-                        [("code", '=', item['code']), ('active', 'in', [True, False])])
                     if not production_process_parameter:
                         production_process_parameter = self.create({
                             "name": item['name'],
@@ -1151,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']
@@ -1163,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:
-                            production_process_parameter.create_service_product()
-                    production_process_parameter.create_work_center()
+                    #     if not production_process_parameter.outsourced_service_products:
+                    #         production_process_parameter.create_service_product()
+                    # production_process_parameter.create_work_center()
         else:
             raise ValidationError("表面工艺可选参数认证未通过")
 

sf_plan/models/custom_plan.py

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

sf_quality/__manifest__.py

@@ -26,7 +26,6 @@
         'views/quality_check_view.xml',
         'views/quality_company.xml',
         'wizard/check_picking_wizard_view.xml',
-        'wizard/confirmation_wizard_views.xml',
     ],
 
     'assets': {

sf_quality/models/quality.py

@@ -5,6 +5,7 @@ from odoo import fields, models, api
 from odoo.exceptions import ValidationError
 from datetime import datetime
 from odoo.addons.sf_base.commons.common import Common
+from odoo.tools import float_round
 
 
 class QualityCheck(models.Model):
@@ -132,3 +133,71 @@ class QualityCheck(models.Model):
             return "零件特采发送成功"
         else:
             raise ValidationError("零件特采发送失败")
+        
+    
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for val in vals_list:
+            if 'point_id' in val and 'measure_on' not in val:
+                # 如果没有控制方式字段，则从检查点读取质量方式
+                point_id = self.env['quality.point'].browse(val['point_id'])
+                val.update({'measure_on': point_id.measure_on})
+        return super(QualityCheck, self).create(vals_list)
+    
+
+    @api.depends('total_qty','testing_percentage_within_lot', 'is_lot_tested_fractionally')
+    def _compute_workorder_qty_to_test(self):
+        for qc in self:
+            if qc.is_lot_tested_fractionally:
+                rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
+                qc.workorder_qty_to_test = float_round(float(qc.total_qty) * qc.testing_percentage_within_lot / 100,
+                                                precision_rounding=rounding, rounding_method="UP")
+            else:
+                qc.workorder_qty_to_test = qc.total_qty
+
+    @api.depends('picking_id', 'workorder_id')
+    def _compute_total_qty(self):
+        super(QualityCheck, self)._compute_total_qty()
+        for qc in self: 
+            if not qc.picking_id and qc.workorder_id:
+                qc.total_qty = qc.workorder_id.production_id.product_qty
+
+    @api.depends('workorder_qty_to_test')
+    def _compute_workorder_qty_tested(self):
+        for qc in self:
+            qc.workorder_qty_tested = qc.workorder_qty_to_test
+
+
+    workorder_qty_to_test = fields.Float('应检', compute='_compute_workorder_qty_to_test', store=True)
+    workorder_qty_tested = fields.Float('已检', compute='_compute_workorder_qty_tested', store=True)
+    workorder_qty_test_failed = fields.Float('不合格数')
+
+
+    @api.onchange('total_qty', 'workorder_qty_test_failed', 'workorder_qty_to_test', 'workorder_qty_tested')
+    def _onchage_qty(self):
+        for record in self:
+            if record.total_qty and record.workorder_qty_to_test and record.workorder_qty_to_test > float(record.total_qty):
+                record.workorder_qty_to_test = float(record.total_qty)
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '待检数量不能超过总数量'
+                    }
+                }
+            if record.workorder_qty_to_test and record.workorder_qty_tested and record.workorder_qty_tested > record.workorder_qty_to_test:
+                record.workorder_qty_tested = record.workorder_qty_to_test
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '已检数量不能超过待检数量'
+                    }
+                }
+            if record.workorder_qty_tested and record.workorder_qty_test_failed and record.workorder_qty_test_failed > record.workorder_qty_tested:
+                record.workorder_qty_test_failed = record.workorder_qty_tested
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '不合格数量不能超过已检数量'
+                    }
+                }

sf_quality/security/ir.model.access.csv

@@ -74,6 +74,5 @@ access_quality_cnc_test_group_quality_director,quality_cnc_test_group_quality_di
 access_quality_cnc_test_group_sf_equipment_user,quality_cnc_test_group_sf_equipment_user,model_quality_cnc_test,sf_base.group_sf_equipment_user,1,1,0,0
 
 access_picking_validate_check_wizard,access.picking_validate_check_wizard,model_picking_validate_check_wizard,quality.group_quality_user,1,1,1,0
-access_confirmation_wizard,access.confirmation.wizard,model_confirmation_wizard,quality.group_quality_user,1,1,1,0
 
 

sf_quality/views/quality_check_view.xml

@@ -88,6 +88,42 @@
                 <button name="do_cancel_publish" string="取消发布" type="object" class="btn-primary" confirm="确定取消发布吗？" attrs="{'invisible': ['|',('is_out_check', '=', False), ('publish_status', '!=', 'published')]}"/>
                 <button name="do_re_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
             </xpath>
+            <xpath expr="//field[@name='total_qty']" position="attributes">
+                <attribute name="attrs">{
+                    'invisible': ['&amp;', '|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False), '|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
+                    'readonly': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
+                    'on_change': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)]
+                }</attribute>
+            </xpath>
+            <xpath expr="//field[@name='total_qty']" position="after">
+                <label for="workorder_qty_to_test"
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                    <field name="workorder_qty_to_test" attrs="{'readonly': 0, 'on_chnage': 1}"/>
+                    <field name="uom_id"/>
+                </div>
+                <label for="workorder_qty_tested"
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                    <field name="workorder_qty_tested" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
+                    <field name="uom_id"/>
+                </div>
+                <label for="workorder_qty_test_failed"
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                    <field name="workorder_qty_test_failed" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
+                    <field name="uom_id"/>
+                </div>
+            </xpath>
+            <xpath expr="//label[@for='qty_tested']" position="attributes">
+                <attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&amp;', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
+            </xpath>
+            <xpath expr="//div[@class='o_row'][.//field[@name='qty_tested']]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&amp;', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
+            </xpath>
         </field>
     </record>
 

sf_quality/wizard/__init__.py

@@ -1,2 +1 @@
 from . import check_picking_wizard
-from . import confirmation_wizard

sf_quality/wizard/confirmation_wizard.py

@@ -1,32 +0,0 @@
-from odoo import models, fields, api
-
-
-class ConfirmationWizard(models.TransientModel):
-    _name = 'confirmation.wizard'
-    _description = '二次确认向导'
-
-    # 可根据需要传递上下文参数
-    check_id = fields.Many2one('quality.check', string='质检单', required=True)
-    picking_name = fields.Char(string='拣货单', related='check_id.picking_id.name', store=True)
-    number = fields.Char(string='数量', related='check_id.total_qty', store=True)
-    picking_num = fields.Integer(string='拣货数量', compute='_compute_picking_num', store=True)
-
-    @api.depends('check_id.picking_id')
-    def _compute_picking_num(self):
-        for record in self.check_id:
-            if record.picking_id:
-                for move in record.picking_id.move_ids_without_package:
-                    if move.product_id == record.product_id:
-                        self.picking_num = int(move.product_uom_qty)
-                    else:
-                        self.picking_num = 0
-
-    button_text = fields.Char(string='确认按钮文字')
-
-    def action_confirm(self):
-        self.ensure_one()
-
-        # 获取原始记录
-        check = self.env['quality.check'].browse(self.check_id.id)
-        # 调用实际发布方法
-        return check._do_actual_publish()

sf_quality/wizard/confirmation_wizard_views.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<record id="view_confirmation_wizard_form" model="ir.ui.view">
-    <field name="name">confirmation.wizard.form</field>
-    <field name="model">confirmation.wizard</field>
-    <field name="arch" type="xml">
-        <form>
-                    <div class="alert alert-warning">
-                        <p>拣货调拨单号<strong><field name="picking_name" class="oe_inline"/></strong>需求数量为<strong><field name="picking_num" class="oe_inline"/></strong>，当前质量检查单产品数量为<strong><field name="number" class="oe_inline"/></strong>，数量不一致，是否确认继续？</p>
-                    </div>
-                <footer>
-                    <button name="action_confirm" string="确定" type="object" class="btn-primary"/>
-                    <button string="取消" class="btn-secondary" special="cancel"/>
-                </footer>
-        </form>
-    </field>
-</record>
-
-</odoo>

sf_sale/models/sale_order.py

@@ -343,10 +343,13 @@ class RePurchaseOrder(models.Model):
                         if order_line.product_id.id in product_list:
                             purchase.purchase_type = 'outsourcing'
                             break
-            request_lines = self.order_line.mapped('purchase_request_lines')
-            # 检查是否存在 is_subcontract 为 True 的行
-            if any(line.is_subcontract for line in request_lines):
-                purchase.purchase_type = 'consignment'
+            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')
+            # # 检查是否存在 is_subcontract 为 True 的行
+            # if any(line.is_subcontract for line in request_lines):
+            #     purchase.purchase_type = 'consignment'
 
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
@@ -381,28 +384,27 @@ class RePurchaseOrder(models.Model):
                 if not line.taxes_id:
                     raise UserError('请对【产品】中的【税】进行选择')
 
-    def get_purchase_request(self, consecutive_process_parameters, production):
-        result = []
-        for pp in consecutive_process_parameters:
-            server_template = self.env['product.template'].search(
-                [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
-                 ('detailed_type', '=', 'service')])
-            # route_ids
-            result.append({
-                "product_id": server_template.product_variant_id.id,
-                'related_product':production.product_id.id,
-                "name": production.procurement_group_id.name,
-                "date_required": fields.Datetime.now(),
-                "product_uom_id":server_template.uom_id.id,
-                "product_qty": 1,
-                "request_id": False,
-                "move_dest_ids": False,
-                "orderpoint_id": False,
-                'is_subcontract':True,
-                'group_id':production.procurement_group_id.id,
-                'production_name':pp.production_id.name,
-            })
-        return result
+    # def get_purchase_request(self, consecutive_process_parameters, production):
+    #     result = []
+    #     for pp in consecutive_process_parameters:
+    #         server_template = self.env['product.template'].search(
+    #             [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
+    #              ('detailed_type', '=', 'service')])
+    #         # route_ids
+    #         result.append({
+    #             "product_id": server_template.product_variant_id.id,
+    #             "name": production.procurement_group_id.name,
+    #             "date_required": fields.Datetime.now(),
+    #             "product_uom_id":server_template.uom_id.id,
+    #             "product_qty": 1,
+    #             "request_id": False,
+    #             "move_dest_ids": False,
+    #             "orderpoint_id": False,
+    #             'is_subcontract':True,
+    #             'group_id':production.procurement_group_id.id,
+    #             'production_name':pp.production_id.name,
+    #         })
+    #     return result
 
     def get_purchase_order(self, consecutive_process_parameters, production, product_id_to_production_names):
         for pp in consecutive_process_parameters:
@@ -417,7 +419,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_warehouse/models/model.py

@@ -812,40 +812,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来引用当前遍历到的记录
-            logging.info('record.picking_id.name: %s' % record.picking_id.name)
-            logging.info('record.env: %s' % record.env['stock.picking'].search([('name', '=', record.picking_id.name)]))
-
-            # 获取当前的stock.picking对象
-            current_picking = record.env['stock.picking'].search([('name', '=', record.picking_id.name)], limit=1)
-
-            # 获取当前picking的第一个stock.move对象
-            current_move = current_picking.move_ids[0] if current_picking.move_ids else False
-
-            # 如果存在相关的stock.move对象
-            if current_move:
-                # 获取源stock.move对象
-                origin_move = current_move.move_orig_ids[0] if current_move.move_orig_ids else 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的下一步
+            current_picking = record.picking_id
+            if not current_picking:
+                record.current_location_id = False
+                continue
+                
+            # 获取当前picking对应的lot_location映射
+            lot_dest_map = origin_location_map.get(current_picking.id, {})
+            
+            # 查找匹配的lot_id
+            for move_line in current_picking.move_line_ids:
+                if move_line.lot_id and move_line.lot_id.id in lot_dest_map:
+                    record.current_location_id = lot_dest_map[move_line.lot_id.id]
+                    break
+            else:
+                record.current_location_id = False
 
     # 是一张单据一张单据往下走的，所以这里的目标货位是上一张单据的当前货位，且这样去计算是可以的。
     @api.depends('location_dest_id')