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_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 4bf7cc72..c202fc71 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -217,6 +217,23 @@ class StockRule(models.Model):
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and not
                                            p.move_raw_ids and not p.workorder_ids)).action_confirm()
+            # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
+            for production in productions:
+                if production.picking_ids:
+                    product_type_id = production.picking_ids[0].move_ids[0].product_id.categ_id
+                    if product_type_id.name == '坯料':
+                        location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+                        if not location_id:
+                            logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+                            break
+                        for picking_id in production.picking_ids:
+                            if picking_id.picking_type_id.name == '内部调拨':
+                                if picking_id.location_dest_id.product_type != product_type_id:
+                                    picking_id.location_dest_id = location_id.id
+                            elif picking_id.picking_type_id.name == '生产发料':
+                                if picking_id.location_id.product_type != product_type_id:
+                                    picking_id.location_id = location_id.id
+
             for production in productions:
                 '''
                 创建制造订单时生成序列号
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 7bf352eb..00cca206 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -34,15 +34,13 @@
                 <!--                </xpath>-->
                 <xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
                     <button name="action_confirm" data-hotkey="v"
-                            string="确认" type="object" context="{'validate_analytic': True}"
+                            string="确认接单" type="object" context="{'validate_analytic': True}"
                             attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|','&amp;',('state', 'in',
-                        ['cancel','draft']),('check_status',
-                        'in',
-                        [False,'approved']),'&amp;',('check_status', '=', 'approved'),('state', 'in',
-                        ['sale','cancel','draft'])]}
+                    <attribute name="attrs">{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state',
+                        'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in',
+                        ['sale','cancel']),('delivery_status', '!=', False)]}
                     </attribute>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
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"/> -->