From 8c4996b7c26c30edf44422053d3a694e365195a2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Jan 2024 17:05:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0fid=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=BA=8F=E5=88=97=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            |  7 ++-
 sf_tool_management/views/tool_base_views.xml | 57 ++++++++++++++------
 sf_tool_management/wizard/wizard.py          |  4 ++
 sf_tool_management/wizard/wizard_view.xml    |  4 +-
 4 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index ae06d91b..45f9c0ed 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -15,6 +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)
     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)
@@ -211,6 +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')
     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')
     # 机床信息
@@ -281,6 +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')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
 
     @api.model
@@ -476,6 +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')
     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,
@@ -502,7 +506,7 @@ class MachineTableToolChangingApply(models.Model):
     reason_for_applying = fields.Char(string='申请原因', readonly=True)
     remark = fields.Char(string='备注说明', readonly=False)
 
-    status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移'), ('3', '已组装')],
+    status = fields.Selection([('0', '未操作'), ('1', '已申请换刀'), ('2', '已转移'), ('3', '已组装')],
                               string='操作状态', default='0')
 
     sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装单', readonly=True)
@@ -787,6 +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)
     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 9cbbeeeb..419dd6fd 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -7,7 +7,8 @@
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
                 <tree string="功能刀具列表" create="0" edit="0" delete="0">
-                    <field name="barcode_id"/>
+                    <field name="barcode_id" invisible="1"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="image" widget='image'/>
                     <field name="tool_groups_id"/>
@@ -76,12 +77,13 @@
                         </div>
                         <div class="oe_title">
                             <h1>
-                                <field name="barcode_id" readonly="1" nolabel="True"/>
+                                <field name="code" readonly="1" nolabel="True"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="code" readonly="1"/>
+                                <field name="barcode_id" invisible="1"/>
+                                <field name="fid" readonly="1"/>
                                 <field name="functional_tool_name_id" invisible="False"
                                        placeholder="请输入20字以内的名称"/>
                                 <field name="sf_cutting_tool_type_id"/>
@@ -178,6 +180,7 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="barcode_id"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="image" widget='image'/>
                     <field name="functional_tool_diameter"/>
@@ -224,7 +227,8 @@
                     <field name="maintenance_equipment_id" optional="hide"/>
                     <field name="machine_tool_code"/>
                     <field name="cutter_spacing_code_id"/>
-                    <field name="barcode_id"/>
+                    <field name="barcode_id" invisible="1"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -250,6 +254,7 @@
                     <field name="machine_tool_code"/>
                     <field name="cutter_spacing_code_id"/>
                     <field name="barcode_id"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -376,7 +381,7 @@
                             <page string="刀具信息">
                                 <field name="sf_functional_cutting_tool_entity_ids" widget="many2many">
                                     <tree edit="0" create="0" delete="0">
-                                        <field name="barcode_id"/>
+                                        <field name="fid"/>
                                         <field name="functional_tool_name_id"/>
                                         <field name="new_former"/>
                                         <field name="tool_loading_length" string="总长度(mm)"/>
@@ -435,7 +440,8 @@
             <field name="arch" type="xml">
                 <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
                     <field name="reference" string="单据号"/>
-                    <field name="lot_id" string="功能刀具序列号"/>
+                    <field name="lot_id" invisible="1"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id" string="功能刀具名称"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -457,6 +463,7 @@
                 <search>
                     <field name="reference"/>
                     <field name="lot_id"/>
+                    <field name="fid"/>
                     <field name="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -510,6 +517,7 @@
 
                     <field name="machine_table_type_id" invisible="1"/>
                     <field name="barcode_id" invisible="1"/>
+                    <field name="fid" invisible="1"/>
                     <field name="functional_tool_type_id" invisible="1"/>
                     <field name="tool_position_interface_type" invisible="1"/>
                     <field name="extension_length" invisible="1"/>
@@ -529,6 +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_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -551,7 +560,7 @@
                                         'default_replacement_extension_length': extension_length,
                                         'default_replacement_effective_length': effective_length,
                                         }"
-                            attrs="{'invisible': [('status', '!=', '0')]}"
+                            attrs="{'invisible': ['|',('status', '!=', '0'), ('functional_tool_name_id', '=', False)]}"
                             class="btn-primary" groups="sf_base.group_sf_mrp_user"
                     />
                     <button string="转移"
@@ -566,6 +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_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -582,9 +592,11 @@
                             attrs="{'invisible': ['|',('status', '!=', '0'), ('functional_tool_name_id', '=', False)]}"
                     />
                     <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary"
-                            attrs="{'invisible': [('status', '!=', '1')]}" groups="sf_base.group_sf_mrp_user" confirm="是否确认撤回换刀申请"/>
+                            attrs="{'invisible': [('status', '!=', '1')]}" groups="sf_base.group_sf_mrp_user"
+                            confirm="是否确认撤回换刀申请"/>
                     <button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
-                            attrs="{'invisible': [('status', '!=', '2')]}" groups="sf_base.group_sf_mrp_user" confirm="是否确认撤回转移"/>
+                            attrs="{'invisible': [('status', '!=', '2')]}" groups="sf_base.group_sf_mrp_user"
+                            confirm="是否确认撤回转移"/>
                 </tree>
             </field>
         </record>
@@ -607,6 +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_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -629,7 +642,7 @@
                                         'default_replacement_extension_length': extension_length,
                                         'default_replacement_effective_length': effective_length,
                                         }"
-                                attrs="{'invisible': [('status', '!=', '0')]}"
+                                attrs="{'invisible': ['|',('status', '!=', '0'), ('functional_tool_name_id', '=', False)]}"
                                 class="btn-primary" groups="sf_base.group_sf_mrp_user"
                         />
                         <button string="转移"
@@ -642,6 +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_functional_tool_name': functional_tool_name,
                                         'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_tool_position_interface_type': tool_position_interface_type,
@@ -657,9 +671,12 @@
                                 class="btn-primary" groups="sf_base.group_sf_mrp_user"
                                 attrs="{'invisible': ['|',('status', '!=', '0'),('functional_tool_name_id', '=', False)]}"/>
                         <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary"
-                                attrs="{'invisible': [('status', '!=', '1')]}" groups="sf_base.group_sf_mrp_user" confirm="是否确认撤回换刀申请"/>
-                        <button string="撤回转移" name="revocation_2" type="object" groups="sf_base.group_sf_mrp_user" class="btn-primary"
+                                attrs="{'invisible': [('status', '!=', '1')]}" groups="sf_base.group_sf_mrp_user"
+                                confirm="是否确认撤回换刀申请"/>
+                        <button string="撤回转移" name="revocation_2" type="object" groups="sf_base.group_sf_mrp_user"
+                                class="btn-primary"
                                 attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
+                        <field name="status" widget="statusbar" statusbar_visible="0,1,2,3"/>
                     </header>
                     <field name="functional_tool_status" string="状态" invisible="True"/>
                     <sheet>
@@ -686,7 +703,8 @@
                             <page string="功能刀具信息">
                                 <group>
                                     <group>
-                                        <field name="barcode_id"/>
+                                        <field name="barcode_id" invisible="1"/>
+                                        <field name="fid"/>
                                         <field name="code"/>
                                         <field name="functional_tool_name_id"
                                                options="{'no_create': True, 'no_quick_create': True}"/>
@@ -722,6 +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="functional_tool_name_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -948,7 +967,8 @@
                                     }"
                             attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
                             class="btn-primary"/>
-                    <button string="组装单打印" name="assemble_single_print" type="object" groups="sf_base.group_sf_mrp_user"
+                    <button string="组装单打印" name="assemble_single_print" type="object"
+                            groups="sf_base.group_sf_mrp_user"
                             attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
                             confirm="是否确认打印组装单"/>
                 </tree>
@@ -986,10 +1006,12 @@
                                 attrs="{'invisible': [('assemble_status', '!=', '0')]}"
                                 class="btn-primary"/>
 
-                        <button string="打印二维码" name="automatic_printing_of_QR_code" type="object" groups="sf_base.group_sf_mrp_user"
+                        <button string="打印二维码" name="automatic_printing_of_QR_code" type="object"
+                                groups="sf_base.group_sf_mrp_user"
                                 attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
                                 confirm="是否确认打印二维码"/>
-                        <button string="组装单打印" name="assemble_single_print" type="object" groups="sf_base.group_sf_mrp_user"
+                        <button string="组装单打印" name="assemble_single_print" type="object"
+                                groups="sf_base.group_sf_mrp_user"
                                 attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
                                 confirm="是否确认打印组装单"/>
                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
@@ -1021,7 +1043,8 @@
                                     <group col="1">
                                         <group>
                                             <group>
-                                                <field name="barcode_id"/>
+                                                <field name="barcode_id" invisible="True"/>
+                                                <field name="fid" string="功能刀具fid"/>
                                                 <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 9f1a1aae..c5eaffab 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -9,6 +9,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
     _description = '换刀需求信息'
 
     code = fields.Char('编码', readonly=True)
+    fid = fields.Char('fid', 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)
@@ -321,6 +322,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # 组装功能刀具参数信息
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
+    fid = fields.Char('fid', 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',
@@ -522,6 +524,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         return {
             'barcode_id': stock_lot.id,
             'code': self.tool_code,
+            'fid': self.fid,
             'tool_groups_id': self.tool_groups_id.id,
             'integral_code_id': self.integral_code_id.id,
             'blade_code_id': self.blade_code_id.id,
@@ -558,6 +561,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         return {
             'barcode_id': stock_lot.id,
             'code': self.tool_code,
+            'fid': self.fid,
             '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 5c007bdc..c119f8a9 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -24,7 +24,8 @@
                             <field name="whether_standard_knife"/>
                         </group>
                         <group>
-                            <field name="barcode_id"/>
+                            <field name="barcode_id" invisible="1"/>
+                            <field name="fid"/>
                             <field name="code"/>
                             <field name="functional_tool_name"/>
                             <field name="functional_tool_type_id"/>
@@ -334,6 +335,7 @@
                         <group>
                             <field name="barcode_id" invisible="True"/>
                             <field name="tool_code" readonly="True"/>
+                            <field name="fid" placeholder="请输入fid码"/>
                             <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}"/>

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 2/3] =?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}"/>

From e13bd0dc61ba15f0d8d869d1278c283e45d0dc66 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Jan 2024 17:25:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E9=A2=84=E8=AD=A6=E7=9A=84rfid=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 877a0e96..b55d7003 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -212,7 +212,7 @@ class FunctionalToolWarning(models.Model):
     _description = '功能刀具预警'
 
     code = fields.Char('编码', related='functional_tool_name_id.code')
-    rfid = fields.Char('rfid', related='functional_tool_name_id.code')
+    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')
     name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name')
     # 机床信息