From 7da84821eb07cfa1370adfe4144e41416cf1cefa Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 07 十一月 2024 11:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/BL/Type_InventoryPlanArchiveVersion/Method_GetRowByUnit.qbl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_Main/BL/Type_InventoryPlanArchiveVersion/Method_GetRowByUnit.qbl b/_Main/BL/Type_InventoryPlanArchiveVersion/Method_GetRowByUnit.qbl
index e9db693..aefff99 100644
--- a/_Main/BL/Type_InventoryPlanArchiveVersion/Method_GetRowByUnit.qbl
+++ b/_Main/BL/Type_InventoryPlanArchiveVersion/Method_GetRowByUnit.qbl
@@ -1,17 +1,17 @@
 Quintiq file version 2.0
 #parent: #root
 Method GetRowByUnit (
-  String product,
+  Product_MP product,
   String unit
 ) as InventoryPlanArchiveRow
 {
   TextBody:
   [*
     // 鐢勫叞楦� Sep-6-2024 (created)
-    row := selectobject( this, Row, row, row.Name() = product and row.Unit() = unit );
+    row := selectobject( this, Row, row, row.Name() = product.ID() and row.Unit() = unit );
     if( isnull( row ) ){
       //鍒濆鍖栧崟鍏冩牸 
-      row := this.Row( relnew, Name := product, Unit := unit );
+      row := this.Row( relnew, Name := product.ID(), Unit := unit, ProductID := ifexpr( exists( product.GetAllParent(), Elements, e, e.ID() = EnginePipelineReport::GetDefaultProductParent() ), product.Notes(), product.ID() )  );
       traverse( this, Column, column ){
         row.Initialize( column );
       }

--
Gitblit v1.9.3