From 809195e23ee1d4c5bb45db33f32a98b61b49773c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 29 Apr 2026 18:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_stock/views/inherit_stock_picking.xml | 23 +++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/yuthon_stock/views/inherit_stock_picking.xml b/yuthon_stock/views/inherit_stock_picking.xml
index d58b97781..a831b5a1f 100644
--- a/yuthon_stock/views/inherit_stock_picking.xml
+++ b/yuthon_stock/views/inherit_stock_picking.xml
@@ -45,12 +45,6 @@
             </xpath>
             <xpath expr="//page[@name='operations']//field[@name='move_ids_without_package']//field[@name='product_uom'][@groups='uom.group_uom']" position="after">
                 <field name="available_location_ids" invisible="1"/>
-                <field name="location_id" string="所在仓库" optional="show"
-                       invisible="parent.picking_type_code != 'internal'"
-                       domain="[('id', 'in', available_location_ids)]"
-                       options="{'no_create': True}"/>
-                <field name="borrow_type" string="借用/领用" readonly="1" optional="show"
-                       invisible="parent.picking_type_code != 'internal'"/>
             </xpath>
             <xpath expr="//button[@name='%(stock.act_stock_return_picking)d']" position="attributes">
                 <attribute name="invisible">1</attribute>
@@ -350,7 +344,20 @@
                     <notebook>
                         <page string="作业" name="operations">
                             <field name="move_ids_without_package"
-                                   context="{'default_picking_id': id, 'default_picking_type_id': picking_type_id}"/>
+                                   context="{'default_picking_id': id, 'default_picking_type_id': picking_type_id}">
+                                <tree editable="bottom">
+                                    <field name="available_location_ids" invisible="1"/>
+                                    <field name="company_id" invisible="1"/>
+                                    <field name="product_uom_category_id" invisible="1"/>
+                                    <field name="product_id" options="{'no_create': True}"/>
+                                    <field name="product_uom_qty" string="需求"/>
+                                    <field name="product_uom" groups="uom.group_uom"/>
+                                    <field name="location_id" string="所在仓库"
+                                           domain="[('id', 'in', available_location_ids)]"
+                                           options="{'no_create': True}"/>
+                                    <field name="borrow_type" string="借用/领用" readonly="1"/>
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </sheet>
@@ -375,7 +382,7 @@
         <field name="name">借用/领用</field>
         <field name="res_model">stock.picking</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="stock_picking_views_tree_borrow"/>
+        <field name="views" eval="[(ref('stock_picking_views_tree_borrow'), 'tree'), (ref('stock_picking_form_borrow'), 'form')]"/>
         <field name="domain">['&amp;', '|', ('picking_type_id.name', 'ilike', '借用'), ('picking_type_id.name', 'ilike', '领用'), '|', ('create_uid', '=', uid), ('approver_id', '=', uid)]</field>
         <field name="context">{"default_picking_type_id": 72}</field>
     </record>