From e92c9675b6aeb235cf2ad32aed7b24060e4dab58 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 5 Aug 2024 17:18:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=20=E5=A4=84=E7=90=86=20=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E8=B0=83=E6=8B=A8=E5=8D=95=EF=BC=8C=E5=9C=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9B=AE=E6=A0=87=E8=B4=A7=E4=BD=8D=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B8=A6=E5=BE=AA=E7=8E=AF=E8=B4=A7=E4=BD=8D?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9A=84=E8=B4=A7=E4=BD=8D=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/fixture_view.xml                 | 14 +++++++-------
 sf_warehouse/views/change_stock_move_views.xml |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 0e86738d..07dadd33 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -171,7 +171,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="orientation_dish_diameter"/>
                                     <field name="clamping_diameter"/>
                                     <field name="clamping_num"/>
@@ -197,7 +197,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="clamping_diameter"/>
                                     <field name="connector_diameter"/>
                                     <field name="chucking_power_max"/>
@@ -220,7 +220,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -248,7 +248,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -278,7 +278,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="height_tolerance_value"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -307,7 +307,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"/>
+                                    <field name="weight"  string="重量(kg)"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -335,7 +335,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight"/>
+                                    <field name="weight" string="重量(kg)"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
diff --git a/sf_warehouse/views/change_stock_move_views.xml b/sf_warehouse/views/change_stock_move_views.xml
index c5df0881..9e1073c9 100644
--- a/sf_warehouse/views/change_stock_move_views.xml
+++ b/sf_warehouse/views/change_stock_move_views.xml
@@ -21,7 +21,8 @@
                     <!--                                               ]"/> -->
                     <field name="destination_location_id" domain="[('location_id', '=', location_dest_id_value), '|',
                            ('location_status', '=', '空闲'), ('product_id', '=', current_product_id), ('product_sn_id',
-                           '=', there_is_no_sn)]" options="{'no_create': True,'no_create_edit':True}"/>
+                           '=', there_is_no_sn), ('rotative_Boolean', '=', False)]"
+                           options="{'no_create': True,'no_create_edit':True}"/>
                     <field name="rfid_barcode" string="Rfid"/>
 
                     <!--                     <field name="location_dest_id_product_type"/> -->