修改出厂检验报告预览数据

Merge Request: Merge branch 'feature/采购消息通知' into feature/销售合同优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2164

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -119,13 +119,24 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
             this.listherHeaderBodyNum()
         })
         const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
+        
         if(treeModifiers) {
-            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.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();
+                    
+                })
+            }
         }
         return this._super(...arguments);
     },

jikimo_purchase_request/__manifest__.py

@@ -14,7 +14,9 @@
         '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/models/mrp_production.py

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

jikimo_purchase_request/models/purchase_order.py

@@ -1,4 +1,5 @@
 from odoo import api, fields, models, _
+from odoo.tools import float_compare
 
 
 class PurchaseOrder(models.Model):
@@ -13,4 +14,43 @@ class PurchaseOrder(models.Model):
         ('done', '完成'),
         ('cancel', '取消'),
         ('rejected', '已驳回')
-    ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
+    ], 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

jikimo_purchase_request/models/stock_picking.py

@@ -33,3 +33,15 @@ 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,12 +79,4 @@ 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/views/purchase_request_menu_views.xml

@@ -0,0 +1,21 @@
+<?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,18 +15,29 @@
                 <field name="part_number"/>
                 <field name="part_name"/>
             </xpath>
-            <xpath expr="//button[@name='button_done']" position="attributes">
+             <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='button_in_progress']/following-sibling::button[1]" position="attributes">
+            <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>
+
     <record id="view_purchase_request_line_tree_sf" model="ir.ui.view">
         <field name="name">purchase.request.line.sf.tree</field>
         <field name="model">purchase.request.line</field>
@@ -72,4 +83,9 @@
             </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_tier_validation/__manifest__.py

@@ -1,10 +1,9 @@
 # -*- 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,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
-from . import models
+from . import models
+from . import stock_rule

jikimo_purchase_request_tier_validation/models/models.py

@@ -22,3 +22,9 @@ 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

@@ -0,0 +1,16 @@
+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/models/mrp_workorder.py

@@ -9,7 +9,7 @@ class MrpWorkorder(models.Model):
     exception_ids = fields.One2many('jikimo.workorder.exception', 'workorder_id', string='工单异常记录')
 
     def write(self, values):
-        if values.get('test_results') and self.exception_ids:
+        if 'test_results' in values and self.exception_ids:
             pending_exception = self.exception_ids.filtered(
                 lambda exc: exc.state == 'pending' and exc.exception_code == 'YC0005'
             )

quality_control/models/quality.py

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

sf_base/decorators/api_log.py

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

sf_base/models/api_log.py

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

sf_base/views/api_log_views.xml

@@ -5,13 +5,15 @@
         <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"/>
-                <field name="status"/>
+                <field name="response_time" sum="0"/>
+                <field name="requester"/>
+                <field name="responser"/>
+                <field name="create_date" string="请求时间"/>
+                <field name="status" sum="0"/>
             </tree>
         </field>
     </record>
@@ -32,6 +34,8 @@
                         <group>
                             <field name="response_time"/>
                             <field name="status"/>
+                            <field name="requester"/>
+                            <field name="responser"/>
                             <field name="create_date" string="请求时间"/>
                         </group>
                     </group>
@@ -48,6 +52,23 @@
         </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_manufacturing/controllers/main.py

@@ -45,6 +45,8 @@ 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'):
+                order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

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,13 +636,17 @@ 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,
@@ -657,6 +661,16 @@ 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'])
@@ -787,6 +801,17 @@ 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:
@@ -1772,7 +1797,6 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
-        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1841,6 +1865,7 @@ 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

@@ -744,21 +744,25 @@ 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 = tomorrow + ' 00:00:00'
-        tomorrow_end = tomorrow + ' 23:59:59'
+        tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+        tomorrow_start = f"{tomorrow} 00:00:00"
+        tomorrow_end = f"{tomorrow} 23:59:59"
         logging.info('tomorrow:%s' % tomorrow)
         sql = """
           SELECT *
           FROM mrp_workorder
           WHERE state!='rework'
-          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
+          AND (date_planned_start + interval '8 hours') >= %s::timestamp
+          AND (date_planned_finished + interval '8 hours') <= %s::timestamp
           """
         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(production_line)
+            params.append(line.id)
         self.env.cr.execute(sql, params)
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]

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

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

sf_manufacturing/models/sale_order.py

@@ -190,7 +190,30 @@ 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/stock.py

@@ -857,7 +857,7 @@ class ReStockMove(models.Model):
                     move.part_name = move.product_id.part_name
                 elif move.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -889,7 +889,7 @@ class ReStockMove(models.Model):
                             continue
                     product_name = ''
                     logging.info('制造订单的产品 %s', production_id.product_id.name)
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)

sf_manufacturing/views/mrp_production_addional_change.xml

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

sf_manufacturing/wizard/rework_wizard.py

@@ -125,11 +125,17 @@ class ReworkWizard(models.TransientModel):
                 # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
                 # 2、返工CNC工单和装夹预调工单则自动解绑RFID
                 clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
+
+                vals_list = [{
+                    'id': order.id,
+                    'rfid_code_old': order.rfid_code,
+                    'rfid_code': False
+                } for order in rework_workorder_ids]
+                rework_workorder_ids.write(vals_list)
                 if clamp_workorder_ids:
                     for clamp_workorder_id in clamp_workorder_ids:
-                        self.production_id.workorder_ids.filtered(
-                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                            {'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'})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单

sf_message/data/bussiness_node.xml

@@ -126,6 +126,11 @@
             <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>
@@ -156,9 +161,13 @@
             <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 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>
     </data>
 

sf_message/data/template_data.xml

@@ -339,6 +339,18 @@
 事项：请确认委外采购单并处理。</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"/>
@@ -402,16 +414,28 @@
             </field>
         </record>
 
-        <record id="template_quality_check" model="jikimo.message.template">
+<!--        <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">
             <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="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="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 待质检提醒：
-单号：产品[{{name}}]({{url}})
-事项：有{{num}}个质检单需要处理。</field>
+单号：[{{name}}]({{url}})
+事项：有一个质检单需要处理({{type_name}})。</field>
         </record>
     </data>
 

sf_message/models/__init__.py

@@ -14,3 +14,4 @@ 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_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

@@ -0,0 +1,43 @@
+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 = self.state
+        res = super(SFMessagePurchaseRequest, self).write(vals)
+        if vals.get('state') == 'approved' and original_state != 'approved':
+            self.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,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import models, fields, api, _
+from urllib.parse import urlencode
 
 
 class SFMessageQualityCheck(models.Model):
@@ -10,25 +11,70 @@ 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)
+        # 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('待质检')
         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 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 = self.quality_state
+        res = super(SFMessageQualityCheck, self).write(vals)
+        if res and vals.get('quality_state') == 'none' and original_state != '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', '=', self.id)])
+            if not queue_id and '制造' not in [pt.name for pt in self.point_id.picking_type_ids]:
+                self.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

sf_mrs_connect/controllers/controllers.py

@@ -143,94 +143,114 @@ 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.current_programming_count == ret['reprogramming_num'])
+                        lambda r: r.send_time is False)
                     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(
-                            {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
+                        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']
+                        })
                         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:
-                        logging.info('无对应状态，不需更新编程记录')
+                        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'],
+                    #     })
+                    
 
                 for production in productions:
                     logging.info('production====:%s' % production.name)
@@ -249,6 +269,7 @@ 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_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'],
+    'depends': ['quality_control', 'web_widget_model_viewer', 'sf_manufacturing','jikimo_attachment_viewer', 'jikimo_confirm_dialog'],
     '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
+from odoo.tools import float_round, float_compare
 
 
 class QualityCheck(models.Model):
@@ -208,4 +208,96 @@ 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,47 +73,50 @@
             <xpath expr="//header" position="inside">
                 <field name="is_out_check" invisible="1"/>
                 <field name="publish_status" invisible="1"/>              
-                <button name="%(sf_quality.action_report_quality_inspection_preview)d" 
+                <button name="preview_doc" 
                 string="预览"
-                type="action" 
+                type="object" 
                 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="do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
+                <button name="preview_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="do_re_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
+                <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"/>
             </xpath>
             <xpath expr="//field[@name='total_qty']" position="attributes">
                 <attribute name="attrs">{
                     'invisible': ['&amp;', '|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False), '|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
-                    'readonly': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
+                    'readonly': [('total_qty_readonly', '=', True)],
                     'on_change': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)]
                 }</attribute>
             </xpath>
             <xpath expr="//field[@name='total_qty']" position="after">
                 <label for="workorder_qty_to_test"
-                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
                     <field name="workorder_qty_to_test" attrs="{'readonly': 0, 'on_chnage': 1}"/>
                     <field name="uom_id"/>
                 </div>
                 <label for="workorder_qty_tested"
-                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
                     <field name="workorder_qty_tested" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
                     <field name="uom_id"/>
                 </div>
                 <label for="workorder_qty_test_failed"
-                    attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
                 <div class="o_row"
-                        attrs="{'invisible': ['|', '&amp;', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('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,6 +17,7 @@
         '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

@@ -0,0 +1,15 @@
+<?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,6 +63,10 @@ class ReSaleOrder(models.Model):
 
     model_display_version = fields.Char('模型展示版本', default="v1")
 
+    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, state='sale',
@@ -194,18 +198,15 @@ 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_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']))
+            order.purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
+            order.consignment_purchase_order_count = len(order._get_sale_to_purchase_1('outsourcing'))
 
     def action_view_purchase_orders(self):
         """
         采购
         """
         self.ensure_one()
-        purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type not in ['outsourcing']).ids
+        purchase_order_ids = self._get_sale_to_purchase('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -223,13 +224,20 @@ 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_purchase_orders().filtered(
-            lambda po: po.purchase_type in ['outsourcing']).ids
+        outsourcing_purchase_order_ids = self._get_sale_to_purchase_1('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -247,6 +255,14 @@ 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'

sf_sale/views/sale_order_view.xml

@@ -198,7 +198,20 @@
                     </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/models/functional_tool.py

@@ -150,6 +150,17 @@ 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_warehouse/models/sync_common.py

@@ -121,12 +121,13 @@ class MrsShelfLocationDataSync(models.Model):
                         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']
-                                    })
+                            # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
+                            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']: