解决采购申请创建的采购单取消后导致后续单据无法就绪的问题

Merge Request: 客供料的制造订单，不显示采购申请的智能按钮

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2199

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -119,7 +119,9 @@ 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);
@@ -127,6 +129,15 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
                     this.mergeColumns(this.props.merge_fields,  data)
                 })
             }
+            if(treeModifiers.pacthResize) {
+
+                owl.onPatched(() => {
+                    this.columnWidths = null;
+                    this.freezeColumnWidths();
+                    
+                })
+            }
+        }
         return this._super(...arguments);
     },
     setRequired() {

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

@@ -9,18 +9,12 @@ class MrpProduction(models.Model):
     @api.depends('state')
     def _compute_pr_mp_count(self):
         for item in self:
-            # if item.product_id.product_tmpl_id.single_manufacturing == True and not item.is_remanufacture:
+            if item.product_id.is_customer_provided:
-            #     first_order = self.env['mrp.production'].search(
+                item.pr_mp_count = 0
-            #         [('origin', '=', item.origin), ('product_id', '=', item.product_id.id)], limit=1, order='id asc')
+            else:
-            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
-            #     item.pr_mp_count = len(pr_ids)
-            # else:
-            #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)])
-            #     item.pr_mp_count = len(pr_ids)
                 # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-            first_mp = self.env['mrp.production'].search(
+                mrp_names = self.env['mrp.production'].search([('origin', '=', item.origin)]).mapped('name')
-                    [('origin', '=', item.origin)], limit=1, order='id asc')
+                pr_ids = self.env['purchase.request'].sudo().search([('origin', 'in', mrp_names)])
-            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')])
 
@@ -29,18 +23,10 @@ class MrpProduction(models.Model):
         采购请求
         """
         self.ensure_one()
-        # pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
-        # if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
-        #     first_order = self.env['mrp.production'].search(
-        #         [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
-        # else:
-        #     pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
-        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
-        first_mp = self.env['mrp.production'].search(
-                    [('origin', '=', self.origin)], limit=1, order='id asc')
-        pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
 
+        # 由于采购申请合并了所有销售订单行的采购，所以不区分产品
+        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 = {
             'res_model': 'purchase.request',
@@ -54,7 +40,7 @@ class MrpProduction(models.Model):
         else:
             action.update({
                 'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids)],
+                'domain': [('id', 'in', pr_ids.ids)],
                 'view_mode': 'tree,form',
             })
         return 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):
@@ -14,3 +15,50 @@ class PurchaseOrder(models.Model):
         ('cancel', '取消'),
         ('rejected', '已驳回')
     ], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
+
+
+    def button_confirm(self):
+        res = super(PurchaseOrder, self).button_confirm()
+        # 取消反向调拨单
+        reverse_move_ids = self.env['stock.move'].search([
+            ('origin', '=', self.name),
+            ('purchase_line_id', '=', False),
+            ('state', '!=', 'done')
+        ])
+        if reverse_move_ids:
+            reverse_move_ids.picking_id.action_cancel()
+        return res
+    
+    def button_cancel(self):
+        """
+            1. 先将采购订单行与目标库存移动断开链接，避免采购单取消后，调拨单被调整为mts的问题
+            2. 取消采购订单
+            3. 将采购订单行与目标库存移动重新建立链接
+        """
+        created_purchase_request_line_ids = {}
+        if self.order_line.move_dest_ids.created_purchase_request_line_id:
+            move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
+            created_purchase_request_line_ids = {move.id: move.created_purchase_request_line_id for move in move_ids}
+            self.order_line.write({'move_dest_ids': [(5, 0, 0)]})
+        res =super(PurchaseOrder, self).button_cancel()
+        for move_id, created_purchase_request_line_id in created_purchase_request_line_ids.items():
+            self.env['stock.move'].browse(move_id).created_purchase_request_line_id = created_purchase_request_line_id
+        # if move_ids.mapped('created_purchase_request_line_id'):
+        #     move_ids.write({'state': 'waiting', 'is_done': False})
+        return res
+
+    def write(self, vals):
+        res = super(PurchaseOrder, self).write(vals)
+        if 'state' in vals and vals['state'] == 'purchase':
+            purchase_request = self.order_line.purchase_request_lines.request_id
+            if purchase_request:
+                finished = True
+                # 判断该采购申请所有明细行是否都完成
+                for purchase_request_line in purchase_request.line_ids:
+                    finished_qty = sum(purchase_request_line.purchase_lines.filtered(lambda line: line.state == 'purchase').mapped('product_qty'))
+                    if float_compare(finished_qty ,purchase_request_line.product_qty, precision_rounding=purchase_request_line.product_id.uom_id.rounding) < 0:
+                        finished = False
+                        break
+                if finished:
+                    purchase_request.button_done()
+        return res

jikimo_purchase_request/models/purchase_request.py

@@ -2,6 +2,7 @@ import re
 import ast
 from odoo import models, fields, api, _
 from itertools import groupby
+from odoo.tools import float_compare
 
 
 class PurchaseRequest(models.Model):
@@ -36,11 +37,14 @@ class PurchaseRequest(models.Model):
         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:
@@ -50,17 +54,17 @@ class PurchaseRequest(models.Model):
         discrepancies = []
         for product_id, qty in product_qty_map.items():
             if product_id in product_summary:
-                if product_summary[product_id] != qty:
+                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"
+            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 += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单确认的数量 {order_qty}。\n"
                 # 添加确认框
             message += "确认关闭？"
             return {
@@ -96,7 +100,8 @@ 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")
@@ -145,6 +150,8 @@ class PurchaseRequestLine(models.Model):
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
+                else:
+                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:

jikimo_purchase_request/models/stock_picking.py

@@ -36,10 +36,12 @@ class StockPicking(models.Model):
 
     def _action_done(self):
         res = super(StockPicking, self)._action_done()
-        # 将采购申请明细行的move_dest_ids设置为backorder_ids
+        # 将新产生的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]
+               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

@@ -18,12 +18,26 @@
              <xpath expr="//button[@name='button_done']" position="attributes">
                 <attribute name="class"/>
             </xpath>
-            <xpath expr="//button[@name='button_in_progress']/following-sibling::button[1]" position="attributes">
+              <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>
+
     <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>
@@ -69,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 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_test_generate_product_name/__init__.py

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

jikimo_test_generate_product_name/__manifest__.py

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

jikimo_test_generate_product_name/models/__init__.py

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

jikimo_test_generate_product_name/models/product_template.py

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

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

@@ -35,16 +35,19 @@ 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="response_time" sum="0"/>
-                <field name="status"/>
+                <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_bf_connect/models/http.py

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

sf_demand_plan/__init__.py

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

sf_demand_plan/controllers/__init__.py

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

sf_demand_plan/controllers/controllers.py

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

sf_demand_plan/models/sale_order.py

@@ -4,6 +4,12 @@ from odoo import models, fields, api, _
 class ReSaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    mrp_production_ids = fields.Many2many(
+        'mrp.production',
+        compute='_compute_mrp_production_ids',
+        string='与此销售订单相关联的制造订单',
+        groups='mrp.group_mrp_user', store=True)
+
     def sale_order_create_line(self, product, item):
         ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
         vals = {

sf_demand_plan/models/sf_production_demand_plan.py

@@ -14,7 +14,6 @@ class SfProductionDemandPlan(models.Model):
 
     def _get_machining_precision(self):
         machinings = self.env['sf.machining.accuracy'].sudo().search([])
-
         list = [(m.sync_id, m.name) for m in machinings]
         return list
 
@@ -35,7 +34,8 @@ class SfProductionDemandPlan(models.Model):
     sale_order_id = fields.Many2one(comodel_name="sale.order",
                                     string="销售订单", readonly=True)
     sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
-                                         string="销售订单行", readonly=True)
+                                         string="销售订单明细", readonly=True)
+    sale_order_line_number = fields.Char(string='销售订单行', compute='_compute_sale_order_line_number', store=True)
     company_id = fields.Many2one(
         related='sale_order_id.company_id',
         store=True, index=True, precompute=True)
@@ -89,9 +89,9 @@ class SfProductionDemandPlan(models.Model):
         string='订单状态',
         related='sale_order_line_id.state')
     route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
-    contract_date = fields.Date('合同日期')
+    contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
     date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
-    contract_code = fields.Char('合同号')
+    contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
     plan_remark = fields.Text("计划备注")
     material_check = fields.Selection([
         ('0', "未齐套"),
@@ -99,8 +99,8 @@ class SfProductionDemandPlan(models.Model):
     ], string='投料齐套检查', compute='_compute_material_check', store=True)
     processing_time = fields.Char('程序工时', readonly=True)
     planned_start_date = fields.Date('计划开工日期')
-    actual_start_date = fields.Date('实际开工日期', compute='_compute_actual_start_date', store=True)
+    actual_start_date = fields.Datetime('实际开工日期', compute='_compute_actual_start_date', store=True)
-    actual_end_date = fields.Date('实际完工日期', compute='_compute_actual_end_date', store=True)
+    actual_end_date = fields.Datetime('实际完工日期', compute='_compute_actual_end_date', store=True)
     print_count = fields.Char('打印次数', default='T0C0', readonly=True)
     sequence = fields.Integer('序号')
 
@@ -160,13 +160,23 @@ class SfProductionDemandPlan(models.Model):
                     if pending_productions:
                         record.status = '50'  # 待下达生产
                     # 检查所有制造订单的排程单状态
-                    if record.sale_order_id.mrp_production_ids and all(
+                    if record.sale_order_id.mrp_production_ids:
-                            order.product_id == record.product_id and order.schedule_state != '未排' for order in
+                        product_productions = record.sale_order_id.mrp_production_ids.filtered(
-                            record.sale_order_id.mrp_production_ids):
+                            lambda p: p.product_id.id == record.product_id.id
+                        )
+                        if product_productions and all(order.schedule_state != '未排' for order in product_productions):
                             record.status = '60'  # 已下达
                 if sale_order_state == 'cancel' or not record.sale_order_line_id:
                     record.status = '100'  # 取消
 
+    @api.depends('sale_order_line_id.product_id.name')
+    def _compute_sale_order_line_number(self):
+        for line in self:
+            if line.product_id:
+                line.sale_order_line_number = line.sale_order_line_id.product_id.name[-1]
+            else:
+                line.sale_order_line_number = None
+
     @api.depends('product_id.part_number', 'product_id.model_name')
     def _compute_part_number(self):
         for line in self:
@@ -191,7 +201,7 @@ class SfProductionDemandPlan(models.Model):
     def _compute_materials_id(self):
         for line in self:
             if line.product_id:
-                line.materials_id = f"{line.product_id.materials_id.name}*{line.product_id.materials_type_id.name}"
+                line.materials_id = f"{line.product_id.materials_id.name}/{line.product_id.materials_type_id.name}"
             else:
                 line.materials_id = None
 
@@ -232,7 +242,7 @@ class SfProductionDemandPlan(models.Model):
                     lambda mo: mo.product_id == record.product_id)
                 if manufacturing_orders:
                     start_dates = [
-                        workorder.date_start.date() for mo in manufacturing_orders
+                        workorder.date_start for mo in manufacturing_orders
                         for workorder in mo.workorder_ids if workorder.date_start
                     ]
                     record.actual_start_date = min(start_dates) if start_dates else None
@@ -249,9 +259,11 @@ class SfProductionDemandPlan(models.Model):
                 manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
                     lambda mo: mo.product_id == record.product_id)
                 finished_orders = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
-                if len(finished_orders) >= record.product_uom_qty:
+                sum_product_qty = sum(finished_orders.mapped('product_qty'))
+                if finished_orders and float_compare(sum_product_qty, record.product_uom_qty,
+                                                     precision_rounding=record.product_id.uom_id.rounding) >= 0:
                     end_dates = [
-                        workorder.date_finished.date() for mo in finished_orders
+                        workorder.date_finished for mo in finished_orders
                         for workorder in mo.workorder_ids if workorder.date_finished
                     ]
                     record.actual_end_date = max(end_dates) if end_dates else None
@@ -288,61 +300,17 @@ class SfProductionDemandPlan(models.Model):
                 raise ValidationError("计划开工日期必须大于或等于今天。")
 
     def release_production_order(self):
+        if not self.planned_start_date:
+            raise ValidationError("请先填写计划开工日期")
         pro_plan_list = self.env['sf.production.plan'].search(
             [('product_id', '=', self.product_id.id), ('state', '=', 'draft')])
         sf_production_line = self.env['sf.production.line'].sudo().search(
             [('name', '=', '1#CNC自动生产线')], limit=1)
-        current_datetime = datetime.now() + timedelta(minutes=3)
+        if sf_production_line:
-        current_hour = current_datetime.hour + current_datetime.minute / 60
+            now = datetime.now()
-        date_planned_start = None
+            time_part = (now + timedelta(minutes=3)).time()
-        production_lines = sf_production_line.mrp_workcenter_ids.filtered(lambda b: "自动生产线" in b.name)
+            date_part = fields.Date.from_string(self.planned_start_date)
-        if production_lines:
+            date_planned_start = datetime.combine(date_part, time_part)
-            if not production_lines.deal_with_workcenter_calendar(current_datetime):
-                attendance_list = production_lines.resource_calendar_id.attendance_ids
-                # 获取所有工作日规则并按星期几分组
-                attendance_by_day = {}
-                for attendance in attendance_list:
-                    if attendance.dayofweek not in attendance_by_day:
-                        attendance_by_day[attendance.dayofweek] = []
-                    attendance_by_day[attendance.dayofweek].append(attendance)
-
-                for day_offset in range(0, 8):
-                    check_date = current_datetime + timedelta(days=day_offset)
-                    # 日期为星期几
-                    check_day = production_lines.get_current_day_of_week(check_date)
-                    if check_day in attendance_by_day:
-                        day_attendances = attendance_by_day[check_day]
-                        if day_offset == 0:
-                            for attendance in day_attendances:
-                                if current_hour < attendance.hour_to:
-                                    # 找到下一个有效时间段
-                                    if current_hour < attendance.hour_from:
-                                        # 使用开始时间
-                                        date_planned_start = check_date.replace(
-                                            hour=int(attendance.hour_from),
-                                            minute=int((attendance.hour_from % 1) * 60),
-                                            second=0,
-                                            microsecond=0
-                                        )
-                                    else:
-                                        continue
-                                    break
-                        else:
-                            # 不是今天，使用第一个工作时间段
-                            attendance = day_attendances[0]
-                            date_planned_start = check_date.replace(
-                                hour=int(attendance.hour_from),
-                                minute=int((attendance.hour_from % 1) * 60),
-                                second=0,
-                                microsecond=0
-                            )
-
-                        if date_planned_start:
-                            break
-            else:
-                date_planned_start = current_datetime
-
-        if date_planned_start:
             pro_plan_list.production_line_id = sf_production_line.id
             pro_plan_list.date_planned_start = date_planned_start
             for pro_plan in pro_plan_list:
@@ -395,12 +363,12 @@ class SfProductionDemandPlan(models.Model):
                             )
                             for order in purchase_orders
                         )
-                        if total_purchase_quantity < record.product_uom_qty:
+                        if float_compare(total_purchase_quantity, record.product_uom_qty,
+                                         precision_rounding=record.product_id.uom_id.rounding) == -1:
                             pr_ids = self.env['purchase.request'].sudo().search(
-                                [('origin', 'like', mrp_production[0].name), ('state', '!=', 'done')])
+                                [('line_ids.product_id', 'in', raw_materials.ids), ('state', '!=', 'done')])
                             outsourcing_purchase_request.extend(pr_ids.ids)
             elif record.supply_method in ('purchase', 'outsourcing'):
-                pr_ids = None
                 purchase_orders = self.env['purchase.order'].sudo().search([
                     ('state', 'in', ('purchase', 'done')),
                     ('order_line.product_id', '=', record.product_id.id)
@@ -413,7 +381,9 @@ class SfProductionDemandPlan(models.Model):
                     )
                     for order in purchase_orders
                 )
-                if total_purchase_quantity < record.product_uom_qty:
+
+                if float_compare(total_purchase_quantity, record.product_uom_qty,
+                                 precision_rounding=record.product_id.uom_id.rounding) == -1:
                     pr_ids = self.env['purchase.request'].sudo().search(
                         [('origin', 'like', record.sale_order_id.name), ('state', '!=', 'done')])
                     outsourcing_purchase_request.extend(pr_ids.ids)
@@ -435,7 +405,9 @@ class SfProductionDemandPlan(models.Model):
                         )
                         for order in product_purchase_orders
                     )
-                    if total_outsourcing_purchase_quantity / total_product_qty < record.product_uom_qty:
+                    quantity = total_outsourcing_purchase_quantity / total_product_qty
+                    if float_compare(quantity, record.product_uom_qty,
+                                     precision_rounding=record.product_id.uom_id.rounding) == -1:
                         purchase_request = self.env['purchase.request'].sudo().search(
                             [('line_ids.product_id', 'in', bom_product_ids.ids),
                              ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
@@ -450,7 +422,9 @@ class SfProductionDemandPlan(models.Model):
             record.hide_action_stock_picking = False
             record.hide_action_outsourcing_stock_picking = False
             if record.supply_method in ('automation', 'manual'):
-                manufacturing_orders = record.sale_order_id.mrp_production_ids
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda p: p.product_id.id == record.product_id.id
+                )
                 record.hide_action_stock_picking = bool(manufacturing_orders.mapped('picking_ids').filtered(
                     lambda p: p.state == 'assigned'))
             elif record.supply_method in ('purchase', 'outsourcing'):

sf_demand_plan/views/demand_plan.xml

@@ -3,7 +3,8 @@
         <field name="name">sf.production.demand.plan.tree</field>
         <field name="model">sf.production.demand.plan</field>
         <field name="arch" type="xml">
-            <tree string="需求计划" default_order="create_date desc" editable="bottom" class="demand_plan_tree">
+            <tree string="需求计划" default_order="sequence desc,create_date desc" editable="bottom"
+                  class="demand_plan_tree">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
                             class="btn-primary"/>
@@ -33,7 +34,7 @@
                 <field name="product_remark" optional="hide"/>
                 <field name="order_code" optional="hide"/>
                 <field name="sale_order_id" optional="hide"/>
-                <field name="sale_order_line_id" optional="hide"/>
+                <field name="sale_order_line_number" optional="hide"/>
                 <field name="order_state"/>
                 <field name="route_id" optional="hide"/>
                 <field name="contract_date"/>
@@ -41,7 +42,7 @@
                 <field name="contract_code"/>
                 <field name="plan_remark"/>
                 <field name="processing_time"/>
-                <field name="material_check"/>
+                <field name="material_check" optional="hide"/>
                 <field name="hide_action_open_mrp_production" invisible="1"/>
                 <field name="hide_action_purchase_orders" invisible="1"/>
                 <field name="hide_action_stock_picking" invisible="1"/>
@@ -84,6 +85,7 @@
                 <field name="materials_id"/>
                 <field name="model_process_parameters_ids"/>
                 <field name="plan_remark"/>
+                <field name="contract_code"/>
                 <group expand="0" string="Group By">
                     <filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
                     <filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
@@ -96,6 +98,8 @@
                             context="{'group_by': 'deadline_of_delivery'}"/>
                     <filter name="group_by_materials_id" string="材料" domain="[]"
                             context="{'group_by': 'materials_id'}"/>
+                    <filter name="group_by_contract_code" string="合同号" domain="[]"
+                            context="{'group_by': 'contract_code'}"/>
                 </group>
             </search>
         </field>

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -62,7 +62,7 @@ class MrpWorkorder(models.Model):
                     [('workorder_id', '=', record.id)])
                 if demand_plan_print:
                     self.env['sf.demand.plan.print.wizard'].sudo().write(
-                        {'cnc_worksheet': res.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
+                        {'cnc_worksheet': record.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
                 else:
                     demand_plan = self.env['sf.production.demand.plan'].sudo().search(
                         [('product_id', '=', record.product_id.id)])

sf_machine_connect/controllers/controllers.py

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

sf_manufacturing/controllers/controllers.py

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

sf_manufacturing/controllers/main.py

@@ -27,7 +27,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
             bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
             order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft',
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], kw['remark'], state='draft',
                 model_display_version=kw.get('model_display_version'))
             i = 1
             # 给sale_order的default_code字段赋值
@@ -45,6 +45,9 @@ 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/mrp_production.py

@@ -283,6 +283,8 @@ class MrpProduction(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = production_id.product_id.name
                     if production_id.sale_order_id:
                         sale_order = production_id.sale_order_id
                     else:
@@ -636,13 +638,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 +663,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 +803,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 +1799,6 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
-        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1841,6 +1867,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

@@ -227,6 +227,14 @@ 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]
+                else:
+                    next_workorder = None
+            if next_workorder:
                 next_state = next_workorder.state
                 if next_state not in ['pending', 'waiting', 'ready']:
                     raise UserError('下工序已经开始，无法回退')
@@ -745,21 +753,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 = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
-        tomorrow_start = tomorrow + ' 00:00:00'
+        tomorrow_start = f"{tomorrow} 00:00:00"
-        tomorrow_end = tomorrow + ' 23:59:59'
+        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 (date_planned_start + interval '8 hours') >= %s::timestamp
-          AND to_char(date_planned_finished::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')<= %s
+          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)]
@@ -1589,25 +1601,17 @@ 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 ['装夹预调']):
+            if record.routing_type in ['解除装夹']:
-                for workorder in record.production_id.workorder_ids:
+                rfid_code = record.rfid_code
-                    if workorder.processing_panel == record.processing_panel:
+                work_ids = record.production_id.workorder_ids.filtered(
-                        rfid_code = workorder.rfid_code
+                    lambda wo: wo.processing_panel == record.processing_panel and wo.state != 'rework')
-                        if record.is_rework is not True:
+                work_ids.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                            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:
+                if any(wo.rfid_code for wo in work_ids):
-                            raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
+                    raise ValidationError(f'【{record.name}】工单解绑失败，请重新点击完成按钮！！！')
-                        # workorder.rfid_code_old = rfid_code
+                logging.info('work_ids.rfid_code:%s' % [wo.rfid_code for wo in work_ids])
-                        # workorder.rfid_code = False
-                        logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
-
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:

sf_manufacturing/models/product_template.py

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

sf_manufacturing/models/purchase_order.py

@@ -212,6 +212,8 @@ class PurchaseOrderLine(models.Model):
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)
+                else:
+                    product_name = record.product_id.name
                 sale_order_name = ''
                 match_sale = re.search(r'S(\d+)', record.product_id.name)
                 if match_sale:

sf_manufacturing/models/sale_order.py

@@ -74,14 +74,17 @@ class SaleOrder(models.Model):
                 'blank_area': product.model_area,
                 'price': product.list_price,
                 'embryo_redundancy_id': line.embryo_redundancy_id,
+                'model_id': line.model_id
             }
             product_name = ''
             match = re.search(r'(S\d{5}-\d+)', product.name)
+            product_seria = 0
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)
                 # 获取成品名结尾-n的n
                 product_seria = int(product_name.split('-')[-1])
+            
             # 成品供货方式为采购则不生成bom
             if line.supply_method != 'purchase':
                 bom_data = self.env['mrp.bom'].with_user(self.env.ref("base.user_admin")).get_bom(product)
@@ -190,7 +193,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/sf_technology_design.py

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

sf_manufacturing/models/stock.py

@@ -637,6 +637,8 @@ class StockPicking(models.Model):
                     if lot_ids:
                         move.action_clear_lines_show_details()
                         move.action_show_details()
+        # 先进行设置数量
+        self.action_set_quantities_to_reservation()
         res = super().button_validate()
         # lot_ids = None
         # product_ids = self.move_ids.mapped('product_id')
@@ -861,6 +863,8 @@ class ReStockMove(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = move.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:
@@ -893,6 +897,8 @@ class ReStockMove(models.Model):
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
+                    else:
+                        product_name = production_id.product_id.name
                     if move.picking_id.sale_order_id:
                         sale_order = move.picking_id.sale_order_id
                     else:

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/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 is not False).write(
+            workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code and wo.state != 'rework').write(
                 {'rfid_code_old': rfid_code, 'rfid_code': False})
             workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
-                                           (wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
+                                           (wo.rfid_code_old or wo.rfid_code) and wo.state != 'rework')).write(
                 {'rfid_code_old': False, 'rfid_code': False})
 
         if self.is_remanufacture is True:

sf_manufacturing/wizard/rework_wizard.py

@@ -125,13 +125,28 @@ class ReworkWizard(models.TransientModel):
                 # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
                 # 2、返工CNC工单和装夹预调工单则自动解绑RFID
                 clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
-                if clamp_workorder_ids:
+
-                    for clamp_workorder_id in clamp_workorder_ids:
+                # for order in rework_workorder_ids:
-                        self.production_id.workorder_ids.filtered(
+                #     order.write({
-                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
+                #         'rfid_code_old': order.rfid_code,
-                            {'rfid_code': None})
+                #         '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})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                 workorders_values = []
                 for work in rework_workorder_ids:
@@ -158,8 +173,12 @@ class ReworkWizard(models.TransientModel):
                     # ====新工单绑定rfid===
                     for new_work_id in new_work_ids:
                         if new_work_id.routing_type in ['CNC加工', '解除装夹']:
-                            new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
+                            # 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
-                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
+                            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})
                     self.production_id.detection_result_ids.filtered(
                         lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
                     panels = []  # 返工的加工面
@@ -213,11 +232,13 @@ 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程序
@@ -259,7 +280,8 @@ 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({
@@ -296,7 +318,8 @@ 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'})
                 # ================= 返工完成，制造订单状态置为加工中 ==============

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">
+<!--        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">-->
-            <field name="name">待质检提醒</field>
+<!--            <field name="name">待质检提醒</field>-->
-            <field name="model">product.product</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

@@ -210,8 +210,8 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 功能刀具寿命到期提醒：
-单号：拆解单[{{code}}]({{tool_expired_remind_special_url}})
+单号：拆解单[{{code}}]({{request_url}})
-事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>
+事项：{{name}}寿命已到期，需拆解</field>
         </record>
 
         <record id="template_tool_assembly_remind" model="jikimo.message.template">
@@ -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_id" ref="quality.model_quality_check"/>
-            <field name="model">product.product</field>
+            <field name="model">quality.check</field>
-            <field name="bussiness_node_id" ref="bussiness_quality_check"/>
+            <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}})
+单号：[{{name}}]({{url}})
-事项：有{{num}}个质检单需要处理。</field>
+事项：有一个质检单需要处理({{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_functional_tool_dismantle.py

@@ -1,4 +1,5 @@
 from odoo import models, api
+from urllib.parse import urlencode
 
 
 class SFMessagefunctionalToolDismantle(models.Model):
@@ -18,6 +19,32 @@ 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):
         menu_id = 0
         action_id = 0
@@ -26,4 +53,5 @@ class SFMessagefunctionalToolDismantle(models.Model):
             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)
         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 == '待质检提醒':
+            # if message_queue_id.message_template_id.name == '待质检提醒':
-                content = message_queue_id.message_template_id.content
+            #     content = message_queue_id.message_template_id.content
-                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+            #     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(
+            #     quality_check_num = self.env['quality.check'].sudo().search_count(
-                    [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
+            #         [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
-                if quality_check_num >= 1:
+            #     if quality_check_num >= 1:
-                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+            #         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref('quality_control.quality_check_action_report').id
+            #         action_id = self.env.ref('quality_control.quality_check_action_report').id
-                    url_with_id = f"{url}/web#view_type=list&action={action_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(
+            #         content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
-                        '{{num}}', str(quality_check_num))
+            #             '{{num}}', str(quality_check_num))
-                    contents.append(content)
+            #         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,46 @@
+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,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,73 @@ class SFMessageQualityCheck(models.Model):
     @api.model_create_multi
     def create(self, vals_list):
         result = super().create(vals_list)
-        try:
+        # try:
-            # 判断是否为web页面创建请求
+        #     # 判断是否为web页面创建请求
-            is_web_request = self.env.context.get('is_web_request', False)
+        #     is_web_request = self.env.context.get('is_web_request', False)
-            if not is_web_request:
+        #     if not is_web_request:
-                for obj in result:
+        #         for obj in result:
-                    jikimo_message_queue = self.get_message_queue(obj.product_id.id)
+        #             jikimo_message_queue = self.get_message_queue(obj.product_id.id)
-                    if not jikimo_message_queue:
+        #             if not jikimo_message_queue:
-                        obj.product_id.add_queue('待质检提醒')
+        #                 obj.product_id.add_queue('待质检提醒')
-        except Exception as e:
+        # except Exception as e:
-            logging.info('add_queue待质检提醒 error:%s' % 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
+    # def get_message_queue(self, res_id):
-        message_template = self.env["jikimo.message.template"].sudo().search([
+    #     business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
-            ("name", "=", '待质检提醒'),
+    #     message_template = self.env["jikimo.message.template"].sudo().search([
-            ("bussiness_node_id", "=", business_node_id)
+    #         ("name", "=", '待质检提醒'),
-        ], limit=1)
+    #         ("bussiness_node_id", "=", business_node_id)
-        jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+    #     ], limit=1)
-            [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
+    #     jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
-             ('message_template_id', '=', message_template.id)])
+    #         [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
-        return jikimo_message_queue
+    #          ('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

sf_mrs_connect/controllers/controllers.py

@@ -42,6 +42,12 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 res = {'status': -2, 'message': '查询到待工艺确认的制造订单'}
                 return json.JSONEncoder().encode(res)
             if productions:
+                # 修改需求计划中的程序工时
+                demand_plan = request.env['sf.production.demand.plan'].with_user(
+                    request.env.ref("base.user_admin")).search([('model_id', '=', ret['folder_name'])])
+                if demand_plan and ret['total_estimated_time']:
+                    demand_plan.write(
+                        {'processing_time': ret['total_estimated_time']})
 
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
@@ -147,29 +153,23 @@ 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(
+                        record_ids_obj.write({
-                            {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
+                            '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('首次下发')
+                    else:
-                        production.programming_record_ids.create({
+                        if ret['reset_flag']:
-                            '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,
@@ -181,60 +181,86 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 '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['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)
@@ -253,6 +279,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):
@@ -209,3 +209,95 @@ class QualityCheck(models.Model):
                         '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/quick_easy_order.py

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

sf_sale/models/quick_easy_order_old.py

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

sf_sale/models/sale_order.py

@@ -63,9 +63,15 @@ 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, state='sale',
+                          deadline_of_delivery, payments_way, pay_way, order_number, remark, state='sale',
                           model_display_version='v1'):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
@@ -84,6 +90,7 @@ 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字符串情况
@@ -194,17 +201,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(
+            order.purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
-                lambda po: po.purchase_type not in ['outsourcing']))
+            order.consignment_purchase_order_count = len(order._get_sale_to_purchase_1('outsourcing'))
-            order.consignment_purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
 
     def action_view_purchase_orders(self):
         """
         采购
         """
         self.ensure_one()
-        purchase_order_ids = self._get_purchase_orders().filtered(
+        purchase_order_ids = self._get_sale_to_purchase('outsourcing')
-            lambda po: po.purchase_type not in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -222,12 +227,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_sale_to_purchase('outsourcing')
+        outsourcing_purchase_order_ids = self._get_sale_to_purchase_1('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -245,7 +258,7 @@ class ReSaleOrder(models.Model):
             })
         return action
 
-    def _get_sale_to_purchase(self, purchase_type):
+    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
@@ -364,12 +377,13 @@ class RePurchaseOrder(models.Model):
 
     @api.depends('partner_id')
     def _compute_user_id(self):
-        if not self.user_id:
+        for item in self:
-            if self.partner_id:
+            if not item.user_id:
-                self.user_id = self.partner_id.purchase_user_id.id
+                if item.partner_id:
+                    item.user_id = item.partner_id.purchase_user_id.id
                     # self.state = 'purchase'
                 else:
-                self.user_id = self.env.user.id
+                    item.user_id = item.env.user.id
 
     @api.constrains('order_line')
     def check_order_line(self):

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

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

sf_tool_management/models/functional_tool.py

@@ -58,20 +58,6 @@ 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:
             # 创建报警刀具拆解单
@@ -150,6 +136,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_tool_management/models/stock.py

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

sf_tool_management/views/functional_tool_views.xml

@@ -42,7 +42,6 @@
             <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="正常,报警,已拆除"/>
@@ -188,6 +187,7 @@
                                         <field name="current_location" string="当前位置"/>
                                         <field name="current_shelf_location_id" string="当前货位"
                                                attrs="{'invisible': [('current_shelf_location_id', '=', False)]}"/>
+                                        <field name="create_date" string="装刀时间"/>
                                     </group>
                                 </group>
                             </page>

sf_tool_management/views/stock.xml

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

sf_warehouse/__manifest__.py

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

sf_warehouse/migrations/1.2/post-migrate.py

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

sf_warehouse/models/model.py

@@ -303,7 +303,9 @@ class SfShelf(models.Model):
         area_type_barcode = self.barcode
         i_str = str(i + 1).zfill(3)  # 确保是两位数，如果不足两位，左侧补0
         j_str = str(j + 1).zfill(3)  # 确保是两位数，如果不足两位，左侧补0
-        return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + i_str + '-' + j_str
+        num_str = str((i)*self.layer_capacity+j + 1).zfill(3)
+        # return area_type_barcode + self.channel + self.direction + '-' + self.barcode + '-' + i_str + '-' + j_str
+        return area_type_barcode + '-' + num_str
 
     def print_all_location_barcode(self):
         """
@@ -545,6 +547,24 @@ class ShelfLocation(models.Model):
         records = super(ShelfLocation, self).create(vals_list)
         return records
 
+    kanban_show_layer_info = fields.Char('展示货位的层信息', compute='_compute_kanban_show_info')
+    kanban_show_center_control_code = fields.Char('展示货位的货柜信息', compute='_compute_kanban_show_info')
+    @api.depends('shelf_id','barcode')
+    def _compute_kanban_show_info(self):
+        for record in self:
+            arr = record.barcode.split('-')
+            alen = len(arr)
+            if( alen >= 1):
+                _cc_code = int(arr[alen-1])
+                _layer = _cc_code // record.shelf_id.layer_capacity
+                _layer_capacity = _cc_code % record.shelf_id.layer_capacity
+                if _layer_capacity == 0:
+                    _layer_capacity = record.shelf_id.layer_capacity
+                else: 
+                    _layer_capacity = _layer_capacity
+                    _layer = _layer+1
+                record.kanban_show_layer_info=f"{_layer}-{_layer_capacity}"
+                record.kanban_show_center_control_code=f"{_cc_code}"
 
 class SfShelfLocationLot(models.Model):
     _name = 'sf.shelf.location.lot'

sf_warehouse/models/sync_common.py

@@ -107,25 +107,39 @@ class MrsShelfLocationDataSync(models.Model):
                     equipment_id.register_equipment_tool()
 
             shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info()
-            total_data = self.get_total_data()
+            self.set_shelf_location(shelfinfo)
+
+        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.find_our_code(total_data, item['Postion'])
+            shelf_barcode = self.env['sf.shelf.location.datasync'].sudo().find_our_code(
-                location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)], limit=1)
+                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.tool_in_out_stock_location(location_id)
+                    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 != '报警':
-                            if item.get('State') == '报警':
+                            # 创建报警刀具拆解单和刀具报警记录
-                                if tool.functional_tool_status != item.get('State'):
+                            tool.create_tool_dismantle()
-                                    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
@@ -137,7 +151,3 @@ class MrsShelfLocationDataSync(models.Model):
                     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("数据错误导致同步失败,请联系管理员")

sf_warehouse/static/src/css/kanban_location_custom.scss

@@ -0,0 +1,128 @@
+// 定义一个 mixin 来处理重复的样式
+@mixin kanban-common-styles($record-count-each-row,
+    $record-gap: 16px,
+    $color-guide-width: 70px) {
+    $record-gap-total-width: $record-gap * ($record-count-each-row - 1);
+
+    display: flex !important;
+    flex-wrap: wrap !important;
+    overflow-x: hidden !important;
+    overflow-y: auto !important;
+    padding: 0px !important;
+    gap: $record-gap !important;
+    width: 100% !important;
+    height: 100% !important;
+
+    // 设置卡片样式
+    .o_kanban_record {
+        flex: 0 0 calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+        height: calc((100% - #{$record-gap * 6}) / 6) !important; // 平均分配高度
+        margin: 0 !important;
+        padding: 0px !important;
+        background-color: white !important;
+        border: 1px solid #dee2e6 !important;
+        border-radius: 4px !important;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
+        min-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+        max-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
+
+        &:hover {
+            transform: translateY(-1px) !important;
+            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important;
+        }
+
+        .o_kanban_record_bottom {
+            margin: 0;
+        }
+
+        .oe_kanban_card.kanban_color_3,
+        .oe_kanban_card.kanban_color_1,
+        .oe_kanban_card.kanban_color_2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            height: 100%;
+
+            .sf_kanban_custom_location_info_style {
+                display: flex !important;
+                justify-content: center !important;
+                align-items: center !important;
+                width: 100%;
+                font-size: 14px;
+                color: #000000;
+            }
+
+            .sf_kanban_no {
+                display: flex !important;
+                justify-content: center !important;
+                align-items: center !important;
+                font-size: 18px;
+                color: #000000;
+            }
+        }
+    }
+}
+
+// 使用 mixin 为不同的列数生成样式
+.o_kanban_view {
+    .sf_kanban_location_style {
+         // 设置卡片样式
+        .o_kanban_record {
+
+            &:hover {
+                transform: translateY(-1px) !important;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important;
+            }
+
+            .o_kanban_record_bottom {
+                margin: 0;
+            }
+
+            .oe_kanban_card.kanban_color_3,
+            .oe_kanban_card.kanban_color_1,
+            .oe_kanban_card.kanban_color_2 {
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                width: 100%;
+                height: 100%;
+
+                .sf_kanban_custom_location_info_style {
+                    display: flex !important;
+                    justify-content: center !important;
+                    align-items: center !important;
+                    width: 100%;
+                    font-size: 14px;
+                    color: #000000;
+                }
+
+                .sf_kanban_no {
+                    display: flex !important;
+                    justify-content: center !important;
+                    align-items: center !important;
+                    font-size: 18px;
+                    color: #000000;
+                }
+            }
+        }
+    }
+
+    .sf_kanban_location_style12 {
+        @include kanban-common-styles(12);
+    }
+
+    .sf_kanban_location_style19 {
+        @include kanban-common-styles(19);
+    }
+
+    .sf_kanban_location_style4 {
+        @include kanban-common-styles(4);
+    }
+
+    .sf_kanban_location_style3 {
+        @include kanban-common-styles(3);
+    }
+}

sf_warehouse/static/src/js/custom_kanban_controller.js

@@ -1,21 +1,177 @@
 /** @odoo-module */
 
 import { KanbanController } from "@web/views/kanban/kanban_controller";
+import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
 import { kanbanView } from "@web/views/kanban/kanban_view";
 import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { useState, onWillStart, onWillUnmount, onMounted } from "@odoo/owl";
+
+
+// 自定义看板渲染器
+class CustomKanbanRenderer extends KanbanRenderer {
 
-// the controller usually contains the Layout and the renderer.
-class CustomKanbanController extends KanbanController {
-    // Your logic here, override or insert new methods...
-    // if you override setup(), don't forget to call super.setup()
 }
 
+// 自定义看板控制器
+class CustomKanbanController extends KanbanController {
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+        this.searchModel = this.model.env.searchModel;
+        this.defaultPagerLimit = this.getSystemDefaultLimit();
+        this._onUpdate = (payload) => {
+            this._handleSearchUpdate(payload);
+        };
+
+        this.env.services.user.updateContext({
+            isBaseStyle: true
+        });
+        let self = this;
+        // 获取货架分层数据
+        onWillStart(async () => {
+            this.searchModel.on('update', self, self._onUpdate);
+            await this.loadShelfLayersData();
+        });
+
+        // 组件销毁时移除监听
+        onWillUnmount(() => {
+            this.searchModel.off('update', self, self._onUpdate);
+        });
+
+        // 监听视图切换事件以监控面包屑
+        onMounted(() => {
+            this.handleRouteChange()
+        });
+    }
+
+    handleRouteChange() {
+        this.render(true);
+        let domain = this.searchModel.domain;
+        if (domain.length > 0) {
+            let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+            this.onShelfChange(shelfDomain[2]);
+        } else {
+            this.setKanbanStyle('sf_kanban_location_style');
+        }
+    }
+
+    _handleSearchUpdate() {
+        try {
+            let domain = this.searchModel.domain;
+            if (domain.length > 0) {
+                let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+                if (shelfDomain) {
+                    let shelfId = shelfDomain[2];
+                    // 如果货架ID存在，则设置相应的样式
+                    if (shelfId) {
+                        this.onShelfChange(shelfId);
+                        return;
+                    }
+                }
+            }
+            //设置默认样式
+            this.updatePagerLimit(this.defaultPagerLimit);
+            this.setKanbanStyle('sf_kanban_location_style');
+        } catch (error) {
+        }
+
+    }
+
+    // 加载所有货架的层数数据
+    async loadShelfLayersData() {
+        this.shelfLayersMap = {};
+        const shelfIds = await this.orm.search('sf.shelf', []);
+        const shelves = await this.orm.read('sf.shelf', shelfIds, ['id', 'layer_capacity']);
+
+        shelves.forEach(shelf => {
+            this.shelfLayersMap[shelf.id] = shelf.layer_capacity;
+        });
+    }
+
+    setKanbanStyle(style) {
+        this.env.services.user.updateContext({
+            isBaseStyle: style === 'sf_kanban_location_style'
+        });
+        const kanbanViewEl = document.querySelector('.o_kanban_renderer');
+        if (kanbanViewEl) {
+            let isHave = false;
+            // 移除所有现有的 sf_kanban_* 类
+            Array.from(kanbanViewEl.classList).forEach(cls => {
+                if (cls.startsWith('sf_kanban_location_style')) {
+                    kanbanViewEl.classList.remove(cls);
+                    isHave = true;
+                }
+            });
+
+            // 添加新类
+            if (isHave) kanbanViewEl.classList.add(style);
+        }
+        const ghostCards = document.querySelectorAll('.o_kanban_ghost');
+        ghostCards.forEach(card => {
+            card.remove();
+        });
+    }
+
+    updatePagerLimit(limit) {
+        if (this.model.root.limit !== limit) {
+            this.model.root.limit = limit;
+            this.render(true);
+        }
+    }
+
+    // 处理货架变更事件
+    async onShelfChange(shelfId) {
+        let style = 'sf_kanban_location_style';
+        let isBaseStyle = true;
+        if (shelfId) {
+            // 如果没有缓存，从服务器加载数据
+            if (!(shelfId in this.shelfLayersMap)) {
+                const [shelf] = await this.orm.read('sf.shelf', [shelfId], ['layer_capacity']);
+                this.shelfLayersMap[shelfId] = shelf.layer_capacity;
+            }
+
+            // 获取该货架的层数
+            const layerCapacity = this.shelfLayersMap[shelfId];
+            // 根据层数设置不同的样式
+            if (layerCapacity >= 1) {
+                style = `sf_kanban_location_style${layerCapacity}`;
+                isBaseStyle = false;
+            }
+        }
+        if (isBaseStyle) {
+            this.updatePagerLimit(this.defaultPagerLimit);
+        }
+        else {
+            this.updatePagerLimit(500);
+        }
+        this.setKanbanStyle(style);
+    }
+
+    /**
+     * 获取系统默认分页记录数
+     */
+    getSystemDefaultLimit() {
+        // 方法1：从用户服务获取默认值
+        const userService = this.env.services.user;
+
+        // 获取用户配置的默认分页大小
+        if (userService && userService.user_context && userService.user_context.limit) {
+            return userService.user_context.limit;
+        }
+
+        // 方法3：使用Odoo核心默认值（通常为80）
+        return 80;
+    }
+}
+
+// 设置自定义模板
 CustomKanbanController.template = "sf_warehouse.CustomKanbanView";
 
 export const customKanbanView = {
-    ...kanbanView, // contains the default Renderer/Controller/Model
+    ...kanbanView,
     Controller: CustomKanbanController,
+    Renderer: CustomKanbanRenderer,
 };
 
-// Register it to the views registry
 registry.category("views").add("custom_kanban", customKanbanView);

sf_warehouse/views/shelf_location.xml

@@ -197,55 +197,44 @@
             <field name="name">shelf.location.kanban</field>
             <field name="model">sf.shelf.location</field>
             <field name="arch" type="xml">
-                <kanban class="o_kanban_mobile" js_class="custom_kanban" create="0">
+                <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
                     <templates>
                         <t t-name="kanban-box">
+                            <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
                             <div t-attf-class="oe_kanban_card oe_kanban_global_click
                         #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
                         #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
                         #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
-                                <!--                                 标题 -->
+                        
+                               <!-- 所有情况都需要的数据 (隐藏) -->
+                                <div style="display:none">
+                                    <field name="location_status"/>
+                                </div>
+                                
+                                
+                                <t t-if="isBaseStyle">
                                     <div class="o_kanban_card_header">
                                         <div class="o_kanban_card_header_title">
                                             <field name="name"/>
                                         </div>
                                     </div>
-                                <!--                                 内容 -->
-                                <div class="o_kanban_record_bottom">
-                                    <field name="location_status"/>
-                                </div>
                                     <div class="o_kanban_record_bottom">
                                         <field name="product_sn_id"/>
                                         <span>|</span>
                                         <field name="product_id"/>
                                     </div>
+                                </t>
+                                
+                                <t t-else="">
+                                    <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
+                                        <field name="kanban_show_layer_info"/>
+                                    </div>
+                                    <div class="o_kanban_record_bottom sf_kanban_no">
+                                        <field name="kanban_show_center_control_code"/>
+                                    </div>
+                                </t>
                             </div>
                         </t>
-                        <!--                                             <t t-name="kanban-box"> -->
-                        <!--                                                  <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
-                        <!--                                                     #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
-                        <!--                                                     #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
-                        <!--                                                     #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
-                        <!--                                                     看板内容 -->
-                        <!--                                                 </div> -->
-                        <!--                                                 <div t-attf-class="oe_kanban_card"> -->
-                        <!--                                                     标题 -->
-                        <!--                                                     <div class="o_kanban_card_header"> -->
-                        <!--                                                         <div class="o_kanban_card_header_title"> -->
-                        <!--                                                             <field name="name"/> -->
-                        <!--                                                         </div> -->
-                        <!--                                                     </div> -->
-                        <!--                                                     内容 -->
-                        <!--                                                     <div class="o_kanban_record_bottom"> -->
-                        <!--                                                         <field name="location_status"/> -->
-                        <!--                                                     </div> -->
-                        <!--                                                     <div class="o_kanban_record_bottom"> -->
-                        <!--                                                         <field name="product_sn_id"/> -->
-                        <!--                                                         <span> | </span> -->
-                        <!--                                                         <field name="product_id"/> -->
-                        <!--                                                     </div> -->
-                        <!--                                                 </div> -->
-                        <!--                                             </t> -->
                     </templates>
                 </kanban>
             </field>