命名修改

Merge Request: 采购申请按钮优化

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2134

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

@@ -8,16 +8,19 @@
     'category': 'purchase',
     'depends': ['sf_manufacturing', 'purchase_request'],
     'data': [
+        'security/ir.model.access.csv',
         'views/sale_order_view.xml',
         'views/mrp_production.xml',
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',
+        'views/purchase_request_line_view.xml',
+        'wizard/purchase_request_wizard_views.xml',
     ],
-    # 'assets': {
+    'assets': {
-    #           'web.assets_backend': [
+        'web.assets_backend': [
-    #               'jikimo_purchase_request/static/src/**/*'
+            'jikimo_purchase_request/static/src/**/*'
-    #           ],
+        ],
-    #       },
+    },
     'application': True,
     'installable': True,
     'auto_install': False,

jikimo_purchase_request/i18n/zh_CN.po

@@ -410,7 +410,7 @@ msgstr "显示名称"
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_search
 msgid "Done"
-msgstr "完成"
+msgstr "关闭"
 
 #. module: purchase_request
 #: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__move_dest_ids
@@ -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,12 +9,20 @@ class MrpProduction(models.Model):
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
+            # if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
+            #     first_order = self.env['mrp.production'].search(
+            #         [('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc')
+            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
+            #     item.pr_mp_count = len(pr_ids)
+            # else:
+            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
+            #     item.pr_mp_count = len(pr_ids)
+            # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+            first_mp = self.env['mrp.production'].search(
+                    [('origin', '=', item.origin)], limit=1, order='id asc')
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
+            item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
-            if pr_ids:
-                item.pr_mp_count = len(pr_ids)
-            else:
-                item.pr_mp_count = 0
 
     def action_view_pr_mp(self):
         """
@@ -22,7 +30,18 @@ class MrpProduction(models.Model):
         """
         self.ensure_one()
         # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
+        # 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

@@ -1,6 +1,7 @@
 import re
 import ast
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from itertools import groupby
 
 
 class PurchaseRequest(models.Model):
@@ -29,6 +30,54 @@ class PurchaseRequest(models.Model):
         action['context'] = origin_context
         return action
 
+    def button_done(self):
+        product_qty_map = {key: sum(line.product_qty for line in group) for key, group in
+                           groupby(self.line_ids, key=lambda x: x.product_id.id)}
+        lines = self.mapped("line_ids.purchase_lines.order_id")
+        # 采购单产品和数量
+        product_summary = {}
+        if lines:
+            for line in lines:
+                for line_item in line.order_line:
+                    product_id = line_item.product_id.id
+                    qty = line_item.product_qty
+                    if product_id in product_summary:
+                        product_summary[product_id] += qty
+                    else:
+                        product_summary[product_id] = qty
+
+        # 校验产品数量
+        discrepancies = []
+        for product_id, qty in product_qty_map.items():
+            if product_id in product_summary:
+                if product_summary[product_id] != qty:
+                    discrepancies.append((product_id, qty, product_summary[product_id]))
+            else:
+                discrepancies.append((product_id, qty, 0))
+
+        if discrepancies:
+            # 弹出提示框
+            message = "产品数量不一致:\n"
+            for product_id, required_qty, order_qty in discrepancies:
+                product_name = self.env['product.product'].browse(product_id).display_name  # 获取产品名称
+                message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单数量 {order_qty}（含询价状态）\n"
+                # 添加确认框
+            message += "确认关闭？"
+            return {
+                    'name': _('采购申请'),
+                    'type': 'ir.actions.act_window',
+                    'views': [(self.env.ref(
+                        'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
+                               'form')],
+                    'res_model': 'purchase.request.wizard',
+                    'target': 'new',
+                    'context': {
+                        'default_purchase_request_id': self.id,
+                        'default_message': message,
+            }}
+        return super(PurchaseRequest, self).button_done()
+
+
 class PurchaseRequestLine(models.Model):
     _inherit = 'purchase.request.line'
     _description = '采购申请明细'
@@ -47,6 +96,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:
@@ -79,7 +141,7 @@ class PurchaseRequestLine(models.Model):
                 continue
             if record.product_id.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
@@ -98,3 +160,36 @@ 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"))
+            if pr.purchase_count > 0:
+                qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
+                    "product_qty"))
+            pr.qty_to_buy = qty_to_buy > 0.0
+            pr.pending_qty_to_receive = qty_to_buy
+
+    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,45 @@
+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
+
+    def _action_done(self):
+        res = super(StockPicking, self)._action_done()
+        # 将采购申请明细行的move_dest_ids设置为backorder_ids
+        backorder_ids = self.backorder_ids
+        if backorder_ids:
+            purchase_request_lines = self.move_ids.move_orig_ids.purchase_line_id.purchase_request_lines
+            if purchase_request_lines:
+                purchase_request_lines.move_dest_ids = [(4, x.id) for x in backorder_ids.move_ids]
+        return res

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/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_request_wizard_group_user,purchase.request.wizard,model_purchase_request_wizard,base.group_user,1,1,1,1

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/purchase_request_view.xml

@@ -15,6 +15,12 @@
                 <field name="part_number"/>
                 <field name="part_name"/>
             </xpath>
+            <xpath expr="//button[@name='button_done']" position="attributes">
+                <attribute name="class"/>
+            </xpath>
+            <xpath expr="//button[@name='button_in_progress']/following-sibling::button[1]" position="attributes">
+                <attribute name="class">oe_highlight</attribute>
+            </xpath>
         </field>
     </record>
 

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/__init__.py

@@ -1,3 +1,4 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
 
 from . import purchase_request_line_make_purchase_order
+from . import purchase_request_wizard

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_purchase_request/wizard/purchase_request_wizard.py

@@ -0,0 +1,12 @@
+from odoo import models, fields, api
+
+
+class PurchaseRequestWizard(models.TransientModel):
+    _name = 'purchase.request.wizard'
+    _description = '采购申请向导'
+
+    purchase_request_id = fields.Many2one('purchase.request', string='采购申请')
+    message = fields.Char(string='提示', readonly=True)
+
+    def confirm(self):
+        return self.purchase_request_id.write({"state": "done"})

jikimo_purchase_request/wizard/purchase_request_wizard_views.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="purchase_request_wizard_wizard_form_view">
+        <field name="name">purchase.request.wizard.form.view</field>
+        <field name="model">purchase.request.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <div>
+                        <div style="white-space: pre-wrap;">
+                            <field name="message"/>
+                        </div>
+                    </div>
+                    <footer>
+                        <button string="确认" name="confirm" type="object" class="oe_highlight"/>
+                        <button string="取消" class="btn btn-secondary" special="cancel"/>
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+</odoo>

jikimo_workorder_exception/controllers/main.py

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

quality_control/models/quality.py

@@ -133,6 +133,7 @@ class QualityCheck(models.Model):
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
     material_name = fields.Char('材料名称', compute='_compute_material_name')
+    model_id = fields.Char('模型ID', related='product_id.model_id')
 
     # # 总数量，值为调拨单_产品明细_数量
     # total_qty = fields.Float('总数量', compute='_compute_total_qty', readonly=True)
@@ -141,7 +142,7 @@ class QualityCheck(models.Model):
     # # 出厂检验报告编号
     # report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
     # 总数量，值为调拨单_产品明细_数量
-    total_qty = fields.Char('总数量', compute='_compute_total_qty')
+    total_qty = fields.Char('总数量', compute='_compute_total_qty', store=True)
 
     column_nums = fields.Integer('测量值列数', default=1)
 
@@ -153,9 +154,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())
@@ -735,8 +736,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/views/quality_views.xml

@@ -493,6 +493,9 @@
                 <field name="picking_id"/>
                 <field name="lot_id"/>
                 <field name="team_id"/>
+                <field name="part_number"/>
+                <field name="part_name"/>
+                <field name="model_id"/>
                 <filter string="In Progress" name="progress" domain="[('quality_state', '=', 'none')]"/>
                 <filter string="Passed" name="passed" domain="[('quality_state', '=', 'pass')]"/>
                 <filter string="Failed" name="failed" domain="[('quality_state', '=', 'fail')]"/>

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_to_test = fields.Float(related='current_check_id.qty_to_test', string='待检')
-    qty_tested = fields.Float(related='current_check_id.qty_tested', readonly=False)
+    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')

requirements.txt

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

sf_base/commons/common.py

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

sf_base/controllers/controllers.py

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

sf_base/decorators/api_log.py

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

sf_base/models/api_log.py

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

sf_demand_plan/__init__.py

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

sf_demand_plan/__manifest__.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': '机企猫智能工厂 需求计划',
+    'version': '1.0',
+    'summary': '智能工厂计划管理',
+    'sequence': 1,
+    'description': """
+在本模块，支持齐套检查与下达生产
+    """,
+    'category': 'sf',
+    'website': 'https://www.sf.jikimo.com',
+    'depends': ['sf_plan', 'jikimo_printing'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/demand_plan.xml',
+        'wizard/sf_demand_plan_print_wizard_view.xml',
+    ],
+    'demo': [
+    ],
+    'assets': {
+        'web.assets_qweb': [
+        ],
+        'web.assets_backend': [
+            'sf_demand_plan/static/src/scss/style.css',
+        ]
+    },
+    'license': 'LGPL-3',
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+}

sf_demand_plan/controllers/__init__.py

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

sf_demand_plan/controllers/controllers.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+from odoo import http, fields, models
+from odoo.http import request
+from odoo.addons.sf_base.controllers.controllers import MultiInheritController
+
+
+class SfPlanMrsConnect(http.Controller, MultiInheritController):
+
+    @http.route('/api/demand_plan/update_processing_time', type='json', auth='sf_token', methods=['GET', 'POST'],
+                csrf=False,
+                cors="*")
+    def update_processing_time(self, **kw):
+        """
+        根据模型id修改程序工时
+        :param kw:
+        :return:
+        """
+        try:
+            res = {'status': 1, 'message': '成功'}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            ret = json.loads(ret['result'])
+            logging.info('根据模型id修改程序工时:%s' % ret)
+            demand_plan = request.env['sf.production.demand.plan'].sudo().search(
+                [('model_id', '=', ret['model_id'])])
+            if demand_plan:
+                demand_plan.write(
+                    {'processing_time': ret['total_estimated_time']})
+            else:
+                res = {'status': 0, 'message': '未查到该需求计划'}
+        except Exception as e:
+            logging.info('update_demand_paln error:%s' % e)
+            res['status'] = -1
+            res['message'] = '系统解析错误！'
+        return json.JSONEncoder().encode(res)

sf_demand_plan/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import sf_production_demand_plan
+from . import sale_order

sf_demand_plan/models/sale_order.py

@@ -0,0 +1,23 @@
+from odoo import models, fields, api, _
+
+
+class ReSaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    def sale_order_create_line(self, product, item):
+        ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
+        vals = {
+            'sale_order_id': ret.order_id.id,
+            'sale_order_line_id': ret.id,
+        }
+        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
+        if demand_plan.product_id.machining_drawings_name:
+            filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
+            wizard_vals = {
+                'demand_plan_id': demand_plan.id,
+                'model_id': demand_plan.model_id,
+                'filename_url': filename_url,
+                'type': '1',
+            }
+            self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
+        return ret

sf_demand_plan/models/sf_production_demand_plan.py

@@ -0,0 +1,558 @@
+# -*- coding: utf-8 -*-
+import ast
+import json
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+from datetime import datetime, timedelta
+from odoo.exceptions import UserError
+
+
+class SfProductionDemandPlan(models.Model):
+    _name = 'sf.production.demand.plan'
+    _description = 'sf_production_demand_plan'
+
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+
+    priority = fields.Selection([
+        ('1', '紧急'),
+        ('2', '高'),
+        ('3', '中'),
+        ('4', '低'),
+    ], string='优先级', default='3')
+    status = fields.Selection([
+        ('10', '草稿'),
+        ('20', '待确认'),
+        ('30', '需求确认'),
+        ('50', '待下达生产'),
+        ('60', '已下达'),
+        ('100', '取消'),
+    ], string='状态', compute='_compute_status', store=True)
+    sale_order_id = fields.Many2one(comodel_name="sale.order",
+                                    string="销售订单", readonly=True)
+    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
+                                         string="销售订单行", readonly=True)
+    company_id = fields.Many2one(
+        related='sale_order_id.company_id',
+        store=True, index=True, precompute=True)
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        related='sale_order_line_id.order_partner_id',
+        string="客户",
+        store=True, index=True)
+    order_remark = fields.Text(related='sale_order_id.remark',
+                               string="订单备注", store=True)
+    glb_url = fields.Char(related='sale_order_line_id.glb_url', string='glb文件地址')
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        related='sale_order_line_id.product_id',
+        string='产品', store=True, index=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')
+    part_name = fields.Char('零件名称', related='product_id.part_name')
+    part_number = fields.Char('零件图号', compute='_compute_part_number', store=True)
+    is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
+    supply_method = fields.Selection([
+        ('automation', "自动化产线加工"),
+        ('manual', "人工线下加工"),
+        ('purchase', "外购"),
+        ('outsourcing', "委外加工"),
+    ], string='供货方式', related='sale_order_line_id.supply_method', store=True)
+    product_uom_qty = fields.Float(
+        string="需求数量",
+        related='sale_order_line_id.product_uom_qty', store=True)
+    deadline_of_delivery = fields.Date('客户交期', related='sale_order_id.deadline_of_delivery', store=True)
+    inventory_quantity_auto_apply = fields.Float(
+        string="成品库存",
+        compute='_compute_inventory_quantity_auto_apply'
+    )
+    qty_delivered = fields.Float(
+        "交货数量", related='sale_order_line_id.qty_delivered')
+    qty_to_deliver = fields.Float(
+        "待交货数量", related='sale_order_line_id.qty_to_deliver')
+    model_long = fields.Char('尺寸', compute='_compute_model_long')
+    materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
+                                                 related='product_id.model_machining_precision')
+    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter',
+                                                    'plan_process_parameter_rel',
+                                                    string='表面工艺',
+                                                    compute='_compute_model_process_parameters_ids'
+                                                    , store=True
+                                                    )
+    product_remark = fields.Char("产品备注", related='product_id.model_remark')
+    order_code = fields.Char('E-SHOP订单号', related='sale_order_id.order_code')
+    order_state = fields.Selection(
+        string='订单状态',
+        related='sale_order_line_id.state')
+    route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
+    contract_date = fields.Date('合同日期')
+    date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
+    contract_code = fields.Char('合同号')
+    plan_remark = fields.Text("计划备注")
+    material_check = fields.Selection([
+        ('0', "未齐套"),
+        ('1', "已齐套"),
+    ], string='投料齐套检查', compute='_compute_material_check', store=True)
+    processing_time = fields.Char('程序工时', readonly=True)
+    planned_start_date = fields.Date('计划开工日期')
+    actual_start_date = fields.Date('实际开工日期', compute='_compute_actual_start_date', store=True)
+    actual_end_date = fields.Date('实际完工日期', compute='_compute_actual_end_date', store=True)
+    print_count = fields.Char('打印次数', default='T0C0', readonly=True)
+    sequence = fields.Integer('序号')
+
+    hide_action_open_mrp_production = fields.Boolean(
+        string='显示待工艺确认按钮',
+        compute='_compute_hid_button',
+        default=False
+    )
+
+    hide_action_purchase_orders = fields.Boolean(
+        string='显示采购按钮',
+        compute='_compute_hide_action_purchase_orders',
+        default=False
+    )
+
+    hide_action_stock_picking = fields.Boolean(
+        string='显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_outsourcing_stock_picking = fields.Boolean(
+        string='委外显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_view_programming = fields.Boolean(
+        string='显示编程单按钮',
+        compute='_compute_hid_button',
+        default=False
+    )
+
+    outsourcing_purchase_request = fields.Char('委外采购申请单')
+
+    @api.depends('sale_order_id.state', 'sale_order_id.mrp_production_ids.schedule_state', 'sale_order_id.order_line',
+                 'sale_order_id.mrp_production_ids.state')
+    def _compute_status(self):
+        for record in self:
+            if record.sale_order_id:
+                sale_order_state = record.sale_order_id.state
+                if sale_order_state in ('draft', 'sent', 'supply method'):
+                    record.status = '20'  # 待确认
+                if record.supply_method in ('purchase', 'outsourcing') and sale_order_state in (
+                        'sale', 'processing', 'physical_distribution', 'delivered',
+                        'done') and sale_order_state != 'cancel':
+                    record.status = '60'  # 已下达
+                if record.supply_method in ('automation', 'manual'):
+                    if sale_order_state in (
+                            'sale', 'processing', 'physical_distribution', 'delivered',
+                            'done') and sale_order_state != 'cancel':
+                        record.status = '30'  # 需求确认
+                    # 检查所有制造订单的排程单状态,有一个为待排程状态,就为待下达生产
+                    pending_productions = record.sale_order_id.mrp_production_ids.filtered(
+                        lambda p: p.state == 'confirmed' and p.product_id.id == record.product_id.id
+                    )
+                    if pending_productions:
+                        record.status = '50'  # 待下达生产
+                    # 检查所有制造订单的排程单状态
+                    if record.sale_order_id.mrp_production_ids and all(
+                            order.product_id == record.product_id and order.schedule_state != '未排' for order in
+                            record.sale_order_id.mrp_production_ids):
+                        record.status = '60'  # 已下达
+                if sale_order_state == 'cancel' or not record.sale_order_line_id:
+                    record.status = '100'  # 取消
+
+    @api.depends('product_id.part_number', 'product_id.model_name')
+    def _compute_part_number(self):
+        for line in self:
+            if line.product_id:
+                if line.product_id.part_number:
+                    line.part_number = line.product_id.part_number
+                else:
+                    if line.product_id.model_name:
+                        line.part_number = line.product_id.model_name.rsplit('.', 1)[0]
+            else:
+                line.part_number = None
+
+    @api.depends('product_id.length', 'product_id.width', 'product_id.height')
+    def _compute_model_long(self):
+        for line in self:
+            if line.product_id:
+                line.model_long = f"{line.product_id.length}*{line.product_id.width}*{line.product_id.height}"
+            else:
+                line.model_long = None
+
+    @api.depends('product_id.materials_id')
+    def _compute_materials_id(self):
+        for line in self:
+            if line.product_id:
+                line.materials_id = f"{line.product_id.materials_id.name}*{line.product_id.materials_type_id.name}"
+            else:
+                line.materials_id = None
+
+    @api.depends('product_id.model_process_parameters_ids')
+    def _compute_model_process_parameters_ids(self):
+        for line in self:
+            if line.product_id and line.product_id.model_process_parameters_ids:
+                line.model_process_parameters_ids = [(6, 0, line.product_id.model_process_parameters_ids.ids)]
+            else:
+                line.model_process_parameters_ids = [(5, 0, 0)]
+
+    def _compute_inventory_quantity_auto_apply(self):
+        location_id = self.env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id
+        product_ids = self.mapped('product_id').ids
+        if product_ids:
+            quant_data = self.env['stock.quant'].read_group(
+                domain=[
+                    ('product_id', 'in', product_ids),
+                    ('location_id', '=', location_id)
+                ],
+                fields=['product_id', 'inventory_quantity_auto_apply'],
+                groupby=['product_id']
+            )
+            quantity_map = {item['product_id'][0]: item['inventory_quantity_auto_apply'] for item in quant_data}
+        else:
+            quantity_map = {}
+        for line in self:
+            if line.product_id:
+                line.inventory_quantity_auto_apply = quantity_map.get(line.product_id.id, 0.0)
+            else:
+                line.inventory_quantity_auto_apply = 0.0
+
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.date_start')
+    def _compute_actual_start_date(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                if manufacturing_orders:
+                    start_dates = [
+                        workorder.date_start.date() for mo in manufacturing_orders
+                        for workorder in mo.workorder_ids if workorder.date_start
+                    ]
+                    record.actual_start_date = min(start_dates) if start_dates else None
+                else:
+                    record.actual_start_date = None
+            else:
+                record.actual_start_date = None
+
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.state',
+                 'sale_order_id.mrp_production_ids.workorder_ids.date_finished')
+    def _compute_actual_end_date(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                finished_orders = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
+                if len(finished_orders) >= record.product_uom_qty:
+                    end_dates = [
+                        workorder.date_finished.date() for mo in finished_orders
+                        for workorder in mo.workorder_ids if workorder.date_finished
+                    ]
+                    record.actual_end_date = max(end_dates) if end_dates else None
+                else:
+                    record.actual_end_date = None
+            else:
+                record.actual_end_date = None
+
+    @api.depends('sale_order_id.mrp_production_ids.move_raw_ids.forecast_availability',
+                 'sale_order_id.mrp_production_ids.move_raw_ids.quantity_done')
+    def _compute_material_check(self):
+        for record in self:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                if manufacturing_orders and manufacturing_orders.move_raw_ids:
+                    total_forecast_availability = sum(manufacturing_orders.mapped('move_raw_ids.forecast_availability'))
+                    total_quantity_done = sum(manufacturing_orders.mapped('move_raw_ids.quantity_done'))
+                    total_sum = total_forecast_availability + total_quantity_done
+                    if float_compare(total_sum, record.product_uom_qty,
+                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
+                        record.material_check = '1'  # 已齐套
+                    else:
+                        record.material_check = '0'  # 未齐套
+                else:
+                    record.material_check = None
+            else:
+                record.material_check = None
+
+    @api.constrains('planned_start_date')
+    def _check_planned_start_date(self):
+        for record in self:
+            if record.planned_start_date and record.planned_start_date < fields.Date.today():
+                raise ValidationError("计划开工日期必须大于或等于今天。")
+
+    def release_production_order(self):
+        pro_plan_list = self.env['sf.production.plan'].search(
+            [('product_id', '=', self.product_id.id), ('state', '=', 'draft')])
+        sf_production_line = self.env['sf.production.line'].sudo().search(
+            [('name', '=', '1#CNC自动生产线')], limit=1)
+        current_datetime = datetime.now() + timedelta(minutes=3)
+        current_hour = current_datetime.hour + current_datetime.minute / 60
+        date_planned_start = None
+        production_lines = sf_production_line.mrp_workcenter_ids.filtered(lambda b: "自动生产线" in b.name)
+        if production_lines:
+            if not production_lines.deal_with_workcenter_calendar(current_datetime):
+                attendance_list = production_lines.resource_calendar_id.attendance_ids
+                # 获取所有工作日规则并按星期几分组
+                attendance_by_day = {}
+                for attendance in attendance_list:
+                    if attendance.dayofweek not in attendance_by_day:
+                        attendance_by_day[attendance.dayofweek] = []
+                    attendance_by_day[attendance.dayofweek].append(attendance)
+
+                for day_offset in range(0, 8):
+                    check_date = current_datetime + timedelta(days=day_offset)
+                    # 日期为星期几
+                    check_day = production_lines.get_current_day_of_week(check_date)
+                    if check_day in attendance_by_day:
+                        day_attendances = attendance_by_day[check_day]
+                        if day_offset == 0:
+                            for attendance in day_attendances:
+                                if current_hour < attendance.hour_to:
+                                    # 找到下一个有效时间段
+                                    if current_hour < attendance.hour_from:
+                                        # 使用开始时间
+                                        date_planned_start = check_date.replace(
+                                            hour=int(attendance.hour_from),
+                                            minute=int((attendance.hour_from % 1) * 60),
+                                            second=0,
+                                            microsecond=0
+                                        )
+                                    else:
+                                        continue
+                                    break
+                        else:
+                            # 不是今天，使用第一个工作时间段
+                            attendance = day_attendances[0]
+                            date_planned_start = check_date.replace(
+                                hour=int(attendance.hour_from),
+                                minute=int((attendance.hour_from % 1) * 60),
+                                second=0,
+                                microsecond=0
+                            )
+
+                        if date_planned_start:
+                            break
+            else:
+                date_planned_start = current_datetime
+
+        if date_planned_start:
+            pro_plan_list.production_line_id = sf_production_line.id
+            pro_plan_list.date_planned_start = date_planned_start
+            for pro_plan in pro_plan_list:
+                pro_plan.do_production_schedule()
+
+    def button_action_print(self):
+        return {
+            'res_model': 'sf.demand.plan.print.wizard',
+            'type': 'ir.actions.act_window',
+            'name': _("打印"),
+            'domain': [('demand_plan_id', 'in', self.ids)],
+            'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
+            'target': 'new',
+        }
+
+    @api.depends('sale_order_id.mrp_production_ids.state', 'sale_order_id.mrp_production_ids.programming_state')
+    def _compute_hid_button(self):
+        for record in self:
+            mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == record.product_id.id
+            )
+            record.hide_action_open_mrp_production = bool(mrp_production_ids) and record.supply_method in (
+                'automation', 'manual')
+            programming_mrp_production_ids = record.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.programming_state == '编程中' and p.product_id.id == record.product_id.id
+            )
+            record.hide_action_view_programming = bool(programming_mrp_production_ids)
+
+    def _compute_hide_action_purchase_orders(self):
+        for record in self:
+            record.hide_action_purchase_orders = False
+            outsourcing_purchase_request = []
+            if record.supply_method in ('automation',
+                                        'manual') and record.material_check == '0' and not record.sale_order_line_id.is_incoming_material:
+                mrp_production = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda p: p.product_id.id == record.product_id.id
+                ).sorted(key=lambda p: p.id)
+                if mrp_production:
+                    raw_materials = mrp_production.mapped('move_raw_ids.product_id')
+                    if raw_materials:
+                        purchase_orders = self.env['purchase.order'].sudo().search([
+                            ('state', '=', 'purchase'),
+                            ('order_line.product_id', 'in', raw_materials.ids)
+                        ])
+                        total_purchase_quantity = sum(
+                            sum(
+                                order.order_line.filtered(
+                                    lambda line: line.product_id in raw_materials
+                                ).mapped('product_qty')
+                            )
+                            for order in purchase_orders
+                        )
+                        if total_purchase_quantity < record.product_uom_qty:
+                            pr_ids = self.env['purchase.request'].sudo().search(
+                                [('origin', 'like', mrp_production[0].name), ('state', '!=', 'done')])
+                            outsourcing_purchase_request.extend(pr_ids.ids)
+            elif record.supply_method in ('purchase', 'outsourcing'):
+                pr_ids = None
+                purchase_orders = self.env['purchase.order'].sudo().search([
+                    ('state', 'in', ('purchase', 'done')),
+                    ('order_line.product_id', '=', record.product_id.id)
+                ])
+                total_purchase_quantity = sum(
+                    sum(
+                        order.order_line.filtered(
+                            lambda line: line.product_id in record.product_id
+                        ).mapped('product_qty')
+                    )
+                    for order in purchase_orders
+                )
+                if total_purchase_quantity < record.product_uom_qty:
+                    pr_ids = self.env['purchase.request'].sudo().search(
+                        [('origin', 'like', record.sale_order_id.name), ('state', '!=', 'done')])
+                    outsourcing_purchase_request.extend(pr_ids.ids)
+                if record.supply_method == 'outsourcing' and not record.sale_order_line_id.is_incoming_material:
+                    bom_line_ids = record.product_id.bom_ids.bom_line_ids
+                    # BOM_数量
+                    total_product_qty = sum(line.product_qty for line in bom_line_ids)
+                    bom_product_ids = bom_line_ids.mapped('product_id')
+                    product_purchase_orders = self.env['purchase.order'].sudo().search([
+                        ('state', 'in', ('purchase', 'done')),
+                        ('order_line.product_id', 'in', bom_product_ids.ids)
+                    ])
+                    # 购订单_数量
+                    total_outsourcing_purchase_quantity = sum(
+                        sum(
+                            order.order_line.filtered(
+                                lambda line: line.product_id in bom_product_ids
+                            ).mapped('product_qty')
+                        )
+                        for order in product_purchase_orders
+                    )
+                    if total_outsourcing_purchase_quantity / total_product_qty < record.product_uom_qty:
+                        purchase_request = self.env['purchase.request'].sudo().search(
+                            [('line_ids.product_id', 'in', bom_product_ids.ids),
+                             ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
+                        outsourcing_purchase_request.extend(purchase_request.ids)
+            record.outsourcing_purchase_request = json.dumps(outsourcing_purchase_request)
+            if outsourcing_purchase_request:
+                record.hide_action_purchase_orders = True
+
+    @api.depends('sale_order_id.mrp_production_ids.picking_ids.state', 'sale_order_id.picking_ids.state')
+    def _compute_hide_action_stock_picking(self):
+        for record in self:
+            record.hide_action_stock_picking = False
+            record.hide_action_outsourcing_stock_picking = False
+            if record.supply_method in ('automation', 'manual'):
+                manufacturing_orders = record.sale_order_id.mrp_production_ids
+                record.hide_action_stock_picking = bool(manufacturing_orders.mapped('picking_ids').filtered(
+                    lambda p: p.state == 'assigned'))
+            elif record.supply_method in ('purchase', 'outsourcing'):
+                assigned_picking_ids = record.sale_order_id.picking_ids.filtered(
+                    lambda
+                        p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in record.product_id)
+                if record.supply_method == 'outsourcing':
+                    outsourcing_assigned_picking_ids = record.get_outsourcing_picking_ids()
+                    record.hide_action_outsourcing_stock_picking = outsourcing_assigned_picking_ids
+                    record.hide_action_stock_picking = assigned_picking_ids or outsourcing_assigned_picking_ids
+                else:
+                    record.hide_action_stock_picking = assigned_picking_ids
+
+    def get_outsourcing_picking_ids(self):
+        order_ids = self.env['purchase.order'].sudo().search(
+            [('order_line.product_id', 'in', self.product_id.ids),
+             ('purchase_type', '=', 'outsourcing')])
+        outsourcing_picking_ids = order_ids._get_subcontracting_resupplies()
+        outsourcing_assigned_picking_ids = outsourcing_picking_ids.filtered(lambda p: p.state == 'assigned')
+        return outsourcing_assigned_picking_ids
+
+    def action_open_sale_order(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'sale.order',
+            'res_id': self.sale_order_id.id,
+            'view_mode': 'form',
+        }
+
+    def action_open_mrp_production(self):
+        self.ensure_one()
+        mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+            lambda p: p.state == 'technology_to_confirmed' and p.product_id.id == self.product_id.id
+        )
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+        }
+        if len(mrp_production_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': mrp_production_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("制造订单列表"),
+                'domain': [('id', 'in', mrp_production_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_purchase_request(self):
+        self.ensure_one()
+        pr_ids = self.env['purchase.request'].sudo().search(
+            [('id', 'in', ast.literal_eval(self.outsourcing_purchase_request))])
+        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': _("采购申请"),
+                'domain': [('id', 'in', pr_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_stock_picking(self):
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("stock.action_picking_tree_all")
+        picking_ids = None
+        if self.supply_method in ('automation', 'manual'):
+            picking_ids = self.sale_order_id.mrp_production_ids.mapped('picking_ids').filtered(
+                lambda p: p.state == 'assigned')
+        elif self.supply_method in ('purchase', 'outsourcing'):
+            picking_ids = self.sale_order_id.picking_ids.filtered(
+                lambda
+                    p: p.state == 'assigned' and p.picking_type_id.name != '发料出库' and p.move_line_ids.product_id in self.product_id)
+            if self.supply_method == 'outsourcing' and self.hide_action_outsourcing_stock_picking:
+                picking_ids = picking_ids.union(self.get_outsourcing_picking_ids())
+        if picking_ids:
+            if len(picking_ids) > 1:
+                action['domain'] = [('id', 'in', picking_ids.ids)]
+            elif picking_ids:
+                action['res_id'] = picking_ids.id
+                action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+                if 'views' in action:
+                    action['views'] += [(state, view) for state, view in action['views'] if view != 'form']
+            return action
+
+    def action_view_programming(self):
+        self.ensure_one()
+        programming_mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+            lambda p: p.programming_state == '编程中' and p.product_id.id == self.product_id.id
+        ).mapped('programming_no')
+        if programming_mrp_production_ids:
+            programming_no = list(set(programming_mrp_production_ids))
+            numbers_str = "、".join(programming_no)
+            raise ValidationError(f"编程单号：{numbers_str}，请去云平台处理")

sf_demand_plan/security/ir.model.access.csv

@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sf_production_demand_plan,sf.production.demand.plan,model_sf_production_demand_plan,base.group_user,1,0,0,0
+access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for dispatch,model_sf_production_demand_plan,sf_base.group_plan_dispatch,1,1,0,0
+
+access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
+access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0

sf_demand_plan/static/src/scss/style.css

@@ -0,0 +1,11 @@
+.demand_plan_tree .o_list_table_ungrouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    min-width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_grouped th:not(.o_list_record_selector,.row_no,[data-name=sequence]) {
+    width: 98px !important;
+}
+
+.demand_plan_tree .o_list_table_ungrouped  {
+    min-width: 1900px;
+}

sf_demand_plan/views/demand_plan.xml

@@ -0,0 +1,119 @@
+<odoo>
+    <record id="view_sf_production_demand_plan_tree" model="ir.ui.view">
+        <field name="name">sf.production.demand.plan.tree</field>
+        <field name="model">sf.production.demand.plan</field>
+        <field name="arch" type="xml">
+            <tree string="需求计划" default_order="create_date desc" editable="bottom" class="demand_plan_tree">
+                <header>
+                    <button string="打印" name="button_action_print" type="object"
+                            class="btn-primary"/>
+                </header>
+                <field name="sequence" widget="handle"/>
+                <field name="id" optional="hide"/>
+                <field name="priority"/>
+                <field name="status"/>
+                <field name="partner_id"/>
+                <field name="order_remark"/>
+                <field name="glb_url" optional="hide"/>
+                <field name="product_id"/>
+                <field name="model_id" optional="hide"/>
+                <field name="part_name"/>
+                <field name="part_number"/>
+                <field name="is_incoming_material"/>
+                <field name="supply_method"/>
+                <field name="product_uom_qty"/>
+                <field name="deadline_of_delivery"/>
+                <field name="inventory_quantity_auto_apply"/>
+                <field name="qty_delivered"/>
+                <field name="qty_to_deliver"/>
+                <field name="model_long"/>
+                <field name="materials_id"/>
+                <field name="model_machining_precision"/>
+                <field name="model_process_parameters_ids" widget="many2many_tags"/>
+                <field name="product_remark" optional="hide"/>
+                <field name="order_code" optional="hide"/>
+                <field name="sale_order_id" optional="hide"/>
+                <field name="sale_order_line_id" optional="hide"/>
+                <field name="order_state"/>
+                <field name="route_id" optional="hide"/>
+                <field name="contract_date"/>
+                <field name="date_order"/>
+                <field name="contract_code"/>
+                <field name="plan_remark"/>
+                <field name="processing_time"/>
+                <field name="material_check"/>
+                <field name="hide_action_open_mrp_production" invisible="1"/>
+                <field name="hide_action_purchase_orders" invisible="1"/>
+                <field name="hide_action_stock_picking" invisible="1"/>
+                <field name="hide_action_view_programming" invisible="1"/>
+                <button name="action_open_sale_order" type="object" string="供货方式待确认" class="btn-secondary"
+                        attrs="{'invisible': [('supply_method', '!=', False)]}"/>
+                <button name="action_open_mrp_production" type="object" string="待工艺确认" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_open_mrp_production', '=', False)]}"/>
+                <button name="action_view_purchase_request" type="object" string="采购申请" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_purchase_orders', '=', False)]}"/>
+                <button name="action_view_stock_picking" type="object" string="调拨单" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_stock_picking', '=', False)]}"/>
+                <button name="action_view_programming" type="object" string="编程单" class="btn-secondary"
+                        attrs="{'invisible': [('hide_action_view_programming', '=', False)]}"/>
+                <field name="planned_start_date"/>
+                <field name="actual_start_date"/>
+                <field name="actual_end_date"/>
+                <field name="create_date" optional="hide" string="创建时间"/>
+                <field name="create_uid" optional="hide" string="创建人"/>
+                <field name="write_date" string="更新时间"/>
+                <field name="write_uid" optional="hide" string="更新人"/>
+                <field name="print_count"/>
+                <button name="release_production_order" type="object" string="下达生产" class="btn-primary"
+                        attrs="{'invisible': ['|',('status', '!=', '50'), ('supply_method', 'not in', ['automation', 'manual'])]}"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_sf_production_demand_plan_search" model="ir.ui.view">
+        <field name="name">sf.production.demand.plan.search</field>
+        <field name="model">sf.production.demand.plan</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="order_remark"/>
+                <field name="product_id"/>
+                <field name="part_name"/>
+                <field name="part_number"/>
+                <field name="partner_id"/>
+                <field name="supply_method"/>
+                <field name="materials_id"/>
+                <field name="model_process_parameters_ids"/>
+                <field name="plan_remark"/>
+                <group expand="0" string="Group By">
+                    <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
+                    <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
+                    <filter name="group_by_partner_id" string="客户" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter name="group_by_is_incoming_material" string="客供料" domain="[]"
+                            context="{'group_by': 'is_incoming_material'}"/>
+                    <filter name="group_by_supply_method" string="供货方式" domain="[]"
+                            context="{'group_by': 'supply_method'}"/>
+                    <filter name="group_by_deadline_of_delivery" string="客户交期" domain="[]"
+                            context="{'group_by': 'deadline_of_delivery'}"/>
+                    <filter name="group_by_materials_id" string="材料" domain="[]"
+                            context="{'group_by': 'materials_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="sf_production_demand_plan_action" model="ir.actions.act_window">
+        <field name="name">需求计划</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.production.demand.plan</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+
+    <menuitem
+            id="demand_plan_menu"
+            name="需求计划"
+            sequence="140"
+            action="sf_production_demand_plan_action"
+            parent="sf_plan.sf_production_plan_menu"
+    />
+</odoo>

sf_demand_plan/wizard/__init__.py

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import models, fields, api, _
+
+_logger = logging.getLogger(__name__)
+
+
+class SfDemandPlanPrintWizard(models.TransientModel):
+    _name = 'sf.demand.plan.print.wizard'
+    _description = u'打印向导'
+
+    demand_plan_id = fields.Many2one('sf.production.demand.plan', string='需求计划ID')
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        related='demand_plan_id.product_id',
+        string='产品', store=True, index=True)
+    model_id = fields.Char('模型ID')
+    filename_url = fields.Char('文件名/URL')
+    type = fields.Selection([
+        ('1', '图纸'),
+        ('2', '程序单'),
+    ], string='类型')
+    status = fields.Selection([
+        ('not_start', '未开始'),
+        ('success', '成功'),
+        ('fail', '失败'),
+    ], string='状态', default='not_start')
+    machining_drawings = fields.Binary('2D加工图纸', related='product_id.machining_drawings', store=True)
+
+    workorder_id = fields.Many2one('mrp.workorder', string='工单')
+    cnc_worksheet = fields.Binary('程序单')
+
+    def demand_plan_print(self):
+        for record in self:
+            pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
+            if pdf_data:
+                try:
+                    # 执行打印
+                    self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
+                    record.status = 'success'
+                    t_part, c_part = record.demand_plan_id.print_count.split('C')
+                    t_num = int(t_part[1:])
+                    c_num = int(c_part)
+                    if record.type == '1':
+                        t_num += 1
+                    elif record.type == '2':
+                        c_num += 1
+                    record.demand_plan_id.print_count = f"T{t_num}C{c_num}"
+                except Exception as e:
+                    record.status = 'fail'
+                    _logger.error(f"文件{record.filename_url}打印失败: {str(e)}")
+
+
+class MrpWorkorder(models.Model):
+    _inherit = 'mrp.workorder'
+
+    def write(self, vals):
+        res = super(MrpWorkorder, self).write(vals)
+        for record in self:
+            if 'cnc_worksheet' in vals:
+                demand_plan_print = self.env['sf.demand.plan.print.wizard'].sudo().search(
+                    [('workorder_id', '=', record.id)])
+                if demand_plan_print:
+                    self.env['sf.demand.plan.print.wizard'].sudo().write(
+                        {'cnc_worksheet': res.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
+                else:
+                    demand_plan = self.env['sf.production.demand.plan'].sudo().search(
+                        [('product_id', '=', record.product_id.id)])
+                    if demand_plan:
+                        wizard_vals = {
+                            'demand_plan_id': demand_plan.id,
+                            'model_id': demand_plan.model_id,
+                            'type': '2',
+                            'workorder_id': record.id,
+                            'cnc_worksheet': record.cnc_worksheet,
+                            'filename_url': record.cnc_worksheet_name
+                        }
+                        self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
+        return res

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="action_plan_print_tree" model="ir.ui.view">
+        <field name="name">sf.demand.plan.print.wizard.tree</field>
+        <field name="model">sf.demand.plan.print.wizard</field>
+        <field name="arch" type="xml">
+            <tree string="打印">
+                <field name="model_id"/>
+                <field name="filename_url"/>
+                <field name="type"/>
+                <field name="machining_drawings" widget="adaptive_viewer"/>
+                <field name="cnc_worksheet" widget="pdf_viewer"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+</odoo>

sf_dlm/models/product_supplierinfo.py

@@ -17,7 +17,7 @@ class ResProductCategory(models.Model):
 class ResProductProduct(models.Model):
     _inherit = 'product.product'
 
-    single_manufacturing = fields.Boolean(string="单个制造")
+    # single_manufacturing = fields.Boolean(string="单个制造")
     is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
 
 

sf_dlm_management/models/mrp_routing_workcenter.py

@@ -2,8 +2,8 @@
 # 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):

sf_dlm_management/models/sf_production_common.py

@@ -3,12 +3,12 @@
 # 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:
@@ -26,7 +26,7 @@
 #     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)])
@@ -48,7 +48,7 @@
 #                     'partner_id': res_partner.id,
 #                     'price': 1, })],
 #             })
-#
+
 #     def create_work_center(self):
 #         production_process_parameter = self
 #         if not production_process_parameter.process_id:
@@ -70,7 +70,7 @@
 #                 production_process_parameter.routing_id = routing_id.id
 #             else:
 #                 production_process_parameter.routing_id = workcenter_id.id
-#
+
 #     def init(self):
 #         super(SfProductionProcessParameter, self).init()
 #         # 在模块初始化时触发计算字段的更新

sf_manufacturing/__manifest__.py

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

sf_manufacturing/controllers/controllers.py

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

sf_manufacturing/models/__init__.py

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

sf_manufacturing/models/mrp_production.py

@@ -279,7 +279,7 @@ class MrpProduction(models.Model):
                     production_id.part_name = production_id.product_id.part_name
                 elif production_id.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -928,12 +928,13 @@ class MrpProduction(models.Model):
     #                         'sf_stock.stock_route_process_outsourcing').id)]
     #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
     #             cur_request_line = request_line_list[0]
-    #             cur_request_line['product_qty'] = len(request_line_list)
+    #             # cur_request_line['product_qty'] = cur_request_line['product_qty']
     #             cur_request_line['request_id'] = pr.id
     #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
     #             cur_request_line.pop('group_id', None)
     #             cur_request_line.pop('production_name', None)
     #             self.env["purchase.request.line"].create(cur_request_line)
+    #         pr.button_approved()
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):

sf_manufacturing/models/mrp_workorder.py

@@ -71,7 +71,7 @@ class ResMrpWorkOrder(models.Model):
                                         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:
@@ -85,6 +85,7 @@ class ResMrpWorkOrder(models.Model):
     #             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:
@@ -129,8 +130,14 @@ class ResMrpWorkOrder(models.Model):
                     record.back_button_display = False
             else:
                 next_workorder = sorted_workorders[position + 1]
-                next_state = next_workorder.state
+                # 持续获取下一个工单，直到找到一个不是返工的工单
-                if (next_state == 'ready' or (
+                while next_workorder and next_workorder.state == 'rework':
+                    position += 1
+                    if position + 1 < len(sorted_workorders):
+                        next_workorder = sorted_workorders[position + 1]
+                    else:
+                        next_workorder = None
+                if next_workorder and (next_workorder.state == 'ready' or (
                         next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
                     record.back_button_display = True
                 else:
@@ -319,6 +326,7 @@ class ResMrpWorkOrder(models.Model):
 
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
     technology_design_id = fields.Many2one('sf.technology.design')
+    cnc_worksheet_name = fields.Char('工作指令文件名', readonly=True)
 
     def _compute_default_construction_period_status(self):
         need_list = ['pending', 'waiting', 'ready', 'progress', 'to be detected', 'done']
@@ -439,7 +447,6 @@ class ResMrpWorkOrder(models.Model):
         action['context'] = dict(self._context, default_origin=self.name)
         return action
 
-    @api.depends('state', 'production_id.name')
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
             if order.routing_type == '表面工艺' and order.state not in ['cancel']:
@@ -485,6 +492,7 @@ class ResMrpWorkOrder(models.Model):
     #             'view_mode': 'tree,form',
     #         })
     #     return action
+
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -513,7 +521,8 @@ class ResMrpWorkOrder(models.Model):
         return result
 
     def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
         # domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
         # domain = [('group_id', '=', self.production_id.procurement_group_id.id), ('purchase_type', '=', 'consignment')]
         purchase_orders = self.env['purchase.order'].search(domain, order='id desc')
@@ -1243,6 +1252,13 @@ class ResMrpWorkOrder(models.Model):
         }]
         return workorders_values_str
 
+    # def check_lot_exists(self, picking_id, lot_id):
+    #     return bool(
+    #         picking_id.move_ids.move_line_ids.filtered(
+    #             lambda line: line.lot_id.id == lot_id
+    #         )
+    #     )
+
     def _process_compute_state(self):
         sorted_workorders = sorted(self, key=lambda x: x.sequence)
         for workorder in sorted_workorders:
@@ -1264,10 +1280,17 @@ class ResMrpWorkOrder(models.Model):
                         workorder.state = 'pending'
                     continue
             # ================= 如果制造订单制造类型为【人工线下加工】==========================
+            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+            # picking_ids = workorder.production_id.picking_ids.filtered(
+            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+            # exists = any(
+            #     move_line.lot_id == lot_id
+            #     for picking in picking_ids
+            #     for move in picking.move_ids
+            #     for move_line in move.move_line_ids
+            # )
             if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'
+                    and workorder.production_id.schedule_state == '已排'):
-                    and len(workorder.production_id.picking_ids.filtered(
-                        lambda w: w.state not in ['done', 'cancel'])) == 0):
                 # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     if workorder.production_id.state == 'rework':
@@ -1276,6 +1299,9 @@ class ResMrpWorkOrder(models.Model):
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
                         workorder.state = 'ready'
+                        # picking_id = workorder.production_id.picking_ids.filtered(
+                        #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                        # move_out = picking_id.move_ids
                         move_out = workorder.move_subcontract_workorder_ids[1]
                         for mo in move_out:
                             if mo.state != 'done':
@@ -1316,6 +1342,10 @@ class ResMrpWorkOrder(models.Model):
                             if purchase_orders_id.state == 'purchase':
                                 workorder.state = 'ready'
                                 move_out = workorder.move_subcontract_workorder_ids[1]
+                                # picking_id = workorder.production_id.picking_ids.filtered(
+                                #     lambda
+                                #         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                                # move_out = picking_id.move_ids
                                 for mo in move_out:
                                     if mo.state != 'done':
                                         mo.write({'state': 'assigned', 'production_id': False})
@@ -1325,7 +1355,6 @@ class ResMrpWorkOrder(models.Model):
                             else:
                                 workorder.state = 'waiting'
 
-
     @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
                  'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                  'production_id.programming_state')
@@ -1357,11 +1386,11 @@ class ResMrpWorkOrder(models.Model):
             # 判断是否有坯料的序列号信息
             boolean = False
             if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料':
+                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and \
+                        self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
                     if self.production_id.move_raw_ids[0].move_line_ids:
-                        if self.production_id.move_raw_ids[0].move_line_ids:
+                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
-                            if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+                            boolean = True
-                                boolean = True
                 else:
                     boolean = True
             if not boolean:
@@ -1391,6 +1420,10 @@ class ResMrpWorkOrder(models.Model):
         if self.routing_type == '表面工艺':
             if self.is_subcontract is True:
                 move_out = self.move_subcontract_workorder_ids[1]
+                # picking_id = self.production_id.picking_ids.filtered(
+                #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                # move_out = picking_id.move_ids
+                # move_out = self.move_subcontract_workorder_ids[1]
                 # move_out = self.env['stock.move'].search(
                 #     [('location_id', '=', self.env['stock.location'].search(
                 #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),

sf_manufacturing/models/product_template.py

@@ -795,7 +795,7 @@ class ResProductMo(models.Model):
         for record in self:
             if record.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.name)
+                match = re.search(r'(S\d{5}-\d+)', record.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
@@ -1030,6 +1030,7 @@ class ResProductMo(models.Model):
             'single_manufacturing': product_id.single_manufacturing,
             'is_bfm': True,
             'active': True,
+            'tracking': finish_product.tracking,  # 坯料的跟踪方式跟随成品
         }
         # 外协和采购生成的坯料需要根据材料型号绑定供应商
         if route_type == 'subcontract' or route_type == 'purchase':

sf_manufacturing/models/purchase_order.py

@@ -59,6 +59,86 @@ class PurchaseOrder(models.Model):
             production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
             purchase.production_count = len(production_id)
 
+    # def process_replenish(self,production,total_qty):
+    #     record = self
+    #     bom_line_id = production.bom_id.bom_line_ids
+    #     replenish = self.env['stock.warehouse.orderpoint'].search([
+    #         ('product_id', '=', bom_line_id.product_id.id),
+    #         (
+    #             'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
+    #         # ('state', 'in', ['draft', 'confirmed'])
+    #     ], limit=1)
+    #     if not replenish:
+    #         replenish_model = self.env['stock.warehouse.orderpoint']
+    #         replenish = replenish_model.create({
+    #             'product_id': bom_line_id.product_id.id,
+    #             'location_id': self.env.ref(
+    #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+    #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+    #             'group_id': record.group_id.id,
+    #             'qty_to_order': total_qty,
+    #             'origin': record.name,
+    #         })
+    #     else:
+    #         replenish.write({
+    #             'product_id': bom_line_id.product_id.id,
+    #             'location_id': self.env.ref(
+    #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
+    #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
+    #             'group_id': record.group_id.id,
+    #             'qty_to_order': total_qty + replenish.qty_to_order,
+    #             'origin': record.name + ',' + replenish.origin,
+    #         })
+    #     replenish.action_replenish()
+
+    # def outsourcing_service_replenishment(self):
+    #     record = self
+    #     if record.purchase_type != 'consignment':
+    #         return
+    #     grouped_lines = {}
+    #     for line in record.order_line:
+    #         if line.related_product.id not in grouped_lines:
+    #             grouped_lines[line.related_product.id] = []
+    #         grouped_lines[line.related_product.id].append(line)
+    #     for product_id,lines in grouped_lines.items():
+    #         production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+    #         if not production:
+    #             continue
+    #         total_qty = sum(line.product_qty for line in lines)
+    #         record.process_replenish(production,total_qty)
+    #     for product_id,lines in grouped_lines.items():
+    #         productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+    #         if not productions:
+    #             continue
+    #         # production.bom_id.bom_line_ids.product_id
+    #         location_id = self.env['stock.location'].search([('name', '=', '制造前')])
+    #         quants = self.env['stock.quant'].search([
+    #             ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
+    #             ('location_id', '=', location_id.id)
+    #         ])
+    #         total_qty = sum(quants.mapped('quantity'))  # 计算该位置的总库存量
+    #         is_available = total_qty > 0
+    #         if not is_available:
+    #             raise UserError('请先完成坯料入库')
+    #         for production_id in productions:
+    #             work_ids = production_id.workorder_ids.filtered(
+    #                 lambda wk: wk.state not in ['done', 'rework', 'cancel'])
+    #             if not work_ids:
+    #                 continue
+    #             min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
+    #             if min_sequence_wk.is_subcontract:
+    #                 picking_id = production_id.picking_ids.filtered(
+    #                 lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+    #                 move_out = picking_id.move_ids
+    #                 for mo in move_out:
+    #                     if mo.state != 'done':
+    #                         mo.write({'state': 'assigned', 'production_id': False})
+    #                         if not mo.move_line_ids:
+    #                             self.env['stock.move.line'].create(
+    #                                 mo.get_move_line(production_id, min_sequence_wk))
+            # product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            # match = re.search(r'(S\d{5}-\d)',product.name)
+            # pass
     def button_confirm(self):
         for record in self:
             for line in record.order_line:
@@ -66,38 +146,15 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            # if record.purchase_type == 'consignment':
+            # record.outsourcing_service_replenishment()        
-            #     bom_line_id = record.order_line[0].purchase_request_lines.request_id.bom_id.bom_line_ids
-            #     replenish = self.env['stock.warehouse.orderpoint'].search([
-            #         ('product_id', '=', bom_line_id.product_id.id),
-            #         (
-            #         'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
-            #         # ('state', 'in', ['draft', 'confirmed'])
-            #     ], limit=1)
-            #     if not replenish:
-            #         replenish_model = self.env['stock.warehouse.orderpoint']
-            #         replenish = replenish_model.create({
-            #             'product_id': bom_line_id.product_id.id,
-            #             'location_id': self.env.ref(
-            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-            #             'group_id': record.group_id.id,
-            #             'qty_to_order': 1,
-            #             'origin': record.name,
-            #         })
-            #     else:
-            #         replenish.write({
-            #             'product_id': bom_line_id.product_id.id,
-            #             'location_id': self.env.ref(
-            #                 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
-            #             'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
-            #             'group_id': record.group_id.id,
-            #             'qty_to_order': 1 + replenish.qty_to_order,
-            #             'origin': record.name + ',' + replenish.origin,
-            #         })
-            #     replenish.action_replenish()
         
-        return super(PurchaseOrder, self).button_confirm()
+        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')
@@ -151,7 +208,7 @@ class PurchaseOrderLine(models.Model):
                 continue
             if record.product_id.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)

sf_manufacturing/models/purchase_request_line.py

@@ -1,4 +1,4 @@
-# # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # import base64
 # import datetime
 # import logging
@@ -7,24 +7,24 @@
 # 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

@@ -58,7 +58,8 @@ 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.single_manufacturing = product_template_id.single_manufacturing
+            # line.product_id.tracking = product_template_id.tracking
 
             order_id = self
             product = line.product_id
@@ -75,7 +76,7 @@ class SaleOrder(models.Model):
                 'embryo_redundancy_id': line.embryo_redundancy_id,
             }
             product_name = ''
-            match = re.search(r'(S\d{5}-\d)', product.name)
+            match = re.search(r'(S\d{5}-\d+)', product.name)
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)

sf_manufacturing/models/sf_production_common.py

@@ -20,13 +20,13 @@ class SfProductionProcessParameter(models.Model):
     # is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
     # is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
     # routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
-    #
+
     # @api.depends('outsourced_service_products')
     # def _compute_service_products(self):
     #     for record in self:
     #         # 假设取第一条作为主明细
-    #         record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
+    #         record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
-    #
+
     # def _inverse_service_products(self):
     #     for record in self:
     #         if record.service_products:
@@ -45,7 +45,7 @@ class SfProductionProcessParameter(models.Model):
     #     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:
@@ -58,7 +58,7 @@ class SfProductionProcessParameter(models.Model):
     #             record.is_product_button = True
     #         else:
     #             record.is_product_button = False
-    #
+
     # def has_wksp_prefix(self):
     #     """
     #     判断字符串是否以WKSP开头（不区分大小写）

sf_manufacturing/models/stock.py

@@ -564,6 +564,13 @@ class StockPicking(models.Model):
 
     part_numbers = fields.Char(string="零件图号", compute='_compute_part_info', store=True, index=True)
     part_names = fields.Char(string="零件名称", compute='_compute_part_info', store=True, index=True)
+    model_id = fields.Char('模型ID', compute='_compute_model_id', store=True, index=True)
+
+    @api.depends('move_ids_without_package.model_id')
+    def _compute_model_id(self):
+        for picking in self:
+            model_id = picking.move_ids_without_package.mapped('model_id')
+            picking.model_id = ','.join(filter(None, model_id))
 
     @api.depends('move_ids_without_package.part_number', 'move_ids_without_package.part_name')
     def _compute_part_info(self):
@@ -631,6 +638,62 @@ class StockPicking(models.Model):
                         move.action_clear_lines_show_details()
                         move.action_show_details()
         res = super().button_validate()
+        # lot_ids = None
+        # product_ids = self.move_ids.mapped('product_id')
+        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+        #     lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
+        # production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
+        # if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
+        #     # 如果是最后一张外协入库单，则设置库存位置的预留数量
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_finish()
+        #     # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+        #     # picking_ids = workorder.production_id.picking_ids.filtered(
+        #     #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+
+        #     # if move_in:
+        #     #     workorder = move_in.subcontract_workorder_id
+        #     #     workorders = workorder.production_id.workorder_ids
+        #     #     subcontract_workorders = workorders.filtered(
+        #     #         lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+        #     #     # if workorder == subcontract_workorders[-1]:
+        #     #     #     self.env['stock.quant']._update_reserved_quantity(
+        #     #     #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+        #     #     #         lot_id=move_in.move_line_ids.lot_id,
+        #     #     #         package_id=False, owner_id=False, strict=False
+        #     #     #     )
+        #     #     workorder.button_finish()
+        # if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_start()
         picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
         if res is True and self.picking_type_id.id == picking_type_in:
             # 如果是最后一张外协入库单，则设置库存位置的预留数量
@@ -675,6 +738,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 +770,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 +780,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/'))
@@ -782,6 +846,7 @@ class ReStockMove(models.Model):
     materiel_height = fields.Float(string='物料高度', digits=(16, 4))
     part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
     part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')
 
     @api.depends('product_id')
     def _compute_part_info(self):
@@ -792,7 +857,7 @@ class ReStockMove(models.Model):
                     move.part_name = move.product_id.part_name
                 elif move.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -824,7 +889,7 @@ class ReStockMove(models.Model):
                             continue
                     product_name = ''
                     logging.info('制造订单的产品 %s', production_id.product_id.name)
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -848,7 +913,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 +922,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 +967,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/models/stock_warehouse_orderpoint.py

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

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -602,6 +602,7 @@
                     <field name="part_number"/>
                     <field name="sale_order_id"/>
                     <field name="deadline_of_delivery" icon="fa-calendar" enable_counters="1" filter_domain="[('deadline_of_delivery', 'ilike', self)]"/>
+                    <field name="model_id"/>
                 </xpath>
                 <xpath expr="//field[@name='product_variant_attributes']" position="attributes">
                     <attribute name="invisible">1</attribute>

sf_manufacturing/views/mrp_routing_workcenter_view.xml

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

sf_manufacturing/views/mrp_views_menus.xml

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

sf_manufacturing/views/mrp_workorder_view.xml

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

sf_manufacturing/views/product_template_views.xml

@@ -12,5 +12,18 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="product_template_search_inherit_sf_manufacturing" model="ir.ui.view">
+            <field name="name">product.template.search</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='categ_id']" position="after">
+                    <field name="part_number" string="零件图号"/>
+                    <field name="part_name" string="零件名称"/>
+                    <field name="model_id" string="模型ID"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </odoo>

sf_manufacturing/views/stock_picking_view.xml

@@ -73,6 +73,7 @@
                 <xpath expr="//field[@name='picking_type_id']" position="after">
                     <field name="part_numbers" string="零件图号" filter_domain="[('part_numbers', 'ilike', self)]"/>
                     <field name="part_names" string="零件名称" filter_domain="[('part_names', 'ilike', self)]"/>
+                    <field name="model_id" string="模型ID" filter_domain="[('model_id', 'ilike', self)]"/>
                 </xpath>
             </field>
         </record>

sf_manufacturing/views/stock_warehouse_orderpoint.xml

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

sf_manufacturing/wizard/rework_wizard.py

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

sf_mrs_connect/controllers/controllers.py

@@ -24,6 +24,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
             res = {'status': 1, 'message': '成功'}
             datas = request.httprequest.data
             model_id = None
+            part_number = None
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
@@ -59,7 +60,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                         return json.JSONEncoder().encode(res)
                 for production in productions:
-                    model_id = production.product_id.model_id # 一个编程单的制造订单对应同一个模型
                     production.write({'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False})
                     for panel in ret['processing_panel'].split(','):
                         # 查询状态为进行中且工序类型为CNC加工的工单
@@ -76,6 +76,10 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                             cnc_workorder_has.write(
                                 {'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret),
                                  'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)})
+                            
+                # 一个编程单的制造订单对应同一个模型
+                model_id = productions[0].product_id.model_id 
+                part_number = productions[0].product_id.part_number
                 for panel in ret['processing_panel'].split(','):
                     # 查询状态为进行中且工序类型为CNC加工的工单
                     cnc_workorder = productions.workorder_ids.filtered(
@@ -87,16 +91,25 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                         files_panel = os.listdir(program_path_tmp_panel)
                         panel_file_path = ''
+                        panel_file_name = ''
                         if files_panel:
                             for file in files_panel:
                                 file_extension = os.path.splitext(file)[1]
                                 if file_extension.lower() == '.pdf':
                                     panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                    panel_file_name = os.path.splitext(file)[0]
                                     logging.info('panel_file_path:%s' % panel_file_path)
+                                    logging.info('panel_file_name:%s' % panel_file_name)
                                     
                             # 向编程单中添加二维码
-                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "模型ID：%s" % model_id)
+                            request.env['printing.utils'].add_qr_code_to_pdf(
-                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                                panel_file_path,
+                                model_id,
+                                "模型ID：%s" % model_id,
+                                "零件图号：%s" % part_number if part_number else None
+                            )
+                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read()),
+                                                 'cnc_worksheet_name': panel_file_name})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
                                                                                                 'cancel'] and ap.processing_panel == panel)

sf_plan/models/custom_plan.py

@@ -15,6 +15,7 @@ class sf_production_plan(models.Model):
     # _order = 'state desc, write_date desc'
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')
     state = fields.Selection([
         ('draft', '待排程'),
         ('done', '已排程'),

sf_plan/views/view.xml

@@ -170,6 +170,7 @@
                     <field name="part_number"/>
                     <field name="order_deadline" filter_domain="[('order_deadline', 'ilike', self)]"/>
                     <field name="production_line_id"/>
+                    <field name="model_id"/>
                     <filter string="待排程" name="draft" domain="[('state','=','draft')]"/>
                     <filter string="已排程" name="done" domain="[('state','=','done')]"/>
                     <filter string="加工中" name="processing" domain="[('state','=','processing')]"/>

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

@@ -196,8 +196,7 @@ class ReSaleOrder(models.Model):
         for order in self:
             order.purchase_order_count = len(order._get_purchase_orders().filtered(
                 lambda po: po.purchase_type not in ['outsourcing']))
-            order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered(
+            order.consignment_purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
-                lambda po: po.purchase_type in ['outsourcing']))
 
     def action_view_purchase_orders(self):
         """
@@ -228,8 +227,7 @@ class ReSaleOrder(models.Model):
         委外加工
         """
         self.ensure_one()
-        outsourcing_purchase_order_ids = self._get_purchase_orders().filtered(
+        outsourcing_purchase_order_ids = self._get_sale_to_purchase('outsourcing')
-            lambda po: po.purchase_type in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -247,6 +245,14 @@ class ReSaleOrder(models.Model):
             })
         return action
 
+    def _get_sale_to_purchase(self, purchase_type):
+        """查询满足条件的采购订单"""
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type == purchase_type).ids
+        order_ids = self.env['purchase.order'].sudo().search(
+            [('origin', '=', self.name), ('purchase_type', '=', purchase_type)]).ids
+        return list(set(purchase_order_ids) | set(order_ids))
+
 
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
@@ -393,10 +399,11 @@ class RePurchaseOrder(models.Model):
     #         # 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,
+    #             "product_qty": production.product_qty,
     #             "request_id": False,
     #             "move_dest_ids": False,
     #             "orderpoint_id": False,
@@ -419,7 +426,7 @@ class RePurchaseOrder(models.Model):
                      ('detailed_type', '=', 'service')])
                 server_product_process.append((0, 0, {
                     'product_id': server_template.product_variant_id.id,
-                    'product_qty': 1,
+                    'product_qty': production.product_uom_qty,
                     'product_uom': server_template.uom_id.id,
                     'related_product': production.product_id.id,
                     'manual_part_number': pp.part_number,

sf_tool_management/controllers/controllers.py

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

sf_tool_management/models/maintenance_equipment.py

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

sf_warehouse/models/model.py

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