From e57574783f6ac446bd8d662cb4c7aaf3ab922b07 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 16 Jan 2025 10:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom_many2many_checkboxes.css                      | 1 +
 sf_manufacturing/__manifest__.py                         | 1 +
 sf_manufacturing/static/src/scss/equipment_spacing.scss  | 3 +++
 sf_manufacturing/views/sf_maintenance_equipment.xml      | 9 +++++----
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 sf_manufacturing/static/src/scss/equipment_spacing.scss

diff --git a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css
index edaa2bb4..20cb4c7e 100644
--- a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css
+++ b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css
@@ -22,6 +22,7 @@
     width: 50px;
     height: 50px;
     margin-bottom: 5px;
+    margin-top: 15px;
 }
 
 .item-label {
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index c6f40b37..e2ef6dbe 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -59,6 +59,7 @@
             'sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js',
             'sf_manufacturing/static/src/js/qr.js',
             'sf_manufacturing/static/src/xml/qr.xml',
+            'sf_manufacturing/static/src/scss/equipment_spacing.scss',
         ]
 
     },
diff --git a/sf_manufacturing/static/src/scss/equipment_spacing.scss b/sf_manufacturing/static/src/scss/equipment_spacing.scss
new file mode 100644
index 00000000..5748345f
--- /dev/null
+++ b/sf_manufacturing/static/src/scss/equipment_spacing.scss
@@ -0,0 +1,3 @@
+.my_custom_group_spacing {
+    margin-top: 30px; /* 调整组与上方元素的距离 */
+}
\ No newline at end of file
diff --git a/sf_manufacturing/views/sf_maintenance_equipment.xml b/sf_manufacturing/views/sf_maintenance_equipment.xml
index 5ddf59b0..8eb69007 100644
--- a/sf_manufacturing/views/sf_maintenance_equipment.xml
+++ b/sf_manufacturing/views/sf_maintenance_equipment.xml
@@ -12,15 +12,16 @@
                       attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
                     <button name="get_equipment_base_coordinate" string="获取基坐标数据" type="object"
                             class="oe_highlight"/>
-                    <separator invisible="0"/>
-                    <group>
+                    <group class="my_custom_group_spacing">
                         <group>
                             <field name="base_coordinate_fixture_model_id" options="{'no_create': True}"/>
-                            <field name="base_coordinate_g_coordinate"/>
                             <field name="base_coordinate_x"/>
-                            <field name="base_coordinate_y"/>
                             <field name="base_coordinate_z"/>
                         </group>
+                        <group>
+                            <field name="base_coordinate_g_coordinate"/>
+                            <field name="base_coordinate_y"/>
+                        </group>
                     </group>
                 </page>
                 <page string="标准刀库" name="sf_equipment_product_template"