恢复刀具房样式和编码

1货位编码规则简化
2货位看板直观化展示

jikimo_frontend/static/src/js/custom_form_status_indicator.js

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

jikimo_printing/models/jikimo_printing.py

@@ -17,6 +17,11 @@ class JikimoPrinting(models.AbstractModel):
         """
             打印二维码
         """
+        printer = self.env['printing.printer'].get_default()
+        if not printer:
+            _logger.error("未找到默认打印机")
+            return False
+
         # 生成二维码
         qr = qrcode.QRCode(version=1, box_size=10, border=5)
         qr.add_data(data)
@@ -45,19 +50,23 @@ class JikimoPrinting(models.AbstractModel):
 
         # 获取PDF内容并打印
         pdf_content = pdf_buffer.getvalue()
-        printer = self.env['printing.printer'].get_default()
-        _logger.info(f"打印内容: {pdf_content}")
+        # _logger.info(f"打印内容: {pdf_content}")
         printer.print_document(report=None, content=pdf_content, doc_format='pdf')
 
         # 清理资源
         pdf_buffer.close()
         temp_image.close()
 
+        return True
+
     def print_pdf(self, pdf_data):
         """
             打印PDF
         """
-        _logger.info("PDF打印开始")
+        printer = self.env['printing.printer'].get_default()
+        if not printer:
+            _logger.error("未找到默认打印机")
+            return False
 
         pdf_data_str = pdf_data.decode('ascii', errors='ignore')
         decoded_data = base64.b64decode(pdf_data_str)
@@ -69,15 +78,10 @@ class JikimoPrinting(models.AbstractModel):
         
         # 获取PDF内容
         pdf_content = pdf_buffer.getvalue()
-        _logger.info(f"处理后的内容前20字节: {pdf_content[:20]}")
-        
-        # 获取默认打印机
-        printer = self.env['printing.printer'].get_default()
-        if not printer:
-            _logger.error("未找到默认打印机")
-            return
         
         printer.print_document(report=None, content=pdf_content, doc_format='pdf')
         # 清理资源
         pdf_buffer.close()
-        _logger.info("PDF打印结束") 
+
+        _logger.info("成功打印PDF")
+        return True

jikimo_printing/models/workorder_printing.py

@@ -21,8 +21,6 @@ class MrpWorkorder(models.Model):
                             # 执行打印
                             self.env['jikimo.printing'].print_pdf(pdf_data)
                             wo.production_id.product_id.is_print_program = True
-                            _logger.info(f"工单 {wo.name} 的PDF已成功打印")     
-
                         except Exception as e:
                             _logger.error(f"工单 {wo.name} 的PDF打印失败: {str(e)}")
 

jikimo_purchase_request/__manifest__.py

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

jikimo_purchase_request/i18n/zh_CN.po

@@ -410,7 +410,7 @@ msgstr "显示名称"
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
 #: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_search
 msgid "Done"
-msgstr "完成"
+msgstr "关闭"
 
 #. module: purchase_request
 #: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__move_dest_ids

jikimo_purchase_request/models/__init__.py

@@ -5,3 +5,4 @@ from . import sale_order
 from . import mrp_production
 from . import purchase_order
 from . import stock_rule
+from . import stock_picking

jikimo_purchase_request/models/mrp_production.py

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

jikimo_purchase_request/models/purchase_order.py

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

jikimo_purchase_request/models/purchase_request.py

@@ -1,13 +1,15 @@
 import re
 import ast
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from itertools import groupby
+from odoo.tools import float_compare
 
 
 class PurchaseRequest(models.Model):
     _inherit = 'purchase.request'
     _description = '采购申请'
 
-     # 为state添加取消状态
+    # 为state添加取消状态
     state = fields.Selection(
         selection_add=[('cancel', '已取消')],
         ondelete={'cancel': 'set default'}  # 添加 ondelete 策略
@@ -29,6 +31,56 @@ class PurchaseRequest(models.Model):
         action['context'] = origin_context
         return action
 
+    def button_done(self):
+        product_qty_map = {key: sum(line.product_qty for line in group) for key, group in
+                           groupby(self.line_ids, key=lambda x: x.product_id.id)}
+        lines = self.mapped("line_ids.purchase_lines.order_id")
+        # 采购单产品和数量
+        product_summary = {}
+        product_rounding = {}
+        if lines:
+            for line in lines:
+                for line_item in line.order_line:
+                    product_id = line_item.product_id.id
+                    qty = line_item.product_qty
+                    product_rounding[product_id] = line_item.product_id.uom_id.rounding
+                    if product_id in product_summary:
+                        product_summary[product_id] += qty
+                    else:
+                        product_summary[product_id] = qty
+
+        # 校验产品数量
+        discrepancies = []
+        for product_id, qty in product_qty_map.items():
+            if product_id in product_summary:
+                if float_compare(product_summary[product_id], qty, precision_rounding=product_rounding[product_id]) < 0:
+                    discrepancies.append((product_id, qty, product_summary[product_id]))
+            else:
+                discrepancies.append((product_id, qty, 0))
+
+        if discrepancies:
+            # 弹出提示框
+            message = "产品数量不一致:\n"
+            for product_id, required_qty, order_qty in discrepancies:
+                product_name = self.env['product.product'].browse(product_id).display_name  # 获取产品名称
+                message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单数量 {order_qty}（含询价状态）\n"
+                # 添加确认框
+            message += "确认关闭？"
+            return {
+                'name': _('采购申请'),
+                'type': 'ir.actions.act_window',
+                'views': [(self.env.ref(
+                    'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
+                           'form')],
+                'res_model': 'purchase.request.wizard',
+                'target': 'new',
+                'context': {
+                    'default_purchase_request_id': self.id,
+                    'default_message': message,
+                }}
+        return super(PurchaseRequest, self).button_done()
+
+
 class PurchaseRequestLine(models.Model):
     _inherit = 'purchase.request.line'
     _description = '采购申请明细'
@@ -47,7 +99,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")
@@ -92,7 +145,7 @@ class PurchaseRequestLine(models.Model):
                 continue
             if record.product_id.categ_id.name == '坯料':
                 product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.product_id.name)
+                match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
                 # 如果匹配成功，提取结果
                 if match:
                     product_name = match.group(0)

jikimo_purchase_request/models/stock_picking.py

@@ -0,0 +1,47 @@
+from odoo import fields, api, models, _
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    purchase_request_count = fields.Integer('采购订单数量', compute='_compute_purchase_request')
+
+    @api.depends('name')
+    def _compute_purchase_request(self):
+        for record in self:
+            purchase_request_ids = self.env['purchase.request'].search([('origin', '=', record.name)])
+            record.purchase_request_count = len(purchase_request_ids)
+
+    def action_view_purchase_request(self):
+        self.ensure_one()
+
+        purchase_request_ids = self.env['purchase.request'].search([('origin', '=', self.name)])
+
+        action = {
+            'res_model': 'purchase.request',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_request_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_request_ids[0].id,
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购请求单", self.name),
+                'domain': [('id', 'in', purchase_request_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def _action_done(self):
+        res = super(StockPicking, self)._action_done()
+        # 将新产生的backorder对应上原来的采购申请明细行
+        backorder_ids = self.backorder_ids
+        if backorder_ids:
+            purchase_request_lines = self.move_ids.move_orig_ids.purchase_line_id.purchase_request_lines
+            if purchase_request_lines:
+               purchase_request_lines.move_dest_ids = [
+                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id == purchase_request_lines.product_id.id
+                ]
+        return res

jikimo_purchase_request/models/stock_rule.py

@@ -1,4 +1,5 @@
 from odoo import api, fields, models
+from collections import defaultdict
 
 
 class StockRule(models.Model):
@@ -44,13 +45,38 @@ class StockRule(models.Model):
         purchase_request_line_model.create(request_line_data)
 
     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})
+        # 如果补货组相同，并且产品相同，则合并
+        procurements_dict = defaultdict()
+        for procurement, rule in procurements:
+            if (procurement.product_id.id, procurement.values['group_id'], rule.id) not in procurements_dict:
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)] = {
+                    'product_id': procurement.product_id, 
+                    'product_qty': procurement.product_qty,
+                    'product_uom': procurement.product_uom,
+                    'location_id': procurement.location_id,
+                    'name': procurement.name,
+                    'origin': procurement.origin,
+                    'company_id': procurement.company_id,
+                    'values': procurement.values,
+                    'rule': rule
+                }
+            else:
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['product_qty'] += procurement.product_qty
+                procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['values']['move_dest_ids'] |= procurement.values['move_dest_ids']
+        new_procurements = []
+        for k, p in procurements_dict.items():
+            new_procurements.append((
+                self.env['procurement.group'].Procurement(
+                    product_id=p['product_id'],
+                    product_qty=p['product_qty'],
+                    product_uom=p['product_uom'],
+                    location_id=p['location_id'],
+                    name=p['name'],
+                    origin=p['origin'],
+                    company_id=p['company_id'],
+                    values=p['values']
+                ), p['rule'])
+            )
+
+        res = super(StockRule, self)._run_buy(new_procurements)
         return res

jikimo_purchase_request/security/ir.model.access.csv

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

jikimo_purchase_request/views/purchase_request_menu_views.xml

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

jikimo_purchase_request/views/purchase_request_view.xml

@@ -15,6 +15,26 @@
                 <field name="part_number"/>
                 <field name="part_name"/>
             </xpath>
+             <xpath expr="//button[@name='button_done']" position="attributes">
+                <attribute name="class"/>
+            </xpath>
+              <xpath expr="//button[@name='button_in_progress']" position="attributes">
+                  <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//button[@name='%(purchase_request.action_purchase_request_line_make_purchase_order)d']" position="attributes">
+                <attribute name="class">oe_highlight</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_purchase_request_tree_sf" model="ir.ui.view">
+        <field name="name">purchase.request.sf.tree</field>
+        <field name="model">purchase.request</field>
+        <field name="inherit_id" ref="purchase_request.view_purchase_request_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='activity_ids']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
         </field>
     </record>
 
@@ -63,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/views/stock_picking_views.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="stock_pikcing_inherited_form_jikimo_purchase_request" model="ir.ui.view">
+        <field name="name">stock.pikcing.inherited.form.jikimo.purchase.request</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']/button" position="before">
+                <button class="oe_stat_button" name="action_view_purchase_request" type="object" icon="fa-credit-card"
+                        attrs="{'invisible': [('purchase_request_count', '=', 0)]}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="purchase_request_count"/>
+                        </span>
+                        <span class="o_stat_text">采购申请</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>

jikimo_purchase_request/wizard/__init__.py

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

jikimo_purchase_request/wizard/purchase_request_wizard.py

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

jikimo_purchase_request/wizard/purchase_request_wizard_views.xml

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

jikimo_purchase_request_tier_validation/__manifest__.py

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

jikimo_purchase_request_tier_validation/models/__init__.py

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

jikimo_purchase_request_tier_validation/models/models.py

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

jikimo_purchase_request_tier_validation/models/stock_rule.py

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

jikimo_purchase_tier_validation/__manifest__.py

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

jikimo_workorder_exception/controllers/main.py

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

quality_control/models/quality.py

@@ -133,6 +133,7 @@ class QualityCheck(models.Model):
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
     material_name = fields.Char('材料名称', compute='_compute_material_name')
+    model_id = fields.Char('模型ID', related='product_id.model_id')
 
     # # 总数量，值为调拨单_产品明细_数量
     # total_qty = fields.Float('总数量', compute='_compute_total_qty', readonly=True)
@@ -141,7 +142,7 @@ class QualityCheck(models.Model):
     # # 出厂检验报告编号
     # report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
     # 总数量，值为调拨单_产品明细_数量
-    total_qty = fields.Char('总数量', compute='_compute_total_qty')
+    total_qty = fields.Char('总数量', compute='_compute_total_qty', store=True)
 
     column_nums = fields.Integer('测量值列数', default=1)
 
@@ -153,9 +154,9 @@ class QualityCheck(models.Model):
                 for move in record.picking_id.move_ids_without_package:
                     if move.product_id == record.product_id:
                         total_qty = int(move.product_uom_qty)
-                record.total_qty = total_qty if total_qty > 0 else ''
+                record.total_qty = total_qty if total_qty > 0 else 0
             else:
-                record.total_qty = ''
+                record.total_qty = 0
 
     # 检验数
     check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
@@ -338,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
         )
@@ -735,8 +736,9 @@ class QualityCheck(models.Model):
     def _compute_qty_to_test(self):
         for qc in self:
             if qc.is_lot_tested_fractionally:
+                rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
                 qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100,
-                                             precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
+                                             precision_rounding=rounding, rounding_method="UP")
             else:
                 qc.qty_to_test = qc.qty_line
 

quality_control/views/quality_views.xml

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

quality_control/wizard/quality_check_wizard.py

@@ -23,8 +23,8 @@ class QualityCheckWizard(models.TransientModel):
     lot_name = fields.Char(related='current_check_id.lot_name')
     lot_line_id = fields.Many2one(related='current_check_id.lot_line_id')
     qty_line = fields.Float(related='current_check_id.qty_line')
-    qty_to_test = fields.Float(related='current_check_id.qty_to_test')
-    qty_tested = fields.Float(related='current_check_id.qty_tested', readonly=False)
+    qty_to_test = fields.Float(related='current_check_id.qty_to_test', string='待检')
+    qty_tested = fields.Float(related='current_check_id.qty_tested', string='已检', readonly=False)
     measure = fields.Float(related='current_check_id.measure', readonly=False)
     measure_on = fields.Selection(related='current_check_id.measure_on')
     quality_state = fields.Selection(related='current_check_id.quality_state')

sf_base/commons/common.py

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

sf_base/controllers/controllers.py

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

sf_base/decorators/api_log.py

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

sf_base/models/api_log.py

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

sf_base/views/api_log_views.xml

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

sf_dlm/models/product_supplierinfo.py

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

sf_dlm_management/models/mrp_routing_workcenter.py

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

sf_dlm_management/models/sf_production_common.py

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

sf_manufacturing/__manifest__.py

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

sf_manufacturing/controllers/controllers.py

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

sf_manufacturing/controllers/main.py

@@ -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')})
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

sf_manufacturing/models/__init__.py

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

sf_manufacturing/models/mrp_production.py

@@ -279,7 +279,7 @@ class MrpProduction(models.Model):
                     production_id.part_name = production_id.product_id.part_name
                 elif production_id.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -636,13 +636,17 @@ class MrpProduction(models.Model):
     # 增加触发时间参数
     def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
         try:
+            reason = ""
             manufacturing_type = None
             if self.is_scrap:
                 manufacturing_type = 'scrap'
+                reason = "报废"
             elif self.tool_state == '2':
                 manufacturing_type = 'invalid_tool_rework'
+                reason = "无效功能刀具"
             elif self.is_rework:
                 manufacturing_type = 'rework'
+                reason = "返工"
             res = {'programming_no': self.programming_no,
                    'manufacturing_type': manufacturing_type,
                    'trigger_time': trigger_time,
@@ -657,6 +661,16 @@ class MrpProduction(models.Model):
             result = json.loads(ret['result'])
             logging.info('update_programming_state-ret:%s' % result)
             if result['status'] == 1:
+                self.programming_record_ids.create({
+                    'number': len(self.programming_record_ids) + 1,
+                    'production_id': self.id,
+                    'reason': reason,
+                    'programming_method': False,
+                    'current_programming_count': False,
+                    'target_production_id': False,
+                    'apply_time': fields.Datetime.now(),
+                    'send_time': False,
+                })
                 self.write({'is_rework': True})
             else:
                 raise UserError(ret['message'])
@@ -787,6 +801,17 @@ class MrpProduction(models.Model):
             if ret['status'] == 1:
                 self.write(
                     {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
+                # 生成编程记录
+                self.programming_record_ids.create({
+                    'number': len(self.programming_record_ids) + 1,
+                    'production_id': self.id,
+                    'reason': '首次下发',
+                    'programming_method': False,
+                    'current_programming_count': False,
+                    'target_production_id': False,
+                    'apply_time': fields.Datetime.now(),
+                    'send_time': False,
+                })
             else:
                 raise UserError(ret['message'])
         except Exception as e:
@@ -928,12 +953,13 @@ class MrpProduction(models.Model):
     #                         'sf_stock.stock_route_process_outsourcing').id)]
     #         for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
     #             cur_request_line = request_line_list[0]
-    #             cur_request_line['product_qty'] = len(request_line_list)
+    #             # cur_request_line['product_qty'] = cur_request_line['product_qty']
     #             cur_request_line['request_id'] = pr.id
     #             cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
     #             cur_request_line.pop('group_id', None)
     #             cur_request_line.pop('production_name', None)
     #             self.env["purchase.request.line"].create(cur_request_line)
+    #         pr.button_approved()
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
@@ -1771,7 +1797,6 @@ class MrpProduction(models.Model):
         """
             检查前置条件：制造订单【状态】=“待排程、待加工”，制造订单的【编程状态】=“已编程”。
         """
-        print('申请编程')
         if len(self) > 1:
             raise UserError('仅支持选择单个制造订单进行编程申请，请重新选择')
         for production in self:
@@ -1840,6 +1865,7 @@ class sf_programming_record(models.Model):
     target_production_id = fields.Char('目标制造单号')
     apply_time = fields.Datetime('申请时间')
     send_time = fields.Datetime('下发时间')
+    apply_uid = fields.Many2one('res.users', '申请人', default=lambda self: self.env.user)
 
 
 class sf_detection_result(models.Model):

sf_manufacturing/models/mrp_workorder.py

@@ -71,7 +71,7 @@ class ResMrpWorkOrder(models.Model):
                                         tracking=True)
     back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
     # pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
-    #
+
     # @api.depends('state')
     # def _compute_pr_mp_count(self):
     #     for item in self:
@@ -85,6 +85,7 @@ class ResMrpWorkOrder(models.Model):
     #             item.pr_mp_count = len(pr_ids)
     #         else:
     #             item.pr_mp_count = 0
+
     @api.depends('state')
     def _compute_back_button_display(self):
         for record in self:
@@ -129,8 +130,14 @@ class ResMrpWorkOrder(models.Model):
                     record.back_button_display = False
             else:
                 next_workorder = sorted_workorders[position + 1]
-                next_state = next_workorder.state
-                if (next_state == 'ready' or (
+                # 持续获取下一个工单，直到找到一个不是返工的工单
+                while next_workorder and next_workorder.state == 'rework':
+                    position += 1
+                    if position + 1 < len(sorted_workorders):
+                        next_workorder = sorted_workorders[position + 1]
+                    else:
+                        next_workorder = None
+                if next_workorder and (next_workorder.state == 'ready' or (
                         next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
                     record.back_button_display = True
                 else:
@@ -439,7 +446,6 @@ class ResMrpWorkOrder(models.Model):
         action['context'] = dict(self._context, default_origin=self.name)
         return action
 
-    @api.depends('state', 'production_id.name')
     def _compute_surface_technics_purchase_ids(self):
         for order in self:
             if order.routing_type == '表面工艺' and order.state not in ['cancel']:
@@ -485,6 +491,7 @@ class ResMrpWorkOrder(models.Model):
     #             'view_mode': 'tree,form',
     #         })
     #     return action
+
     def action_view_surface_technics_purchase(self):
         self.ensure_one()
         # if self.routing_type == '表面工艺':
@@ -513,7 +520,8 @@ class ResMrpWorkOrder(models.Model):
         return result
 
     def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
         # domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
         # domain = [('group_id', '=', self.production_id.procurement_group_id.id), ('purchase_type', '=', 'consignment')]
         purchase_orders = self.env['purchase.order'].search(domain, order='id desc')
@@ -736,21 +744,25 @@ class ResMrpWorkOrder(models.Model):
     #         self.workpiece_delivery_ids[0].write({'rfid_code': self.rfid_code})
 
     def get_plan_workorder(self, production_line):
-        tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
-        tomorrow_start = tomorrow + ' 00:00:00'
-        tomorrow_end = tomorrow + ' 23:59:59'
+        tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+        tomorrow_start = f"{tomorrow} 00:00:00"
+        tomorrow_end = f"{tomorrow} 23:59:59"
         logging.info('tomorrow:%s' % tomorrow)
         sql = """
           SELECT *
           FROM mrp_workorder
           WHERE state!='rework'
-          to_char(date_planned_start::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')>= %s
-          AND to_char(date_planned_finished::timestamp + '8 hour','YYYY-MM-DD HH:mm:SS')<= %s
+          AND (date_planned_start + interval '8 hours') >= %s::timestamp
+          AND (date_planned_finished + interval '8 hours') <= %s::timestamp
           """
         params = [tomorrow_start, tomorrow_end]
         if production_line:
+            line = self.env['sf.production.line'].search(
+                [('name', '=', production_line)], limit=1)
+            if not line:
+                raise ValueError(f"生产线'{production_line}'不存在")
             sql += "AND production_line_id = %s"
-            params.append(production_line)
+            params.append(line.id)
         self.env.cr.execute(sql, params)
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]
@@ -1243,6 +1255,13 @@ class ResMrpWorkOrder(models.Model):
         }]
         return workorders_values_str
 
+    # def check_lot_exists(self, picking_id, lot_id):
+    #     return bool(
+    #         picking_id.move_ids.move_line_ids.filtered(
+    #             lambda line: line.lot_id.id == lot_id
+    #         )
+    #     )
+
     def _process_compute_state(self):
         sorted_workorders = sorted(self, key=lambda x: x.sequence)
         for workorder in sorted_workorders:
@@ -1264,10 +1283,17 @@ class ResMrpWorkOrder(models.Model):
                         workorder.state = 'pending'
                     continue
             # ================= 如果制造订单制造类型为【人工线下加工】==========================
+            # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+            # picking_ids = workorder.production_id.picking_ids.filtered(
+            #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+            # exists = any(
+            #     move_line.lot_id == lot_id
+            #     for picking in picking_ids
+            #     for move in picking.move_ids
+            #     for move_line in move.move_line_ids
+            # )
             if (workorder.production_id.production_type == '人工线下加工'
-                    and workorder.production_id.schedule_state == '已排'
-                    and len(workorder.production_id.picking_ids.filtered(
-                        lambda w: w.state not in ['done', 'cancel'])) == 0):
+                    and workorder.production_id.schedule_state == '已排'):
                 # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     if workorder.production_id.state == 'rework':
@@ -1276,6 +1302,9 @@ class ResMrpWorkOrder(models.Model):
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
                         workorder.state = 'ready'
+                        # picking_id = workorder.production_id.picking_ids.filtered(
+                        #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                        # move_out = picking_id.move_ids
                         move_out = workorder.move_subcontract_workorder_ids[1]
                         for mo in move_out:
                             if mo.state != 'done':
@@ -1316,6 +1345,10 @@ class ResMrpWorkOrder(models.Model):
                             if purchase_orders_id.state == 'purchase':
                                 workorder.state = 'ready'
                                 move_out = workorder.move_subcontract_workorder_ids[1]
+                                # picking_id = workorder.production_id.picking_ids.filtered(
+                                #     lambda
+                                #         wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                                # move_out = picking_id.move_ids
                                 for mo in move_out:
                                     if mo.state != 'done':
                                         mo.write({'state': 'assigned', 'production_id': False})
@@ -1325,7 +1358,6 @@ class ResMrpWorkOrder(models.Model):
                             else:
                                 workorder.state = 'waiting'
 
-
     @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
                  'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                  'production_id.programming_state')
@@ -1357,11 +1389,11 @@ class ResMrpWorkOrder(models.Model):
             # 判断是否有坯料的序列号信息
             boolean = False
             if self.production_id.move_raw_ids:
-                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料':
+                if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and \
+                        self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
                     if self.production_id.move_raw_ids[0].move_line_ids:
-                        if self.production_id.move_raw_ids[0].move_line_ids:
-                            if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
-                                boolean = True
+                        if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+                            boolean = True
                 else:
                     boolean = True
             if not boolean:
@@ -1391,6 +1423,10 @@ class ResMrpWorkOrder(models.Model):
         if self.routing_type == '表面工艺':
             if self.is_subcontract is True:
                 move_out = self.move_subcontract_workorder_ids[1]
+                # picking_id = self.production_id.picking_ids.filtered(
+                #     lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
+                # move_out = picking_id.move_ids
+                # move_out = self.move_subcontract_workorder_ids[1]
                 # move_out = self.env['stock.move'].search(
                 #     [('location_id', '=', self.env['stock.location'].search(
                 #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
@@ -1556,25 +1592,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 ['装夹预调']):
-                for workorder in record.production_id.workorder_ids:
-                    if workorder.processing_panel == record.processing_panel:
-                        rfid_code = workorder.rfid_code
-                        if record.is_rework is not True:
-                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                        elif workorder.routing_type != '装夹预调' and workorder.state != 'rework':
-                            workorder.write({'rfid_code_old': False, 'rfid_code': False})
-                        elif workorder.routing_type == '装夹预调' and workorder.state != 'rework':
-                            workorder.write({'rfid_code_old': rfid_code, 'rfid_code': False})
-                        self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
-                            {'tool_material_status': '可用'})
-                        if workorder.rfid_code:
-                            raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
-                        # workorder.rfid_code_old = rfid_code
-                        # workorder.rfid_code = False
-                        logging.info('workorder.rfid_code:%s' % workorder.rfid_code)
 
+            if record.routing_type in ['解除装夹']:
+                rfid_code = record.rfid_code
+                work_ids = record.production_id.workorder_ids.filtered(
+                    lambda wo: wo.processing_panel == record.processing_panel and wo.state != 'rework')
+                work_ids.write({'rfid_code_old': rfid_code, 'rfid_code': False})
+                self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
+                    {'tool_material_status': '可用'})
+                if any(wo.rfid_code for wo in work_ids):
+                    raise ValidationError(f'【{record.name}】工单解绑失败，请重新点击完成按钮！！！')
+                logging.info('work_ids.rfid_code:%s' % [wo.rfid_code for wo in work_ids])
             if is_production_id is True:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
@@ -1809,7 +1837,7 @@ class ResMrpWorkOrder(models.Model):
             orderby=orderby,
             lazy=lazy
         )
-    
+
     model_id = fields.Char('模型ID', related='production_id.model_id')
 
 

sf_manufacturing/models/product_template.py

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

sf_manufacturing/models/purchase_order.py

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

sf_manufacturing/models/purchase_request_line.py

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

sf_manufacturing/models/sale_order.py

@@ -58,7 +58,8 @@ class SaleOrder(models.Model):
             # 复制成品模板上的属性
             line.product_id.product_tmpl_id.copy_template(product_template_id)
             # 将模板上的single_manufacturing属性复制到成品上
-            line.product_id.single_manufacturing = product_template_id.single_manufacturing
+            # line.product_id.single_manufacturing = product_template_id.single_manufacturing
+            # line.product_id.tracking = product_template_id.tracking
 
             order_id = self
             product = line.product_id
@@ -75,7 +76,7 @@ class SaleOrder(models.Model):
                 'embryo_redundancy_id': line.embryo_redundancy_id,
             }
             product_name = ''
-            match = re.search(r'(S\d{5}-\d)', product.name)
+            match = re.search(r'(S\d{5}-\d+)', product.name)
             # 如果匹配成功，提取结果
             if match:
                 product_name = match.group(0)
@@ -189,7 +190,30 @@ class SaleOrder(models.Model):
             'target': 'new',
             'res_id': wizard.id,
         }
+    def create_sale_documents(self, contract_file_name, contract_file):
+        # 创建ir.attachment记录
+        attachment = self.env['ir.attachment'].sudo().create({
+            'name': contract_file_name,
+            'type': 'binary',
+            'datas': contract_file,
+            'res_model': 'sale.order',
+        })
 
+        # 获取默认的文档文件夹
+        workspace = self.env.ref('sf_sale.documents_sales_contracts_folder_1').id
+
+        # 创建 documents.document 记录
+        document = self.env['documents.document'].sudo().create({
+            'name': contract_file_name,
+            'attachment_id': attachment.id,
+            'folder_id': workspace,
+            'res_model': 'sale.order',
+            'res_id': self.id,
+        })
+
+        self.write({
+            'contract_document_id': document.id
+        })
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'

sf_manufacturing/models/sf_production_common.py

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

sf_manufacturing/models/stock.py

@@ -564,6 +564,13 @@ class StockPicking(models.Model):
 
     part_numbers = fields.Char(string="零件图号", compute='_compute_part_info', store=True, index=True)
     part_names = fields.Char(string="零件名称", compute='_compute_part_info', store=True, index=True)
+    model_id = fields.Char('模型ID', compute='_compute_model_id', store=True, index=True)
+
+    @api.depends('move_ids_without_package.model_id')
+    def _compute_model_id(self):
+        for picking in self:
+            model_id = picking.move_ids_without_package.mapped('model_id')
+            picking.model_id = ','.join(filter(None, model_id))
 
     @api.depends('move_ids_without_package.part_number', 'move_ids_without_package.part_name')
     def _compute_part_info(self):
@@ -631,6 +638,62 @@ class StockPicking(models.Model):
                         move.action_clear_lines_show_details()
                         move.action_show_details()
         res = super().button_validate()
+        # lot_ids = None
+        # product_ids = self.move_ids.mapped('product_id')
+        # if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
+        #     lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
+        # production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
+        # if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
+        #     # 如果是最后一张外协入库单，则设置库存位置的预留数量
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_finish()
+        #     # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
+        #     # picking_ids = workorder.production_id.picking_ids.filtered(
+        #     #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+
+        #     # if move_in:
+        #     #     workorder = move_in.subcontract_workorder_id
+        #     #     workorders = workorder.production_id.workorder_ids
+        #     #     subcontract_workorders = workorders.filtered(
+        #     #         lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
+        #     #     # if workorder == subcontract_workorders[-1]:
+        #     #     #     self.env['stock.quant']._update_reserved_quantity(
+        #     #     #         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+        #     #     #         lot_id=move_in.move_line_ids.lot_id,
+        #     #     #         package_id=False, owner_id=False, strict=False
+        #     #     #     )
+        #     #     workorder.button_finish()
+        # if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
+        #     for production_id in production_ids:
+        #         if lot_ids:
+        #             lot_id = production_id.move_raw_ids.move_line_ids.lot_id
+        #             # picking_ids = production_id.picking_ids.filtered(
+        #             #     lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
+        #             if lot_id in lot_ids:
+        #                 workorder_id = production_id.workorder_ids.filtered(
+        #                     lambda a: a.state == 'progress' and a.is_subcontract)
+        #                 if not workorder_id:
+        #                     continue
+        #                 workorder_id.button_finish()
+        #         else:
+        #             workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
+        #             if not workorder_id:
+        #                 continue
+        #             workorder_id.button_start()
         picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
         if res is True and self.picking_type_id.id == picking_type_in:
             # 如果是最后一张外协入库单，则设置库存位置的预留数量
@@ -675,6 +738,7 @@ class StockPicking(models.Model):
 
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
+        production = workorders[0].production_id
         for workorder in workorders:
             if workorder.move_subcontract_workorder_ids:
                 workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
@@ -706,7 +770,7 @@ class StockPicking(models.Model):
             })
             moves_in = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
-                                                                  procurement_group_id.id, move_dest_id))
+                                                                  procurement_group_id.id, move_dest_id, production.product_uom_qty))
             picking_in = self.create(
                 moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
             # pick_ids.append(picking_in.id)
@@ -716,7 +780,7 @@ class StockPicking(models.Model):
             # self.env.context.get('default_production_id')
             moves_out = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
-                                                                  procurement_group_id.id, moves_in.id))
+                                                                  procurement_group_id.id, moves_in.id, production.product_uom_qty))
             workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
             picking_out = self.create(
                 moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
@@ -782,6 +846,7 @@ class ReStockMove(models.Model):
     materiel_height = fields.Float(string='物料高度', digits=(16, 4))
     part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
     part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+    model_id = fields.Char('模型ID', related='product_id.model_id')
 
     @api.depends('product_id')
     def _compute_part_info(self):
@@ -792,7 +857,7 @@ class ReStockMove(models.Model):
                     move.part_name = move.product_id.part_name
                 elif move.product_id.categ_id.type == '坯料':
                     product_name = ''
-                    match = re.search(r'(S\d{5}-\d)', move.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', move.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -824,7 +889,7 @@ class ReStockMove(models.Model):
                             continue
                     product_name = ''
                     logging.info('制造订单的产品 %s', production_id.product_id.name)
-                    match = re.search(r'(S\d{5}-\d)', production_id.product_id.name)
+                    match = re.search(r'(S\d{5}-\d+)', production_id.product_id.name)
                     # 如果匹配成功，提取结果
                     if match:
                         product_name = match.group(0)
@@ -848,7 +913,7 @@ class ReStockMove(models.Model):
             traceback_error = traceback.format_exc()
             logging.error("零件图号 零件名称获取失败:%s" % traceback_error)
 
-    def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
+    def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False, product_uom_qty=1.0):
         route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
         stock_rule = self.env['stock.rule'].sudo().search(
             [('route_id', '=', route_id), ('picking_type_id', '=', picking_type_id)])
@@ -857,7 +922,7 @@ class ReStockMove(models.Model):
             'company_id': item.company_id.id,
             'product_id': item.bom_id.bom_line_ids.product_id.id,
             'product_uom': item.bom_id.bom_line_ids.product_uom_id.id,
-            'product_uom_qty': 1.0,
+            'product_uom_qty': product_uom_qty,
             'location_id': stock_rule.location_src_id.id,
             'location_dest_id': stock_rule.location_dest_id.id,
             'origin': item.name,
@@ -902,7 +967,7 @@ class ReStockMove(models.Model):
             'location_id': self.picking_id.location_id.id,
             'location_dest_id': self.picking_id.location_dest_id.id,
             'picking_id': self.picking_id.id,
-            'reserved_uom_qty': 1.0,
+            'reserved_uom_qty': self.product_uom_qty,
             'lot_id': production_id.move_line_raw_ids.lot_id.id,
             'company_id': self.env.company.id,
             # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,

sf_manufacturing/models/stock_warehouse_orderpoint.py

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

sf_manufacturing/views/mrp_production_addional_change.xml

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

sf_manufacturing/views/mrp_routing_workcenter_view.xml

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

sf_manufacturing/views/mrp_views_menus.xml

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

sf_manufacturing/views/mrp_workorder_view.xml

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

sf_manufacturing/views/product_template_views.xml

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

sf_manufacturing/views/stock_picking_view.xml

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

sf_manufacturing/views/stock_warehouse_orderpoint.xml

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

sf_manufacturing/wizard/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:
-                        self.production_id.workorder_ids.filtered(
-                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                            {'rfid_code': None})
+
+                # for order in rework_workorder_ids:
+                #     order.write({
+                #         'rfid_code_old': order.rfid_code,
+                #         'rfid_code': False
+                #     })
                 # 返工工单状态设置为【返工】
                 rework_workorder_ids.write({'state': 'rework'})
+                if clamp_workorder_ids:
+                    for clamp_workorder_id in clamp_workorder_ids:
+                        # 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录
+                        self.production_id.workorder_ids.filtered(lambda wk: (
+                                wk.processing_panel == clamp_workorder_id.processing_panel
+                                and wk.state == 'rework' and wk.rfid_code)).write(
+                            {'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None})
+                        # 清除返工的装夹预调工单同面的非返工工单的RFID
+                        self.production_id.workorder_ids.filtered(lambda wk: (
+                                wk.processing_panel == clamp_workorder_id.processing_panel and wk.state != 'rework')).write(
+                            {'rfid_code_old': None, 'rfid_code': None})
+                # 清除其他返工工单的RFID
+                for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code):
+                    work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                 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(
-                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
+                            # 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
+                            work_id = self.production_id.workorder_ids.filtered(
+                                lambda wk: (wk.processing_panel == new_work_id.processing_panel and wk.rfid_code
+                                            and wk.routing_type == '装夹预调' and wk.state != 'rework'))
+                            if work_id:
+                                new_work_id.write({'rfid_code': work_id.rfid_code})
                     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({
@@ -268,6 +290,8 @@ class ReworkWizard(models.TransientModel):
                                             'cmm_ids': new_cnc_workorder.cmm_ids.sudo()._json_cmm_program(
                                                 cnc_work.processing_panel, ret),
                                             'cnc_worksheet': old_cnc_rework.cnc_worksheet})
+                                    # 复制装夹图纸
+                                    new_cnc_workorder.processing_drawing = old_cnc_rework.processing_drawing
                                 # ========== 处理装夹预调 【装夹图纸】 数据 ================
                                 for new_pre_work in new_pre_workorder_ids:
                                     pre_rework = max(self.production_id.workorder_ids.filtered(
@@ -294,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'})
                 # ================= 返工完成，制造订单状态置为加工中 ==============
@@ -315,7 +340,7 @@ class ReworkWizard(models.TransientModel):
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
                         if p.processing_panel is not False and p.processing_panel not in panel_arr:
-                            if len(panel_arr)>0:
+                            if len(panel_arr) > 0:
                                 panel_arr += ','.join(p.processing_panel)
                             else:
                                 panel_arr = p.processing_panel

sf_message/data/bussiness_node.xml

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

sf_message/data/template_data.xml

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

sf_message/models/__init__.py

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

sf_message/models/sf_message_product.py

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

sf_message/models/sf_message_purchase_request.py

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

sf_mrs_connect/controllers/controllers.py

@@ -24,6 +24,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
             res = {'status': 1, 'message': '成功'}
             datas = request.httprequest.data
             model_id = None
+            part_number = None
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
@@ -59,7 +60,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                         return json.JSONEncoder().encode(res)
                 for production in productions:
-                    model_id = production.product_id.model_id # 一个编程单的制造订单对应同一个模型
                     production.write({'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False})
                     for panel in ret['processing_panel'].split(','):
                         # 查询状态为进行中且工序类型为CNC加工的工单
@@ -76,6 +76,10 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                             cnc_workorder_has.write(
                                 {'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret),
                                  'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)})
+                            
+                # 一个编程单的制造订单对应同一个模型
+                model_id = productions[0].product_id.model_id 
+                part_number = productions[0].product_id.part_number
                 for panel in ret['processing_panel'].split(','):
                     # 查询状态为进行中且工序类型为CNC加工的工单
                     cnc_workorder = productions.workorder_ids.filtered(
@@ -95,7 +99,12 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                     logging.info('panel_file_path:%s' % panel_file_path)
                                     
                             # 向编程单中添加二维码
-                            request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "模型ID：%s" % model_id)
+                            request.env['printing.utils'].add_qr_code_to_pdf(
+                                panel_file_path,
+                                model_id,
+                                "模型ID：%s" % model_id,
+                                "零件图号：%s" % part_number if part_number else None
+                            )
                             cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
                             pre_workorder = productions.workorder_ids.filtered(
                                 lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
@@ -134,94 +143,114 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                 for production in productions:
                     logging.info('production====:%s' % production.name)
                     record_ids_obj = production.programming_record_ids.filtered(
-                        lambda r: r.current_programming_count == ret['reprogramming_num'])
+                        lambda r: r.send_time is False)
                     logging.info('record_ids_obj====:%s' % record_ids_obj)
                     if record_ids_obj:
+                        record_ids_obj = record_ids_obj.sorted('id')[0]
                         logging.info('record_ids_obj.reason====:%s' % record_ids_obj.reason)
-                        record_ids_obj.write(
-                            {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
+                        record_ids_obj.write({
+                            'current_programming_count': ret['reprogramming_num'],
+                            'send_time': ret['send_time'],
+                            'target_production_id': productions_reprogram,
+                            'programming_method': ret['programme_way']
+                        })
                         logging.info('已更新编程记录:%s' % record_ids_obj)
                         correct_record_ids_obj = record_ids_obj
                         correct_production_id = production.id
-                    if ret['reprogramming_num'] == 0:
-                        logging.info('首次下发')
-                        production.programming_record_ids.create({
-                            'number': 1,
-                            'production_id': production.id,
-                            'reason': '首次下发',
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': False,
-                            'send_time': ret['send_time'],
-                        })
-                        logging.info('已创建首次下发的编程记录:%s' % production.name)
-                    elif ret['reset_flag']:
-                        logging.info('重置状态')
-                        production.programming_record_ids.create({
-                            'number': len(production.programming_record_ids) + 1,
-                            'production_id': production.id,
-                            'reason': '重置状态',
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': False,
-                            'send_time': ret['send_time'],
-                        })
-                        logging.info('已创建重置状态的编程记录:%s' % production.name)
-                    elif ret['manufacturing_type'] == 'rework':
-                        logging.info('返工')
-                        rework_record_ids_obj = production.programming_record_ids.create({
-                            'number': len(production.programming_record_ids) + 1,
-                            'production_id': production.id,
-                            'reason': '返工',
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': ret['trigger_time'],
-                            'send_time': ret['send_time'],
-                        })
-                        logging.info('已创建返工的编程记录:%s' % production.name)
-                        logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
-                        # rework_production_id = production.id
-                        # logging.info('rework_production_id====:%s' % rework_production_id)
-                    elif ret['manufacturing_type'] == 'scrap':
-                        production.programming_record_ids.create({
-                            'number': len(production.programming_record_ids) + 1,
-                            'production_id': production.id,
-                            'reason': '报废',
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': ret['trigger_time'],
-                            'send_time': ret['send_time'],
-                        })
-                    elif ret['manufacturing_type'] == 'invalid_tool_rework':
-                        logging.info('无效功能刀具')
-                        production.programming_record_ids.create({
-                            'number': len(production.programming_record_ids) + 1,
-                            'production_id': production.id,
-                            'reason': '无效功能刀具',
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': ret['trigger_time'],
-                            'send_time': ret['send_time'],
-                        })
-                        logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
-                    elif ret['reprogramming_reason']:
-                        production.programming_record_ids.create({
-                            'number': len(production.programming_record_ids) + 1,
-                            'production_id': production.id,
-                            'reason': ret['reprogramming_reason'],
-                            'programming_method': ret['programme_way'],
-                            'current_programming_count': ret['reprogramming_num'],
-                            'target_production_id': productions_reprogram,
-                            'apply_time': ret['trigger_time'],
-                            'send_time': ret['send_time'],
-                        })
+                    # 更新重新编程记录
                     else:
-                        logging.info('无对应状态，不需更新编程记录')
+                        if ret['reset_flag']:
+                            logging.info('重置状态')
+                            production.programming_record_ids.create({
+                                'number': len(production.programming_record_ids) + 1,
+                                'production_id': production.id,
+                                'reason': '重置状态',
+                                'programming_method': ret['programme_way'],
+                                'current_programming_count': ret['reprogramming_num'],
+                                'target_production_id': productions_reprogram,
+                                'apply_time': False,
+                                'send_time': ret['send_time'],
+                            })
+                        else:
+                            logging.info('无对应状态，不需更新编程记录')
+                    # if ret['reprogramming_num'] == 0:
+                    #     logging.info('首次下发')
+                    #     production.programming_record_ids.create({
+                    #         'number': 1,
+                    #         'production_id': production.id,
+                    #         'reason': '首次下发',
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': False,
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    #     logging.info('已创建首次下发的编程记录:%s' % production.name)
+                    # elif ret['reset_flag']:
+                    #     logging.info('重置状态')
+                    #     production.programming_record_ids.create({
+                    #         'number': len(production.programming_record_ids) + 1,
+                    #         'production_id': production.id,
+                    #         'reason': '重置状态',
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': False,
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    #     logging.info('已创建重置状态的编程记录:%s' % production.name)
+                    # elif ret['manufacturing_type'] == 'rework':
+                    #     logging.info('返工')
+                    #     rework_record_ids_obj = production.programming_record_ids.create({
+                    #         'number': len(production.programming_record_ids) + 1,
+                    #         'production_id': production.id,
+                    #         'reason': '返工',
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': ret['trigger_time'],
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    #     logging.info('已创建返工的编程记录:%s' % production.name)
+                    #     logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
+                    #     # rework_production_id = production.id
+                    #     # logging.info('rework_production_id====:%s' % rework_production_id)
+                    # elif ret['manufacturing_type'] == 'scrap':
+                    #     production.programming_record_ids.create({
+                    #         'number': len(production.programming_record_ids) + 1,
+                    #         'production_id': production.id,
+                    #         'reason': '报废',
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': ret['trigger_time'],
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    # elif ret['manufacturing_type'] == 'invalid_tool_rework':
+                    #     logging.info('无效功能刀具')
+                    #     production.programming_record_ids.create({
+                    #         'number': len(production.programming_record_ids) + 1,
+                    #         'production_id': production.id,
+                    #         'reason': '无效功能刀具',
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': ret['trigger_time'],
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    #     logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
+                    # elif ret['reprogramming_reason']:
+                    #     production.programming_record_ids.create({
+                    #         'number': len(production.programming_record_ids) + 1,
+                    #         'production_id': production.id,
+                    #         'reason': ret['reprogramming_reason'],
+                    #         'programming_method': ret['programme_way'],
+                    #         'current_programming_count': ret['reprogramming_num'],
+                    #         'target_production_id': productions_reprogram,
+                    #         'apply_time': ret['trigger_time'],
+                    #         'send_time': ret['send_time'],
+                    #     })
+                    
 
                 for production in productions:
                     logging.info('production====:%s' % production.name)
@@ -240,6 +269,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                                 'current_programming_count': correct_record_ids_obj.current_programming_count,
                                 'target_production_id': correct_record_ids_obj.target_production_id,
                                 'apply_time': correct_record_ids_obj.apply_time,
+                                'apply_uid': correct_record_ids_obj.apply_uid.id,
                                 'send_time': correct_record_ids_obj.send_time,
                             })
                             logging.info('已创建正确的制造订单的编程记录:%s' % production.name)

sf_plan/models/custom_plan.py

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

sf_plan/views/view.xml

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

sf_quality/__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,6 +5,7 @@ from odoo import fields, models, api
 from odoo.exceptions import ValidationError
 from datetime import datetime
 from odoo.addons.sf_base.commons.common import Common
+from odoo.tools import float_round, float_compare
 
 
 class QualityCheck(models.Model):
@@ -125,10 +126,178 @@ class QualityCheck(models.Model):
         # todo 需修改
         val = ['0037818516']
         logging.info('获取到的工单信息%s' % val)
-        r = requests.post(crea_url, json=val, headers=headers)
+        # r = requests.post(crea_url, json=val, headers=headers)
+        r = self.env['api.request.log'].log_request(
+            'get',
+            crea_url,
+            name='零件特采',
+            responser='中控系统',
+            json=val,
+            headers=headers
+        )
         ret = r.json()
         logging.info('_register_quality_check:%s' % ret)
         if ret['Succeed']:
             return "零件特采发送成功"
         else:
             raise ValidationError("零件特采发送失败")
+        
+    
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for val in vals_list:
+            if 'point_id' in val and 'measure_on' not in val:
+                # 如果没有控制方式字段，则从检查点读取质量方式
+                point_id = self.env['quality.point'].browse(val['point_id'])
+                val.update({'measure_on': point_id.measure_on})
+        return super(QualityCheck, self).create(vals_list)
+    
+
+    @api.depends('total_qty','testing_percentage_within_lot', 'is_lot_tested_fractionally')
+    def _compute_workorder_qty_to_test(self):
+        for qc in self:
+            if qc.is_lot_tested_fractionally:
+                rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
+                qc.workorder_qty_to_test = float_round(float(qc.total_qty) * qc.testing_percentage_within_lot / 100,
+                                                precision_rounding=rounding, rounding_method="UP")
+            else:
+                qc.workorder_qty_to_test = qc.total_qty
+
+    @api.depends('picking_id', 'workorder_id')
+    def _compute_total_qty(self):
+        super(QualityCheck, self)._compute_total_qty()
+        for qc in self: 
+            if not qc.picking_id and qc.workorder_id:
+                qc.total_qty = qc.workorder_id.production_id.product_qty
+
+    @api.depends('workorder_qty_to_test')
+    def _compute_workorder_qty_tested(self):
+        for qc in self:
+            qc.workorder_qty_tested = qc.workorder_qty_to_test
+
+
+    workorder_qty_to_test = fields.Float('应检', compute='_compute_workorder_qty_to_test', store=True)
+    workorder_qty_tested = fields.Float('已检', compute='_compute_workorder_qty_tested', store=True)
+    workorder_qty_test_failed = fields.Float('不合格数')
+
+
+    @api.onchange('total_qty', 'workorder_qty_test_failed', 'workorder_qty_to_test', 'workorder_qty_tested')
+    def _onchage_qty(self):
+        for record in self:
+            if record.total_qty and record.workorder_qty_to_test and record.workorder_qty_to_test > float(record.total_qty):
+                record.workorder_qty_to_test = float(record.total_qty)
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '待检数量不能超过总数量'
+                    }
+                }
+            if record.workorder_qty_to_test and record.workorder_qty_tested and record.workorder_qty_tested > record.workorder_qty_to_test:
+                record.workorder_qty_tested = record.workorder_qty_to_test
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '已检数量不能超过待检数量'
+                    }
+                }
+            if record.workorder_qty_tested and record.workorder_qty_test_failed and record.workorder_qty_test_failed > record.workorder_qty_tested:
+                record.workorder_qty_test_failed = record.workorder_qty_tested
+                return {
+                    'warning': {
+                        'title': '警告',
+                        'message': '不合格数量不能超过已检数量'
+                    }
+                }
+            
+    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,20 +73,59 @@
             <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': [('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': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                    <field name="workorder_qty_to_test" attrs="{'readonly': 0, 'on_chnage': 1}"/>
+                    <field name="uom_id"/>
+                </div>
+                <label for="workorder_qty_tested"
+                    attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        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': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
+                <div class="o_row"
+                        attrs="{'invisible': ['|', ('measure_on', '!=', 'move_line'), '&amp;', ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
+                    <field name="workorder_qty_test_failed" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
+                    <field name="uom_id"/>
+                </div>
+            </xpath>
+            <xpath expr="//label[@for='qty_tested']" position="attributes">
+                <attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&amp;', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
+            </xpath>
+            <xpath expr="//div[@class='o_row'][.//field[@name='qty_tested']]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&amp;', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
             </xpath>
         </field>
     </record>

sf_sale/__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 write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError

sf_sale/models/quick_easy_order_old.py

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

sf_sale/models/sale_order.py

@@ -63,6 +63,11 @@ class ReSaleOrder(models.Model):
 
     model_display_version = fields.Char('模型展示版本', default="v1")
 
+    contract_code = fields.Char('合同编号')
+    contract_document_id = fields.Many2one('documents.document', string='合同文件')
+    contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
+    contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
+
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
                           deadline_of_delivery, payments_way, pay_way, order_number, state='sale',
@@ -194,18 +199,15 @@ class ReSaleOrder(models.Model):
     @api.depends('order_line.purchase_line_ids.order_id')
     def _compute_purchase_order_count(self):
         for order in self:
-            order.purchase_order_count = len(order._get_purchase_orders().filtered(
-                lambda po: po.purchase_type not in ['outsourcing']))
-            order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered(
-                lambda po: po.purchase_type in ['outsourcing']))
+            order.purchase_order_count = len(order._get_sale_to_purchase('outsourcing'))
+            order.consignment_purchase_order_count = len(order._get_sale_to_purchase_1('outsourcing'))
 
     def action_view_purchase_orders(self):
         """
         采购
         """
         self.ensure_one()
-        purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type not in ['outsourcing']).ids
+        purchase_order_ids = self._get_sale_to_purchase('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -223,13 +225,20 @@ class ReSaleOrder(models.Model):
             })
         return action
 
+    def _get_sale_to_purchase(self, purchase_type):
+        """查询满足条件的采购订单"""
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type not in ['outsourcing']).ids
+        order_ids = self.env['purchase.order'].sudo().search(
+            [('origin', '=', self.name), ('purchase_type', '!=', purchase_type)]).ids
+        return list(set(purchase_order_ids) | set(order_ids))
+
     def action_view_consignment_purchase_orders(self):
         """
         委外加工
         """
         self.ensure_one()
-        outsourcing_purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type in ['outsourcing']).ids
+        outsourcing_purchase_order_ids = self._get_sale_to_purchase_1('outsourcing')
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -247,6 +256,14 @@ class ReSaleOrder(models.Model):
             })
         return action
 
+    def _get_sale_to_purchase_1(self, purchase_type):
+        """查询满足条件的采购订单"""
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type == purchase_type).ids
+        order_ids = self.env['purchase.order'].sudo().search(
+            [('origin', '=', self.name), ('purchase_type', '=', purchase_type)]).ids
+        return list(set(purchase_order_ids) | set(order_ids))
+
 
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
@@ -358,12 +375,13 @@ class RePurchaseOrder(models.Model):
 
     @api.depends('partner_id')
     def _compute_user_id(self):
-        if not self.user_id:
-            if self.partner_id:
-                self.user_id = self.partner_id.purchase_user_id.id
-                # self.state = 'purchase'
-            else:
-                self.user_id = self.env.user.id
+        for item in self:
+            if not item.user_id:
+                if item.partner_id:
+                    item.user_id = item.partner_id.purchase_user_id.id
+                    # self.state = 'purchase'
+                else:
+                    item.user_id = item.env.user.id
 
     @api.constrains('order_line')
     def check_order_line(self):
@@ -393,10 +411,11 @@ class RePurchaseOrder(models.Model):
     #         # route_ids
     #         result.append({
     #             "product_id": server_template.product_variant_id.id,
+    #             'related_product': production.product_id.id,
     #             "name": production.procurement_group_id.name,
     #             "date_required": fields.Datetime.now(),
     #             "product_uom_id":server_template.uom_id.id,
-    #             "product_qty": 1,
+    #             "product_qty": production.product_qty,
     #             "request_id": False,
     #             "move_dest_ids": False,
     #             "orderpoint_id": False,
@@ -419,7 +438,7 @@ class RePurchaseOrder(models.Model):
                      ('detailed_type', '=', 'service')])
                 server_product_process.append((0, 0, {
                     'product_id': server_template.product_variant_id.id,
-                    'product_qty': 1,
+                    'product_qty': production.product_uom_qty,
                     'product_uom': server_template.uom_id.id,
                     'related_product': production.product_id.id,
                     'manual_part_number': pp.part_number,

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

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

sf_tool_management/models/functional_tool.py

@@ -150,6 +150,17 @@ class FunctionalCuttingToolEntity(models.Model):
                         else:
                             # 原刀从线边出库
                             item.tool_in_out_stock_location_1(location_id, tool_room_id)
+                    # 系统中该刀在线边刀架其他位置，需先清除这个位置的刀具信息
+                    shelf_location_id = self.env['sf.shelf.location'].sudo().search([
+                        ('product_sn_id', '=', item.barcode_id.id)])
+                    if shelf_location_id:
+                        shelf_location_id.write(
+                            {'product_id': None,
+                             'product_sn_id': None,
+                             'tool_rfid': None,
+                             "tool_name_id": None,
+                             'product_num': 0,
+                             'location_status': '空闲'})
                     # 新刀入库到线边
                     item.create_stock_move(pre_manufacturing_id, location_id)
                     item.current_shelf_location_id = location_id.id

sf_tool_management/models/maintenance_equipment.py

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

sf_warehouse/__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 @@
+from odoo import api, SUPERUSER_ID
+
+def migrate(cr, version):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    sf_shelf_model = env["sf.shelf"]
+    sf_shelf_location_model = env["sf.shelf.location"]
+    
+    preproduction_shelf_ids = sf_shelf_location_model.get_preproduction_shelf_ids()
+    
+    shelves = sf_shelf_model.search([])
+    for shelf in shelves:
+        if shelf.id not in preproduction_shelf_ids:
+            continue
+            
+        shelf_barcode = shelf.barcode or ""
+        if not shelf_barcode:
+            continue
+        locations = sf_shelf_location_model.search([("shelf_id", "=", shelf.id)], order="id asc")
+        for index, location in enumerate(locations, start=1):
+            new_barcode = f"{shelf_barcode}-{index:03d}"
+            location.barcode = new_barcode

sf_warehouse/models/sync_common.py

@@ -121,12 +121,13 @@ class MrsShelfLocationDataSync(models.Model):
                         tool.tool_in_out_stock_location(location_id)
                         if tool:
                             location_id.product_sn_id = tool.barcode_id.id
-                            # 修改功能刀具状态
-                            if item.get('State') == '报警':
-                                if tool.functional_tool_status != item.get('State'):
-                                    tool.write({
-                                        'functional_tool_status': item['State']
-                                    })
+                            # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
+                            if 'LifeStd' in item and 'LifeUse' in item:
+                                tool.sudo().write({
+                                    'max_lifetime_value': item['LifeStd'],
+                                    'used_value': item['LifeUse'],
+                                    'functional_tool_status': item['State'],
+                                })
                         else:
                             location_id.product_sn_id = False
                             if item['RfidCode']:

sf_warehouse/static/src/css/kanban_location_custom.scss

@@ -0,0 +1,198 @@
+// 定义看板公共样式的Mixin
+@mixin kanban-common-styles($record-count-each-row, $record-gap: 16px) {
+    $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: 0 !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: 0 !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;
+      position: relative;
+      transition: all 0.25s ease !important;
+      overflow: visible !important; // 允许悬停条溢出卡片边界
+  
+      // === 状态标签（保留原设计）===
+      .status-label {
+        position: absolute;
+        top: 8px;
+        right: 8px;
+        padding: 3px 8px;
+        background: rgba(255, 255, 255, 0.9);
+        border: 1px solid #e0e0e0;
+        border-radius: 3px;
+        font-size: 11px;
+        color: #424242;
+        z-index: 2;
+      }
+  
+      // === 优化：悬停信息条（核心改动）===
+      .status-hover-bar {
+        position: absolute;
+        bottom: calc(100% + 8px); // 默认显示在卡片上方
+        left: 0;
+        z-index: 1000;
+        min-width: max-content;    // 宽度自适应内容
+        max-width: 300px;          // 防止过宽
+        padding: 10px 12px;
+        background: rgba(255, 255, 255, 0.95);
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+        font-size: 12px;
+        color: #424242;
+        white-space: nowrap;       // 强制单行显示
+        opacity: 0;
+        pointer-events: none;      // 避免阻挡卡片交互
+        transition: opacity 0.2s ease, transform 0.2s ease;
+        transform: translateY(10px);
+        
+        // 三角形指示器
+        &::after {
+          content: '';
+          position: absolute;
+          top: 100%;
+          left: 15px;
+          border: 6px solid transparent;
+          border-top-color: rgba(0, 0, 0, 0.85);
+        }
+  
+        div {
+          margin-bottom: 4px;
+          line-height: 1.4;
+        }
+      }
+  
+      // === 悬停触发逻辑 ===
+      &:hover {
+        transform: translateY(-4px) !important;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
+        z-index: 10;
+  
+        .status-hover-bar {
+        background: rgba(50, 50, 50, 0.9);
+        color: #fff !important;
+        font-size: 12px;
+          opacity: 0.9;
+          transform: translateY(0);
+          pointer-events: auto; // 悬停时允许交互
+        }
+      }
+  
+      // === 边界保护（智能定位）===
+      // 左侧卡片：左对齐
+      &:nth-child(#{$record-count-each-row}n+1) .status-hover-bar {
+        left: 0;
+        right: auto;
+        &::after { left: 15px; }
+      }
+  
+      // 右侧卡片：右对齐
+      &:nth-child(#{$record-count-each-row}n) .status-hover-bar {
+        left: auto;
+        right: 0;
+        &::after {
+          left: auto;
+          right: 15px;
+        }
+      }
+      &:nth-child(#{$record-count-each-row}n + #{$record-count-each-row - 1}) .status-hover-bar {
+        left: auto;
+        right: 0;
+        &::after {
+          left: auto;
+          right: 15px;
+        }
+      }
+      // 顶部卡片：悬停条显示在下方
+      &:nth-child(-n+#{$record-count-each-row}) .status-hover-bar {
+        bottom: auto;
+        top: calc(100% + 8px);
+        &::after {
+          top: auto;
+          bottom: 100%;
+          border-top-color: transparent;
+          border-bottom-color: rgba(255, 255, 255, 0.95);
+        }
+      }
+  
+      // === 禁用状态样式（保留原效果）===
+      &.kanban_color_3 {
+        opacity: 0.6;
+        &:hover {
+          opacity: 0.85;
+          .status-hover-bar {
+            background:rgba(0, 0, 0, 0.85);
+            color: white !important;
+            border: 1px solid rgba(255, 255, 255, 0.15) !important; 
+          }
+        }
+      }
+    }
+  }
+  
+  // === 看板视图样式（完全保留）===
+  .o_kanban_view {
+    // 卡片内部结构（不修改）
+    .o_kanban_record {
+      .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: 15px;
+          color: #000000;
+          padding:0px;
+        }
+  
+        .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,197 @@
-/** @odoo-module */
-
-import {KanbanController} from "@web/views/kanban/kanban_controller";
-import {kanbanView} from "@web/views/kanban/kanban_view";
-import {registry} from "@web/core/registry";
-
-// 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()
-}
-
-CustomKanbanController.template = "sf_warehouse.CustomKanbanView";
-
-export const customKanbanView = {
-    ...kanbanView, // contains the default Renderer/Controller/Model
-    Controller: CustomKanbanController,
-};
-
-// Register it to the views registry
-registry.category("views").add("custom_kanban", customKanbanView);
+/** @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 {
+
+}
+
+// 自定义看板控制器
+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 () => {
+            try {
+                this.preproductionShelfIds = await this.orm.call(
+                    'sf.shelf.location',
+                    'get_preproduction_shelf_ids',
+                    []
+                );
+            } catch (error) {
+                this.preproductionShelfIds = [];
+            }
+            
+            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');
+            if (shelfDomain && shelfDomain[2] && this.preproductionShelfIds && this.preproductionShelfIds.includes(shelfDomain[2])) {
+                this.onShelfChange(shelfDomain[2]);
+            } else {
+                this.setKanbanStyle('sf_kanban_location_style');
+            }
+        } 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];
+                    if (shelfId && this.preproductionShelfIds.includes(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);
+        }
+        
+        // 获取当前的搜索域
+        let domain = this.searchModel.domain;
+        let shelfDomain = domain.find(item => item[0] === 'shelf_id');
+        
+        // 只有当shelf_id在preproductionShelfIds中时才删除幽灵看板
+        if (shelfDomain && this.preproductionShelfIds && this.preproductionShelfIds.includes(shelfDomain[2])) {
+            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,
+    Controller: CustomKanbanController,
+    Renderer: CustomKanbanRenderer,
+};
+
+registry.category("views").add("custom_kanban", customKanbanView);

sf_warehouse/views/shelf_location.xml

@@ -1,330 +1,344 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <!--         货架视图 -->
-        <record id="view_sf_shelf" model="ir.ui.view">
-            <field name="name">Sf Shelf</field>
-            <field name="model">sf.shelf</field>
-            <field name="arch" type="xml">
-                <form string="Sf Shelf">
-                    <header>
-                        <field name="is_there_area" invisible="1"/>
-                        <button string="生成货位" name="create_location" type="object" class="oe_highlight"
-                                attrs="{'invisible': [('is_there_area', '=', True)]}"/>
-                    </header>
-                    <sheet>
-                        <group>
-                            <field name="barcode" string="货架编码"/>
-                            <field name="name" string="货架名称"/>
-                            <field name="check_state" string="审核状态"/>
-                            <field name="channel" string="通道"/>
-                            <field name="shelf_location_id" string="所属库区"/>
-                            <field name="direction" string="方向"/>
-                            <field name="shelf_height" string="货架高度(m)"/>
-                            <field name="shelf_layer" string="货架层数"/>
-                            <field name="layer_capacity" string="层数容量"/>
-                            <field name="shelf_rotative_Boolean"/>
-                        </group>
-                        <notebook>
-                            <page string="货位">
-                                <button name="print_all_location_barcode" type="object" string="一键打印"
-                                        class="oe_highlight"/>
-                                <field name="location_ids" widget="one2many_list">
-                                    <tree string="Shelf Location">
-                                        <field name="barcode" string="编码"/>
-                                        <field name="name" string="名称"/>
-                                        <field name="qr_code" string="条码" widget="image"/>
-                                        <button string="打印" name="print_single_location_qr_code" type="object"
-                                                class="oe_highlight"/>
-                                    </tree>
-                                </field>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_sf_shelf_tree" model="ir.ui.view">
-            <field name="name">Sf Shelf tree</field>
-            <field name="model">sf.shelf</field>
-            <field name="arch" type="xml">
-                <tree string="Sf Shelf">
-                    <field name="barcode" string="货架编码"/>
-                    <field name="name" string="名称"/>
-                    <field name="shelf_location_id" string="所属库区"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--         货架action -->
-        <record id="sf_shelf_action" model="ir.actions.act_window">
-            <field name="name">货架</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.shelf</field>
-            <field name="view_mode">tree,form</field>
-            <!--             <field name="view_id" ref="view_sf_shelf_tree"/> -->
-        </record>
-
-        <!--         货架菜单 -->
-        <menuitem
-                id="sf_shelf_menu"
-                name="货架"
-                parent="stock.menu_warehouse_config"
-                sequence="19"
-                action="sf_shelf_action"
-                groups="sf_base.group_sf_stock_user"/>
-
-
-        <record id="view_shelf_location_tree" model="ir.ui.view">
-            <field name="name">Shelf Location tree</field>
-            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
-                <tree string="Shelf Location">
-                    <field name="barcode"/>
-                    <field name="name"/>
-                    <field name="location_id"/>
-                    <!--                     <field name="check_state" widget="label_selection"-->
-                    <!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
-                    <!--                     <button name="action_check" string="审核" type="object"-->
-                    <!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
-                    <!--                                groups="sf_base.group_sf_stock_manager"-->
-                    <!--                                class="oe_highlight"/>-->
-                </tree>
-            </field>
-        </record>
-
-
-        <!--        货架货位移动历史按钮-->
-
-        <record id="sf_stock_move_line_view_search" model="ir.ui.view">
-            <field name="name">sf.view.picking.form</field>
-            <field name="model">stock.move.line</field>
-            <field name="inherit_id" ref="stock.stock_move_line_view_search"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='product_id']" position="after">
-                    <field name='current_location_id'/>
-                    <field name='destination_location_id'/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="stock_move_line_action1" model="ir.actions.act_window">
-            <field name="name">移动历史</field>
-            <field name="res_model">stock.move.line</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="sf_stock_move_line_view_search"/>
-            <field name="view_id" ref="stock.view_move_line_tree"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    产品移动历史
-                </p>
-            </field>
-        </record>
-
-        <record id="view_shelf_location_form" model="ir.ui.view">
-            <field name="name">Shelf Location form</field>
-            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
-                <form string="Shelf Location" create="0">
-                    <header>
-                        <button string="货位变更"
-                                name="%(sf_warehouse.sf_shelf_location_wizard_act)d"
-                                type="action"
-                                context="{'default_name':name,
-                                'default_current_name':name,
-                                'default_current_product_sn_ids':product_sn_ids,
-                                'default_lot_id':product_sn_id,
-                                'default_current_shelf_id':shelf_id,
-                                'default_current_location_id':location_id,
-                                'default_current_barcode_id':id,
-                                'default_current_product_id':product_id,
-                                    }"
-                                class="btn-primary" attrs="{'invisible':[('location_status','!=','占用')]}"/>
-                        <field name="location_status" invisible="1"/>
-                        <button string="禁用货位" name="action_location_status_disable" type="object"
-                                class="oe_highlight"
-                                attrs="{'invisible': [('location_status', '!=', '空闲')]}"/>
-                        <button string="启用货位" name="action_location_status_enable" type="object"
-                                class="oe_highlight"
-                                attrs="{'invisible': [('location_status', '!=', '禁用')]}"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_button_box" name="button_box">
-                            <button name="%(stock_move_line_action1)d"
-                                    type="action"
-                                    class="oe_stat_button"
-                                    context="{'search_default_current_location_id': [active_id]}"
-                                    icon="fa-exchange">
-                                <field string="当前位置历史" name="current_move_ids" widget="statinfo"/>
-                            </button>
-                            <button name="%(stock_move_line_action1)d"
-                                    type="action"
-                                    class="oe_stat_button"
-                                    context="{'search_default_destination_location_id': [active_id]}"
-                                    icon="fa-exchange">
-                                <field string="目标位置历史" name="destination_move_ids" widget="statinfo"/>
-                            </button>
-                        </div>
-                        <group>
-                            <field name="barcode" readonly="1"/>
-                            <field name="name" readonly="1"/>
-                            <field name="rotative_Boolean" invisible="1"/>
-                            <field name="shelf_id" readonly="1"/>
-                            <field name="location_id" readonly="1"/>
-                            <field name="product_id"/>
-                            <field name="product_sn_id" options="{'no_create': True}"
-                                   attrs="{'invisible': [('product_sn_ids', '!=', [])]}"/>
-                            <field name="product_sn_ids"
-                                   attrs="{'invisible': [('product_sn_ids', '=', [])]}">
-                                <tree edit="1" create="0" delete="0" editable="bottom">
-                                    <field name="lot_id" readonly="1"/>
-                                    <field name="qty" readonly="1"/>
-                                </tree>
-                            </field>
-                            <field name="product_num" readonly="1"/>
-                            <field name="location_status"/>
-                            <field name="storage_time" widget="datetime"/>
-                            <field name="production_id" readonly="1"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="shelf_location_kanban_view" model="ir.ui.view">
-            <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">
-                    <templates>
-                        <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 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>
-                        <!--                                             <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>
-        </record>
-
-        <!--     搜索视图 -->
-        <record id="shelf_location_search_view" model="ir.ui.view">
-            <field name="name">shelf.location.search</field>
-            <field name="model">sf.shelf.location</field>
-            <field name="arch" type="xml">
-                <search string="货位">
-                    <field name="barcode"/>
-                    <field name="product_id"/>
-                    <searchpanel class="account_root">
-                        <!--                     <field name="location_type" icon="fa-filter"/> -->
-                        <!--                         <field name="location_id" select="multi" icon="fa-filter"/> -->
-                        <field name="location_id" string="所属库区" icon="fa-filter"/>
-                        <field name="shelf_id" string="货架"/>
-                        <!--                     <field name="location_status" icon="fa-filter"/> -->
-                    </searchpanel>
-                </search>
-            </field>
-        </record>
-
-        <record id="shelf_location_kanban_action_id" model="ir.actions.act_window">
-            <field name="name">货位看板</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.shelf.location</field>
-            <field name="view_mode">kanban,form</field>
-            <!--             <field name="domain">[('check_state','=','enable')]</field> -->
-        </record>
-
-        <!--     <record id="example_action" model="ir.actions.act_window"> -->
-        <!--     <field name="name">Example</field> -->
-        <!--     <field name="type">ir.actions.act_window</field> -->
-        <!--     <field name="res_model">stock.location</field> -->
-        <!--     <field name="view_mode">kanban</field> -->
-        <!--     <field name="searchpanel">true</field> -->
-        <!--     <field name="searchpanel_field_label">货架</field> -->
-        <!--     <field name="searchpanel_field_name">parent_id</field> -->
-        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
-        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
-        <!-- </record> -->
-
-
-        <menuitem id="shelf_location_kanban_menu" name="货位看板" parent="stock.menu_stock_root"
-                  sequence="51"
-                  action="shelf_location_kanban_action_id"
-                  groups="sf_base.group_sf_stock_user"/>
-
-        <record id="action_sf_shelf_location" model="ir.actions.act_window">
-            <field name="name">货位</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.shelf.location</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--     <record id="example_action" model="ir.actions.act_window"> -->
-        <!--     <field name="name">Example</field> -->
-        <!--     <field name="type">ir.actions.act_window</field> -->
-        <!--     <field name="res_model">stock.location</field> -->
-        <!--     <field name="view_mode">kanban</field> -->
-        <!--     <field name="searchpanel">true</field> -->
-        <!--     <field name="searchpanel_field_label">货架</field> -->
-        <!--     <field name="searchpanel_field_name">parent_id</field> -->
-        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
-        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
-        <!-- </record> -->
-
-
-        <!--     <menuitem id="menu_stock_location" name="货位状态" parent="stock.menu_stock_root" -->
-        <!--         sequence="50" -->
-        <!--         action="kanban_action_id"/>     -->
-
-        <menuitem id="menu_sf_shelf_location" name="货位" parent="stock.menu_warehouse_config"
-                  sequence="20"
-                  action="action_sf_shelf_location"
-                  groups="sf_base.group_sf_stock_user"/>
-
-
-    </data>
-</odoo>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!--         货架视图 -->
+        <record id="view_sf_shelf" model="ir.ui.view">
+            <field name="name">Sf Shelf</field>
+            <field name="model">sf.shelf</field>
+            <field name="arch" type="xml">
+                <form string="Sf Shelf">
+                    <header>
+                        <field name="is_there_area" invisible="1"/>
+                        <button string="生成货位" name="create_location" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('is_there_area', '=', True)]}"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="barcode" string="货架编码"/>
+                            <field name="name" string="货架名称"/>
+                            <field name="check_state" string="审核状态"/>
+                            <field name="channel" string="通道"/>
+                            <field name="shelf_location_id" string="所属库区"/>
+                            <field name="direction" string="方向"/>
+                            <field name="shelf_height" string="货架高度(m)"/>
+                            <field name="shelf_layer" string="货架层数"/>
+                            <field name="layer_capacity" string="层数容量"/>
+                            <field name="shelf_rotative_Boolean"/>
+                        </group>
+                        <notebook>
+                            <page string="货位">
+                                <button name="print_all_location_barcode" type="object" string="一键打印"
+                                        class="oe_highlight"/>
+                                <field name="location_ids" widget="one2many_list">
+                                    <tree string="Shelf Location">
+                                        <field name="barcode" string="编码"/>
+                                        <field name="name" string="名称"/>
+                                        <field name="qr_code" string="条码" widget="image"/>
+                                        <button string="打印" name="print_single_location_qr_code" type="object"
+                                                class="oe_highlight"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_sf_shelf_tree" model="ir.ui.view">
+            <field name="name">Sf Shelf tree</field>
+            <field name="model">sf.shelf</field>
+            <field name="arch" type="xml">
+                <tree string="Sf Shelf">
+                    <field name="barcode" string="货架编码"/>
+                    <field name="name" string="名称"/>
+                    <field name="shelf_location_id" string="所属库区"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--         货架action -->
+        <record id="sf_shelf_action" model="ir.actions.act_window">
+            <field name="name">货架</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.shelf</field>
+            <field name="view_mode">tree,form</field>
+            <!--             <field name="view_id" ref="view_sf_shelf_tree"/> -->
+        </record>
+
+        <!--         货架菜单 -->
+        <menuitem
+                id="sf_shelf_menu"
+                name="货架"
+                parent="stock.menu_warehouse_config"
+                sequence="19"
+                action="sf_shelf_action"
+                groups="sf_base.group_sf_stock_user"/>
+
+
+        <record id="view_shelf_location_tree" model="ir.ui.view">
+            <field name="name">Shelf Location tree</field>
+            <field name="model">sf.shelf.location</field>
+            <field name="arch" type="xml">
+                <tree string="Shelf Location">
+                    <field name="barcode"/>
+                    <field name="name"/>
+                    <field name="location_id"/>
+                    <!--                     <field name="check_state" widget="label_selection"-->
+                    <!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
+                    <!--                     <button name="action_check" string="审核" type="object"-->
+                    <!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
+                    <!--                                groups="sf_base.group_sf_stock_manager"-->
+                    <!--                                class="oe_highlight"/>-->
+                </tree>
+            </field>
+        </record>
+
+
+        <!--        货架货位移动历史按钮-->
+
+        <record id="sf_stock_move_line_view_search" model="ir.ui.view">
+            <field name="name">sf.view.picking.form</field>
+            <field name="model">stock.move.line</field>
+            <field name="inherit_id" ref="stock.stock_move_line_view_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_id']" position="after">
+                    <field name='current_location_id'/>
+                    <field name='destination_location_id'/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="stock_move_line_action1" model="ir.actions.act_window">
+            <field name="name">移动历史</field>
+            <field name="res_model">stock.move.line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="sf_stock_move_line_view_search"/>
+            <field name="view_id" ref="stock.view_move_line_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    产品移动历史
+                </p>
+            </field>
+        </record>
+
+        <record id="view_shelf_location_form" model="ir.ui.view">
+            <field name="name">Shelf Location form</field>
+            <field name="model">sf.shelf.location</field>
+            <field name="arch" type="xml">
+                <form string="Shelf Location" create="0">
+                    <header>
+                        <button string="货位变更"
+                                name="%(sf_warehouse.sf_shelf_location_wizard_act)d"
+                                type="action"
+                                context="{'default_name':name,
+                                'default_current_name':name,
+                                'default_current_product_sn_ids':product_sn_ids,
+                                'default_lot_id':product_sn_id,
+                                'default_current_shelf_id':shelf_id,
+                                'default_current_location_id':location_id,
+                                'default_current_barcode_id':id,
+                                'default_current_product_id':product_id,
+                                    }"
+                                class="btn-primary" attrs="{'invisible':[('location_status','!=','占用')]}"/>
+                        <field name="location_status" invisible="1"/>
+                        <button string="禁用货位" name="action_location_status_disable" type="object"
+                                class="oe_highlight"
+                                attrs="{'invisible': [('location_status', '!=', '空闲')]}"/>
+                        <button string="启用货位" name="action_location_status_enable" type="object"
+                                class="oe_highlight"
+                                attrs="{'invisible': [('location_status', '!=', '禁用')]}"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_button_box" name="button_box">
+                            <button name="%(stock_move_line_action1)d"
+                                    type="action"
+                                    class="oe_stat_button"
+                                    context="{'search_default_current_location_id': [active_id]}"
+                                    icon="fa-exchange">
+                                <field string="当前位置历史" name="current_move_ids" widget="statinfo"/>
+                            </button>
+                            <button name="%(stock_move_line_action1)d"
+                                    type="action"
+                                    class="oe_stat_button"
+                                    context="{'search_default_destination_location_id': [active_id]}"
+                                    icon="fa-exchange">
+                                <field string="目标位置历史" name="destination_move_ids" widget="statinfo"/>
+                            </button>
+                        </div>
+                        <group>
+                            <field name="barcode" readonly="1"/>
+                            <field name="name" readonly="1"/>
+                            <field name="rotative_Boolean" invisible="1"/>
+                            <field name="shelf_id" readonly="1"/>
+                            <field name="location_id" readonly="1"/>
+                            <field name="product_id"/>
+                            <field name="product_sn_id" options="{'no_create': True}"
+                                   attrs="{'invisible': [('product_sn_ids', '!=', [])]}"/>
+                            <field name="product_sn_ids"
+                                   attrs="{'invisible': [('product_sn_ids', '=', [])]}">
+                                <tree edit="1" create="0" delete="0" editable="bottom">
+                                    <field name="lot_id" readonly="1"/>
+                                    <field name="qty" readonly="1"/>
+                                </tree>
+                            </field>
+                            <field name="product_num" readonly="1"/>
+                            <field name="location_status"/>
+                            <field name="storage_time" widget="datetime"/>
+                            <field name="production_id" readonly="1"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+<record id="shelf_location_kanban_view" model="ir.ui.view">
+    <field name="name">shelf.location.kanban</field>
+    <field name="model">sf.shelf.location</field>
+    <field name="arch" type="xml">
+        <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"/>
+                            <field name="tool_name_id"/>
+                        </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="product_sn_id"/>
+                                <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>
+                            <!-- 添加RFID字段 -->
+                           <!--  <t t-if="record.data and record.data.display_rfid">
+                                <div class="o_kanban_record_bottom">
+                                    <field name="display_rfid"/>
+                                </div>
+                            </t>
+                            <t t-if="record.data and record.data.tool_rfid">
+                                <div class="o_kanban_record_bottom">
+                                    <field name="tool_rfid"/>
+                                </div>
+                            </t> -->
+                            <!-- 悬停时显示的详细信息 -->
+                            <div class="status-hover-bar">
+                                 <t t-if="record.product_id.value">
+                                        <div>产品: <t t-esc="record.product_id.value"/></div>
+                                    </t>
+                                <t t-if="record.product_sn_id.value">
+                                        <div>标签ID: <t t-esc="record.product_sn_id.value"/></div>
+                                    </t>
+                                 <!-- <t t-if="record.display_rfid.value">
+                                        <div>rfid: <t t-esc="record.display_rfid.value"/></div>
+                                    </t>
+                                    <t t-if="record.tool_rfid.value">
+                                        <div>rfid: <t t-esc="record.tool_rfid.value"/></div>
+                                    </t> -->
+                                     <t t-if="record.tool_name_id and record.tool_name_id.value">
+                                        <div>功能刀具名称: <t t-esc="record.tool_name_id.value"/></div>
+                                    </t>
+                                <div>状态: <t t-esc="record.location_status.value"/></div>
+                            </div>
+                        </t>
+                    </div>
+                </t>
+            </templates>
+        </kanban>
+    </field>
+</record>
+        <!--     搜索视图 -->
+        <record id="shelf_location_search_view" model="ir.ui.view">
+            <field name="name">shelf.location.search</field>
+            <field name="model">sf.shelf.location</field>
+            <field name="arch" type="xml">
+                <search string="货位">
+                    <field name="barcode"/>
+                    <field name="product_id"/>
+                    <searchpanel class="account_root">
+                        <!--                     <field name="location_type" icon="fa-filter"/> -->
+                        <!--                         <field name="location_id" select="multi" icon="fa-filter"/> -->
+                        <field name="location_id" string="所属库区" icon="fa-filter"/>
+                        <field name="shelf_id" string="货架"/>
+                        <!--                     <field name="location_status" icon="fa-filter"/> -->
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
+
+        <record id="shelf_location_kanban_action_id" model="ir.actions.act_window">
+            <field name="name">货位看板</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.shelf.location</field>
+            <field name="view_mode">kanban,form</field>
+            <!--             <field name="domain">[('check_state','=','enable')]</field> -->
+        </record>
+
+        <!--     <record id="example_action" model="ir.actions.act_window"> -->
+        <!--     <field name="name">Example</field> -->
+        <!--     <field name="type">ir.actions.act_window</field> -->
+        <!--     <field name="res_model">stock.location</field> -->
+        <!--     <field name="view_mode">kanban</field> -->
+        <!--     <field name="searchpanel">true</field> -->
+        <!--     <field name="searchpanel_field_label">货架</field> -->
+        <!--     <field name="searchpanel_field_name">parent_id</field> -->
+        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
+        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
+        <!-- </record> -->
+
+
+        <menuitem id="shelf_location_kanban_menu" name="货位看板" parent="stock.menu_stock_root"
+                  sequence="51"
+                  action="shelf_location_kanban_action_id"
+                  groups="sf_base.group_sf_stock_user"/>
+
+        <record id="action_sf_shelf_location" model="ir.actions.act_window">
+            <field name="name">货位</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.shelf.location</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!--     <record id="example_action" model="ir.actions.act_window"> -->
+        <!--     <field name="name">Example</field> -->
+        <!--     <field name="type">ir.actions.act_window</field> -->
+        <!--     <field name="res_model">stock.location</field> -->
+        <!--     <field name="view_mode">kanban</field> -->
+        <!--     <field name="searchpanel">true</field> -->
+        <!--     <field name="searchpanel_field_label">货架</field> -->
+        <!--     <field name="searchpanel_field_name">parent_id</field> -->
+        <!--     <field name="searchpanel_field_group_by">['parent_id']</field> -->
+        <!--     <field name="domain">[('location_type', '=', '货位')]</field> -->
+        <!-- </record> -->
+
+
+        <!--     <menuitem id="menu_stock_location" name="货位状态" parent="stock.menu_stock_root" -->
+        <!--         sequence="50" -->
+        <!--         action="kanban_action_id"/>     -->
+
+        <menuitem id="menu_sf_shelf_location" name="货位" parent="stock.menu_warehouse_config"
+                  sequence="20"
+                  action="action_sf_shelf_location"
+                  groups="sf_base.group_sf_stock_user"/>
+
+
+    </data>
+</odoo>