From 9e212a2684c85b56c3291b9ed5c3b02d9374feac Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 15 Sep 2023 09:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=BA=8A=E6=8D=A2?=
 =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            |  4 ++--
 sf_tool_management/views/tool_base_views.xml | 14 +++++++-------
 sf_tool_management/wizard/wizard_view.xml    |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 33bc1d4b..9ae2a422 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -551,7 +551,7 @@ class MachineTableToolChangingApply(models.Model):
 
     name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False,
                            group_expand='_read_group_names')
-    machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True,
+    machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
                                             compute='_compute_name')
     machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_name')
     cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
@@ -595,7 +595,7 @@ class MachineTableToolChangingApply(models.Model):
     def _compute_name(self):
         for record in self:
             if record:
-                record.machine_table_type_id = record.name.machine_tool_category.id
+                record.machine_table_type_id = record.name.category_id.id
                 record.machine_tool_code = record.name.code
 
     @api.depends('functional_tool_name_id')
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 7192c8f0..31b69188 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -870,7 +870,7 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="name" readonly="1"/>
+                                <field name="name" readonly="0" placeholder="请选择"/>
                             </h1>
                         </div>
                         <group>
@@ -879,7 +879,7 @@
                                 <field name="machine_tool_code" invisible="True"/>
                                 <field name="cutter_spacing_code"/>
                                 <field name="functional_tool_code"/>
-                                <field name="functional_tool_name_id"/>
+                                <field name="functional_tool_name_id" placeholder="请选择"/>
                                 <field name="functional_tool_type_id"/>
                             </group>
                         </group>
@@ -999,19 +999,19 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="name" readonly="1"/>
+                                <field name="name" readonly="0" placeholder="请输入工单任务编号"/>
                             </h1>
                         </div>
                         <group>
                             <group>
                                 <field name="cam_procedure_code"/>
                                 <field name="cam_cutter_spacing_code"/>
-                                <field name="machine_table_name_id"/>
+                                <field name="machine_table_name_id" placeholder="请选择"/>
                             </group>
                             <group>
                                 <field name="functional_tool_code"/>
-                                <field name="functional_tool_name_id"/>
-                                <field name="functional_tool_type_id"/>
+                                <field name="functional_tool_name_id" placeholder="请选择"/>
+                                <field name="functional_tool_type_id" placeholder="请选择"/>
                                 <field name="machine_tool_cutter_spacing_code"/>
                             </group>
                         </group>
@@ -1027,7 +1027,7 @@
                                         <field name="coarse_middle_thin"/>
                                     </group>
                                     <group>
-                                        <field name="need_knife_time"/>
+                                        <field name="need_knife_time" placeholder="请选择"/>
                                         <field name="required_cutting_time"/>
                                         <field name="whether_standard_tool"/>
                                         <field name="applicant"/>
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index 4e871807..2c7f1bed 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -23,15 +23,15 @@
                         </group>
                         <group string="功能刀具信息">
                             <group>
-                                <field name="replacement_tool_name_id"/>
+                                <field name="replacement_tool_name_id" placeholder="请选择"/>
                                 <field name="replacement_tool_type_id"/>
-                                <field name="replacement_tool_coarse_middle_thin"/>
+                                <field name="replacement_tool_coarse_middle_thin" placeholder="请选择"/>
                                 <field name="applicant"/>
                             </group>
                             <group>
                                 <field name="replacement_tool_code"/>
-                                <field name="used_tool_time"/>
-                                <field name="new_former"/>
+                                <field name="used_tool_time" placeholder="请选择"/>
+                                <field name="new_former" placeholder="请选择"/>
                                 <field name="reason_for_applying"/>
 
                             </group>