From 9f57ad6aaf39d594daf47b4de628b577f4da7daf Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Jan 2024 17:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86fid=E6=94=B9=E4=B8=BArfid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            | 10 +++---
 sf_tool_management/views/tool_base_views.xml | 32 ++++++++++----------
 sf_tool_management/wizard/wizard.py          |  8 ++---
 sf_tool_management/wizard/wizard_view.xml    |  4 +--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 45f9c0ed..877a0e96 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -15,7 +15,7 @@ class FunctionalCuttingToolEntity(models.Model):
 
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
     code = fields.Char('编码', related='functional_tool_name_id.code')
-    fid = fields.Char('fid', readonly=True)
+    rfid = fields.Char('rfid', readonly=True)
     name = fields.Char(related='functional_tool_name_id.name')
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
@@ -212,7 +212,7 @@ class FunctionalToolWarning(models.Model):
     _description = '功能刀具预警'
 
     code = fields.Char('编码', related='functional_tool_name_id.code')
-    fid = fields.Char('fid', related='functional_tool_name_id.code')
+    rfid = fields.Char('rfid', related='functional_tool_name_id.code')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
     name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
     # 机床信息
@@ -283,7 +283,7 @@ class StockMoveLine(models.Model):
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
     install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time')
     code = fields.Char('编码', related='functional_tool_name_id.code')
-    fid = fields.Char('fid', related='functional_tool_name_id.fid')
+    rfid = fields.Char('rfid', related='functional_tool_name_id.rfid')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
 
     @api.model
@@ -479,7 +479,7 @@ class MachineTableToolChangingApply(models.Model):
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True,
                                  domain=[('product_id.name', '=', '功能刀具')],
                                  related='functional_tool_name_id.barcode_id')
-    fid = fields.Char('fid', related='functional_tool_name_id.fid')
+    rfid = fields.Char('rfid', related='functional_tool_name_id.rfid')
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')],
                                               string='功能刀具名称')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
@@ -791,7 +791,7 @@ class FunctionalToolAssembly(models.Model):
             obj.name = obj.after_assembly_functional_tool_name
 
     code = fields.Char('功能刀具编码', readonly=True)
-    fid = fields.Char('fid', readonly=True)
+    rfid = fields.Char('rfid', readonly=True)
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
     name = fields.Char(string='名称', readonly=True, compute='_compute_name')
     assembly_order_code = fields.Char(string='组装单编码', readonly=True)
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 419dd6fd..59229492 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="功能刀具列表" create="0" edit="0" delete="0">
                     <field name="barcode_id" invisible="1"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="image" widget='image'/>
                     <field name="tool_groups_id"/>
@@ -83,7 +83,7 @@
                         <group>
                             <group>
                                 <field name="barcode_id" invisible="1"/>
-                                <field name="fid" readonly="1"/>
+                                <field name="rfid" readonly="1"/>
                                 <field name="functional_tool_name_id" invisible="False"
                                        placeholder="请输入20字以内的名称"/>
                                 <field name="sf_cutting_tool_type_id"/>
@@ -180,7 +180,7 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="barcode_id"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="image" widget='image'/>
                     <field name="functional_tool_diameter"/>
@@ -228,7 +228,7 @@
                     <field name="machine_tool_code"/>
                     <field name="cutter_spacing_code_id"/>
                     <field name="barcode_id" invisible="1"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -254,7 +254,7 @@
                     <field name="machine_tool_code"/>
                     <field name="cutter_spacing_code_id"/>
                     <field name="barcode_id"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -381,7 +381,7 @@
                             <page string="刀具信息">
                                 <field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
                                     <tree edit="0" create="0" delete="0">
-                                        <field name="fid"/>
+                                        <field name="rfid"/>
                                         <field name="functional_tool_name_id"/>
                                         <field name="new_former"/>
                                         <field name="tool_loading_length" string="总长度(mm)"/>
@@ -441,7 +441,7 @@
                 <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
                     <field name="reference" string="单据号"/>
                     <field name="lot_id" invisible="1"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id" string="功能刀具名称"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -463,7 +463,7 @@
                 <search>
                     <field name="reference"/>
                     <field name="lot_id"/>
-                    <field name="fid"/>
+                    <field name="rfid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -517,7 +517,7 @@
 
                     <field name="machine_table_type_id" invisible="1"/>
                     <field name="barcode_id" invisible="1"/>
-                    <field name="fid" invisible="1"/>
+                    <field name="rfid" invisible="1"/>
                     <field name="functional_tool_type_id" invisible="1"/>
                     <field name="tool_position_interface_type" invisible="1"/>
                     <field name="extension_length" invisible="1"/>
@@ -537,7 +537,7 @@
                                         'default_machine_tool_code': machine_tool_code,
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
-                                        'default_fid': fid,
+                                        'default_rfid': rfid,
                                         'default_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -575,7 +575,7 @@
                                         'default_machine_tool_code': machine_tool_code,
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
-                                        'default_fid': fid,
+                                        'default_rfid': rfid,
                                         'default_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -619,7 +619,7 @@
                                         'default_machine_tool_code': machine_tool_code,
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
-                                        'default_fid': fid,
+                                        'default_rfid': rfid,
                                         'default_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -655,7 +655,7 @@
                                         'default_machine_tool_code': machine_tool_code,
                                         'default_cutter_spacing_code_id': cutter_spacing_code_id,
                                         'default_barcode_id': barcode_id,
-                                        'default_fid': fid,
+                                        'default_rfid': rfid,
                                         'default_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -704,7 +704,7 @@
                                 <group>
                                     <group>
                                         <field name="barcode_id" invisible="1"/>
-                                        <field name="fid"/>
+                                        <field name="rfid"/>
                                         <field name="code"/>
                                         <field name="functional_tool_name_id"
                                                options="{'no_create': True, 'no_quick_create': True}"/>
@@ -740,7 +740,7 @@
                     <field name="machine_table_type_id"/>
                     <field name="cutter_spacing_code_id" optional="hide"/>
                     <field name="barcode_id" invisible="1"/>
-                    <field name="fid" invisible="1"/>
+                    <field name="rfid" invisible="1"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -1044,7 +1044,7 @@
                                         <group>
                                             <group>
                                                 <field name="barcode_id" invisible="True"/>
-                                                <field name="fid" string="功能刀具fid"/>
+                                                <field name="rfid" string="功能刀具rfid"/>
                                                 <field name="code"/>
                                                 <field name="after_assembly_functional_tool_name"
                                                        string="功能刀具名称"/>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index c5eaffab..e6f39655 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -9,7 +9,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
     _description = '换刀需求信息'
 
     code = fields.Char('编码', readonly=True)
-    fid = fields.Char('fid', readonly=True)
+    rfid = fields.Char('rfid', readonly=True)
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
     name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
@@ -322,7 +322,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 组装功能刀具参数信息
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
-    fid = fields.Char('fid', required=True)
+    rfid = fields.Char('rfid', required=True)
     tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_tool_code')
     after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name')
     after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
@@ -524,7 +524,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         return {
             'barcode_id': stock_lot.id,
             'code': self.tool_code,
-            'fid': self.fid,
+            'rfid': self.rfid,
             'tool_groups_id': self.tool_groups_id.id,
             'integral_code_id': self.integral_code_id.id,
             'blade_code_id': self.blade_code_id.id,
@@ -561,7 +561,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         return {
             'barcode_id': stock_lot.id,
             'code': self.tool_code,
-            'fid': self.fid,
+            'rfid': self.rfid,
             'tool_groups_id': self.tool_groups_id.id,
             'functional_tool_name_id': functional_tool_assembly_id.id,
             'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index c119f8a9..cd15a91b 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -25,7 +25,7 @@
                         </group>
                         <group>
                             <field name="barcode_id" invisible="1"/>
-                            <field name="fid"/>
+                            <field name="rfid"/>
                             <field name="code"/>
                             <field name="functional_tool_name"/>
                             <field name="functional_tool_type_id"/>
@@ -335,7 +335,7 @@
                         <group>
                             <field name="barcode_id" invisible="True"/>
                             <field name="tool_code" readonly="True"/>
-                            <field name="fid" placeholder="请输入fid码"/>
+                            <field name="rfid" placeholder="请输入rfid码"/>
                             <field name="after_assembly_functional_tool_name" string="功能刀具名称"/>
                             <field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
                                    options="{'no_create': True, 'no_quick_create': True}"/>