From 4bcd6b99446444d1ab7ce00b13f2303528378a72 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 25 Apr 2024 17:14:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=9C=BA=E5=BA=8A?=
 =?UTF-8?q?=E5=88=80=E4=BD=8D=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E5=88=B0=E6=9C=BA=E5=BA=8A=E7=9A=84=E5=88=80?=
 =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0-=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E7=9A=84=E6=9C=BA=E5=BA=8A=E6=8D=A2?=
 =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=9F=E8=83=BD=E8=8F=9C=E5=8D=95=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8D=95=EF=BC=9B3=E3=80=81=E5=88=80?=
 =?UTF-8?q?=E6=9F=84=E5=92=8C=E6=89=98=E7=9B=98=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=EF=BC=8C=E5=AF=B9=E5=BD=95=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?Rfid=E5=81=9A=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/maintenance_equipment.py              |  2 +-
 sf_tool_management/views/menu_view.xml           | 16 ++++++++--------
 .../views/sf_maintenance_equipment.xml           |  6 +++---
 sf_warehouse/models/model.py                     |  8 ++++++++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 135bf200..f693ed2c 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -67,7 +67,7 @@ class SfMaintenanceEquipment(models.Model):
                     equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
                         [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
                     functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
-                        [('rfid', '=', str(int(data['RfidCode'])))])
+                        [('rfid', '=', data['RfidCode'])])
                     time = None
                     if data['AddDatetime']:
                         datatime = str(data['AddDatetime'])
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index 8ddee8eb..c964bb35 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -23,13 +23,13 @@
                 parent="menu_sf_tool_manage"
         />
 
-        <menuitem
-                sequence="10"
-                name="机床换刀申请"
-                id="menu_sf_machine_table_tool_changing_apply"
-                action="sf_machine_table_tool_changing_apply_view_act"
-                parent="menu_sf_function_tool_plan"
-        />
+<!--        <menuitem-->
+<!--                sequence="10"-->
+<!--                name="机床换刀申请"-->
+<!--                id="menu_sf_machine_table_tool_changing_apply"-->
+<!--                action="sf_machine_table_tool_changing_apply_view_act"-->
+<!--                parent="menu_sf_function_tool_plan"-->
+<!--        />-->
         <menuitem
                 sequence="20"
                 name="CAM工单程序用刀计划"
@@ -42,7 +42,7 @@
         <!--  ================功能菜单=================  -->
         <menuitem
                 sequence="5"
-                name="功能"
+                name="作业单"
                 id="menu_sf_function_tool_function"
                 parent="menu_sf_tool_manage"
         />
diff --git a/sf_tool_management/views/sf_maintenance_equipment.xml b/sf_tool_management/views/sf_maintenance_equipment.xml
index 39a7d2c8..8b3de5a9 100644
--- a/sf_tool_management/views/sf_maintenance_equipment.xml
+++ b/sf_tool_management/views/sf_maintenance_equipment.xml
@@ -12,10 +12,10 @@
                     <button string="获取机床刀库信息" name="register_equipment_tool" type="object" class="btn-primary"/>
                     <field name='product_template_ids'>
                         <tree editable='bottom'>
-                            <field name="code" readonly="false"/>
+                            <field name="code" readonly="1"/>
                             <field name="tool_code"/>
                             <field name="functional_tool_type"/>
-                            <field name="functional_tool_name_id"/>
+                            <field name="functional_tool_name_id" readonly="1"/>
                             <field name="image" widget="image"/>
                             <field name="tool_groups"/>
                             <field name="diameter"/>
@@ -23,7 +23,7 @@
                             <field name="life_value_max"/>
                             <field name="alarm_value"/>
                             <field name="used_value"/>
-                            <field name="tool_install_time"/>
+                            <field name="tool_install_time" readonly="1"/>
                         </tree>
                     </field>
                 </page>
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index b5c0d099..fdbd0c33 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -1006,6 +1006,14 @@ class CustomStockMove(models.Model):
         """
         for record in self:
             if record:
+                lot = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
+                if lot:
+                    if lot.product_id.cutting_tool_material_id:
+                        material = lot.product_id.cutting_tool_material_id.name
+                    else:
+                        material = lot.product_id.fixture_material_id.name
+                    raise ValidationError(
+                        '该Rfid【%s】已经被序列号为【%s】的【%s】物料所占用!' % (barcode, lot.name, material))
                 if '刀柄' in (record.product_id.cutting_tool_material_id.name or '') or '托盘' in (
                         record.product_id.fixture_material_id.name or ''):
                     for move_line_nosuggest_id in record.move_line_nosuggest_ids: