From a82a54c4641d280bc11afbe34b336c5929408d74 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 15:40:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E6=B8=85=E5=8D=95=E5=81=9A=E7=BC=96=E8=BE=91=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=9B2=E3=80=81=E5=88=80=E5=85=B7=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=E2=80=94=E2=80=94=E6=8A=A5=E5=BA=9F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py                  |  2 +-
 sf_base/views/tool_views.xml                     |  4 ++--
 sf_tool_management/models/base.py                | 14 ++++++++++++--
 sf_tool_management/models/functional_tool.py     | 16 ++++++++++++++++
 .../views/functional_tool_views.xml              |  3 ++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 7977ed80..98eea36c 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -331,7 +331,7 @@ class ToolInventory(models.Model):
     work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
     life_span = fields.Float('寿命(min)')
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)
 
     active = fields.Boolean('已归档', default=True)
 
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 1e82b8c2..05196a19 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -555,9 +555,9 @@
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
-                <field name="name"/>
+                <field name="name"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id"/>
+                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', True)]}"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 8daf1488..61156536 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -581,6 +581,15 @@ class FunctionalToolAssembly(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
+    def action_open_reference1(self):
+        self.ensure_one()
+        return {
+            'res_model': self._name,
+            'type': 'ir.actions.act_window',
+            'views': [[False, "form"]],
+            'res_id': self.id,
+        }
+
     def put_start_preset(self):
         self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
         self.write({
@@ -750,7 +759,8 @@ class FunctionalToolDismantle(models.Model):
         return 'GNDJ-CJD-%s-%s' % (datetime, num)
 
     functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True,
-                                         domain=[('functional_tool_status', '!=', '已拆除')])
+                                         domain=[('functional_tool_status', '!=', '已拆除'),
+                                                 ('current_location', '=', '刀具房')])
     tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
                                    compute='_compute_functional_tool_num')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_functional_tool_num', store=True)
@@ -1028,7 +1038,7 @@ class ProductProduct(models.Model):
             'product_id': self.id,
             'lot_id': lot_id.id,
             'move_id': stock_move_id.id,
-            'destination_location_id': shelf_location_id.id,
+            'destination_location_id': shelf_location_id.id if shelf_location_id else False,
             'install_tool_time': fields.Datetime.now(),
             'qty_done': 1.0,
             'state': 'done',
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 45f52f4f..18f0a466 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -387,6 +387,22 @@ class StockMoveLine(models.Model):
         names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(names)
 
+    def action_open_reference1(self):
+        self.ensure_one()
+        if self.functional_tool_name_id:
+            action = self.functional_tool_name_id.action_open_reference1()
+            return action
+        elif self.move_id:
+            action = self.move_id.action_open_reference()
+            if action['res_model'] != 'stock.move':
+                return action
+        return {
+            'res_model': self._name,
+            'type': 'ir.actions.act_window',
+            'views': [[False, "form"]],
+            'res_id': self.id,
+        }
+
 
 class RealTimeDistributionOfFunctionalTools(models.Model):
     _name = 'sf.real.time.distribution.of.functional.tools'
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 6d812368..6fde82a0 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -477,7 +477,8 @@
             <field name="name">功能刀具出入库记录</field>
             <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
+                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0" default_order="id desc"
+                      action="action_open_reference1" type="object">
                     <field name="reference" string="单据号"/>
                     <field name="lot_id" invisible="1"/>
                     <field name="rfid"/>

From 95e89d8979a72fc57286ad06f1a65f8811378e4d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 17:10:39 +0800
Subject: [PATCH 2/2] 1

---
 sf_base/views/tool_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 05196a19..fff58007 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -557,7 +557,7 @@
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
                 <field name="name"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', True)]}"/>
+                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>