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_OfflinePlanArchiveVersion/Method_GetRow.qbl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
index 7e54b9d..a6201d7 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
Method GetRow (
- const NewOfflinePlanRow noprow
+ NewOfflinePlanRow noprow
) as OfflinePlanArchiveRow
{
TextBody:
@@ -10,8 +10,10 @@
row := selectobject( this, Row, row, row.ProductID() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() );
if( isnull( row ) ){
+ product := selectobject( noprow.NewOfflinePlanTable().MacroPlan(), Product_MP, product, product.ID() = noprow.ProductID() );
unit := ifexpr( noprow.ProductionLine().FindString( "CC", 0 ) > -1, FinancialProductionReport::GetDefaultCCUnit(), FinancialProductionReport::GetDefaultDLUnit() );
- row := this.Row( relnew, ProductID := noprow.ProductID(), ProductionLine := noprow.ProductionLine(), Type := noprow.Type(), Unit := unit );
+ row := this.Row( relnew, Name := noprow.ProductID(), ProductionLine := noprow.ProductionLine(), Type := noprow.Type(), Unit := unit
+ , ProductID := ifexpr( exists( product.GetAllParent(), Elements, e, e.ID() = EnginePipelineReport::GetDefaultProductParent() ), product.Notes(), product.ID() ) );
//鍒濆鍖栧崟鍏冩牸
row.InitializeCell();
}
--
Gitblit v1.9.3