From 47b2e8c709e684972c7e68ddb9c3101cf2124b67 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 27 Jul 2023 15:45:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E7=9A=84=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=8F=AF=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=202.=E5=B7=A5=E5=8D=95=E7=9A=84=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=87=8C=E6=96=B0=E5=A2=9E=E9=95=BF=E5=AE=BD=E9=AB=98=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml                   | 176 +++++++++---------
 sf_base/views/common_view.xml                 |  47 +----
 sf_base/views/fixture_view.xml                |   2 +-
 sf_base/views/functional_fixture_view.xml     |   2 +-
 sf_manufacturing/views/mrp_workorder_view.xml |   5 +
 5 files changed, 101 insertions(+), 131 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 2ddc055e..274d9d64 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -21,52 +21,47 @@
         <field name="name">tree.sf.machine.brand</field>
         <field name="model">sf.machine.brand</field>
         <field name="arch" type="xml">
-            <tree string="品牌">
+            <tree string="品牌" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
-                <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" optional="hide"/>
+                <field name="manufacturer_model_number"/>
+                <field name="tag_ids" widget="many2many_tags"  optional="hide"/>
+                <field name="image_brand"/>
             </tree>
         </field>
     </record>
 
-    <record model="ir.ui.view" id="form_sf_machine_brand">
-        <field name="name">form.sf.machine.brand</field>
-        <field name="model">sf.machine.brand</field>
-        <field name="arch" type="xml">
-            <form string="品牌">
-                <!--                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>-->
-                <field name="image_brand" widget='image' class="oe_avatar" options="{'preview_image': 'image_128'}"/>
-                <div class="oe_title">
-                    <label for="code" string="编码"/>
-                    <h2 class="d-flex">
-                        <field name="code" readonly="True"/>
-                    </h2>
-                </div>
-                <group>
-                    <group>
-                        <field name="name" required="True"/>
-                        <field name="tag_ids"
-                               widget="many2many_tags"
-                               options="{'color_field': 'color', 'no_create_edit': True}"
-                               required="True"/>
-                    </group>
-                </group>
-            </form>
-        </field>
-    </record>
+    <!--    <record model="ir.ui.view" id="form_sf_machine_brand">-->
+    <!--        <field name="name">form.sf.machine.brand</field>-->
+    <!--        <field name="model">sf.machine.brand</field>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <form string="品牌">-->
+    <!--                &lt;!&ndash;                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>&ndash;&gt;-->
+    <!--                <field name="image_brand" widget='image' class="oe_avatar" options="{'preview_image': 'image_128'}"/>-->
+    <!--                <div class="oe_title">-->
+    <!--                    <label for="code" string="编码"/>-->
+    <!--                    <h2 class="d-flex">-->
+    <!--                        <field name="code" readonly="True"/>-->
+    <!--                    </h2>-->
+    <!--                </div>-->
+    <!--                <group>-->
+    <!--                    <group>-->
+    <!--                        <field name="name" required="True"/>-->
+    <!--                        <field name="tag_ids"-->
+    <!--                               widget="many2many_tags"-->
+    <!--                               options="{'color_field': 'color', 'no_create_edit': True}"-->
+    <!--                               required="True"/>-->
+    <!--                    </group>-->
+    <!--                </group>-->
+    <!--            </form>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
     <record id="action_sf_machine_brand" model="ir.actions.act_window">
         <field name="name">品牌</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.machine.brand</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                [品牌] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-            </p>
-            <p>
-            </p>
-        </field>
+        <field name="view_mode">tree</field>
     </record>
 
     #------------------机床型号------------------
@@ -86,7 +81,7 @@
         <field name="name">tree.sf.machine_tool.type</field>
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
-            <tree string="机床型号">
+            <tree string="机床型号" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
@@ -96,20 +91,19 @@
         </field>
     </record>
 
-  <record model="ir.ui.view" id="form_sf_machine_tool_type">
+    <record model="ir.ui.view" id="form_sf_machine_tool_type">
         <field name="name">form.sf.machine_tool.type</field>
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
-            <form string="机床型号">
-
+            <form string="机床型号" create="0" edit="0" delete="0">
                 <group string="基本信息">
                     <group>
                         <field name="code" force_save="1" readonly="1"/>
                         <field name="name" required="1"/>
-                         <field name="machine_tool_category" required="1"/>
+                        <field name="machine_tool_category" required="1"/>
                         <field name="brand_id" required="1"
                                domain="[('tag_ids', '=', '机床')]"
-                               options="{'no_create': True}" />
+                               options="{'no_create': True}"/>
                     </group>
                     <group>
                         <field name="machine_tool_picture" widget="image" nolabel="1"/>
@@ -118,10 +112,10 @@
                 </group>
                 <group string="参数">
                     <group>
-                        <field name="control_system_id" required="1" options="{'no_create': True}" />
+                        <field name="control_system_id" required="1" options="{'no_create': True}"/>
                         <field name="workbench_L" required="1"/>
                         <field name="workbench_W" required="1"/>
-                         <field name="machine_tool_L" required="1"/>
+                        <field name="machine_tool_L" required="1"/>
                         <field name="machine_tool_W" required="1"/>
                         <field name="machine_tool_H" required="1"/>
                         <field name="knife_type" required="1"/>
@@ -138,28 +132,30 @@
                         <div class="test_model"
                              attrs="{'invisible': [('number_of_axles', '=', False)]}">
                             <label for="x_axis" string="x"/>
-                            <field name="x_axis" class="o_address_zip" required="1" options="{'format': false}" />
+                            <field name="x_axis" class="o_address_zip" required="1" options="{'format': false}"/>
                             <span>&amp;nbsp;</span>
                             <label for="y_axis" string="y"/>
-                            <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}" />
+                            <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
                             <span>&amp;nbsp;</span>
                             <label for="z_axis" string="z"/>
-                            <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}" />
+                            <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
                             <br></br>
                             <label for="b_axis" string="b"
                                    attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
                             <field name="b_axis" class="o_address_zip" required="1"
-                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" options="{'format': false}" />
+                                   attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
+                                   options="{'format': false}"/>
                             <span>&amp;nbsp;</span>
                             <label for="c_axis" string="c"
                                    attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
                             <field name="c_axis" class="o_address_zip" required="1"
-                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}" options="{'format': false}" />
+                                   attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
+                                   options="{'format': false}"/>
                         </div>
                     </group>
                     <group>
                         <field name="heightened_way" required="1"/>
-                          <field name="tool_quality_max" required="1"/>
+                        <field name="tool_quality_max" required="1"/>
                         <field name="tool_long_max" required="1"/>
                         <field name="tool_diameter_max" required="1"/>
                         <field name="guide_rail" required="1"/>
@@ -194,7 +190,7 @@
         </field>
     </record>
 
-        #------------------机床类型------------------
+    #------------------机床类型------------------
 
     <record model="ir.ui.view" id="search_sf_machine_tool_category_view">
         <field name="name">search.sf.machine_tool.category</field>
@@ -226,21 +222,20 @@
         <field name="arch" type="xml">
             <form string="机床类型">
                 <group string="基本信息" name="base_info">
-            <group>
-                <field name="code" force_save="1" readonly="1"/>
-                <field name="name" required="1"/>
-            </group>
-            <group>
-                <field name="category" readonly="1"/>
-            </group>
-        </group>
+                    <group>
+                        <field name="code" force_save="1" readonly="1"/>
+                        <field name="name" required="1"/>
+                    </group>
+                    <group>
+                        <field name="category" readonly="1"/>
+                    </group>
+                </group>
 
                 <group string="其它">
                     <field name="remark"/>
                 </group>
 
 
-
             </form>
         </field>
     </record>
@@ -297,7 +292,8 @@
         <field name="arch" type="xml">
             <form string="机床">
                 <header>
-                    <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册" attrs="{'invisible': [('code','!=',False)]}"/>
+                    <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
+                            attrs="{'invisible': [('code','!=',False)]}"/>
                 </header>
                 <group string="基本信息">
                     <group>
@@ -329,11 +325,14 @@
                                 <div class="o_address_format"
                                      attrs="{'invisible': [('number_of_axles', '=', False)]}">
                                     <label for="x_axis" string="x"/>
-                                    <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
+                                    <field name="x_axis" class="o_address_city" required="1"
+                                           options="{'format': false}"/>
                                     <label for="y_axis" string="y"/>
-                                    <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                                    <field name="y_axis" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
                                     <label for="z_axis" string="z"/>
-                                    <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
+                                    <field name="z_axis" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
                                     <label for="b_axis" string="b"
                                            attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
                                     <field name="b_axis" class="o_address_city" required="1"
@@ -350,7 +349,7 @@
                                 <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
                                 <field name="precision" required="1" string="加工精度(mm)"/>
                                 <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                                 <field name="state" widget="selection"/>
+                                <field name="state" widget="selection"/>
                             </group>
                         </group>
                     </page>
@@ -396,7 +395,7 @@
         <field name="name">tree.sf.machine.control_system</field>
         <field name="model">sf.machine.control_system</field>
         <field name="arch" type="xml">
-            <tree string="控制系统">
+            <tree string="控制系统" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
@@ -404,37 +403,30 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="form_sf_machine_control_system">
-        <field name="name">form.sf.machine.control_system</field>
-        <field name="model">sf.machine.control_system</field>
-        <field name="arch" type="xml">
-            <form string="控制系统">
-                <group>
-                    <group>
-                        <field name="code" force_save="1" readonly="1"/>
-                        <field name="brand_id" required="1"
-                               domain="[('tag_ids', '=', '控制系统')]"
-                               options="{'no_create': True}"/>
-                    </group>
-                    <group>
-                        <field name="name" required="1"/>
-                    </group>
-                </group>
-            </form>
-        </field>
-    </record>
+    <!--    <record model="ir.ui.view" id="form_sf_machine_control_system">-->
+    <!--        <field name="name">form.sf.machine.control_system</field>-->
+    <!--        <field name="model">sf.machine.control_system</field>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <form string="控制系统">-->
+    <!--                <group>-->
+    <!--                    <group>-->
+    <!--                        <field name="code" force_save="1" readonly="1"/>-->
+    <!--                        <field name="brand_id" required="1"-->
+    <!--                               domain="[('tag_ids', '=', '控制系统')]"-->
+    <!--                               options="{'no_create': True}"/>-->
+    <!--                    </group>-->
+    <!--                    <group>-->
+    <!--                        <field name="name" required="1"/>-->
+    <!--                    </group>-->
+    <!--                </group>-->
+    <!--            </form>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
     <record id="action_sf_machine_control_system" model="ir.actions.act_window">
         <field name="name">控制系统</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.machine.control_system</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                [控制系统] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-            </p>
-            <p>
-            </p>
-        </field>
+        <field name="view_mode">tree</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 27fac9a9..f73e4dcf 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="sf_processing_technology_form">
             <field name="model">sf.processing.technology</field>
             <field name="arch" type="xml">
-                <form string="加工工艺">
+                <form string="加工工艺" create="0" edit="0" delete="0">
                     <group>
                         <group>
                             <field name="process_encode" readonly="1"/>
@@ -23,7 +23,7 @@
         <record model="ir.ui.view" id="sf_processing_technology_tree">
             <field name="model">sf.processing.technology</field>
             <field name="arch" type="xml">
-                <tree string="加工工艺">
+                <tree string="加工工艺" create="0" edit="0" delete="0">
                     <field name="process_encode"/>
                     <field name="name"/>
                 </tree>
@@ -44,7 +44,7 @@
         <record model="ir.ui.view" id="sf_production_process_category_form">
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
-                <form string="表面工艺类别">
+                <form string="表面工艺类别" create="0" edit="0" delete="0">
                     <sheet>
                         <group>
                             <group>
@@ -75,7 +75,7 @@
         <record model="ir.ui.view" id="sf_production_process_category_tree">
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
-                <tree string="表面工艺类别"  default_order="sequence, id" >
+                <tree string="表面工艺类别"  default_order="sequence, id" create="0" edit="0" delete="0">
                     <field name="sequence" widget="handle" string="序号"/>
                     <field name="code" readonly="1"/>
                     <field name="name"/>
@@ -98,7 +98,7 @@
         <record model="ir.ui.view" id="sf_production_process_tree">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <tree string="表面工艺">
+                <tree string="表面工艺" create="0" edit="0" delete="0">
                     <field name="process_encode" readonly="1"/>
                     <field name="name" readonly="1"/>
                     <field name="remark"/>
@@ -109,7 +109,7 @@
         <record model="ir.ui.view" id="sf_production_process_form">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <form string="表面工艺">
+                <form string="表面工艺" create="0" edit="0" delete="0">
                     <sheet>
                         <group>
                             <group>
@@ -186,7 +186,7 @@
         <record model="ir.ui.view" id="sf_materials_model_form">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <form string="材料型号">
+                <form string="材料型号" create="0" edit="0" delete="0">
                     <group>
                         <group>
                             <field name="materials_no" readonly="1"/>
@@ -219,7 +219,7 @@
         <record model="ir.ui.view" id="sf_materials_model_tree">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <tree string="材料型号">
+                <tree string="材料型号" create="0" edit="0" delete="0">
                     <field name="materials_no"/>
                     <field name="name"/>
                     <field name="need_h"/>
@@ -246,8 +246,7 @@
         <record model="ir.ui.view" id="sf_production_materials_form">
             <field name="model">sf.production.materials</field>
             <field name="arch" type="xml">
-                <form string="材料">
-
+                <form string="材料" create="0" edit="0" delete="0">
                     <group string="详情">
                         <group>
                             <field name="materials_no" readonly="1" default="编码"/>
@@ -276,10 +275,9 @@
         <record model="ir.ui.view" id="sf_production_materials_tree">
             <field name="model">sf.production.materials</field>
             <field name="arch" type="xml">
-                <tree string="材料">
+                <tree string="材料" create="0" edit="0" delete="0">
                     <field name="materials_no" readonly="1"/>
                     <field name="name" readonly="1"/>
-
                 </tree>
             </field>
         </record>
@@ -299,44 +297,24 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.materials</field>
             <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    材料！
-                </p>
-            </field>
         </record>
         <record id="sf_production_process" model="ir.actions.act_window">
             <field name="name">表面工艺</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.process</field>
             <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    表面工艺！
-                </p>
-            </field>
         </record>
         <record id="sf_materials_model" model="ir.actions.act_window">
             <field name="name">材料型号</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.materials.model</field>
             <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    材料型号！
-                </p>
-            </field>
         </record>
         <record id="sf_processing_technology" model="ir.actions.act_window">
             <field name="name">加工工艺</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.processing.technology</field>
             <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    加工工艺！
-                </p>
-            </field>
         </record>
 
         <record id="sf_production_process_category" model="ir.actions.act_window">
@@ -344,11 +322,6 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.process.category</field>
             <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    表面工艺类别！
-                </p>
-            </field>
         </record>
 
         #------------------托盘------------------
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 04c6fe51..a267aeea 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -175,7 +175,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <form string="夹具型号">
+            <form string="夹具型号" create="0" edit="0" delete="0">
                 <sheet>
                     <group string="基本信息">
                         <group>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index 6fe6a814..0a763393 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -93,7 +93,7 @@
         <field name="name">功能夹具</field>
         <field name="model">sf.functional.fixture</field>
         <field name="arch" type="xml">
-            <form string="功能夹具">
+            <form string="功能夹具" create="0" edit="0" delete="0">
                 <sheet>
                     <group string="基本信息">
                         <group>
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 0b980564..8ec84006 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -129,6 +129,11 @@
             <xpath expr="//page[@name='components']" position="attributes">
                 <attribute name="string">物料</attribute>
             </xpath>
+            <xpath expr="//field[@name='move_raw_ids']/tree/field[@name='product_id']" position="after">
+                <field name='materiel_length' string="长"/>
+                <field name='materiel_width' string="宽"/>
+                <field name='materiel_height' string="高"/>
+            </xpath>
             <field name="production_id" position="after" invisible="0">
                 <group>
                     <field name="date_planned_start" invisible="1"/>