From 42cded8c6481364387d382b2b1eee7c4a6d3e6da Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 12 Jun 2024 10:24:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E5=BA=8F=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/functional_tool.py       | 2 +-
 sf_tool_management/views/functional_tool_views.xml | 2 +-
 sf_tool_management/wizard/wizard.py                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 84df4b8b..628f0b52 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -21,7 +21,7 @@ class FunctionalCuttingToolEntity(models.Model):
     name = fields.Char('名称')
     tool_name_id = fields.Many2one('sf.tool.inventory', '功能刀具名称')
     sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
-    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
+    barcode_id = fields.Many2one('stock.lot', string='序列号', readonly=True)
     sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
                                               group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
 
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 35bf6d21..1dafacf3 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -86,7 +86,7 @@
                         </div>
                         <group>
                             <group>
-                                <field name="barcode_id" invisible="1"/>
+                                <field name="barcode_id" invisible="0"/>
                                 <field name="rfid" readonly="1"
                                        attrs="{'invisible': [('functional_tool_status', '=', '已拆除')]}"/>
                                 <field name="rfid_dismantle" readonly="1"
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index eb6f9fc1..f0a67482 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -824,7 +824,7 @@ class ProductProduct(models.Model):
             logging.info('没有搜索到功能刀具产品：%s' % product_id)
             raise ValidationError('没有找到按唯一序列号追溯的功能刀具产品信息！')
         stock_lot = self.env['stock.lot'].create({
-            'name': self.get_stock_lot_name(tool_assembly_order_id),
+            'name': self.get_stock_lot_name(obj),
             'product_id': product_id[0].id,
             'company_id': self.env.company.id
         })
@@ -851,7 +851,7 @@ class ProductProduct(models.Model):
         else:
             m = int(stock_lot_id.name[-3:]) + 1
             num = "%03d" % m
-        return code + str(num)
+        return '%s-%s' % (code, num)
 
     def tool_material_stock_moves(self, tool_material, assembly_order_code):
         """