From f6a8ca376a6237c53300edcf1e3f4d49215378b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 30 Apr 2026 11:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/yuthon_stock/views/inherit_stock_picking.xml b/yuthon_stock/views/inherit_stock_picking.xml
index 93443afdf..31b0add29 100644
--- a/yuthon_stock/views/inherit_stock_picking.xml
+++ b/yuthon_stock/views/inherit_stock_picking.xml
@@ -323,7 +323,8 @@
             <form string="出库">
                 <header>
                     <field name="approver_id" invisible="1"/>
-                    <button name="action_submit" string="提交审批" type="object" class="btn-primary"
+                    <button name="%(yuthon_stock.action_stock_picking_submit_wizard)d"
+                            string="提交审批" type="action" class="btn-primary"
                             invisible="approval_state not in ['draft', 'refused']"/>
                     <button name="action_approve" string="批准" type="object" class="btn-primary"
                             invisible="approval_state != 'pending' or approver_id != uid"/>
@@ -333,23 +334,23 @@
                            statusbar_visible="draft,pending,approved,refused"/>
                 </header>
                 <sheet>
+                    <field name="company_id" invisible="1"/>
                     <group>
                         <group string="基本信息">
                             <field name="borrow_code" string="流水号" readonly="1"/>
                             <field name="create_uid" string="申请人" readonly="1"/>
-                            <field name="approver_id" string="审批人" options="{'no_create': True}"/>
                             <field name="picking_type_id" string="作业类型" readonly="1"/>
                         </group>
                     </group>
                     <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, 'default_company_id': company_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="available_location_ids" column_invisible="True"/>
+                                    <field name="company_id" column_invisible="True"/>
+                                    <field name="product_uom_category_id" column_invisible="True"/>
+                                    <field name="product_id" options="{'no_create': True}" context="{'search_default_company_id': False}"/>
                                     <field name="product_uom_qty" string="需求"/>
                                     <field name="product_uom" groups="uom.group_uom"/>
                                     <field name="location_id" string="所在仓库"
@@ -388,6 +389,12 @@
         <field name="context">{"default_picking_type_id": 72}</field>
     </record>
 
+    <!-- 强制刷新借用/领用 action 的 views 绑定 -->
+    <function model="ir.actions.act_window" name="write">
+        <value eval="[ref('action_stock_picking_borrow')]"/>
+        <value eval="{'view_ids': [(5,), (0, 0, {'view_id': ref('stock_picking_views_tree_borrow'), 'view_mode': 'tree', 'sequence': 1}), (0, 0, {'view_id': ref('stock_picking_form_borrow'), 'view_mode': 'form', 'sequence': 2})]}"/>
+    </function>
+
     <record id="action_stock_picking_scrap" model="ir.actions.act_window">
         <field name="name">报废</field>
         <field name="res_model">stock.picking</field>
@@ -428,6 +435,7 @@
         <field name="name">收货</field>
         <field name="domain">['&amp;', ('picking_type_code', '=', 'incoming'), '|', '|', ('create_uid', '=', uid), ('acceptance_user_id', '=', uid), ('certifier_user_id', '=', uid)]</field>
         <field name="context">{'contact_display': 'partner_address', 'restricted_picking_type_code': 'incoming', 'search_default_reception': 1}</field>
+        <field name="views" eval="[(False, 'tree'), (ref('stock.view_picking_form'), 'form')]"/>
     </record>
 
     <record id="inherit_view_picking_internal_search_my" model="ir.ui.view">