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

# Conflicts:
#	sf_manufacturing/models/purchase_order.py

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -119,24 +119,13 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
             this.listherHeaderBodyNum()
         })
         const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
-        
         if(treeModifiers) {
-            if(treeModifiers.merge_fields) {
-                this.props.merge_key = treeModifiers.merge_key;
-                this.props.merge_fields = treeModifiers.merge_fields.split(',');
-                const data = this.setColumns(this.props.merge_key);
-                owl.onMounted(() => {
-                    this.mergeColumns(this.props.merge_fields,  data)
-                })
-            }
-            if(treeModifiers.pacthResize) {
-
-                owl.onPatched(() => {
-                    this.columnWidths = null;
-                    this.freezeColumnWidths();
-                    
-                })
-            }
+            this.props.merge_key = treeModifiers.merge_key;
+            this.props.merge_fields = treeModifiers.merge_fields.split(',');
+            const data = this.setColumns(this.props.merge_key);
+            owl.onMounted(() => {
+                this.mergeColumns(this.props.merge_fields,  data)
+            })
         }
         return this._super(...arguments);
     },

jikimo_purchase_request/__manifest__.py

@@ -8,21 +8,18 @@
     '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',
         'views/stock_picking_views.xml',
-        'wizard/purchase_request_wizard_views.xml',
-        'views/purchase_request_menu_views.xml',
     ],
     'assets': {
-        'web.assets_backend': [
-            'jikimo_purchase_request/static/src/**/*'
-        ],
-    },
+              'web.assets_backend': [
+                  '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

jikimo_purchase_request/models/mrp_production.py

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

jikimo_purchase_request/models/purchase_order.py

@@ -1,5 +1,4 @@
 from odoo import api, fields, models, _
-from odoo.tools import float_compare
 
 
 class PurchaseOrder(models.Model):
@@ -14,51 +13,4 @@ class PurchaseOrder(models.Model):
         ('done', '完成'),
         ('cancel', '取消'),
         ('rejected', '已驳回')
-    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
-
-
-    def button_confirm(self):
-        res = super(PurchaseOrder, self).button_confirm()
-        # 取消反向调拨单
-        reverse_move_ids = self.env['stock.move'].search([
-            ('origin', '=', self.name),
-            ('purchase_line_id', '=', False),
-            ('state', '!=', 'done')
-        ])
-        if reverse_move_ids:
-            reverse_move_ids.picking_id.action_cancel()
-        return res
-    
-    def button_cancel(self):
-        """
-            1. 先将采购订单行与目标库存移动断开链接，避免采购单取消后，调拨单被调整为mts的问题
-            2. 取消采购订单
-            3. 将采购订单行与目标库存移动重新建立链接
-        """
-        created_purchase_request_line_ids = {}
-        if self.order_line.move_dest_ids.created_purchase_request_line_id:
-            move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
-            created_purchase_request_line_ids = {move.id: move.created_purchase_request_line_id for move in move_ids}
-            self.order_line.write({'move_dest_ids': [(5, 0, 0)]})
-        res =super(PurchaseOrder, self).button_cancel()
-        for move_id, created_purchase_request_line_id in created_purchase_request_line_ids.items():
-            self.env['stock.move'].browse(move_id).created_purchase_request_line_id = created_purchase_request_line_id
-        # if move_ids.mapped('created_purchase_request_line_id'):
-        #     move_ids.write({'state': 'waiting', 'is_done': False})
-        return res
-
-    def write(self, vals):
-        res = super(PurchaseOrder, self).write(vals)
-        if 'state' in vals and vals['state'] == 'purchase':
-            purchase_request = self.order_line.purchase_request_lines.request_id
-            if purchase_request:
-                finished = True
-                # 判断该采购申请所有明细行是否都完成
-                for purchase_request_line in purchase_request.line_ids:
-                    finished_qty = sum(purchase_request_line.purchase_lines.filtered(lambda line: line.state == 'purchase').mapped('product_qty'))
-                    if float_compare(finished_qty ,purchase_request_line.product_qty, precision_rounding=purchase_request_line.product_id.uom_id.rounding) < 0:
-                        finished = False
-                        break
-                if finished:
-                    purchase_request.button_done()
-        return res
+    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)

jikimo_purchase_request/models/purchase_request.py

@@ -1,15 +1,13 @@
 import re
 import ast
-from odoo import models, fields, api, _
-from itertools import groupby
-from odoo.tools import float_compare
+from odoo import models, fields, api
 
 
 class PurchaseRequest(models.Model):
     _inherit = 'purchase.request'
     _description = '采购申请'
 
-    # 为state添加取消状态
+     # 为state添加取消状态
     state = fields.Selection(
         selection_add=[('cancel', '已取消')],
         ondelete={'cancel': 'set default'}  # 添加 ondelete 策略
@@ -31,57 +29,6 @@ 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 = {}
-        product_rounding = {}
-        if lines:
-            for line in lines:
-                for line_item in line.order_line:
-                    if line_item.state == 'purchase':
-                        product_id = line_item.product_id.id
-                        qty = line_item.product_qty
-                        product_rounding[product_id] = line_item.product_id.uom_id.rounding
-                        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 float_compare(product_summary[product_id], qty, precision_rounding=product_rounding[product_id]) < 0:
-                    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 = '采购申请明细'
@@ -100,8 +47,7 @@ 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_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")
@@ -146,12 +92,10 @@ 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)
-                else:
-                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:

jikimo_purchase_request/models/stock_picking.py

@@ -33,15 +33,3 @@ class StockPicking(models.Model):
                 'view_mode': 'tree,form',
             })
         return action
-
-    def _action_done(self):
-        res = super(StockPicking, self)._action_done()
-        # 将新产生的backorder对应上原来的采购申请明细行
-        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 if x.product_id.id == purchase_request_lines.product_id.id
-                ]
-        return res

jikimo_purchase_request/models/stock_rule.py

@@ -79,4 +79,12 @@ class StockRule(models.Model):
             )
 
         res = super(StockRule, self)._run_buy(new_procurements)
+        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
+        origins = list(set([procurement[0].origin for procurement in procurements]))
+        for origin in origins:
+            pr_ids = self.env["purchase.request"].sudo().search(
+                [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])
+            if pr_ids:
+                pr_ids.write({'need_validation': False})
+                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
         return res

jikimo_purchase_request/security/ir.model.access.csv

@@ -1,2 +0,0 @@
-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/views/purchase_request_menu_views.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="menu_purhcase_request" model="ir.ui.menu">
-            <field name="name">采购申请</field>
-            <field name="parent_id" ref="purchase.menu_purchase_root" />
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="purchase_request.menu_purchase_request_pro_mgt" model="ir.ui.menu">
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="jikimo_purchase_request.menu_purhcase_request"/>
-        </record>
-        
-        <record id="purchase_request.menu_purchase_request_line" model="ir.ui.menu">
-            <field name="sequence">10</field>
-            <field name="parent_id" ref="jikimo_purchase_request.menu_purhcase_request"/>
-        </record>
-    </data>
-</odoo>
-

jikimo_purchase_request/views/purchase_request_view.xml

@@ -15,26 +15,6 @@
                 <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']" position="attributes">
-                  <attribute name="invisible">1</attribute>
-            </xpath>
-            <xpath expr="//button[@name='%(purchase_request.action_purchase_request_line_make_purchase_order)d']" position="attributes">
-                <attribute name="class">oe_highlight</attribute>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="view_purchase_request_tree_sf" model="ir.ui.view">
-        <field name="name">purchase.request.sf.tree</field>
-        <field name="model">purchase.request</field>
-        <field name="inherit_id" ref="purchase_request.view_purchase_request_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='activity_ids']" position="attributes">
-                <attribute name="optional">hide</attribute>
-            </xpath>
         </field>
     </record>
 
@@ -83,9 +63,4 @@
             </xpath>
         </field>
     </record>
-
-    <record model="ir.actions.act_window" id="purchase_request.purchase_request_form_action">
-        <field name="name">Purchase Requests</field>
-        <field name="context"></field>
-    </record>
 </odoo>

jikimo_purchase_request/wizard/__init__.py

@@ -1,4 +1,3 @@
 # 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_wizard.py

@@ -1,12 +0,0 @@
-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

@@ -1,22 +0,0 @@
-<?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_purchase_request_tier_validation/__manifest__.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "机企猫 采购申请审批流程",
+    'name': "机企猫 采购审批流程",
 
     'summary': """
-        采购申请审批流程""",
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
 
     'description': """
         Long description of module's purpose

jikimo_purchase_request_tier_validation/models/__init__.py

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

jikimo_purchase_request_tier_validation/models/models.py

@@ -22,9 +22,3 @@ class PurchaseRequest(models.Model):
             self.state = 'approved'
 
         return res
-    
-    @api.model
-    def _get_under_validation_exceptions(self):
-        res = super(PurchaseRequest, self)._get_under_validation_exceptions()
-        res.append("state")
-        return res

jikimo_purchase_request_tier_validation/models/stock_rule.py

@@ -1,16 +0,0 @@
-from odoo import models, api
-
-class StockRule(models.Model):
-    _inherit = 'stock.rule'
-
-    def _run_buy(self, procurements):
-        res = super(StockRule, self)._run_buy(procurements)
-        # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
-        origins = list(set([procurement[0].origin for procurement in procurements]))
-        for origin in origins:
-            pr_ids = self.env["purchase.request"].sudo().search(
-                [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])
-            if pr_ids:
-                pr_ids.write({'need_validation': False})
-                pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
-        return res

jikimo_purchase_tier_validation/__manifest__.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "机企猫 采购审批流程",
+    'name': "机企猫 采购申请审批流程",
 
     'summary': """
-        采购审批流程""",
+        采购申请审批流程""",
 
     'description': """
-        采购审批流程""",
+        采购申请审批流程""",
 
     'author': "My Company",
     'website': "https://www.yourcompany.com",

jikimo_test_generate_product_name/__init__.py

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

jikimo_test_generate_product_name/__manifest__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': 'Jikimo_test_generate_product_name',
-    'version': '',
-    'summary': """ Jikimo_test_generate_product_name Summary """,
-    'author': '',
-    'website': '',
-    'category': '',
-    'depends': ['sf_manufacturing'],
-    'data': [
-        
-    ],
-    
-    'application': True,
-    'installable': True,
-    'auto_install': False,
-    'license': 'LGPL-3',
-}

jikimo_test_generate_product_name/models/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import product_template

jikimo_test_generate_product_name/models/product_template.py

@@ -1,21 +0,0 @@
-from odoo import models
-
-
-class ProductTemplate(models.Model):
-    _inherit = 'product.template'
-
-    def generate_product_name(self, order_id, item, i):
-        """生成成品名称"""
-        # 3D文件名（去掉后缀，截取前40个字符）+“-”+模型ID
-        product_name = '%s-%s' % ('.'.join(item['model_name'].split('.')[:-1])[:40], item['model_id'])
-        return product_name
-
-    def generate_embryo_name(self, order_id, item,  materials_id, materials_type_id, embryo_redundancy_id, i):
-        """生成坯料名称"""
-        embryo_name = '%s-%s[%s * %s * %s]%s' % (materials_id.name, materials_type_id.name,
-                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
-                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
-                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height),
-                                            item['model_id'])
-        return embryo_name
-    

jikimo_workorder_exception/controllers/main.py

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

quality_control/models/quality.py

@@ -133,7 +133,6 @@ 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)
@@ -339,7 +338,7 @@ class QualityCheck(models.Model):
 
         # 4. 获取报告动作并生成PDF（此时二维码将包含正确的文档ID）
         report_action = self.env.ref('sf_quality.action_report_quality_inspection')
-        pdf_content, v = report_action._render_qweb_pdf(
+        pdf_content, _ = report_action._render_qweb_pdf(
             report_ref=report_action.report_name,
             res_ids=self.ids
         )

quality_control/views/quality_views.xml

@@ -493,9 +493,6 @@
                 <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')]"/>

sf_base/commons/common.py

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

sf_base/decorators/api_log.py

@@ -34,20 +34,17 @@ def api_log(name=None, requester=None):
                 # 计算响应时间
                 end_time = datetime.now()
                 response_time = (end_time - start_time).total_seconds()
-
-                # 获取响应状态
-                status = result.get('code') if 'code' in result else result.get('ErrorCode') if 'ErrorCode' in result else 200
                 
                 # 创建日志记录
                 log_vals = {
                     'name': name or func.__name__,
                     'path': path,
-                    'method': method.upper(),
+                    'method': method,
                     'request_data': json.dumps(request_data, ensure_ascii=False),
                     'response_data': json.dumps(result, ensure_ascii=False),
                     'remote_addr': remote_addr,
                     'response_time': response_time,
-                    'status': 200 if status == 0 else status,
+                    'status': result.get('code') or result.get('ErrorCode') or 500,
                     'requester': requester,
                     'responser': '智能工厂'
                 }

sf_base/models/api_log.py

@@ -59,7 +59,7 @@ class ApiRequestLog(models.Model):
         self.sudo().create({
             'name': name,
             'path': url,
-            'method': method.upper(),
+            'method': method,
             'request_data': request_body,
             'response_data': response_body,
             'remote_addr': None,

sf_base/views/api_log_views.xml

@@ -5,15 +5,13 @@
         <field name="model">api.request.log</field>
         <field name="arch" type="xml">
             <tree>
+                <field name="create_date"/>
                 <field name="name"/>
                 <field name="path"/>
                 <field name="method"/>
                 <field name="remote_addr"/>
-                <field name="response_time" sum="0"/>
-                <field name="requester"/>
-                <field name="responser"/>
-                <field name="create_date" string="请求时间"/>
-                <field name="status" sum="0"/>
+                <field name="response_time"/>
+                <field name="status"/>
             </tree>
         </field>
     </record>
@@ -34,8 +32,6 @@
                         <group>
                             <field name="response_time"/>
                             <field name="status"/>
-                            <field name="requester"/>
-                            <field name="responser"/>
                             <field name="create_date" string="请求时间"/>
                         </group>
                     </group>
@@ -52,23 +48,6 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_api_request_log_search">
-        <field name="name">api.request.log.search</field>
-        <field name="model">api.request.log</field>
-        <field name="arch" type="xml">
-            <search string="API请求日志">
-                <field name="name"/>
-                <field name="requester"/>
-                <field name="responser"/>
-                <group>
-                    <filter name="name" context="{'group_by':'name'}"/>
-                    <filter name="requester" context="{'group_by':'requester'}"/>
-                    <filter name="responser" context="{'group_by':'responser'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
     <record id="action_api_request_log" model="ir.actions.act_window">
         <field name="name">API请求日志</field>
         <field name="res_model">api.request.log</field>

sf_bf_connect/models/http.py

@@ -2,7 +2,7 @@
 import logging
 from datetime import datetime, timedelta
 import hashlib
-from odoo import models, SUPERUSER_ID
+from odoo import models
 from odoo.http import request
 
 __author__ = 'jinling.yang'
@@ -48,7 +48,5 @@ class Http(models.AbstractModel):
             _logger.info('sf_secret_key:%s' % factory_secret.sf_secret_key)
             if check_sf_str != datas['HTTP_CHECKSTR']:
                 raise AuthenticationError('数据校验不通过')
-            # 设置管理员用户
-            request.update_env(user=SUPERUSER_ID)
         else:
             raise AuthenticationError('请求参数中无token')

sf_demand_plan/__init__.py

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

sf_demand_plan/__manifest__.py

@@ -1,32 +0,0 @@
-# -*- 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/models/__init__.py

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

sf_demand_plan/models/sale_order.py

@@ -1,29 +0,0 @@
-from odoo import models, fields, api, _
-
-
-class ReSaleOrder(models.Model):
-    _inherit = 'sale.order'
-
-    mrp_production_ids = fields.Many2many(
-        'mrp.production',
-        compute='_compute_mrp_production_ids',
-        string='与此销售订单相关联的制造订单',
-        groups='mrp.group_mrp_user', store=True)
-
-    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

@@ -1,532 +0,0 @@
-# -*- 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)
-    sale_order_line_number = fields.Char(string='销售订单行', compute='_compute_sale_order_line_number', store=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('合同日期', related='sale_order_id.contract_date')
-    date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
-    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
-    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.Datetime('实际开工日期', compute='_compute_actual_start_date', store=True)
-    actual_end_date = fields.Datetime('实际完工日期', 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:
-                        product_productions = record.sale_order_id.mrp_production_ids.filtered(
-                            lambda p: p.product_id.id == record.product_id.id
-                        )
-                        if product_productions and all(order.schedule_state != '未排' for order in product_productions):
-                            record.status = '60'  # 已下达
-                if sale_order_state == 'cancel' or not record.sale_order_line_id:
-                    record.status = '100'  # 取消
-
-    @api.depends('sale_order_line_id.product_id.name')
-    def _compute_sale_order_line_number(self):
-        for line in self:
-            if line.product_id:
-                line.sale_order_line_number = line.sale_order_line_id.product_id.name[-1]
-            else:
-                line.sale_order_line_number = None
-
-    @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 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')
-                sum_product_qty = sum(finished_orders.mapped('product_qty'))
-                if finished_orders and float_compare(sum_product_qty, record.product_uom_qty,
-                                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
-                    end_dates = [
-                        workorder.date_finished 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):
-        if not self.planned_start_date:
-            raise ValidationError("请先填写计划开工日期")
-        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)
-        if sf_production_line:
-            now = datetime.now()
-            time_part = (now + timedelta(minutes=3)).time()
-            date_part = fields.Date.from_string(self.planned_start_date)
-            date_planned_start = datetime.combine(date_part, time_part)
-            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 float_compare(total_purchase_quantity, record.product_uom_qty,
-                                         precision_rounding=record.product_id.uom_id.rounding) == -1:
-                            pr_ids = self.env['purchase.request'].sudo().search(
-                                [('line_ids.product_id', 'in', raw_materials.ids), ('state', '!=', 'done')])
-                            outsourcing_purchase_request.extend(pr_ids.ids)
-            elif record.supply_method in ('purchase', 'outsourcing'):
-                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 float_compare(total_purchase_quantity, record.product_uom_qty,
-                                 precision_rounding=record.product_id.uom_id.rounding) == -1:
-                    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
-                    )
-                    quantity = total_outsourcing_purchase_quantity / total_product_qty
-                    if float_compare(quantity, record.product_uom_qty,
-                                     precision_rounding=record.product_id.uom_id.rounding) == -1:
-                        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.filtered(
-                    lambda p: p.product_id.id == record.product_id.id
-                )
-                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

@@ -1,6 +0,0 @@
-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

@@ -1,11 +0,0 @@
-.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

@@ -1,123 +0,0 @@
-<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="sequence desc,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_number" 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" optional="hide"/>
-                <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"/>
-                <field name="contract_code"/>
-                <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'}"/>
-                    <filter name="group_by_contract_code" string="合同号" domain="[]"
-                            context="{'group_by': 'contract_code'}"/>
-                </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

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

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -1,79 +0,0 @@
-# -*- 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': record.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

@@ -1,17 +0,0 @@
-<?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

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

sf_dlm_management/models/sf_production_common.py

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

sf_dlm_management/views/product_template_management_view.xml

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

sf_machine_connect/controllers/controllers.py

@@ -377,11 +377,7 @@ class Sf_Dashboard_Connect(http.Controller):
             line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
             line_list = list(map(lambda x: x.name, line_list_obj))
             # print('line_list: %s' % line_list)
-            res['LineList'] = ['业绩总览']
-            res['LineList'] += line_list
-            res['LineList'].append('人工线下加工中心')
-            # 增加“业绩总览”与“人工线下加工中心”
-            
+            res['LineList'] = line_list
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -405,55 +401,37 @@ class Sf_Dashboard_Connect(http.Controller):
 
         try:
             plan_obj = request.env['sf.production.plan'].sudo()
-            # production_obj = request.env['mrp.production'].sudo()
+            production_obj = request.env['mrp.production'].sudo()
             work_order_obj = request.env['mrp.workorder'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
-
-            line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
-            cnc_line_list = list(map(lambda x: x.name, line_list_obj))
             # print('line_list: %s' % line_list)
             for line in line_list:
 
-                if line == '业绩总览':
-                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-                    plan_domain = []
-                elif line == '人工线下加工中心':
-                    work_order_domain = [('routing_type', '=', '人工线下加工')]
-                    plan_domain = [('production_type', '=', '人工线下加工')]
-                else:
-                    work_order_domain = [
-                        ('production_line_id.name', '=', line),
-                        ('routing_type', '=', 'CNC加工')
-                    ]
-                    plan_domain = [('production_line_id.name', '=', line)]
                 # # 工单计划量
                 # plan_data_total_counts = production_obj.search_count(
                 #     [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
                 #      ('active', '=', True)])
 
                 # 工单计划量切换为CNC工单
-                plan_data_total = work_order_obj.search(work_order_domain + [
-                    ('id', '!=', 8061),
-                    ('state', 'in', ['ready', 'progress', 'done'])
-                ])
-
-                plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
+                plan_data_total_counts = work_order_obj.search_count(
+                    [('production_line_id.name', '=', line), ('id', '!=', 8061),
+                     ('state', 'in', ['ready', 'progress', 'done']), ('routing_type', '=', 'CNC加工')])
 
                 # # 工单完成量
                 # plan_data_finish_counts = plan_obj.search_count(
                 #     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
 
                 # 工单完成量切换为CNC工单
-                plan_data_finish = work_order_obj.search(work_order_domain + [
-                    ('state', 'in', ['done'])
-                ])
-
-                plan_data_finish_counts = sum(plan_data_finish.mapped('qty_produced'))
+                plan_data_finish_counts = work_order_obj.search_count(
+                    [('production_line_id.name', '=', line),
+                     ('state', 'in', ['done']), ('routing_type', '=', 'CNC加工')])
 
                 # 超期完成量
                 # 搜索所有已经完成的工单
-                plan_data_overtime = work_order_obj.search(work_order_domain + [
-                    ('state', 'in', ['done'])
+                plan_data_overtime = work_order_obj.search([
+                    ('production_line_id.name', '=', line),
+                    ('state', 'in', ['done']),
+                    ('routing_type', '=', 'CNC加工')
                 ])
 
                 # 使用 filtered 进行字段比较
@@ -462,38 +440,36 @@ class Sf_Dashboard_Connect(http.Controller):
                 )
 
                 # 获取数量
-                # plan_data_overtime_counts = len(plan_data_overtime_counts)
-                plan_data_overtime_counts = sum(plan_data_overtime_counts.mapped('qty_produced'))
+                plan_data_overtime_counts = len(plan_data_overtime_counts)
 
                 # 查找符合条件的生产计划记录
-                # plan_data = plan_obj.search(plan_domain)
+                plan_data = plan_obj.search([
+                    ('production_line_id.name', '=', line),
+                ])
 
                 # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
                 # faulty_plans = plan_data.filtered(lambda p: any(
                 #     result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
                 # ))
 
-                faulty_plans = work_order_obj.search(work_order_domain + [
-                    ('state', 'in', ['scrap', 'rework'])
+                faulty_plans = request.env['quality.check'].sudo().search([
+                    ('operation_id.name', '=', 'CNC加工'),
+                    ('quality_state', 'in', ['fail'])
                 ])
 
                 # 查找制造订单取消与归档的数量
-                # cancel_order_count = production_obj.search_count(
-                #     [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
-                #      ('active', '=', False)])
+                cancel_order_count = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
+                     ('active', '=', False)])
 
                 # 计算符合条件的记录数量
                 # plan_data_fault_counts = len(faulty_plans) + cancel_order_count
-                # plan_data_fault_counts = len(faulty_plans)
-                plan_data_fault_counts = sum(faulty_plans.mapped('qty_produced'))
+                plan_data_fault_counts = len(faulty_plans)
 
                 # 工单返工数量
 
-                plan_data_rework = work_order_obj.search(work_order_domain + [
-                    ('state', 'in', ['rework'])
-                ])
-
-                plan_data_rework_counts = sum(plan_data_rework.mapped('qty_produced'))
+                plan_data_rework_counts = plan_obj.search_count(
+                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework'])])
 
                 # 工单完成率
                 finishe_rate = round(
@@ -503,9 +479,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
 
                 # 完成记录
-                plan_data_finish_orders = plan_obj.search(plan_domain + [
-                    ('state', 'in', ['finished'])
-                ])
+                plan_data_finish_orders = plan_obj.search(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
 
                 # # 检测量
                 # detection_nums = 0
@@ -559,25 +534,25 @@ class Sf_Dashboard_Connect(http.Controller):
                 delay_rate = round((delay_num / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
                 on_time_rate = 1 - delay_rate
 
-                # if plan_data:
-                data = {
-                    'plan_data_total_counts': plan_data_total_counts,
-                    'plan_data_finish_counts': plan_data_finish_counts,
-                    'plan_data_plan_counts': plan_data_total_counts,
-                    'plan_data_fault_counts': plan_data_fault_counts,
-                    'nopass_orders_counts': detection_data - len(pass_nums),
-                    'finishe_rate': finishe_rate,
-                    'plan_data_progress_deviation': plan_data_progress_deviation,
-                    'plan_data_rework_counts': plan_data_rework_counts,
-                    'on_time_rate': on_time_rate,
-                    # 'detection_data': detection_data,
-                    'detection_data': plan_data_finish_counts,
-                    'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts,
-                    'plan_data_overtime_counts': plan_data_overtime_counts,
-                    'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
-                    if plan_data_finish_counts > 0 else 0,
-                }
-                res['data'][line] = data
+                if plan_data:
+                    data = {
+                        'plan_data_total_counts': plan_data_total_counts,
+                        'plan_data_finish_counts': plan_data_finish_counts,
+                        'plan_data_plan_counts': plan_data_total_counts,
+                        'plan_data_fault_counts': plan_data_fault_counts,
+                        'nopass_orders_counts': detection_data - len(pass_nums),
+                        'finishe_rate': finishe_rate,
+                        'plan_data_progress_deviation': plan_data_progress_deviation,
+                        'plan_data_rework_counts': plan_data_rework_counts,
+                        'on_time_rate': on_time_rate,
+                        # 'detection_data': detection_data,
+                        'detection_data': plan_data_finish_counts,
+                        'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts,
+                        'plan_data_overtime_counts': plan_data_overtime_counts,
+                        'overtime_rate': plan_data_overtime_counts / plan_data_finish_counts
+                        if plan_data_finish_counts > 0 else 0,
+                    }
+                    res['data'][line] = data
 
             return json.dumps(res)  # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode()
 
@@ -601,11 +576,8 @@ class Sf_Dashboard_Connect(http.Controller):
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
-        # 将时间减去8小时（UTC+8转UTC）
-        begin_time = (datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
-        end_time = (datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
-        # begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-        # end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
         print('kw', kw)
         time_unit = kw.get('time_unit', 'day').strip('"')  # 默认单位为天
@@ -636,43 +608,16 @@ class Sf_Dashboard_Connect(http.Controller):
                 date_list.append(current_date)
                 current_date += timedelta(days=1)
             return date_list
-        
 
-        if time_unit == 'hour':
+        for line in line_list:
+            date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
+            order_counts = []
 
-            # 计划量，目前只能从mail.message中筛选出
-            plan_order_messages = request.env['mail.message'].sudo().search([
-                ('model', '=', 'mrp.workorder'),
-                ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
-                ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
-                ('tracking_value_ids.field_desc', '=', '状态'),
-                ('tracking_value_ids.new_value_char', '=', '就绪')
-            ])
-                
-            for line in line_list:
-                date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
-                order_counts = []
-
-                if line == '业绩总览':
-                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-                elif line == '人工线下加工中心':
-                    work_order_domain = [('routing_type', '=', '人工线下加工')]
-                else:
-                    work_order_domain = [
-                        ('production_line_id.name', '=', line),
-                        ('routing_type', '=', 'CNC加工')
-                    ]
+            if time_unit == 'hour':
                 time_intervals = get_time_intervals(begin_time, end_time, time_unit)
                 print('============================= %s' % time_intervals)
 
                 time_count_dict = {}
-                plan_count_dict = {}
-
-                orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
-                    ('state', 'in', ['done']),
-                    (date_field_name, '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
-                    (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
-                ])
 
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
@@ -684,106 +629,66 @@ class Sf_Dashboard_Connect(http.Controller):
                     #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
                     # ])
 
-                    interval_orders = orders.filtered(
-                        lambda o: o[date_field_name] >= start_time 
-                        and o[date_field_name] <= end_time
-                    )                    
+                    orders = request.env['mrp.workorder'].sudo().search([
+                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
+                        ('production_line_id.name', '=', line),
+                        ('state', 'in', ['done']),
+                        (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
+                    ])
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
-                    # time_count_dict[key] = len(orders)
-                    time_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
-
-                for time_interval in time_intervals:
-                    start_time, end_time = time_interval
-
-                    # orders = plan_obj.search([
-                    #     ('production_line_id.name', '=', line),
-                    #     ('state', 'in', ['done']),
-                    #     (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                    #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
-                    # ])
-
-                    interval_plan_orders = plan_order_messages.filtered(
-                        lambda o: o.create_date >= start_time 
-                        and o.create_date <= end_time
-                    )
-
-                    interval_order_ids = set(interval_plan_orders.mapped('res_id'))
-
-                    interval_orders = request.env['mrp.workorder'].sudo().browse(interval_order_ids)
-                    if line == '业绩总览':
-                        interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
-                    elif line == '人工线下加工中心':
-                        interval_orders = interval_orders.filtered(lambda o: o.routing_type == '人工线下加工')
-                    else:
-                        interval_orders = interval_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
-
-                    # 使用小时和分钟作为键，确保每个小时的数据有独立的键
-                    key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
-                    # time_count_dict[key] = len(orders)
-                    plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
-
+                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    time_count_dict[key] = len(orders)
                 # order_counts.append()
                 res['data'][line] = {
                     'finish_order_nums': time_count_dict,
-                    'plan_order_nums': plan_count_dict
+                    'plan_order_nums': 28
                 }
-        else:
+                return json.dumps(res)
 
-            for line in line_list:
-                date_field_name = 'date_finished'  # 替换为你模型中的实际字段名
-                order_counts = []
+            date_list = get_date_list(begin_time, end_time)
 
-                if line == '业绩总览':
-                    work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-                elif line == '人工线下加工中心':
-                    work_order_domain = [('routing_type', '=', '人工线下加工')]
-                else:
-                    work_order_domain = [
-                        ('production_line_id.name', '=', line),
-                        ('routing_type', '=', 'CNC加工')
-                    ]
+            for date in date_list:
+                next_day = date + timedelta(days=1)
+                orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                     ('routing_type', '=', 'CNC加工'),
+                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                     ])
 
-                date_list = get_date_list(begin_time, end_time)
+                rework_orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['rework']),
+                     ('routing_type', '=', 'CNC加工'),
+                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                     ])
+                not_passed_orders = request.env['mrp.workorder'].sudo().search(
+                    [('production_id.production_line_id.name', '=', line), ('state', 'in', ['scrap', 'cancel']),
+                     ('routing_type', '=', 'CNC加工'),
+                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
+                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
+                     ])
+                order_counts.append({
+                    'date': date.strftime('%Y-%m-%d'),
+                    'order_count': len(orders),
+                    'rework_orders': len(rework_orders),
+                    'not_passed_orders': len(not_passed_orders)
+                })
+            # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
+            # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
 
-                for date in date_list:
-                    next_day = date + timedelta(days=1)
-                    orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
-                        ('state', 'in', ['done']),
-                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                    ])
+            # date_list_dict = {line: order_counts}
 
-                    rework_orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
-                        ('state', 'in', ['rework']),
-                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                    ])
-                    not_passed_orders = request.env['mrp.workorder'].sudo().search(work_order_domain + [
-                        ('state', 'in', ['scrap', 'cancel']),
-                        (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                        (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                    ])
-                    order_counts.append({
-                        'date': date.strftime('%Y-%m-%d'),
-                        'order_count': sum(orders.mapped('qty_produced')),
-                        'rework_orders': sum(rework_orders.mapped('qty_produced')),
-                        'not_passed_orders': sum(not_passed_orders.mapped('qty_produced'))
-                    })
-                # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
-                # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
-
-                # date_list_dict = {line: order_counts}
-
-                res['data'][line] = order_counts
+            res['data'][line] = order_counts
         return json.dumps(res)
 
     # 实时产量
     @http.route('/api/RealTimeProduct', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
     def RealTimeProduct(self, **kw):
         """
-        获取实时产量（作废）
+        获取实时产量
         :param kw:
         :return:
         """
@@ -806,21 +711,6 @@ class Sf_Dashboard_Connect(http.Controller):
 
         # 当班计划量
         for line in line_list:
-
-            if line == '业绩总览':
-                work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-                plan_domain = []
-            elif line == '人工线下加工中心':
-                work_order_domain = [('routing_type', '=', '人工线下加工')]
-                plan_domain = [('production_type', '=', '人工线下加工')]
-            else:
-                work_order_domain = [
-                    ('production_line_id.name', '=', line),
-                    ('routing_type', '=', 'CNC加工')
-                ]
-                plan_domain = [('production_line_id.name', '=', line)]
-
-
             plan_order_nums = plan_obj.search_count(
                 [('production_line_id.name', '=', line), ('state', 'not in', ['draft']),
                  ('date_planned_start', '>=', begin_time),
@@ -862,72 +752,42 @@ class Sf_Dashboard_Connect(http.Controller):
         :param kw:
         :return:
         """
+
         # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
         res = {'status': 1, 'message': '成功', 'data': {}}
-        # 解决产品名称取到英文的问题
-        request.update_context(lang='zh_CN')
         plan_obj = request.env['sf.production.plan'].sudo()
-        work_order_obj = request.env['mrp.workorder'].sudo()
-        # 获取mrp.workorder的state字段的selection内容
-        state_dict = dict(request.env['mrp.workorder'].sudo()._fields['state'].selection)
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
+        not_done_data = []
+        done_data = []
         final_data = {}
 
-        # 获取当前时间，并计算24小时前的时间
-        current_time = datetime.now()
-        time_48_hours_ago = current_time - timedelta(hours=48)
-
-        # # 计划量，目前只能从mail.message中筛选出
-        # plan_order_messages = request.env['mail.message'].sudo().search([
-        #     ('model', '=', 'mrp.workorder'),
-        #     ('create_date', '>=', time_48_hours_ago.strftime('%Y-%m-%d %H:%M:%S')),
-        #     ('tracking_value_ids.field_desc', '=', '状态'),
-        #     ('tracking_value_ids.new_value_char', 'in', ['就绪', '生产中'])
-        # ])
-
         for line in line_list:
-            not_done_data = []
-            done_data = []
-            not_done_index = 1
-            done_index = 1
-
-            if line == '业绩总览':
-                work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
-            elif line == '人工线下加工中心':
-                work_order_domain = [('routing_type', '=', '人工线下加工')]
-            else:
-                work_order_domain = [
-                    ('production_line_id.name', '=', line),
-                    ('routing_type', '=', 'CNC加工')
-                ]
             # 未完成订单
             # not_done_orders = plan_obj.search(
             #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
             #      ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
             #      ])
-            not_done_orders = work_order_obj.search(work_order_domain + [
-                    ('state', 'in', ['ready', 'progress']),
-                    ('date_planned_start', '>=', time_48_hours_ago),
-                    ('date_planned_start', '<=', current_time)
-                ], order='id asc'
-            )
+            not_done_orders = request.env['mrp.workorder'].sudo().search(
+                [('production_line_id.name', '=', line), ('state', 'in', ['ready', 'progress']),
+                 ('routing_type', '=', 'CNC加工')
+                 ])
 
             # 完成订单
             # 获取当前时间，并计算24小时前的时间
-            # current_time = datetime.now()
-            # time_24_hours_ago = current_time - timedelta(hours=24)
+            current_time = datetime.now()
+            time_24_hours_ago = current_time - timedelta(hours=24)
 
-            finish_orders = work_order_obj.search(work_order_domain + [
-                ('state', 'in', ['done']),
-                ('production_id.state', 'not in', ['cancel']),
-                ('date_finished', '>=', time_48_hours_ago)
-            ], order='id asc')
-            # logging.info('完成订单: %s' % finish_orders)
+            finish_orders = plan_obj.search([
+                ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
+                ('production_id.state', 'not in', ['cancel']), ('active', '=', True),
+                ('actual_end_time', '>=', time_24_hours_ago)
+            ])
+            # print(finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -935,14 +795,14 @@ class Sf_Dashboard_Connect(http.Controller):
             finish_order_ids = [order.id for order in finish_orders]
 
             # 对ID进行排序
-            # sorted_order_ids = sorted(order_ids)
+            sorted_order_ids = sorted(order_ids)
 
-            # finish_sorted_order_ids = sorted(finish_order_ids)
+            finish_sorted_order_ids = sorted(finish_order_ids)
 
             # 创建ID与序号的对应关系
-            # id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(sorted_order_ids)}
+            id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(sorted_order_ids)}
 
-            # finish_id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(finish_sorted_order_ids)}
+            finish_id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(finish_sorted_order_ids)}
 
             # # 输出结果或进一步处理
             # for order_id, sequence in id_to_sequence.items():
@@ -963,21 +823,30 @@ class Sf_Dashboard_Connect(http.Controller):
                 material_match = re.search(material_pattern, blank_name)
                 material = material_match.group(1) if material_match else 'No match found'
 
+                state_dict = {
+                    'draft': '待排程',
+                    'done': '已排程',
+                    'processing': '生产中',
+                    'finished': '已完成',
+                    'ready': '待加工',
+                    'progress': '生产中',
+                }
 
                 line_dict = {
-                    'sequence': not_done_index,
+                    'sequence': id_to_sequence[order.id],
                     'workorder_name': order.production_id.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': order.qty_production,
+                    'order_qty': 1,
                     'state': state_dict[order.state],
 
                 }
                 not_done_data.append(line_dict)
-                not_done_index += 1
 
             for finish_order in finish_orders:
+                if not finish_order.actual_end_time:
+                    continue
                 blank_name = ''
                 try:
                     blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -992,18 +861,17 @@ class Sf_Dashboard_Connect(http.Controller):
                 material = material_match.group(1) if material_match else 'No match found'
 
                 line_dict = {
-                    'sequence': done_index,
-                    'workorder_name': finish_order.production_id.name,
+                    'sequence': finish_id_to_sequence[finish_order.id],
+                    'workorder_name': finish_order.name,
                     'blank_name': blank_name,
                     'material': material,
                     'dimensions': dimensions,
-                    'order_qty': finish_order.qty_produced,
-                    'finish_time': finish_order.date_finished.strftime(
-                        '%Y-%m-%d %H:%M:%S') if finish_order.date_finished else ' '
+                    'order_qty': finish_order.product_qty,
+                    'finish_time': finish_order.actual_end_time.strftime(
+                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
 
                 }
                 done_data.append(line_dict)
-                done_index += 1
 
             # 开始包一层
             res['data'][line] = {'not_done_data': not_done_data, 'done_data': done_data}

sf_manufacturing/__manifest__.py

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

sf_manufacturing/controllers/controllers.py

@@ -56,7 +56,6 @@ 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):
         """
         自动化每天获取机台日计划
@@ -445,7 +444,32 @@ class Manufacturing_Connect(http.Controller):
                         shelfinfo = list(filter(lambda x: x.get('DeviceId') == DeciveId,
                                                 request.env['sf.shelf.location'].sudo().get_sf_shelf_location_info(
                                                     DeciveId)))
-                        request.env['sf.shelf.location.datasync'].sudo().set_shelf_location(shelfinfo)
+                        total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data()
+                        for item in shelfinfo:
+                            logging.info('货架已获取信息:%s' % item)
+                            shelf_barcode = request.env['sf.shelf.location.datasync'].sudo().find_our_code(
+                                total_data, item['Postion'])
+                            location_id = request.env['sf.shelf.location'].sudo().search(
+                                [('barcode', '=', shelf_barcode)],
+                                limit=1)
+                            if location_id:
+                                # 如果是线边刀库信息,则对功能刀具移动生成记录
+                                if 'Tool' in item['Postion']:
+                                    tool = request.env['sf.functional.cutting.tool.entity'].sudo().search(
+                                        [('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
+                                    tool.sudo().tool_in_out_stock_location(location_id)
+                                    if tool:
+                                        location_id.product_sn_id = tool.barcode_id.id
+                                        # 修改功能刀具状态
+                                        if item.get('State') == '报警':
+                                            if tool.functional_tool_status != item.get('State'):
+                                                tool.write({
+                                                    'functional_tool_status': item['State']
+                                                })
+                                    else:
+                                        location_id.product_sn_id = False
+                                        if item['RfidCode']:
+                                            logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
                     else:
                         equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)])
                         if equipment_id:

sf_manufacturing/controllers/main.py

@@ -27,7 +27,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
             bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
             order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], kw['remark'], state='draft',
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft',
                 model_display_version=kw.get('model_display_version'))
             i = 1
             # 给sale_order的default_code字段赋值
@@ -45,9 +45,6 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                 i += 1
-            if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
-                order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
-                order_id.write({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

sf_manufacturing/models/__init__.py

@@ -18,4 +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
+from . import stock_warehouse_orderpoint

sf_manufacturing/models/mrp_production.py

@@ -279,12 +279,10 @@ 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)
-                    else:
-                        product_name = production_id.product_id.name
                     if production_id.sale_order_id:
                         sale_order = production_id.sale_order_id
                     else:
@@ -638,17 +636,13 @@ class MrpProduction(models.Model):
     # 增加触发时间参数
     def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
         try:
-            reason = ""
             manufacturing_type = None
             if self.is_scrap:
                 manufacturing_type = 'scrap'
-                reason = "报废"
             elif self.tool_state == '2':
                 manufacturing_type = 'invalid_tool_rework'
-                reason = "无效功能刀具"
             elif self.is_rework:
                 manufacturing_type = 'rework'
-                reason = "返工"
             res = {'programming_no': self.programming_no,
                    'manufacturing_type': manufacturing_type,
                    'trigger_time': trigger_time,
@@ -663,16 +657,6 @@ class MrpProduction(models.Model):
             result = json.loads(ret['result'])
             logging.info('update_programming_state-ret:%s' % result)
             if result['status'] == 1:
-                self.programming_record_ids.create({
-                    'number': len(self.programming_record_ids) + 1,
-                    'production_id': self.id,
-                    'reason': reason,
-                    'programming_method': False,
-                    'current_programming_count': False,
-                    'target_production_id': False,
-                    'apply_time': fields.Datetime.now(),
-                    'send_time': False,
-                })
                 self.write({'is_rework': True})
             else:
                 raise UserError(ret['message'])
@@ -803,17 +787,6 @@ class MrpProduction(models.Model):
             if ret['status'] == 1:
                 self.write(
                     {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
-                # 生成编程记录
-                self.programming_record_ids.create({
-                    'number': len(self.programming_record_ids) + 1,
-                    'production_id': self.id,
-                    'reason': '首次下发',
-                    'programming_method': False,
-                    'current_programming_count': False,
-                    'target_production_id': False,
-                    'apply_time': fields.Datetime.now(),
-                    'send_time': False,
-                })
             else:
                 raise UserError(ret['message'])
         except Exception as e:
@@ -927,41 +900,43 @@ class MrpProduction(models.Model):
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
-    # def _create_subcontract_purchase_request(self, purchase_request_line):
-    #     sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
-    #     grouped_purchase_request_line = {
-    #         k: list(g)
-    #         for k, g in groupby(sorted_list, key=itemgetter('name'))
-    #     }
-    #     for name, request_line in grouped_purchase_request_line.items():
-    #         request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
-    #         grouped_purchase_request_line_sorted_list = {
-    #             k: list(g)
-    #             for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
-    #         }
-    #         purchase_request_model = self.env["purchase.request"]
-    #         origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
-    #         pr = purchase_request_model.create({
-    #             "origin": origin,
-    #             "company_id": self.company_id.id,
-    #             "picking_type_id": self.env.ref('stock.picking_type_in').id,
-    #             "group_id": request_line[0].get('group_id'),
-    #             "requested_by": self.env.context.get("uid", self.env.uid),
-    #             "assigned_to": False,
-    #             "bom_id": self[0].bom_id.id,
-    #             "is_subcontract":True,
-    #         })
-    #         self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
-    #                         'sf_stock.stock_route_process_outsourcing').id)]
-    #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
-    #             cur_request_line = request_line_list[0]
-    #             # cur_request_line['product_qty'] = 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 _create_subcontract_purchase_request(self, purchase_request_line):
+        sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
+        grouped_purchase_request_line = {
+            k: list(g)
+            for k, g in groupby(sorted_list, key=itemgetter('name'))
+        }
+        for name, request_line in grouped_purchase_request_line.items():
+            request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
+            grouped_purchase_request_line_sorted_list = {
+                k: list(g)
+                for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
+            }
+            purchase_request_model = self.env["purchase.request"]
+            origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
+            pr = purchase_request_model.create({
+                "origin": origin,
+                "company_id": self.company_id.id,
+                "picking_type_id": self.env.ref('stock.picking_type_in').id,
+                "group_id": request_line[0].get('group_id'),
+                "requested_by": self.env.context.get("uid", self.env.uid),
+                "assigned_to": False,
+                "bom_id": self[0].bom_id.id,
+                "is_subcontract":True,
+            })
+            self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
+                            'sf_stock.stock_route_process_outsourcing').id)]
+            for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
+                cur_request_line = request_line_list[0]
+                if cur_request_line['product_qty'] == 1:
+                    cur_request_line['product_qty'] = len(request_line_list)
+                # cur_request_line['product_qty'] = cur_request_line['product_qty']
+                cur_request_line['request_id'] = pr.id
+                cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
+                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):
@@ -989,14 +964,14 @@ class MrpProduction(models.Model):
             if not sorted_workorders:
                 return
             for workorders in reversed(sorted_workorders):
-                self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
-                self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
-        #         purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
-        #             workorders, production)
-        #         all_workorders += workorders
-        # self._create_subcontract_purchase_request(purchase_request_line)
-        # for workorder in all_workorders:
-        #     workorder._compute_pr_mp_count()
+                # self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
+                # self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
+                purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
+                    workorders, production)
+                all_workorders += workorders
+        self._create_subcontract_purchase_request(purchase_request_line)
+        for workorder in all_workorders:
+            workorder._compute_pr_mp_count()
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
@@ -1799,6 +1774,7 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
+        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1867,7 +1843,6 @@ class sf_programming_record(models.Model):
     target_production_id = fields.Char('目标制造单号')
     apply_time = fields.Datetime('申请时间')
     send_time = fields.Datetime('下发时间')
-    apply_uid = fields.Many2one('res.users', '申请人', default=lambda self: self.env.user)
 
 
 class sf_detection_result(models.Model):

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -1,7 +1,7 @@
 import logging
 from odoo import fields, models, api
 from odoo.exceptions import UserError
-# from odoo.tools import str2bool
+from odoo.tools import str2bool
 
 
 class ResMrpRoutingWorkcenter(models.Model):
@@ -25,20 +25,20 @@ class ResMrpRoutingWorkcenter(models.Model):
     workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
-    # optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
+    optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
     reserved_duration = fields.Float('预留时长', default=30, tracking=True)
     is_outsource = fields.Boolean('外协', default=False)
     individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录')
 
-    # @api.onchange('surface_technics_id')
-    # def optional_process_parameters_date(self):
-    #     for record in self:
-    #         if not record.surface_technics_id:
-    #             continue
-    #         parameter_ids = self.env['sf.production.process.parameter'].search([
-    #             ('process_id', '=', record.surface_technics_id.id),
-    #         ])
-    #         record.optional_process_parameters = parameter_ids.ids
+    @api.onchange('surface_technics_id')
+    def optional_process_parameters_date(self):
+        for record in self:
+            if not record.surface_technics_id:
+                continue
+            parameter_ids = self.env['sf.production.process.parameter'].search([
+                ('process_id', '=', record.surface_technics_id.id),
+            ])
+            record.optional_process_parameters = parameter_ids.ids
 
     # @api.model
     # def _auto_init(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -21,16 +21,16 @@ class ResWorkcenter(models.Model):
                                          related='equipment_id.production_line_id', store=True)
     is_process_outsourcing = fields.Boolean('工艺外协')
     users_ids = fields.Many2many("res.users", 'users_workcenter', tracking=True)
-    # @api.constrains('name')
-    # def _check_unique_name_code(self):
-    #     for record in self:
-    #         # 检查是否已经存在相同的 name 和 code 组合
-    #         existing = self.search([
-    #             ('name', '=', record.name),
-    #             ('id', '!=', record.id)  # 排除当前记录
-    #         ])
-    #         if existing:
-    #             raise ValueError('记录已存在')
+    @api.constrains('name')
+    def _check_unique_name_code(self):
+        for record in self:
+            # 检查是否已经存在相同的 name 和 code 组合
+            existing = self.search([
+                ('name', '=', record.name),
+                ('id', '!=', record.id)  # 排除当前记录
+            ])
+            if existing:
+                raise ValueError('记录已存在')
     def write(self, vals):
         if 'users_ids' in vals:
             old_users = self.users_ids

sf_manufacturing/models/mrp_workorder.py

@@ -70,21 +70,21 @@ class ResMrpWorkOrder(models.Model):
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
-    # pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
+    pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
 
-    # @api.depends('state')
-    # def _compute_pr_mp_count(self):
-    #     for item in self:
-    #         if not item.is_subcontract:
-    #             item.pr_mp_count = 0
-    #             continue
-    #         pr_ids = self.env['purchase.request'].sudo().search(
-    #             [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
-    #              ('state', '!=', 'rejected')])
-    #         if pr_ids:
-    #             item.pr_mp_count = len(pr_ids)
-    #         else:
-    #             item.pr_mp_count = 0
+    @api.depends('state')
+    def _compute_pr_mp_count(self):
+        for item in self:
+            if not item.is_subcontract:
+                item.pr_mp_count = 0
+                continue
+            pr_ids = self.env['purchase.request'].sudo().search(
+                [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
+                 ('state', '!=', 'rejected')])
+            if pr_ids:
+                item.pr_mp_count = len(pr_ids)
+            else:
+                item.pr_mp_count = 0
 
     @api.depends('state')
     def _compute_back_button_display(self):
@@ -130,14 +130,8 @@ class ResMrpWorkOrder(models.Model):
                     record.back_button_display = False
             else:
                 next_workorder = sorted_workorders[position + 1]
-                # 持续获取下一个工单，直到找到一个不是返工的工单
-                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_state = next_workorder.state
+                if (next_state == 'ready' or (
                         next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
                     record.back_button_display = True
                 else:
@@ -227,30 +221,22 @@ class ResMrpWorkOrder(models.Model):
                 # finish_move.move_dest_ids.move_line_ids.reserved_uom_qty = 0
         else:
             next_workorder = sorted_workorders[position + 1]
-            # 持续获取下一个工单，直到找到一个不是返工的工单
-            while next_workorder and next_workorder.state == 'rework':
-                position += 1
-                if position + 1 < len(sorted_workorders):
-                    next_workorder = sorted_workorders[position + 1]
+            next_state = next_workorder.state
+            if next_state not in ['pending', 'waiting', 'ready']:
+                raise UserError('下工序已经开始，无法回退')
+            if next_workorder.is_subcontract:
+                next_workorder.picking_ids.write({'state': 'waiting'})
+            next_workorder.state = 'pending'
+            self.time_ids.date_end = None
+            cur_workorder.state = 'progress'
+            cur_workorder.production_id.state = 'progress'
+            quality_check = self.env['quality.check'].search(
+                [('workorder_id', '=', self.id)])
+            for check_order in quality_check:
+                if check_order.point_id.is_inspect:
+                    check_order.quality_state = 'waiting'
                 else:
-                    next_workorder = None
-            if next_workorder:
-                next_state = next_workorder.state
-                if next_state not in ['pending', 'waiting', 'ready']:
-                    raise UserError('下工序已经开始，无法回退')
-                if next_workorder.is_subcontract:
-                    next_workorder.picking_ids.write({'state': 'waiting'})
-                next_workorder.state = 'pending'
-                self.time_ids.date_end = None
-                cur_workorder.state = 'progress'
-                cur_workorder.production_id.state = 'progress'
-                quality_check = self.env['quality.check'].search(
-                    [('workorder_id', '=', self.id)])
-                for check_order in quality_check:
-                    if check_order.point_id.is_inspect:
-                        check_order.quality_state = 'waiting'
-                    else:
-                        check_order.quality_state = 'none'
+                    check_order.quality_state = 'none'
 
     def _compute_working_users(self):
         super()._compute_working_users()
@@ -334,7 +320,6 @@ 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']
@@ -455,51 +440,41 @@ 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']:
-                domain = [('purchase_type', '=', 'consignment'),
-                          ('origin', 'like', '%' + self.production_id.name + '%'),
-                          ('state', '!=', 'cancel')]
-                # domain = [('purchase_type', '=', 'consignment'),
-                #           ('origin', 'like', '%' + self.production_id.name + '%'),
-                #           ('state', '!=', 'cancel')]
-                purchase = self.env['purchase.order'].search(domain)
-                order.surface_technics_purchase_count = 0
-                if not purchase:
-                    order.surface_technics_purchase_count = 0
-                for po in purchase:
-                    if any(
-                            line.product_id and line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id
-                            for line in po.order_line):
-                        order.surface_technics_purchase_count = 1
+            pr_ids = self.env['purchase.request'].sudo().search(
+                [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
+                 ('state', '!=', 'rejected')])
+            if pr_ids.purchase_count:
+                order.surface_technics_purchase_count = pr_ids.purchase_count
             else:
                 order.surface_technics_purchase_count = 0
 
-    # def action_view_pr_mrp_workorder(self):
-    #     """
-    #     采购请求
-    #     """
-    #     self.ensure_one()
-    #     pr_ids = self.env['purchase.request'].sudo().search(
-    #         [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
-    #          ('state', '!=', 'rejected')])
-    #     action = {
-    #         'res_model': 'purchase.request',
-    #         'type': 'ir.actions.act_window',
-    #     }
-    #     if len(pr_ids) == 1:
-    #         action.update({
-    #             'view_mode': 'form',
-    #             'res_id': pr_ids[0].id,
-    #         })
-    #     else:
-    #         action.update({
-    #             'name': _("从 %s生成采购请求单", self.name),
-    #             'domain': [('id', 'in', pr_ids)],
-    #             'view_mode': 'tree,form',
-    #         })
-    #     return action
+    def action_view_pr_mrp_workorder(self):
+        """
+        采购请求
+        """
+        self.ensure_one()
+        pr_ids = self.env['purchase.request'].sudo().search(
+            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
+             ('state', '!=', 'rejected')])
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(pr_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': pr_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购请求单", self.name),
+                'domain': [('id', 'in', pr_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
 
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
@@ -517,16 +492,19 @@ class ResMrpWorkOrder(models.Model):
         # if technology_design.is_auto is False:
         #     domain = [('origin', '=', self.production_id.name)]
         # else:
-        purchase_orders_id = self._get_surface_technics_purchase_ids()
-        result = {
-            "type": "ir.actions.act_window",
-            "res_model": "purchase.order",
-            "res_id": purchase_orders_id.id,
-            # "domain": [['id', 'in', self.purchase_id]],
-            "name": _("Purchase Orders"),
-            'view_mode': 'form',
-        }
-        return result
+        pr_ids = self.env['purchase.request'].sudo().search(
+            [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
+             ('state', '!=', 'rejected')])
+        # purchase_orders_id = self._get_surface_technics_purchase_ids()
+        # result = {
+        #     "type": "ir.actions.act_window",
+        #     "res_model": "purchase.order",
+        #     "res_id": purchase_orders_id.id,
+        #     # "domain": [['id', 'in', self.purchase_id]],
+        #     "name": _("Purchase Orders"),
+        #     'view_mode': 'form',
+        # }
+        return pr_ids.action_view_purchase_order()
 
     def _get_surface_technics_purchase_ids(self):
         domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
@@ -753,25 +731,21 @@ class ResMrpWorkOrder(models.Model):
     #         self.workpiece_delivery_ids[0].write({'rfid_code': self.rfid_code})
 
     def get_plan_workorder(self, production_line):
-        tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
-        tomorrow_start = f"{tomorrow} 00:00:00"
-        tomorrow_end = f"{tomorrow} 23:59:59"
+        tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
+        tomorrow_start = tomorrow + ' 00:00:00'
+        tomorrow_end = tomorrow + ' 23:59:59'
         logging.info('tomorrow:%s' % tomorrow)
         sql = """
           SELECT *
           FROM mrp_workorder
           WHERE state!='rework'
-          AND (date_planned_start + interval '8 hours') >= %s::timestamp
-          AND (date_planned_finished + interval '8 hours') <= %s::timestamp
+          to_char(date_planned_start::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')>= %s
+          AND to_char(date_planned_finished::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')<= %s
           """
         params = [tomorrow_start, tomorrow_end]
         if production_line:
-            line = self.env['sf.production.line'].search(
-                [('name', '=', production_line)], limit=1)
-            if not line:
-                raise ValueError(f"生产线'{production_line}'不存在")
             sql += "AND production_line_id = %s"
-            params.append(line.id)
+            params.append(production_line)
         self.env.cr.execute(sql, params)
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]
@@ -1264,12 +1238,12 @@ 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 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)
@@ -1302,20 +1276,27 @@ class ResMrpWorkOrder(models.Model):
             #     for move_line in move.move_line_ids
             # )
             if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'):
+                    and workorder.production_id.programming_state == '已编程'):
                 # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     if workorder.production_id.state == 'rework':
                         workorder.state = 'waiting'
                         continue
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
-                    if purchase_orders_id.state == 'purchase':
+                    purchase_count = 0
+                    for purchase_order in purchase_orders_id:
+                        for purchase_order_line in purchase_order.order_line:
+                            if purchase_order_line.product_id.server_product_process_parameters_id.id == workorder.surface_technics_parameters_id.id:
+                                purchase_count = purchase_order_line.product_qty
+                    if purchase_orders_id.state == 'purchase' and purchase_count>=workorder.production_id.product_qty:
                         workorder.state = 'ready'
-                        # picking_id = workorder.production_id.picking_ids.filtered(
-                        #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                        # move_out = picking_id.move_ids
-                        move_out = workorder.move_subcontract_workorder_ids[1]
+                        picking_id = workorder.production_id.picking_ids.filtered(
+                            lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                        move_out = picking_id.move_ids
+                        # move_out = workorder.move_subcontract_workorder_ids[1]
                         for mo in move_out:
+                            if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                                continue
                             if mo.state != 'done':
                                 mo.write({'state': 'assigned', 'production_id': False})
                                 if not mo.move_line_ids:
@@ -1331,6 +1312,7 @@ class ResMrpWorkOrder(models.Model):
                 else:
                     workorder.state = 'ready'
                     continue
+                continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'
@@ -1346,19 +1328,18 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
-                    if len(workorder.production_id.picking_ids.filtered(
-                            lambda w: w.state not in ['done',
-                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
+                    if workorder.production_id.programming_state == '已编程':
                         purchase_orders_id = self._get_surface_technics_purchase_ids()
                         if purchase_orders_id:
                             if purchase_orders_id.state == 'purchase':
                                 workorder.state = 'ready'
-                                move_out = workorder.move_subcontract_workorder_ids[1]
-                                # picking_id = workorder.production_id.picking_ids.filtered(
-                                #     lambda
-                                #         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                                # move_out = picking_id.move_ids
+                                picking_id = workorder.production_id.picking_ids.filtered(
+                                    lambda
+                                        wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                                move_out = picking_id.move_ids
                                 for mo in move_out:
+                                    if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                                        continue
                                     if mo.state != 'done':
                                         mo.write({'state': 'assigned', 'production_id': False})
                                         if not mo.move_line_ids:
@@ -1407,7 +1388,16 @@ class ResMrpWorkOrder(models.Model):
                     boolean = True
             if not boolean:
                 raise UserError('制造订单【%s】缺少组件的序列号信息！' % self.production_id.name)
-            self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
+            self.pro_code = False  # 默认值
+            if (
+                    self.production_id
+                    and self.production_id.move_raw_ids
+                    and len(self.production_id.move_raw_ids) > 0
+                    and self.production_id.move_raw_ids[0].move_line_ids
+                    and len(self.production_id.move_raw_ids[0].move_line_ids) > 0
+                    and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id
+            ):
+                self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
             # cnc校验
             if self.production_id.production_type == '自动化产线加工':
                 cnc_workorder = self.search(
@@ -1431,10 +1421,9 @@ 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
+                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(
@@ -1443,6 +1432,8 @@ class ResMrpWorkOrder(models.Model):
                 #          [('barcode', 'ilike', 'VL-SPOC')]).id),
                 #      ('origin', '=', self.production_id.name), ('state', 'not in', ['cancel', 'done'])])
                 for mo in move_out:
+                    if self.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                        continue
                     if mo.state != 'done':
                         mo.write({'state': 'assigned', 'production_id': False})
                         if not mo.move_line_ids:
@@ -1575,7 +1566,8 @@ class ResMrpWorkOrder(models.Model):
                     lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
                 if self == subcontract_workorders[-1]:
                     # 给下一个库存移动就绪
-                    self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
+                    if self.move_subcontract_workorder_ids:
+                        self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
                     # self.production_id.button_mark_done()
             tem_date_planned_finished = record.date_planned_finished
             tem_date_finished = record.date_finished
@@ -1601,17 +1593,25 @@ class ResMrpWorkOrder(models.Model):
                     len(done_workorder) == len(
                 record.production_id.workorder_ids.filtered(lambda wo: wo.state != 'cancel'))):
                 is_production_id = True
+            if record.routing_type in ['解除装夹'] or (
+                    record.is_rework is True and record.routing_type in ['装夹预调']):
+                for workorder in record.production_id.workorder_ids:
+                    if workorder.processing_panel == record.processing_panel:
+                        rfid_code = workorder.rfid_code
+                        if record.is_rework is not True:
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': False, 'rfid_code': False})
+                        elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
+                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                        self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
+                            {'tool_material_status': '可用'})
+                        if workorder.rfid_code:
+                            raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
+                        # workorder.rfid_code_old = rfid_code
+                        # workorder.rfid_code = False
+                        logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
 
-            if record.routing_type in ['解除装夹']:
-                rfid_code = record.rfid_code
-                work_ids = record.production_id.workorder_ids.filtered(
-                    lambda wo: wo.processing_panel == record.processing_panel and wo.state != 'rework')
-                work_ids.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
-                    {'tool_material_status': '可用'})
-                if any(wo.rfid_code for wo in work_ids):
-                    raise ValidationError(f'【{record.name}】工单解绑失败，请重新点击完成按钮！！！')
-                logging.info('work_ids.rfid_code:%s' % [wo.rfid_code for wo in work_ids])
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:

sf_manufacturing/models/product_template.py

@@ -10,8 +10,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
@@ -795,12 +795,10 @@ 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)
-                else:
-                    product_name = record.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.name)
                 if match_sale:
@@ -892,9 +890,8 @@ class ResProductMo(models.Model):
             embryo_redundancy_id = item.get('embryo_redundancy')
         if not embryo_redundancy_id:
             raise UserError('请先配置模型类型内的坯料冗余')
-        product_name = self.generate_product_name(order_id, item, i)
         vals = {
-            'name': product_name,
+            'name': '%s-%s-%s' % ('P', order_id.name, i),
             'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long),
             'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
             'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
@@ -1015,9 +1012,12 @@ class ResProductMo(models.Model):
         if not embryo_redundancy_id:
             raise UserError('请先配置模型类型内的坯料冗余')
         logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
-        embryo_name = self.generate_embryo_name(order_id, item, materials_id, materials_type_id, embryo_redundancy_id, i)
         vals = {
-            'name': embryo_name,
+            'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
+                                                       order_id.name, i, materials_id.name, materials_type_id.name,
+                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
+                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
+                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height)),
             'length': self.format_float(item['model_long'] + embryo_redundancy_id.long),
             'width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
             'height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
@@ -1119,19 +1119,7 @@ class ResProductMo(models.Model):
 
     # 增加产品表面积
 
-    def generate_product_name(self, order_id, item, i):
-        """生成成品名称"""
-        product_name = '%s-%s-%s' % ('P', order_id.name, i)
-        return product_name
 
-    def generate_embryo_name(self, order_id, item,  materials_id, materials_type_id, embryo_redundancy_id, i):
-        """生成坯料名称"""
-        embryo_name = '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
-                                                       order_id.name, i, materials_id.name, materials_type_id.name,
-                                                       self.format_float(item['model_long'] + embryo_redundancy_id.long),
-                                                       self.format_float(item['model_width'] + embryo_redundancy_id.width),
-                                                       self.format_float(item['model_height'] + embryo_redundancy_id.height))
-        return embryo_name
 
 class ResProductFixture(models.Model):
     _inherit = 'product.template'

sf_manufacturing/models/purchase_order.py

@@ -59,83 +59,85 @@ 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 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))
+    def outsourcing_service_replenishment(self):
+        record = self
+        if record.purchase_type != 'consignment':
+            return
+        grouped_lines = {}
+        for line in record.order_line:
+            if line.related_product.id not in grouped_lines:
+                grouped_lines[line.related_product.id] = []
+            grouped_lines[line.related_product.id].append(line)
+        for product_id,lines in grouped_lines.items():
+            production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            if not production:
+                continue
+            total_qty = sum(line.product_qty for line in lines)
+            record.process_replenish(production,total_qty)
+        for product_id,lines in grouped_lines.items():
+            productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
+            if not productions:
+                continue
+            # production.bom_id.bom_line_ids.product_id
+            location_id = self.env['stock.location'].search([('name', '=', '制造前')])
+            quants = self.env['stock.quant'].search([
+                ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
+                ('location_id', '=', location_id.id)
+            ])
+            total_qty = sum(quants.mapped('quantity'))  # 计算该位置的总库存量
+            is_available = total_qty > 0
+            if not is_available:
+                raise UserError('请先完成坯料入库')
+            for production_id in productions:
+                work_ids = production_id.workorder_ids.filtered(
+                    lambda wk: wk.state not in ['done', 'rework', 'cancel'])
+                if not work_ids:
+                    continue
+                min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
+                if min_sequence_wk.is_subcontract and min_sequence_wk.state == 'ready':
+                    picking_id = production_id.picking_ids.filtered(
+                    lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                    move_out = picking_id.move_ids
+                    for mo in move_out:
+                        if production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
+                            continue
+                        if mo.state != 'done':
+                            mo.write({'state': 'assigned', 'production_id': False})
+                            if not mo.move_line_ids:
+                                self.env['stock.move.line'].create(
+                                    mo.get_move_line(production_id, min_sequence_wk))
             # product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
             # match = re.search(r'(S\d{5}-\d)',product.name)
             # pass
@@ -146,12 +148,14 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            # record.outsourcing_service_replenishment()        
+            record.outsourcing_service_replenishment()        
         
         res = super(PurchaseOrder, self).button_confirm()
 
         for line in self.order_line:
             # 将产品不追踪序列号的行项目设置qty_done
+            if not line.move_ids:
+                continue
             if line.move_ids and line.move_ids[0].product_id.tracking == 'none':
                 line.move_ids[0].quantity_done = line.move_ids[0].product_qty
         return res
@@ -208,12 +212,10 @@ 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)
-                else:
-                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:
@@ -226,6 +228,24 @@ class PurchaseOrderLine(models.Model):
                     )
                     record.part_number = filtered_order_line.product_id.part_number
                     record.part_name = filtered_order_line.product_id.part_name
+            elif record.order_id.purchase_type == 'consignment':
+                product_name = ''
+                match = re.search(r'(S\d{5}-\d)', record.related_product.name)
+                # 如果匹配成功，提取结果
+                if match:
+                    product_name = match.group(0)
+                sale_order_name = ''
+                match_sale = re.search(r'S(\d+)', record.related_product.name)
+                if match_sale:
+                    sale_order_name = match_sale.group(0)
+                sale_order = self.env['sale.order'].sudo().search(
+                    [('name', '=', sale_order_name)])
+                if sale_order:
+                    filtered_order_line = sale_order.order_line.filtered(
+                        lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
+                    )
+                    record.part_number = filtered_order_line.product_id.part_number
+                    record.part_name = filtered_order_line.product_id.part_name
             else:
                 record.part_number = record.product_id.part_number
                 record.part_name = record.product_id.part_name

sf_manufacturing/models/purchase_request_line.py

@@ -1,30 +1,30 @@
 # -*- coding: utf-8 -*-
-# import base64
-# import datetime
-# import logging
-# import json
-# import os
-# import re
-# import traceback
-# from operator import itemgetter
+import base64
+import datetime
+import logging
+import json
+import os
+import re
+import traceback
+from operator import itemgetter
 
-# import requests
-# from itertools import groupby
-# from collections import defaultdict, namedtuple
+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
+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 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')
+class PurchaseRequest(models.Model):
+    _inherit = 'purchase.request'
+    bom_id = fields.Many2one('mrp.bom')

sf_manufacturing/models/sale_order.py

@@ -58,8 +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.tracking = product_template_id.tracking
+            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
@@ -74,17 +74,14 @@ class SaleOrder(models.Model):
                 'blank_area': product.model_area,
                 'price': product.list_price,
                 'embryo_redundancy_id': line.embryo_redundancy_id,
-                'model_id': line.model_id
             }
             product_name = ''
-            match = re.search(r'(S\d{5}-\d+)', product.name)
-            product_seria = 0
+            match = re.search(r'(S\d{5}-\d)', product.name)
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)
-                # 获取成品名结尾-n的n
-                product_seria = int(product_name.split('-')[-1])
-            
+            # 获取成品名结尾-n的n
+            product_seria = int(product_name.split('-')[-1])
             # 成品供货方式为采购则不生成bom
             if line.supply_method != 'purchase':
                 bom_data = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).get_bom(product)
@@ -193,30 +190,7 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
-    def create_sale_documents(self, contract_file_name, contract_file):
-        # 创建ir.attachment记录
-        attachment = self.env['ir.attachment'].sudo().create({
-            'name': contract_file_name,
-            'type': 'binary',
-            'datas': contract_file,
-            'res_model': 'sale.order',
-        })
 
-        # 获取默认的文档文件夹
-        workspace = self.env.ref('sf_sale.documents_sales_contracts_folder_1').id
-
-        # 创建 documents.document 记录
-        document = self.env['documents.document'].sudo().create({
-            'name': contract_file_name,
-            'attachment_id': attachment.id,
-            'folder_id': workspace,
-            'res_model': 'sale.order',
-            'res_id': self.id,
-        })
-
-        self.write({
-            'contract_document_id': document.id
-        })
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'

sf_manufacturing/models/sf_production_common.py

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

sf_manufacturing/models/sf_technology_design.py

@@ -23,6 +23,7 @@ class sf_technology_design(models.Model):
     # def _compute_group_uniq_id(self):
     #     for record in self:
 
+
     def json_technology_design_str(self, k, route, i, process_parameter):
         workorders_values_str = [0, '', {
             'route_id': route.id if route.routing_type in ['表面工艺'] else route.route_workcenter_id.id,
@@ -35,19 +36,11 @@ class sf_technology_design(models.Model):
         return workorders_values_str
 
     def write(self, vals):
-        res = super(sf_technology_design, self).write(vals)
-        if 'group_uniq_id' in vals or 'process_parameters_id' in vals or 'active' in vals:
-            if self.production_id:
-                process_parameters_id = self.production_id.technology_design_ids.mapped('process_parameters_id')
-                if process_parameters_id.ids:
-                    self.production_id.product_id.model_process_parameters_ids = process_parameters_id.ids
-                else:
-                    self.production_id.product_id.model_process_parameters_ids = None
-        return res
-
+        return super(sf_technology_design, self).write(vals)
     def unlink_technology_design(self):
         self.active = False
 
+
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
@@ -55,12 +48,10 @@ class sf_technology_design(models.Model):
                 raise ValidationError(_("工序不能为空"))
         result = super(sf_technology_design, self).create(vals_list)
         for res in result:
-            record = self.search([('production_id', '=', res.production_id.id), ('active', 'in', [True, False])],
-                                 order='group_uniq_id desc', limit=1)
-            res.group_uniq_id = record.group_uniq_id + 1
+            record = self.search([('production_id', '=', res.production_id.id), ('active', 'in', [True, False])], order='group_uniq_id desc', limit=1)
+            res.group_uniq_id=record.group_uniq_id + 1
         return result
-
-    def get_duplicates_with_inactive(self, technology_designs):
+    def get_duplicates_with_inactive(self,technology_designs):
         # 统计每个 'sequence' 出现的次数
         sequence_count = Counter(technology_design.sequence for technology_design in technology_designs)
 
@@ -71,7 +62,6 @@ class sf_technology_design(models.Model):
         ]
 
         return result
-
     # def rearrange_numbering(self,self_technology_designs):
     #     inactive_designs = self.get_duplicates_with_inactive(self_technology_designs)
     #     if inactive_designs:
@@ -85,7 +75,7 @@ class sf_technology_design(models.Model):
 
     def get_technology_design(self):
         return {
-            'sequence': self.sequence,
+            'sequence':self.sequence,
             'route_id': self.route_id.id,
             'process_parameters_id': self.process_parameters_id.id,
             'panel': self.panel,
@@ -93,19 +83,17 @@ class sf_technology_design(models.Model):
             'time_cycle_manual': self.time_cycle_manual,
             'is_auto': self.is_auto,
             'active': self.active,
-            'group_uniq_id': self.group_uniq_id,
+            'group_uniq_id':self.group_uniq_id,
         }
-
-    def sync_technology_designs(self, production_technology_designs, self_technology_designs):
+    def sync_technology_designs(self,production_technology_designs, self_technology_designs):
         production_id = production_technology_designs[0].production_id.id
-        self_technology_design_dict = {item.group_uniq_id: item for item in self_technology_designs}
-        production_technology_designs_dict = {item.group_uniq_id: item for item in production_technology_designs}
+        self_technology_design_dict = {item.group_uniq_id:item for item in self_technology_designs}
+        production_technology_designs_dict = {item.group_uniq_id:item for item in production_technology_designs}
         for technology_design in production_technology_designs:
             if not self_technology_design_dict.get(technology_design.group_uniq_id):
                 technology_design.write({'production_id': False})
             else:
-                technology_design.write(
-                    self_technology_design_dict.get(technology_design.group_uniq_id).get_technology_design())
+                technology_design.write(self_technology_design_dict.get(technology_design.group_uniq_id).get_technology_design())
         for technology_design in self_technology_designs:
             if not production_technology_designs_dict.get(technology_design.group_uniq_id):
                 technology_design = technology_design.get_technology_design()
@@ -113,8 +101,9 @@ class sf_technology_design(models.Model):
                 technology_design.pop('group_uniq_id')
                 self.env['sf.technology.design'].create(technology_design)
 
-    def unified_procedure_multiple_work_orders(self, self_technology_designs, production_item):
+
+
+    def unified_procedure_multiple_work_orders(self,self_technology_designs,production_item):
         technology_designs = self.env['sf.technology.design'].sudo().search(
             [('production_id', '=', production_item.id), ('active', 'in', [True, False])])
-        self.sync_technology_designs(self_technology_designs=self_technology_designs,
-                                     production_technology_designs=technology_designs)
+        self.sync_technology_designs(self_technology_designs=self_technology_designs,production_technology_designs=technology_designs)

sf_manufacturing/models/stock.py

@@ -564,13 +564,6 @@ 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):
@@ -637,87 +630,63 @@ class StockPicking(models.Model):
                     if lot_ids:
                         move.action_clear_lines_show_details()
                         move.action_show_details()
-        # 先进行设置数量
-        self.action_set_quantities_to_reservation()
         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:
+        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 == '制造前':
             # 如果是最后一张外协入库单，则设置库存位置的预留数量
-            move_in = self.move_ids
-            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()
-        picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
-        if res and self.picking_type_id.id == picking_type_out:
-            move_out = self.move_ids
-            if move_out:
-                workorder = move_out.subcontract_workorder_id
-                workorder.button_start()
+            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()
         if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
             sale_id = self.env['sale.order'].sudo().search(
                 [('name', '=', self.origin)])
@@ -848,7 +817,6 @@ 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):
@@ -859,12 +827,10 @@ 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)
-                    else:
-                        product_name = move.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:
@@ -893,12 +859,10 @@ 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)
-                    else:
-                        product_name = production_id.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:
@@ -966,6 +930,8 @@ class ReStockMove(models.Model):
         }
 
     def get_move_line(self, production_id, sorted_workorders):
+        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+        qty = production_id.product_qty
         return {
             'move_id': self.id,
             'product_id': self.product_id.id,
@@ -973,7 +939,7 @@ class ReStockMove(models.Model):
             'location_id': self.picking_id.location_id.id,
             'location_dest_id': self.picking_id.location_dest_id.id,
             'picking_id': self.picking_id.id,
-            'reserved_uom_qty': self.product_uom_qty,
+            'reserved_uom_qty': qty,
             'lot_id': production_id.move_line_raw_ids.lot_id.id,
             'company_id': self.env.company.id,
             # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -383,7 +383,7 @@
                                 <field name="process_parameters_id"
                                        attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
                                        string="参数" context="{'route_id':route_id,'production_id': production_id}"
-                                       options="{'no_create': True}"/>
+                                       options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"
@@ -427,7 +427,6 @@
                                 <field name="programming_method"/>
                                 <field name="current_programming_count"/>
                                 <field name="target_production_id"/>
-                                <field name="apply_uid"/>
                                 <field name="apply_time"/>
                                 <field name="send_time"/>
                             </tree>
@@ -603,7 +602,6 @@
                     <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,7 +22,7 @@
                     <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="可选工艺参数">
                         <field name="optional_process_parameters">
                             <tree editable="bottom">
@@ -30,9 +30,9 @@
                                 <field name="is_delete_button" invisible="1"/>
                                 <field name="code" attrs="{'readonly': True}"/>
                                 <field name="name"  required="1"/>
-                                <field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/> -->
+                                <field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/>
                                 <!-- 按钮列 -->
-                                <!-- <button name="action_create_service_product" string="创建服务产品" type="object"
+                                <button name="action_create_service_product" string="创建服务产品" type="object"
                                         class="btn-primary"
                                         attrs="{'invisible': [('is_product_button', '=', True)]}" context="{'default_process_parameter_id':id}"/>
                                 <button name="action_hide_service_products" string="删除" type="object"
@@ -41,7 +41,7 @@
                             </tree>
                         </field>
                     </page>
-                </xpath> -->
+                </xpath>
             </field>
         </record>
     </data>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -144,7 +144,7 @@
                        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"
                         groups="base.group_user,sf_base.group_sf_order_user"
                         attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
@@ -154,7 +154,7 @@
                         </span>
                         <span class="o_stat_text">采购申请</span>
                     </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,9 +677,8 @@
         <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_name" string="零件名称"/>
-                <field name="model_id" string="模型ID"/>
+                <field name="part_number" string="成品零件图号"/>
+                <field name="model_id" string="模型id"/>
             </field>
             <xpath expr="//filter[@name='progress']" position="after">
                 <filter string="待检测" name="state" domain="[('state','=','to be detected')]"/>

sf_manufacturing/views/product_template_views.xml

@@ -12,18 +12,5 @@
                 </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,7 +73,6 @@
                 <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/wizard/production_technology_re_adjust_wizard.py

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

sf_manufacturing/wizard/production_wizard.py

@@ -46,10 +46,10 @@ class ProductionWizard(models.TransientModel):
         mrp_workorder_list = self.mrp_production_id.workorder_ids.filtered(lambda kw: kw.rfid_code)
         for workorder in mrp_workorder_list:
             rfid_code = workorder.rfid_code
-            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code and wo.state != 'rework').write(
+            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code is not False).write(
                 {'rfid_code_old': rfid_code, 'rfid_code': False})
             workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
-                                           (wo.rfid_code_old or wo.rfid_code) and wo.state != 'rework')).write(
+                                           (wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
                 {'rfid_code_old': False, 'rfid_code': False})
 
         if self.is_remanufacture is True:

sf_manufacturing/wizard/rework_wizard.py

@@ -125,28 +125,13 @@ class ReworkWizard(models.TransientModel):
                 # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
                 # 2、返工CNC工单和装夹预调工单则自动解绑RFID
                 clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
-
-                # for order in rework_workorder_ids:
-                #     order.write({
-                #         'rfid_code_old': order.rfid_code,
-                #         'rfid_code': False
-                #     })
-                # 返工工单状态设置为【返工】
-                rework_workorder_ids.write({'state': 'rework'})
                 if clamp_workorder_ids:
                     for clamp_workorder_id in clamp_workorder_ids:
-                        # 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录
-                        self.production_id.workorder_ids.filtered(lambda wk: (
-                                wk.processing_panel == clamp_workorder_id.processing_panel
-                                and wk.state == 'rework' and wk.rfid_code)).write(
-                            {'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None})
-                        # 清除返工的装夹预调工单同面的非返工工单的RFID
-                        self.production_id.workorder_ids.filtered(lambda wk: (
-                                wk.processing_panel == clamp_workorder_id.processing_panel and wk.state != 'rework')).write(
-                            {'rfid_code_old': None, 'rfid_code': None})
-                # 清除其他返工工单的RFID
-                for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code):
-                    work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None})
+                        self.production_id.workorder_ids.filtered(
+                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
+                            {'rfid_code': None})
+                # 返工工单状态设置为【返工】
+                rework_workorder_ids.write({'state': 'rework'})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                 workorders_values = []
                 for work in rework_workorder_ids:
@@ -173,12 +158,8 @@ class ReworkWizard(models.TransientModel):
                     # ====新工单绑定rfid===
                     for new_work_id in new_work_ids:
                         if new_work_id.routing_type in ['CNC加工', '解除装夹']:
-                            # 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
-                            work_id = self.production_id.workorder_ids.filtered(
-                                lambda wk: (wk.processing_panel == new_work_id.processing_panel and wk.rfid_code
-                                            and wk.routing_type == '装夹预调' and wk.state != 'rework'))
-                            if work_id:
-                                new_work_id.write({'rfid_code': work_id.rfid_code})
+                            new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
+                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
                     self.production_id.detection_result_ids.filtered(
                         lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
                     panels = []  # 返工的加工面
@@ -232,13 +213,11 @@ class ReworkWizard(models.TransientModel):
                                     self.production_id.get_new_program(panel_name)
                             if self.reprogramming_num >= 0 and self.programming_state == '已下发':
                                 # ============= 处理CNC加工加工工单的 CNC程序和cmm程序 信息=============
-                                for cnc_work in new_work_ids.filtered(
-                                        lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
+                                for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'):
                                     ret = {'programming_list': []}
                                     old_cnc_rework = max(self.production_id.workorder_ids.filtered(
                                         lambda crw: crw.processing_panel == cnc_work.processing_panel
-                                                    and crw.state == 'rework' and (
-                                                            crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
+                                                    and crw.state == 'rework' and (crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')),
                                         key=lambda w: w.create_date
                                     )
                                     # 获取当前工单的CNC程序和cmm程序
@@ -280,8 +259,7 @@ class ReworkWizard(models.TransientModel):
                                     new_cnc_workorder = self.production_id.workorder_ids.filtered(
                                         lambda ap1: ap1.processing_panel == cnc_work.processing_panel
                                                     and ap1.state not in (
-                                                        'rework', 'done') and (
-                                                            ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
+                                                        'rework', 'done') and (ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工')
                                     )
                                     if not new_cnc_workorder.cnc_ids:
                                         new_cnc_workorder.write({
@@ -318,8 +296,7 @@ class ReworkWizard(models.TransientModel):
                                  'is_rework': False})
                 # ==================申请重新编程=======================
                 if self.is_reprogramming is True:
-                    self.production_id.update_programming_state(
-                        trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
+                    self.production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
                     self.production_id.write(
                         {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
                 # ================= 返工完成，制造订单状态置为加工中 ==============
@@ -340,7 +317,7 @@ class ReworkWizard(models.TransientModel):
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
                         if p.processing_panel is not False and p.processing_panel not in panel_arr:
-                            if len(panel_arr) > 0:
+                            if len(panel_arr)>0:
                                 panel_arr += ','.join(p.processing_panel)
                             else:
                                 panel_arr = p.processing_panel

sf_message/data/bussiness_node.xml

@@ -126,11 +126,6 @@
             <field name="model">mrp.production</field>
         </record>
 
-        <record id="bussiness_purchase_request" model="jikimo.message.bussiness.node">
-            <field name="name">采购申请待处理通知</field>
-            <field name="model">purchase.request</field>
-        </record>
-
         <record id="bussiness_outsourcing" model="jikimo.message.bussiness.node">
             <field name="name">委外加工采购单提醒</field>
             <field name="model">purchase.order</field>
@@ -161,13 +156,9 @@
             <field name="model">purchase.order</field>
         </record>
 
-<!--        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">-->
-<!--            <field name="name">待质检提醒</field>-->
-<!--            <field name="model">product.product</field>-->
-<!--        </record>-->
-        <record id="bussiness_quality_check_none" model="jikimo.message.bussiness.node">
-            <field name="name">待质检</field>
-            <field name="model">quality.check</field>
+        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">
+            <field name="name">待质检提醒</field>
+            <field name="model">product.product</field>
         </record>
     </data>
 

sf_message/data/template_data.xml

@@ -210,8 +210,8 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 功能刀具寿命到期提醒：
-单号：拆解单[{{code}}]({{request_url}})
-事项：{{name}}寿命已到期，需拆解</field>
+单号：拆解单[{{code}}]({{tool_expired_remind_special_url}})
+事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>
         </record>
 
         <record id="template_tool_assembly_remind" model="jikimo.message.template">
@@ -339,18 +339,6 @@
 事项：请确认委外采购单并处理。</field>
         </record>
 
-        <record id="template_purchase_request" model="jikimo.message.template">
-            <field name="name">采购申请待处理通知</field>
-            <field name="model_id" ref="purchase_request.model_purchase_request"/>
-            <field name="model">purchase.request</field>
-            <field name="bussiness_node_id" ref="bussiness_purchase_request"/>
-            <field name="msgtype">markdown</field>
-            <field name="urgency">normal</field>
-            <field name="content">### 采购申请待处理提醒：
-单号：[{{name}}]({{request_url}})
-事项：您有一张新的采购申请单待处理。</field>
-        </record>
-
         <record id="template_purchase_remind" model="jikimo.message.template">
             <field name="name">外购订单采购单提醒</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
@@ -414,28 +402,16 @@
             </field>
         </record>
 
-<!--        <record id="template_quality_check" model="jikimo.message.template">-->
-<!--            <field name="name">待质检提醒</field>-->
-<!--            <field name="model_id" ref="product.model_product_product"/>-->
-<!--            <field name="model">product.product</field>-->
-<!--            <field name="bussiness_node_id" ref="bussiness_quality_check"/>-->
-<!--            <field name="msgtype">markdown</field>-->
-<!--            <field name="urgency">normal</field>-->
-<!--            <field name="content">### 待质检提醒：-->
-<!--单号：产品[{{name}}]({{url}})-->
-<!--事项：有{{num}}个质检单需要处理。</field>-->
-<!--        </record>-->
-<!--    </data>-->
-            <record id="template_quality_check_none" model="jikimo.message.template">
+        <record id="template_quality_check" model="jikimo.message.template">
             <field name="name">待质检提醒</field>
-            <field name="model_id" ref="quality.model_quality_check"/>
-            <field name="model">quality.check</field>
-            <field name="bussiness_node_id" ref="bussiness_quality_check_none"/>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field name="model">product.product</field>
+            <field name="bussiness_node_id" ref="bussiness_quality_check"/>
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 待质检提醒：
-单号：[{{name}}]({{url}})
-事项：有一个质检单需要处理({{type_name}})。</field>
+单号：产品[{{name}}]({{url}})
+事项：有{{num}}个质检单需要处理。</field>
         </record>
     </data>
 

sf_message/models/__init__.py

@@ -14,4 +14,3 @@ from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
 from . import sf_message_product
 from . import sf_message_quality_check
-from . import sf_message_purchase_request

sf_message/models/sf_message_functional_tool_dismantle.py

@@ -1,5 +1,4 @@
 from odoo import models, api
-from urllib.parse import urlencode
 
 
 class SFMessagefunctionalToolDismantle(models.Model):
@@ -19,39 +18,12 @@ class SFMessagefunctionalToolDismantle(models.Model):
                 obj.add_queue('功能刀具寿命到期')
         return result
 
-    def _get_message(self, message_queue_ids):
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '功能刀具寿命到期':
-                content = message_queue_id.message_template_id.content
-                td_line = self.search([('id', '=', int(message_queue_id.res_id))])
-                url = self.request_url(int(message_queue_id.res_id))
-                content = content.replace('{{code}}', td_line.code).replace(
-                    '{{request_url}}', url).replace('{{name}}', td_line.name)
-                contents.append(content)
-        return contents, message_queue_ids
-
-    def request_url(self, id):
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('sf_tool_management.sf_functional_tool_dismantle_view_act').id
-        menu_id = self.env.ref('sf_tool_management.menu_sf_functional_tool_dismantle').id
-        # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
-                  'model': 'sf.functional.tool.dismantle',
-                  'view_type': 'form'}
-        # 拼接查询参数
-        tool_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + tool_string
-        return full_url
-
-    def get_special_url(self, id, tmplate_name, special_name, model_id):
+    def get_special_url(self,id,tmplate_name,special_name,model_id):
         menu_id = 0
         action_id = 0
-        if tmplate_name == '调拨入库' and special_name == 'tool_expired_remind_special_url':
+        if tmplate_name=='调拨入库' and special_name== 'tool_expired_remind_special_url':
             menu_id = self.env.ref('mrp.menu_mrp_root').id
             action_id = self.env.ref('sf_tool_management.sf_functional_tool_dismantle_view_act').id
-            return super(SFMessagefunctionalToolDismantle, self).get_url(id, menu_id, action_id, model_id)
+            return super(SFMessagefunctionalToolDismantle, self).get_url(id, menu_id, action_id,model_id)
         else:
-            return super(SFMessagefunctionalToolDismantle, self).get_special_url(id, tmplate_name, special_name,
-                                                                                 model_id)
+            return super(SFMessagefunctionalToolDismantle, self).get_special_url(id, tmplate_name, special_name, model_id)

sf_message/models/sf_message_product.py

@@ -29,18 +29,18 @@ class SFMessageProduct(models.Model):
                         '{{number}}', str(production_num)).replace(
                         '{{request_url}}', url)
                     contents.append(content)
-            # if message_queue_id.message_template_id.name == '待质检提醒':
-            #     content = message_queue_id.message_template_id.content
-            #     product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-            #     quality_check_num = self.env['quality.check'].sudo().search_count(
-            #         [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
-            #     if quality_check_num >= 1:
-            #         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-            #         action_id = self.env.ref('quality_control.quality_check_action_report').id
-            #         url_with_id = f"{url}/web#view_type=list&action={action_id}"
-            #         content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
-            #             '{{num}}', str(quality_check_num))
-            #         contents.append(content)
+            if message_queue_id.message_template_id.name == '待质检提醒':
+                content = message_queue_id.message_template_id.content
+                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                quality_check_num = self.env['quality.check'].sudo().search_count(
+                    [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
+                if quality_check_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('quality_control.quality_check_action_report').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
+                        '{{num}}', str(quality_check_num))
+                    contents.append(content)
         return contents, message_queue_ids
 
     def get_request_url(self, routing_type):

sf_message/models/sf_message_purchase_request.py

@@ -1,46 +0,0 @@
-import logging
-import re
-from odoo import models, fields, api, _
-from urllib.parse import urlencode
-
-
-class SFMessagePurchaseRequest(models.Model):
-    _name = 'purchase.request'
-    _description = "采购申请"
-    _inherit = ['purchase.request', 'jikimo.message.dispatch']
-
-    def write(self, vals):
-        original_state = {}
-        for item in self:
-            original_state.update({f'{item.id}': item.state})
-        res = super(SFMessagePurchaseRequest, self).write(vals)
-        for item in self:
-            if vals.get('state') == 'approved' and original_state.get(f'{item.id}') != 'approved':
-                item.add_queue('采购申请待处理通知')
-        return res
-
-    def _get_message(self, message_queue_ids):
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '采购申请待处理通知':
-                content = message_queue_id.message_template_id.content
-                url = self.request_url(int(message_queue_id.res_id))
-                request_line = self.env['purchase.request'].search([('id', '=', int(message_queue_id.res_id))])
-                content = content.replace('{{name}}', request_line.name).replace(
-                    '{{request_url}}', url)
-                contents.append(content)
-        return contents, message_queue_ids
-
-    def request_url(self, id):
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('purchase_request.purchase_request_form_action').id
-        menu_id = self.env.ref('purchase_request.menu_purchase_request_act').id
-        # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
-                  'model': 'purchase.request',
-                  'view_type': 'form'}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url

sf_message/models/sf_message_quality_check.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import models, fields, api, _
-from urllib.parse import urlencode
 
 
 class SFMessageQualityCheck(models.Model):
@@ -11,73 +10,25 @@ class SFMessageQualityCheck(models.Model):
     @api.model_create_multi
     def create(self, vals_list):
         result = super().create(vals_list)
-        # try:
-        #     # 判断是否为web页面创建请求
-        #     is_web_request = self.env.context.get('is_web_request', False)
-        #     if not is_web_request:
-        #         for obj in result:
-        #             jikimo_message_queue = self.get_message_queue(obj.product_id.id)
-        #             if not jikimo_message_queue:
-        #                 obj.product_id.add_queue('待质检提醒')
-        # except Exception as e:
-        #     logging.info('add_queue待质检提醒 error:%s' % e)
-        qc_ids = result.filtered(lambda qc: qc.quality_state == 'none')
-        if qc_ids:
-            message_template_id = self.env['jikimo.message.template'].sudo().search([('name', '=', '待质检提醒')])
-            for qc in qc_ids:
-                queue_id = self.env['jikimo.message.queue'].sudo().search(
-                    [('message_template_id', '=', message_template_id[-1].id), ('res_id', '=', qc.id)])
-                if not queue_id and '制造' not in [pt.name for pt in qc.point_id.picking_type_ids]:
-                    qc.add_queue('待质检')
+        try:
+            # 判断是否为web页面创建请求
+            is_web_request = self.env.context.get('is_web_request', False)
+            if not is_web_request:
+                for obj in result:
+                    jikimo_message_queue = self.get_message_queue(obj.product_id.id)
+                    if not jikimo_message_queue:
+                        obj.product_id.add_queue('待质检提醒')
+        except Exception as e:
+            logging.info('add_queue待质检提醒 error:%s' % e)
         return result
 
-    #
-    # def get_message_queue(self, res_id):
-    #     business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
-    #     message_template = self.env["jikimo.message.template"].sudo().search([
-    #         ("name", "=", '待质检提醒'),
-    #         ("bussiness_node_id", "=", business_node_id)
-    #     ], limit=1)
-    #     jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
-    #         [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
-    #          ('message_template_id', '=', message_template.id)])
-    #     return jikimo_message_queue
-    def write(self, vals):
-        original_state = {}
-        for item in self:
-            original_state.update({f'{item.id}': item.quality_state})
-        res = super(SFMessageQualityCheck, self).write(vals)
-        for item in self:
-            if vals.get('quality_state') == 'none' and original_state.get(f'{item.id}') != 'none':
-                message_template_id = self.env['jikimo.message.template'].sudo().search([('name', '=', '待质检提醒')])
-                queue_id = self.env['jikimo.message.queue'].sudo().search(
-                    [('message_template_id', '=', message_template_id[-1].id), ('res_id', '=', item.id)])
-                if not queue_id and '制造' not in [pt.name for pt in item.point_id.picking_type_ids]:
-                    item.add_queue('待质检')
-        return res
-
-    def _get_message(self, message_queue_ids):
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '待质检提醒':
-                content = message_queue_id.message_template_id.content
-                qc_line = self.search([('id', '=', int(message_queue_id.res_id))])
-                url = self.request_url(int(message_queue_id.res_id))
-                content = content.replace('{{name}}', qc_line.name).replace(
-                    '{{url}}', url).replace('{{type_name}}', qc_line.point_id.title)
-                contents.append(content)
-        return contents, message_queue_ids
-
-    def request_url(self, id):
-        url = self.env['ir.config_parameter'].get_param('web.base.url')
-        action_id = self.env.ref('quality_control.quality_check_action_main').id
-        menu_id = self.env.ref('quality_control.menu_quality_checks').id
-        # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
-                  'model': 'quality.check',
-                  'view_type': 'form'}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url
+    def get_message_queue(self, res_id):
+        business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
+        message_template = self.env["jikimo.message.template"].sudo().search([
+            ("name", "=", '待质检提醒'),
+            ("bussiness_node_id", "=", business_node_id)
+        ], limit=1)
+        jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+            [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
+             ('message_template_id', '=', message_template.id)])
+        return jikimo_message_queue

sf_mrs_connect/controllers/controllers.py

@@ -3,6 +3,9 @@ import logging
 import os
 import json
 import base64
+import traceback
+
+
 from odoo import http, fields, models
 from odoo.http import request
 from odoo.addons.sf_base.controllers.controllers import MultiInheritController
@@ -24,7 +27,6 @@ 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)
@@ -42,12 +44,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 res = {'status': -2, 'message': '查询到待工艺确认的制造订单'}
                 return json.JSONEncoder().encode(res)
             if productions:
-                # 修改需求计划中的程序工时
-                demand_plan = request.env['sf.production.demand.plan'].with_user(
-                    request.env.ref("base.user_admin")).search([('model_id', '=', ret['folder_name'])])
-                if demand_plan and ret['total_estimated_time']:
-                    demand_plan.write(
-                        {'processing_time': ret['total_estimated_time']})
 
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
@@ -66,6 +62,7 @@ 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加工的工单
@@ -82,10 +79,6 @@ 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(
@@ -97,25 +90,16 @@ 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,
-                                "零件图号：%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})
+                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "模型ID：%s" % model_id)
+                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
                                                                                                 'cancel'] and ap.processing_panel == panel)
@@ -153,114 +137,94 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 for production in productions:
                     logging.info('production====:%s' % production.name)
                     record_ids_obj = production.programming_record_ids.filtered(
-                        lambda r: r.send_time is False)
+                        lambda r: r.current_programming_count == ret['reprogramming_num'])
                     logging.info('record_ids_obj====:%s' % record_ids_obj)
                     if record_ids_obj:
-                        record_ids_obj = record_ids_obj.sorted('id')[0]
                         logging.info('record_ids_obj.reason====:%s' % record_ids_obj.reason)
-                        record_ids_obj.write({
-                            'current_programming_count': ret['reprogramming_num'],
-                            'send_time': ret['send_time'],
-                            'target_production_id': productions_reprogram,
-                            'programming_method': ret['programme_way']
-                        })
+                        record_ids_obj.write(
+                            {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
                         logging.info('已更新编程记录:%s' % record_ids_obj)
                         correct_record_ids_obj = record_ids_obj
                         correct_production_id = production.id
-                    # 更新重新编程记录
+                    if ret['reprogramming_num'] == 0:
+                        logging.info('首次下发')
+                        production.programming_record_ids.create({
+                            'number': 1,
+                            'production_id': production.id,
+                            'reason': '首次下发',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': False,
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建首次下发的编程记录:%s' % production.name)
+                    elif ret['reset_flag']:
+                        logging.info('重置状态')
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '重置状态',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': False,
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建重置状态的编程记录:%s' % production.name)
+                    elif ret['manufacturing_type'] == 'rework':
+                        logging.info('返工')
+                        rework_record_ids_obj = production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '返工',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建返工的编程记录:%s' % production.name)
+                        logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
+                        # rework_production_id = production.id
+                        # logging.info('rework_production_id====:%s' % rework_production_id)
+                    elif ret['manufacturing_type'] == 'scrap':
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '报废',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                    elif ret['manufacturing_type'] == 'invalid_tool_rework':
+                        logging.info('无效功能刀具')
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': '无效功能刀具',
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
+                        logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
+                    elif ret['reprogramming_reason']:
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': ret['reprogramming_reason'],
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
                     else:
-                        if ret['reset_flag']:
-                            logging.info('重置状态')
-                            production.programming_record_ids.create({
-                                'number': len(production.programming_record_ids) + 1,
-                                'production_id': production.id,
-                                'reason': '重置状态',
-                                'programming_method': ret['programme_way'],
-                                'current_programming_count': ret['reprogramming_num'],
-                                'target_production_id': productions_reprogram,
-                                'apply_time': False,
-                                'send_time': ret['send_time'],
-                            })
-                        else:
-                            logging.info('无对应状态，不需更新编程记录')
-                    # if ret['reprogramming_num'] == 0:
-                    #     logging.info('首次下发')
-                    #     production.programming_record_ids.create({
-                    #         'number': 1,
-                    #         'production_id': production.id,
-                    #         'reason': '首次下发',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': False,
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建首次下发的编程记录:%s' % production.name)
-                    # elif ret['reset_flag']:
-                    #     logging.info('重置状态')
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '重置状态',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': False,
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建重置状态的编程记录:%s' % production.name)
-                    # elif ret['manufacturing_type'] == 'rework':
-                    #     logging.info('返工')
-                    #     rework_record_ids_obj = production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '返工',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建返工的编程记录:%s' % production.name)
-                    #     logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
-                    #     # rework_production_id = production.id
-                    #     # logging.info('rework_production_id====:%s' % rework_production_id)
-                    # elif ret['manufacturing_type'] == 'scrap':
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '报废',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    # elif ret['manufacturing_type'] == 'invalid_tool_rework':
-                    #     logging.info('无效功能刀具')
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': '无效功能刀具',
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    #     logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
-                    # elif ret['reprogramming_reason']:
-                    #     production.programming_record_ids.create({
-                    #         'number': len(production.programming_record_ids) + 1,
-                    #         'production_id': production.id,
-                    #         'reason': ret['reprogramming_reason'],
-                    #         'programming_method': ret['programme_way'],
-                    #         'current_programming_count': ret['reprogramming_num'],
-                    #         'target_production_id': productions_reprogram,
-                    #         'apply_time': ret['trigger_time'],
-                    #         'send_time': ret['send_time'],
-                    #     })
-                    
+                        logging.info('无对应状态，不需更新编程记录')
 
                 for production in productions:
                     logging.info('production====:%s' % production.name)
@@ -279,7 +243,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 'current_programming_count': correct_record_ids_obj.current_programming_count,
                                 'target_production_id': correct_record_ids_obj.target_production_id,
                                 'apply_time': correct_record_ids_obj.apply_time,
-                                'apply_uid': correct_record_ids_obj.apply_uid.id,
                                 'send_time': correct_record_ids_obj.send_time,
                             })
                             logging.info('已创建正确的制造订单的编程记录:%s' % production.name)
@@ -313,7 +276,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
         except Exception as e:
             res = {'status': -1, 'message': '系统解析失败'}
             request.cr.rollback()
-            logging.info('get_cnc_processing_create error:%s' % e)
+            traceback_error = traceback.format_exc()
+            logging.error("get_cnc_processing_create error:%s" % traceback_error)
             return json.JSONEncoder().encode(res)
 
 

sf_mrs_connect/models/sync_common.py

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

sf_plan/models/custom_plan.py

@@ -15,7 +15,6 @@ 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,7 +170,6 @@
                     <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/__manifest__.py

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

sf_quality/models/quality.py

@@ -5,7 +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, float_compare
+from odoo.tools import float_round
 
 
 class QualityCheck(models.Model):
@@ -208,96 +208,4 @@ class QualityCheck(models.Model):
                         'title': '警告',
                         'message': '不合格数量不能超过已检数量'
                     }
-                }
-            
-    total_qty_readonly = fields.Boolean(compute='_compute_total_qty_readonly', store=True)
-
-    def _compute_total_qty_readonly(self):
-        report_test_type_id = self.env.ref('sf_quality.test_type_factory_inspection').id
-        for record in self:
-            if (record.measure_on != 'move_line' or record.workorder_id is False) and record.point_id.test_type_id.id != report_test_type_id:
-                record.total_qty_readonly = True
-            else:
-                record.total_qty_readonly = False
-
-    def preview_doc(self):
-        """预览出厂检验报告"""
-        self.ensure_one()
-        picking_qty = sum(self.picking_id.move_ids.filtered(lambda m: m.product_id == self.product_id).mapped('product_uom_qty'))
-        if not self._check_total_qty(picking_qty) and self.quality_state in ['waiting', 'none']:
-            return {
-                'type': 'ir.actions.client',
-                'tag': 'jikimo_confirm_dialog',
-                'params': {
-                    'active_id': self.id,
-                    'message': f"拣货调拨单号{self.picking_id.name}需求数量为{picking_qty}，当前质量检查单产品数量为{self.total_qty}，数量不一致，是否确认继续？",
-                    'next_model': self._name,
-                    'next_method': 'preview_doc_confirm',
-                    'context': self.env.context
-                }
-            }
-        action = self.env.ref("sf_quality.action_report_quality_inspection_preview").read()[0]
-        return action
-    
-
-    def preview_doc_confirm(self):
-        self.ensure_one()
-        action = self.env.ref("sf_quality.action_report_quality_inspection_preview").read()[0]
-        action['context'] = {
-            'active_id': self.id,
-            'active_ids': [self.id]
-        }
-        return action
-
-    def _check_total_qty(self, compare_qty):
-        """
-            检查质量检查单的总数量是否匹配
-        """
-        self.ensure_one()
-        return float_compare(float(self.total_qty), compare_qty, self.picking_id.product_id.uom_id.rounding) == 0
-    
-
-    def preview_do_publish(self):
-        self.ensure_one()
-        self._check_part_number()
-        self._check_measure_line()
-        self._check_check_qty_and_total_qty()
-
-        picking_qty = sum(self.picking_id.move_ids.filtered(lambda m: m.product_id == self.product_id).mapped('product_uom_qty'))
-        if not self._check_total_qty(picking_qty):
-            return {
-                'type': 'ir.actions.client',
-                'tag': 'jikimo_confirm_dialog',
-                'params': {
-                    'active_id': self.id,
-                    'message': f"拣货调拨单号{self.picking_id.name}需求数量为{picking_qty}，当前质量检查单产品数量为{self.total_qty}，数量不一致，是否确认继续？",
-                    'next_model': self._name,
-                    'next_method': 'preview_do_publish_confirm',
-                    'context': self.env.context,
-                }
-            }
-        else:
-            return self.do_publish()
-        
-
-    def preview_do_publish_confirm(self):
-        self.ensure_one()
-        return {
-            'name': '发布确认',
-            'type': 'ir.actions.act_window',
-            'res_model': 'quality.check.publish.wizard',
-            'view_mode': 'form',
-            'views': [[False, 'form']],
-            'target': 'new',
-            'context': {
-                'default_check_id': self.id,
-                'default_product_name': self.product_id.name,
-                'default_total_qty': self.total_qty,
-                'default_check_qty': self.check_qty,
-                'default_measure_count': self.column_nums,
-                'default_item_count': len(self.measure_line_ids),
-                'default_old_report_name': self.old_report_name,
-                'default_publish_status': self.publish_status,
-                'is_web_request': True
-            }
-        }
+                }

sf_quality/views/quality_check_view.xml

@@ -73,50 +73,47 @@
             <xpath expr="//header" position="inside">
                 <field name="is_out_check" invisible="1"/>
                 <field name="publish_status" invisible="1"/>              
-                <button name="preview_doc" 
+                <button name="%(sf_quality.action_report_quality_inspection_preview)d" 
                 string="预览"
-                type="object" 
+                type="action" 
                 class="oe_highlight" attrs="{'invisible': [('is_out_check', '=', False)]}"/>
 <!--                  --><!-- 如果还需要打印按钮 -->
 <!--                 <button name="%(sf_quality.action_report_quality_inspection)d"  -->
 <!--                         string="打印报告"  -->
 <!--                         type="action"/> -->
 <!--                 <button name="do_preview" string="预览" type="object" class="btn-primary" attrs="{'invisible': [('is_out_check', '=', False)]}"/> -->
-                <button name="preview_do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
+                <button name="do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
 <!--                 <button name="get_report_url" string="ceshi" type="object" class="btn-primary"/> -->
 <!--                 <button name="upload_factory_report" string="upload_factory_report" type="object" class="btn-primary"/> -->
                 <button name="do_cancel_publish" string="取消发布" type="object" class="btn-primary" confirm="确定取消发布吗？" attrs="{'invisible': ['|',('is_out_check', '=', False), ('publish_status', '!=', 'published')]}"/>
-                <button name="preview_do_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
-            </xpath>
-            <xpath expr="//field[@name='total_qty']" position="before">
-                <field name="total_qty_readonly" invisible="1"/>
+                <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': [('total_qty_readonly', '=', True)],
+                    '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': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        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': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        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': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        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>

sf_sale/__manifest__.py

@@ -17,7 +17,6 @@
         'wizard/sale_order_wizard_views.xml',
         'wizard/purchase_order_wizard_views.xml',
         'data/cron_data.xml',
-        'data/documents_data.xml',
         'views/sale_team.xml',
         'views/sale_order_view.xml',
         'views/res_partner_view.xml',

sf_sale/data/documents_data.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <!-- 创建采购合同文件夹 -->
-        <record id="documents_sales_contracts_folder" model="documents.folder">
-            <field name="name">销售合同</field>
-            <field name="description">存放销售合同相关文件</field>
-            <field name="sequence">8</field>
-        </record>
-        <record id="documents_sales_contracts_folder_1" model="documents.folder">
-            <field name="name">下单凭证</field>
-            <field name="parent_folder_id" ref="documents_sales_contracts_folder"/>
-        </record>
-    </data>
-</odoo>

sf_sale/models/quick_easy_order.py

@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError

sf_sale/models/quick_easy_order_old.py

@@ -5,8 +5,8 @@ import requests
 import os
 from datetime import datetime
 # from OCC.Core.GProp import GProp_GProps
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path

sf_sale/models/sale_order.py

@@ -63,15 +63,9 @@ class ReSaleOrder(models.Model):
 
     model_display_version = fields.Char('模型展示版本', default="v1")
 
-    contract_code = fields.Char('合同编号')
-    contract_date = fields.Date('合同日期')
-    contract_document_id = fields.Many2one('documents.document', string='合同文件')
-    contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
-    contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
-
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
-                          deadline_of_delivery, payments_way, pay_way, order_number, remark, state='sale',
+                          deadline_of_delivery, payments_way, pay_way, order_number, state='sale',
                           model_display_version='v1'):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
@@ -90,7 +84,6 @@ class ReSaleOrder(models.Model):
             'pay_way': pay_way,
             'order_code': order_number,
             'model_display_version': model_display_version,
-            'remark': remark,
         }
         if deadline_of_delivery:
             # deadline_of_delivery字段存在为false字符串情况
@@ -201,15 +194,18 @@ class ReSaleOrder(models.Model):
     @api.depends('order_line.purchase_line_ids.order_id')
     def _compute_purchase_order_count(self):
         for order in self:
-            order.purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
-            order.consignment_purchase_order_count = len(order._get_sale_to_purchase_1('outsourcing'))
+            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(
+                lambda po: po.purchase_type in ['outsourcing']))
 
     def action_view_purchase_orders(self):
         """
         采购
         """
         self.ensure_one()
-        purchase_order_ids = self._get_sale_to_purchase('outsourcing')
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type not in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -227,20 +223,13 @@ 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 not in ['outsourcing']).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))
-
     def action_view_consignment_purchase_orders(self):
         """
         委外加工
         """
         self.ensure_one()
-        outsourcing_purchase_order_ids = self._get_sale_to_purchase_1('outsourcing')
+        outsourcing_purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -258,14 +247,6 @@ class ReSaleOrder(models.Model):
             })
         return action
 
-    def _get_sale_to_purchase_1(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'
@@ -365,10 +346,10 @@ class RePurchaseOrder(models.Model):
             if purchase.order_line[0].product_id.categ_id.name == '坯料':
                 if purchase.order_line[0].product_id.materials_type_id.gain_way == '外协':
                     purchase.purchase_type = 'outsourcing'
-            # request_lines = self.order_line.mapped('purchase_request_lines')
-            # # 检查是否存在 is_subcontract 为 True 的行
-            # if any(line.is_subcontract for line in request_lines):
-            #     purchase.purchase_type = 'consignment'
+            request_lines = self.order_line.mapped('purchase_request_lines')
+            # 检查是否存在 is_subcontract 为 True 的行
+            if any(line.is_subcontract for line in request_lines):
+                purchase.purchase_type = 'consignment'
 
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
@@ -377,13 +358,12 @@ class RePurchaseOrder(models.Model):
 
     @api.depends('partner_id')
     def _compute_user_id(self):
-        for item in self:
-            if not item.user_id:
-                if item.partner_id:
-                    item.user_id = item.partner_id.purchase_user_id.id
-                    # self.state = 'purchase'
-                else:
-                    item.user_id = item.env.user.id
+        if not self.user_id:
+            if self.partner_id:
+                self.user_id = self.partner_id.purchase_user_id.id
+                # self.state = 'purchase'
+            else:
+                self.user_id = self.env.user.id
 
     @api.constrains('order_line')
     def check_order_line(self):
@@ -404,28 +384,28 @@ class RePurchaseOrder(models.Model):
                 if not line.taxes_id:
                     raise UserError('请对【产品】中的【税】进行选择')
 
-    # def get_purchase_request(self, consecutive_process_parameters, production):
-    #     result = []
-    #     for pp in consecutive_process_parameters:
-    #         server_template = self.env['product.template'].search(
-    #             [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
-    #              ('detailed_type', '=', 'service')])
-    #         # route_ids
-    #         result.append({
-    #             "product_id": server_template.product_variant_id.id,
-    #             'related_product': production.product_id.id,
-    #             "name": production.procurement_group_id.name,
-    #             "date_required": fields.Datetime.now(),
-    #             "product_uom_id":server_template.uom_id.id,
-    #             "product_qty": production.product_qty,
-    #             "request_id": False,
-    #             "move_dest_ids": False,
-    #             "orderpoint_id": False,
-    #             'is_subcontract':True,
-    #             'group_id':production.procurement_group_id.id,
-    #             'production_name':pp.production_id.name,
-    #         })
-    #     return result
+    def get_purchase_request(self, consecutive_process_parameters, production):
+        result = []
+        for pp in consecutive_process_parameters:
+            server_template = self.env['product.template'].search(
+                [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
+                 ('detailed_type', '=', 'service')])
+            # route_ids
+            result.append({
+                "product_id": server_template.product_variant_id.id,
+                '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": production.product_qty,
+                "request_id": False,
+                "move_dest_ids": False,
+                "orderpoint_id": False,
+                'is_subcontract':True,
+                'group_id':production.procurement_group_id.id,
+                'production_name':pp.production_id.name,
+            })
+        return result
 
     def get_purchase_order(self, consecutive_process_parameters, production, product_id_to_production_names):
         for pp in consecutive_process_parameters:

sf_sale/views/sale_order_view.xml

@@ -198,20 +198,7 @@
                     </div>
                     <field name="date_order" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])], 'required': True}" nolabel="1"/>
                 </xpath>
-                <xpath expr="//notebook/page[@name='customer_signature']" position="after">
-                    <page string="合同" name="contract_documents"
-                          attrs="{'invisible': [('contract_document_id', '=', False)]}">
-                        <group>
-                            <group>
-                                <field name="contract_document_id" invisible="1"/>
-                                <field name="contract_file_name" invisible="1"/>
-                                <field name="contract_file"
-                                       widget="adaptive_viewer"
-                                       filename="contract_file_name"/>
-                            </group>
-                        </group>
-                    </page>
-                </xpath>
+
             </field>
         </record>
 

sf_tool_management/controllers/controllers.py

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

sf_tool_management/models/base.py

@@ -833,8 +833,8 @@ class FunctionalToolAssembly(models.Model):
             location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
             if location_lots:
                 return location_lots[0]
-        raise ValidationError(
-            f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位库存不足，请先进行盘点入库')
+        raise ValidationError(f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位库存不足，请先进行盘点入库')
+
 
     def _get_inventory_bom(self, inventory_id):
         """获取BOM的刀具物料产品信息"""
@@ -894,25 +894,25 @@ class FunctionalToolAssembly(models.Model):
             tool_material_ids = self._get_all_material_location_lot(tool_data.get('pad_ids'))
             tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_4')
 
-        action = {
-            "type": "ir.actions.act_window",
-            "target": "new",
-            "domain": [('cutting_tool_type', '=', tool_type)],
-            "context": {'tool_id': self.id, 'search_default_bom_ids': 1, 'tool_material_ids': tool_material_ids.ids}
-        }
         if tool_type == '刀柄':
-            action.update({
+            return {
+                "type": "ir.actions.act_window",
                 "res_model": "product.product",
                 "views": [[tool_material_tree_id.id, "tree"],
-                          [self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]]
-            })
+                          [self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]],
+                "target": "new",
+                "domain": [('id', 'in', tool_material_ids.ids)],
+                "context": {'tool_id': self.id}
+            }
         elif tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
-            action.update({
+            return {
+                "type": "ir.actions.act_window",
                 "res_model": "sf.shelf.location.lot",
-                "views": [[tool_material_tree_id.id, "tree"],
-                          [self.env.ref('sf_tool_management.view_shelf_location_lot_search').id, 'search']]
-            })
-        return action
+                "views": [[tool_material_tree_id.id, "tree"]],
+                "target": "new",
+                "domain": [('id', 'in', tool_material_ids.ids)],
+                "context": {'tool_id': self.id}
+            }
 
     def _get_all_material_location_lot(self, material_ids):
         """ 获取所有满足条件 """

sf_tool_management/models/functional_tool.py

@@ -58,6 +58,20 @@ class FunctionalCuttingToolEntity(models.Model):
     safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
                                         string='功能刀具安全库存', readonly=True)
 
+    @api.onchange('functional_tool_status')
+    def _onchange_functional_tool_status(self):
+        for item in self:
+            if item:
+                if item.functional_tool_status == '报警':
+                    self.create_tool_dismantle()
+
+    def set_functional_tool_status(self):
+        # self.write({
+        #     'functional_tool_status': '报警'
+        # })
+        self.functional_tool_status = '报警'
+        self.create_tool_dismantle()
+
     def create_tool_dismantle(self):
         for item in self:
             # 创建报警刀具拆解单
@@ -136,17 +150,6 @@ class FunctionalCuttingToolEntity(models.Model):
                         else:
                             # 原刀从线边出库
                             item.tool_in_out_stock_location_1(location_id, tool_room_id)
-                    # 系统中该刀在线边刀架其他位置，需先清除这个位置的刀具信息
-                    shelf_location_id = self.env['sf.shelf.location'].sudo().search([
-                        ('product_sn_id', '=', item.barcode_id.id)])
-                    if shelf_location_id:
-                        shelf_location_id.write(
-                            {'product_id': None,
-                             'product_sn_id': None,
-                             'tool_rfid': None,
-                             "tool_name_id": None,
-                             'product_num': 0,
-                             'location_status': '空闲'})
                     # 新刀入库到线边
                     item.create_stock_move(pre_manufacturing_id, location_id)
                     item.current_shelf_location_id = location_id.id

sf_tool_management/models/stock.py

@@ -256,22 +256,6 @@ class ProductProduct(models.Model):
         })
         return stock_lot
 
-    def search(self, domain, offset=0, limit=None, order=None, count=False):
-        context = self.env.context
-        tool_material_ids = context.get('tool_material_ids')
-        if tool_material_ids:
-            if context.get('default_tool_bom_id'):
-                domain += [('id', 'in', tool_material_ids)]
-                return super(ProductProduct, self).search(domain, offset=0, limit=None, order=None, count=False)
-            else:
-                domain_1 = domain + [('id', 'in', tool_material_ids)]
-                domain_2 = domain + [('id', 'not in', tool_material_ids)]
-                res_1 = super(ProductProduct, self).search(domain_1, offset=0, limit=None, order=None, count=False)
-                res_2 = super(ProductProduct, self).search(domain_2, offset=0, limit=None, order=None, count=False)
-            return res_1 + res_2
-        else:
-            return super(ProductProduct, self).search(domain, offset=0, limit=None, order=None, count=False)
-
     def get_stock_lot_name(self, obj):
         """
             生成功能刀具序列号
@@ -333,22 +317,6 @@ class SfShelfLocationLot(models.Model):
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image', '适配刀片形状',
                                          related='product_id.fit_blade_shape_id')
 
-    def search(self, domain, offset=0, limit=None, order=None, count=False):
-        context = self.env.context
-        tool_material_ids = context.get('tool_material_ids')
-        if tool_material_ids:
-            if context.get('default_tool_bom_id'):
-                domain += [('id', 'in', tool_material_ids)]
-                return super(SfShelfLocationLot, self).search(domain, offset=0, limit=None, order=None, count=False)
-            else:
-                domain_1 = domain + [('id', 'in', tool_material_ids)]
-                domain_2 = domain + [('id', 'not in', tool_material_ids)]
-                res_1 = super(SfShelfLocationLot, self).search(domain_1, offset=0, limit=None, order=None, count=False)
-                res_2 = super(SfShelfLocationLot, self).search(domain_2, offset=0, limit=None, order=None, count=False)
-            return res_1 + res_2
-        else:
-            return super(SfShelfLocationLot, self).search(domain, offset=0, limit=None, order=None, count=False)
-
     @api.depends('lot_id')
     def _compute_product_id(self):
         for item in self:

sf_tool_management/views/functional_tool_views.xml

@@ -42,6 +42,7 @@
             <field name="arch" type="xml">
                 <form create="0" edit="0" delete="0">
                     <header>
+                        <button name="set_functional_tool_status" string="报警" type="object" invisible="1"/>
                         <!--                        <button name="enroll_functional_tool_entity" string="功能刀具注册" type="object"-->
                         <!--                                class="btn-primary"/>-->
                         <field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>
@@ -187,7 +188,6 @@
                                         <field name="current_location" string="当前位置"/>
                                         <field name="current_shelf_location_id" string="当前货位"
                                                attrs="{'invisible': [('current_shelf_location_id', '=', False)]}"/>
-                                        <field name="create_date" string="装刀时间"/>
                                     </group>
                                 </group>
                             </page>

sf_tool_management/views/stock.xml

@@ -33,15 +33,10 @@
     </record>
 
     <record id="view_tool_product_search" model="ir.ui.view">
-        <field name="name">刀柄产品搜索视图</field>
         <field name="model">product.product</field>
-        <field name="priority" eval="10"/>
         <field name="arch" type="xml">
             <search>
                 <field name="name"/>
-                <field name="specification_id"/>
-                <field name="brand_id"/>
-                <filter string="bom物料" name="bom_ids"  domain="[]" context="{'default_tool_bom_id': 1}"/>
             </search>
         </field>
     </record>
@@ -146,17 +141,4 @@
             </tree>
         </field>
     </record>
-
-    <record id="view_shelf_location_lot_search" model="ir.ui.view">
-        <field name="name">sf.shelf.location.lot.search</field>
-        <field name="model">sf.shelf.location.lot</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="product_id"/>
-                <field name="specification_id"/>
-                <field name="brand_id"/>
-                <filter string="bom物料" name="bom_ids"  domain="[]" context="{'default_tool_bom_id': 1}"/>
-            </search>
-        </field>
-    </record>
 </odoo>

sf_warehouse/__manifest__.py

@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': '机企猫智能工厂 库存管理',
-    'version': '1.2',
+    'version': '1.0',
     'summary': '智能工厂库存管理',
     'sequence': 1,
     'description': """
@@ -23,16 +23,17 @@
     'demo': [
     ],
     'assets': {
+
         'web.assets_qweb': [
         ],
+
         'web.assets_backend': [
             # 'sf_warehouse/static/src/js/vanilla-masker.min.js',
             'sf_warehouse/static/src/css/kanban_color_change.scss',
             'sf_warehouse/static/src/js/custom_kanban_controller.js',
             'sf_warehouse/static/src/xml/custom_kanban_controller.xml',
-            'sf_warehouse/static/src/css/kanban_location_custom.scss',
-            'sf_warehouse/static/src/js/shelf_location_search.js',
         ]
+
     },
     'license': 'LGPL-3',
     'installable': True,

sf_warehouse/migrations/1.2/post-migrate.py

@@ -1,21 +0,0 @@
-import logging
-from odoo import api, SUPERUSER_ID
-
-_logger = logging.getLogger(__name__)
-
-def migrate(cr, version):
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    sf_shelf_model = env["sf.shelf"]
-    sf_shelf_location_model = env["sf.shelf.location"]
-    shelves = sf_shelf_model.search([])
-    for shelf in shelves:
-        shelf_barcode = shelf.barcode or ""
-        if not shelf_barcode:
-            continue
-        # locations = sf_shelf_location_model.search([("shelf_id", "=", shelf.id)], order="id asc")
-        locations = shelf.location_ids.sorted('id')
-        for index, location in enumerate(locations, start=1):
-            new_barcode = f"{shelf_barcode}-{index:03d}"
-            location.barcode = new_barcode
-        cr.commit()
-        _logger.info('货架【%s】的%d个货位被更新' % (shelf.name, len(locations)))

sf_warehouse/models/sync_common.py

@@ -107,47 +107,37 @@ class MrsShelfLocationDataSync(models.Model):
                     equipment_id.register_equipment_tool()
 
             shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info()
-            self.set_shelf_location(shelfinfo)
+            total_data = self.get_total_data()
+            print('shelfinfo:', shelfinfo)
+            for item in shelfinfo:
+                logging.info('货架已获取信息:%s' % item)
+                shelf_barcode = self.find_our_code(total_data, item['Postion'])
+                location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)], limit=1)
+                if location_id:
+                    # 如果是线边刀库信息,则对功能刀具移动生成记录
+                    if 'Tool' in item['Postion']:
+                        tool = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                            [('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
+                        tool.tool_in_out_stock_location(location_id)
+                        if tool:
+                            location_id.product_sn_id = tool.barcode_id.id
+                            # 修改功能刀具状态
+                            if item.get('State') == '报警':
+                                if tool.functional_tool_status != item.get('State'):
+                                    tool.write({
+                                        'functional_tool_status': item['State']
+                                    })
+                        else:
+                            location_id.product_sn_id = False
+                            if item['RfidCode']:
+                                logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
+                    else:
+                        stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
+                        if stock_lot_obj:
+                            location_id.product_sn_id = stock_lot_obj.id
+                        else:
+                            location_id.product_sn_id = False
 
         except Exception as e:
             logging.info("库区信息同步失败:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
-
-    def set_shelf_location(self, shelfinfo):
-        print('shelfinfo:', shelfinfo)
-        total_data = self.get_total_data()
-        for item in shelfinfo:
-            logging.info('货架已获取信息:%s' % item)
-            shelf_barcode = self.env['sf.shelf.location.datasync'].sudo().find_our_code(
-                total_data, item['Postion'])
-            location_id = self.env['sf.shelf.location'].sudo().search(
-                [('barcode', '=', shelf_barcode)],
-                limit=1)
-            if location_id:
-                # 如果是线边刀库信息,则对功能刀具移动生成记录
-                if 'Tool' in item['Postion']:
-                    tool = self.env['sf.functional.cutting.tool.entity'].sudo().search(
-                        [('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
-                    tool.sudo().tool_in_out_stock_location(location_id)
-                    if tool:
-                        location_id.product_sn_id = tool.barcode_id.id
-                        if item.get('State') == '报警' and tool.functional_tool_status != '报警':
-                            # 创建报警刀具拆解单和刀具报警记录
-                            tool.create_tool_dismantle()
-                        # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
-                        if 'LifeStd' in item and 'LifeUse' in item:
-                            tool.sudo().write({
-                                'max_lifetime_value': item['LifeStd'],
-                                'used_value': item['LifeUse'],
-                                'functional_tool_status': item['State'],
-                            })
-                    else:
-                        location_id.product_sn_id = False
-                        if item['RfidCode']:
-                            logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
-            else:
-                stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
-                if stock_lot_obj:
-                    location_id.product_sn_id = stock_lot_obj.id
-                else:
-                    location_id.product_sn_id = False