Merge branch 'refs/heads/feature/采购申请优化' into release/release_2.13

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

@@ -18,8 +18,9 @@ class MrpProduction(models.Model):
             #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
             #     item.pr_mp_count = len(pr_ids)
             # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-            mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
+            first_mp = self.env['mrp.production'].search(
+                    [('origin', '=', item.origin)], limit=1, order='id asc')
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
             item.pr_mp_count = len(pr_ids)
             # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
 
@@ -36,8 +37,9 @@ class MrpProduction(models.Model):
         # else:
         #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
         # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-        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)])
 
 
         action = {

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,43 +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):
-        """
-            将取消的采购订单关联的库存移动撤销
-        """
-        move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
-        res =super(PurchaseOrder, self).button_cancel()
-        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,7 +92,7 @@ class PurchaseRequestLine(models.Model):
                 continue
             if record.product_id.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)

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_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/controllers/controllers.py

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

sf_base/decorators/api_log.py

@@ -27,27 +27,21 @@ def api_log(name=None, requester=None):
                 
                 # 执行原始函数
                 result = func(*args, **kwargs)
-                origin_result = result
-                if isinstance(result, str):
-                    result = json.loads(result)
                 
                 # 计算响应时间
                 end_time = datetime.now()
                 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', 500),
                     'requester': requester,
                     'responser': '智能工厂'
                 }
@@ -55,7 +49,7 @@ def api_log(name=None, requester=None):
                 # 异步创建日志记录
                 request.env['api.request.log'].sudo().with_context(tracking_disable=True).create(log_vals)
                 
-                return origin_result
+                return result
                 
             except Exception as e:
                 _logger.error(f"API日志记录失败: {str(e)}")

sf_base/models/api_log.py

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

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_dlm/models/product_supplierinfo.py

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

sf_dlm_management/models/mrp_routing_workcenter.py

@@ -2,8 +2,8 @@
 # from odoo import fields, models, api
 # from odoo.exceptions import UserError
 # from odoo.tools import str2bool
-
-
+#
+#
 # class ResMrpRoutingWorkcenter(models.Model):
 #     _inherit = 'mrp.routing.workcenter'
 #     def init(self):

sf_dlm_management/models/sf_production_common.py

@@ -3,12 +3,12 @@
 # from odoo import fields, models, api
 # from odoo.exceptions import UserError
 # from odoo.tools import str2bool
-
-
+#
+#
 # class SfProductionProcessParameter(models.Model):
 #     _inherit = 'sf.production.process.parameter'
-
-
+#
+#
 #     @api.model
 #     def create(self, vals):
 #         # if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
@@ -26,7 +26,7 @@
 #     def create_service_product(self):
 #         service_categ = self.env.ref(
 #             'sf_dlm.product_category_surface_technics_sf').sudo()
-
+#
 #         product_name = f"{self.process_id.name}_{self.name}"
 #         product_id = self.env['product.template'].search(
 #             [("name", '=', product_name)])
@@ -48,7 +48,7 @@
 #                     'partner_id': res_partner.id,
 #                     'price': 1, })],
 #             })
-
+#
 #     def create_work_center(self):
 #         production_process_parameter = self
 #         if not production_process_parameter.process_id:
@@ -70,7 +70,7 @@
 #                 production_process_parameter.routing_id = routing_id.id
 #             else:
 #                 production_process_parameter.routing_id = workcenter_id.id
-
+#
 #     def init(self):
 #         super(SfProductionProcessParameter, self).init()
 #         # 在模块初始化时触发计算字段的更新

sf_manufacturing/__manifest__.py

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

sf_manufacturing/controllers/controllers.py

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

sf_manufacturing/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,3 @@ from . import quick_easy_order
 from . import purchase_order
 from . import quality_check
 from . import purchase_request_line
-# from . import stock_warehouse_orderpoint

sf_manufacturing/models/mrp_production.py

@@ -279,7 +279,7 @@ class MrpProduction(models.Model):
                     production_id.part_name = production_id.product_id.part_name
                 elif production_id.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -636,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,
@@ -661,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'])
@@ -801,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:
@@ -953,13 +928,12 @@ class MrpProduction(models.Model):
     #                         'sf_stock.stock_route_process_outsourcing').id)]
     #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
     #             cur_request_line = request_line_list[0]
-    #             # cur_request_line['product_qty'] = cur_request_line['product_qty']
+    #             cur_request_line['product_qty'] = len(request_line_list)
     #             cur_request_line['request_id'] = pr.id
     #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
     #             cur_request_line.pop('group_id', None)
     #             cur_request_line.pop('production_name', None)
     #             self.env["purchase.request.line"].create(cur_request_line)
-    #         pr.button_approved()
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
@@ -1797,6 +1771,7 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
+        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1865,7 +1840,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_workorder.py

@@ -71,7 +71,7 @@ class ResMrpWorkOrder(models.Model):
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
     # pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
-
+    #
     # @api.depends('state')
     # def _compute_pr_mp_count(self):
     #     for item in self:
@@ -85,7 +85,6 @@ class ResMrpWorkOrder(models.Model):
     #             item.pr_mp_count = len(pr_ids)
     #         else:
     #             item.pr_mp_count = 0
-
     @api.depends('state')
     def _compute_back_button_display(self):
         for record in self:
@@ -130,14 +129,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 +220,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()
@@ -454,6 +439,7 @@ 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']:
@@ -499,7 +485,6 @@ class ResMrpWorkOrder(models.Model):
     #             'view_mode': 'tree,form',
     #         })
     #     return action
-
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -528,8 +513,7 @@ class ResMrpWorkOrder(models.Model):
         return result
 
     def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
-                  ('state', '!=', 'cancel')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
         # domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
         # domain = [('group_id', '=', self.production_id.procurement_group_id.id), ('purchase_type', '=', 'consignment')]
         purchase_orders = self.env['purchase.order'].search(domain, order='id desc')
@@ -752,25 +736,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)]
@@ -1263,13 +1243,6 @@ class ResMrpWorkOrder(models.Model):
         }]
         return workorders_values_str
 
-    # def check_lot_exists(self, picking_id, lot_id):
-    #     return bool(
-    #         picking_id.move_ids.move_line_ids.filtered(
-    #             lambda line: line.lot_id.id == lot_id
-    #         )
-    #     )
-
     def _process_compute_state(self):
         sorted_workorders = sorted(self, key=lambda x: x.sequence)
         for workorder in sorted_workorders:
@@ -1291,17 +1264,10 @@ class ResMrpWorkOrder(models.Model):
                         workorder.state = 'pending'
                     continue
             # ================= 如果制造订单制造类型为【人工线下加工】==========================
-            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
-            # picking_ids = workorder.production_id.picking_ids.filtered(
-            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
-            # exists = any(
-            #     move_line.lot_id == lot_id
-            #     for picking in picking_ids
-            #     for move in picking.move_ids
-            #     for move_line in move.move_line_ids
-            # )
             if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'):
+                    and workorder.production_id.schedule_state == '已排'
+                    and len(workorder.production_id.picking_ids.filtered(
+                        lambda w: w.state not in ['done', 'cancel'])) == 0):
                 # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     if workorder.production_id.state == 'rework':
@@ -1310,9 +1276,6 @@ class ResMrpWorkOrder(models.Model):
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
                         workorder.state = 'ready'
-                        # picking_id = workorder.production_id.picking_ids.filtered(
-                        #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                        # move_out = picking_id.move_ids
                         move_out = workorder.move_subcontract_workorder_ids[1]
                         for mo in move_out:
                             if mo.state != 'done':
@@ -1353,10 +1316,6 @@ class ResMrpWorkOrder(models.Model):
                             if purchase_orders_id.state == 'purchase':
                                 workorder.state = 'ready'
                                 move_out = workorder.move_subcontract_workorder_ids[1]
-                                # picking_id = workorder.production_id.picking_ids.filtered(
-                                #     lambda
-                                #         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                                # move_out = picking_id.move_ids
                                 for mo in move_out:
                                     if mo.state != 'done':
                                         mo.write({'state': 'assigned', 'production_id': False})
@@ -1366,6 +1325,7 @@ class ResMrpWorkOrder(models.Model):
                             else:
                                 workorder.state = 'waiting'
 
+
     @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
                  'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                  'production_id.programming_state')
@@ -1397,8 +1357,7 @@ class ResMrpWorkOrder(models.Model):
             # 判断是否有坯料的序列号信息
             boolean = False
             if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and \
-                        self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
+                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
                     if self.production_id.move_raw_ids[0].move_line_ids:
                         if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
                             boolean = True
@@ -1431,10 +1390,6 @@ class ResMrpWorkOrder(models.Model):
         if self.routing_type == '表面工艺':
             if self.is_subcontract is True:
                 move_out = self.move_subcontract_workorder_ids[1]
-                # picking_id = self.production_id.picking_ids.filtered(
-                #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
-                # move_out = picking_id.move_ids
-                # move_out = self.move_subcontract_workorder_ids[1]
                 # move_out = self.env['stock.move'].search(
                 #     [('location_id', '=', self.env['stock.location'].search(
                 #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
@@ -1600,17 +1555,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:
@@ -1845,7 +1808,7 @@ class ResMrpWorkOrder(models.Model):
             orderby=orderby,
             lazy=lazy
         )
-
+    
     model_id = fields.Char('模型ID', related='production_id.model_id')
 
 

sf_manufacturing/models/product_template.py

@@ -795,7 +795,7 @@ class ResProductMo(models.Model):
         for record in self:
             if record.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d+)', record.name)
+                match = re.search(r'(S\d{5}-\d)', record.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)

sf_manufacturing/models/purchase_order.py

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

sf_manufacturing/models/purchase_request_line.py

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

sf_manufacturing/models/sale_order.py

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

@@ -20,13 +20,13 @@ class SfProductionProcessParameter(models.Model):
     # is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
     # is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
     # routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
-
+    #
     # @api.depends('outsourced_service_products')
     # def _compute_service_products(self):
     #     for record in self:
     #         # 假设取第一条作为主明细
-    #         record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
-
+    #         record.service_products = record.outsourced_service_products.id if record.outsourced_service_products else False
+    #
     # def _inverse_service_products(self):
     #     for record in self:
     #         if record.service_products:
@@ -45,7 +45,7 @@ class SfProductionProcessParameter(models.Model):
     #     for record in self:
     #         if len(record.outsourced_service_products) > 1:
     #             raise ValidationError("工艺参数不能与多个产品关联")
-
+    #
     # @api.onchange('outsourced_service_products')
     # def _onchange_validate_partner_limit(self):
     #     for record in self:
@@ -58,7 +58,7 @@ class SfProductionProcessParameter(models.Model):
     #             record.is_product_button = True
     #         else:
     #             record.is_product_button = False
-
+    #
     # def has_wksp_prefix(self):
     #     """
     #     判断字符串是否以WKSP开头（不区分大小写）

sf_manufacturing/models/stock.py

@@ -564,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):
@@ -638,62 +631,6 @@ class StockPicking(models.Model):
                         move.action_clear_lines_show_details()
                         move.action_show_details()
         res = super().button_validate()
-        # lot_ids = None
-        # product_ids = self.move_ids.mapped('product_id')
-        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
-        #     lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
-        # production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
-        # if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
-        #     # 如果是最后一张外协入库单，则设置库存位置的预留数量
-        #     for production_id in production_ids:
-        #         if lot_ids:
-        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
-        #             # picking_ids = production_id.picking_ids.filtered(
-        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
-        #             if lot_id in lot_ids:
-        #                 workorder_id = production_id.workorder_ids.filtered(
-        #                     lambda a: a.state == 'progress' and a.is_subcontract)
-        #                 if not workorder_id:
-        #                     continue
-        #                 workorder_id.button_finish()
-        #         else:
-        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
-        #             if not workorder_id:
-        #                 continue
-        #             workorder_id.button_finish()
-        #     # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
-        #     # picking_ids = workorder.production_id.picking_ids.filtered(
-        #     #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
-
-        #     # if move_in:
-        #     #     workorder = move_in.subcontract_workorder_id
-        #     #     workorders = workorder.production_id.workorder_ids
-        #     #     subcontract_workorders = workorders.filtered(
-        #     #         lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
-        #     #     # if workorder == subcontract_workorders[-1]:
-        #     #     #     self.env['stock.quant']._update_reserved_quantity(
-        #     #     #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
-        #     #     #         lot_id=move_in.move_line_ids.lot_id,
-        #     #     #         package_id=False, owner_id=False, strict=False
-        #     #     #     )
-        #     #     workorder.button_finish()
-        # if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
-        #     for production_id in production_ids:
-        #         if lot_ids:
-        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
-        #             # picking_ids = production_id.picking_ids.filtered(
-        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
-        #             if lot_id in lot_ids:
-        #                 workorder_id = production_id.workorder_ids.filtered(
-        #                     lambda a: a.state == 'progress' and a.is_subcontract)
-        #                 if not workorder_id:
-        #                     continue
-        #                 workorder_id.button_finish()
-        #         else:
-        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
-        #             if not workorder_id:
-        #                 continue
-        #             workorder_id.button_start()
         picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
         if res is True and self.picking_type_id.id == picking_type_in:
             # 如果是最后一张外协入库单，则设置库存位置的预留数量
@@ -846,7 +783,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):
@@ -857,7 +793,7 @@ class ReStockMove(models.Model):
                     move.part_name = move.product_id.part_name
                 elif move.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
+                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -889,7 +825,7 @@ class ReStockMove(models.Model):
                             continue
                     product_name = ''
                     logging.info('制造订单的产品 %s', production_id.product_id.name)
-                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)

sf_manufacturing/models/stock_warehouse_orderpoint.py

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

sf_manufacturing/views/mrp_production_addional_change.xml

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

sf_manufacturing/views/mrp_workorder_view.xml

@@ -144,17 +144,17 @@
                        statusbar_visible="pending,waiting,ready,progress,to be detected,done,rework"/>
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
-                <!-- <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
-                        icon="fa-credit-card"
-                        groups="base.group_user,sf_base.group_sf_order_user"
-                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
-                    <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="pr_mp_count"/>
-                        </span>
-                        <span class="o_stat_text">采购申请</span>
-                    </div>
-                </button> -->
+<!--                <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"-->
+<!--                        icon="fa-credit-card"-->
+<!--                        groups="base.group_user,sf_base.group_sf_order_user"-->
+<!--                        attrs="{'invisible': [('pr_mp_count', '=', 0)]}">-->
+<!--                    <div class="o_field_widget o_stat_info">-->
+<!--                        <span class="o_stat_value">-->
+<!--                            <field name="pr_mp_count"/>-->
+<!--                        </span>-->
+<!--                        <span class="o_stat_text">采购申请</span>-->
+<!--                    </div>-->
+<!--                </button>-->
                 <button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
                         icon="fa-credit-card"
                         groups="base.group_user,sf_base.group_sf_order_user"
@@ -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/views/stock_warehouse_orderpoint.xml

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

sf_manufacturing/wizard/production_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

@@ -24,7 +24,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)
@@ -60,6 +59,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加工的工单
@@ -76,10 +76,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(
@@ -99,12 +95,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                     logging.info('panel_file_path:%s' % panel_file_path)
                                     
                             # 向编程单中添加二维码
-                            request.env['printing.utils'].add_qr_code_to_pdf(
-                                panel_file_path,
-                                model_id,
-                                "模型ID：%s" % model_id,
-                                "零件图号：%s" % part_number if part_number else None
-                            )
+                            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'
@@ -143,114 +134,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)
@@ -269,7 +240,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)

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):
@@ -126,15 +126,7 @@ class QualityCheck(models.Model):
         # todo 需修改
         val = ['0037818516']
         logging.info('获取到的工单信息%s' % val)
-        # r = requests.post(crea_url, json=val, headers=headers)
-        r = self.env['api.request.log'].log_request(
-            'get',
-            crea_url,
-            name='零件特采',
-            responser='中控系统',
-            json=val,
-            headers=headers
-        )
+        r = requests.post(crea_url, json=val, headers=headers)
         ret = r.json()
         logging.info('_register_quality_check:%s' % ret)
         if ret['Succeed']:
@@ -208,96 +200,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/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'
@@ -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):
@@ -413,11 +393,10 @@ class RePurchaseOrder(models.Model):
     #         # route_ids
     #         result.append({
     #             "product_id": server_template.product_variant_id.id,
-    #             'related_product': production.product_id.id,
     #             "name": production.procurement_group_id.name,
     #             "date_required": fields.Datetime.now(),
     #             "product_uom_id":server_template.uom_id.id,
-    #             "product_qty": production.product_qty,
+    #             "product_qty": 1,
     #             "request_id": False,
     #             "move_dest_ids": False,
     #             "orderpoint_id": False,

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

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

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

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="正常,报警,已拆除"/>

sf_warehouse/models/model.py

@@ -514,15 +514,7 @@ class ShelfLocation(models.Model):
         crea_url = config['center_control_url'] + "/AutoDeviceApi/GetLocationInfos"
 
         params = {'DeviceId': device_id}
-        # r = requests.get(crea_url, params=params, headers=headers)
-        r = self.env['api.request.log'].log_request(
-            'get',
-            crea_url,
-            name='库位信息',
-            responser='中控系统',
-            params=params,
-            headers=headers
-        )
+        r = requests.get(crea_url, params=params, headers=headers)
 
         ret = r.json()
 

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