From f05301320ccea4804f390b0bfddd6441cb5b1b20 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Sat, 18 May 2024 17:05:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=84=E8=A3=85=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E6=98=AF=E5=90=A6=E7=BB=84=E8=A3=85=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 533df3a6..4a440df6 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -351,7 +351,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 class FunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
     _description = '功能刀具组装'
-    _order = 'use_tool_time asc'
+    _order = 'assemble_status, use_tool_time asc'
 
     @api.depends('functional_tool_name')
     def _compute_name(self):
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index a982dca6..ac98a703 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -47,7 +47,7 @@
                     <sheet>
                         <div class="oe_button_box" name="button_box">
                             <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"
-                                        type="object" class="btn-primary"/>
+                                    type="object" class="btn-primary"/>
                             <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
                                     name="open_functional_tool_warning"
                                     icon="fa-list-ul"
@@ -406,7 +406,7 @@
                                 </field>
                             </page>
                             <page string="组装单">
-                                <field name="sf_functional_tool_assembly_ids" domain="[('assemble_status', '=', 0)]"/>
+                                <field name="sf_functional_tool_assembly_ids"/>
                             </page>
                         </notebook>
                     </sheet>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index d4cb5143..5d3a3bf5 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -802,12 +802,13 @@ class ProductProduct(models.Model):
         """
             创建功能刀具批次/序列号记录
         """
-        product_id = self.env['product.product'].search([('name', '=', '功能刀具')])
+        product_id = self.env['product.product'].search([('categ_type', '=', '功能刀具'), ('tracking', '=', 'serial')])
         if not product_id:
             logging.info('没有搜索到功能刀具产品：%s' % product_id)
+            raise ValidationError('没有找到按唯一序列号追溯的功能刀具产品信息！')
         stock_lot = self.env['stock.lot'].create({
             'name': self.get_stock_lot_name(tool_assembly_order_id),
-            'product_id': product_id.id,
+            'product_id': product_id[0].id,
             'company_id': self.env.company.id
         })
         # 获取位置对象