From 3bcc673d887781614d5621fe2abc1072be6c1e4d Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 27 Feb 2025 15:09:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BA=BF=E4=B8=8B?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 25626f71..8470530c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1224,7 +1224,7 @@ class ResMrpWorkOrder(models.Model):
             if (workorder.production_id.production_type == '人工线下加工'
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
-                        lambda w: w.state in ['done', 'cancel'])) >= 2):
+                        lambda w: w.state not in ['done', 'cancel'])) == 0):
                     # and workorder.production_id.programming_state == '已编程'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()

From 22c5ee68063d9492ffac65ed8a8080e8d6588c6d Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 27 Feb 2025 15:09:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=94=B6=E6=96=99?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9A=84=E6=89=B9=E9=87=8F=E8=B0=83=E6=8B=A8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/views/change_stock_move_views.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sf_warehouse/views/change_stock_move_views.xml b/sf_warehouse/views/change_stock_move_views.xml
index 041332d7..f85e59a1 100644
--- a/sf_warehouse/views/change_stock_move_views.xml
+++ b/sf_warehouse/views/change_stock_move_views.xml
@@ -157,7 +157,9 @@
                             groups="sf_base.group_sf_stock_user"/>
                 </xpath>
                 <xpath expr="//header" position="inside">
-                    <button name="batch_stock_move" type='object' string="批量调拨" invisible="1"/>
+                    <button name="batch_stock_move" type='object' string="批量调拨"
+                    invisible="context.get('stock_type') in ('收料入库')"
+                    />
                 </xpath>
                 <xpath expr="//field[@name='location_dest_id']" position="after">
                     <field name="product_uom_qty_sp"/>
@@ -165,6 +167,18 @@
             </field>
         </record>
 
+        <record id="view_stock_picking_type_kanban_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.type.kanban.view.inherit</field>
+            <field name="model">stock.picking.type</field>
+            <field name="inherit_id" ref="stock.stock_picking_type_kanban"/>
+            <field name="arch" type="xml">
+                <!-- 找到按钮所在位置并添加 context -->
+                <xpath expr="//button[@name='get_action_picking_tree_ready']" position="attributes">
+                    <attribute name="context">{'stock_type': name}</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <record id="sf_view_stock_move_operations" model="ir.ui.view">
             <field name="name">sf.stock.move.operations.form</field>
             <field name="model">stock.move</field>