From 2038c70957e1b10e44ab8a8d94884cd09254f051 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 16 十月 2024 19:15:36 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_ScheduleSummary.qbl | 21 +++++++++++++++++++++
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl | 4 ++--
_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl | 2 +-
_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_AnnualPlanReport.qbl | 21 +++++++++++++++++++++
_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl | 2 +-
_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl | 4 ++--
6 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
index 749da30..3720c16 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
@@ -45,7 +45,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := row.ProductID(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
@@ -62,7 +62,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := row.ProductID(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_AnnualPlanReport.qbl b/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_AnnualPlanReport.qbl
new file mode 100644
index 0000000..cab5230
--- /dev/null
+++ b/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_AnnualPlanReport.qbl
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod CreateMP_Tables_AnnualPlanReport (
+ const MacroPlans owners
+) as owning MP_Tables
+{
+ TextBody:
+ [*
+ // Akari Aug-19-2024 (created)
+ tables := construct( MP_Tables );
+ traverse( owners,Elements,owner ,owner.MDSMacroPlan().Description().LikeUserLocale( "璁″垝姹囨��" )){
+ table := select( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() );
+ if( not isnull( table )){
+ table.Delete();
+ }
+ table := MP_Cell_AnnualPlanReport::Create( owner );
+ tables.Add( table );
+ }
+ return &tables;
+ *]
+}
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_ScheduleSummary.qbl b/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_ScheduleSummary.qbl
new file mode 100644
index 0000000..3b6b88a
--- /dev/null
+++ b/_Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_ScheduleSummary.qbl
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod CreateMP_Tables_ScheduleSummary (
+ const MacroPlans owners
+) as owning MP_Tables
+{
+ TextBody:
+ [*
+ // Akari Aug-19-2024 (created)
+ tables := construct( MP_Tables );
+ traverse( owners,Elements,owner ,owner.MDSMacroPlan().Description().LikeUserLocale( "璁″垝姹囨��" )){
+ table := select( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
+ if( not isnull( table )){
+ table.Delete();
+ }
+ table := MP_Cell_ScheduleSummary::Create( owner );
+ tables.Add( table );
+ }
+ return &tables;
+ *]
+}
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl
index c732421..47015ba 100644
--- a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl
+++ b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl
@@ -8,7 +8,7 @@
[*
// Akari Aug-19-2024 (created)
tables := construct( MP_Tables );
- traverse( owners,Elements,owner ){
+ traverse( owners,Elements,owner ,owner.MDSMacroPlan().Description().LikeUserLocale( "璁″垝姹囨��" )){
table := select( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() );
if( isnull( table )){
table := MP_Cell_AnnualPlanReport::Create( owner );
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl
index d125d15..d43f49f 100644
--- a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl
+++ b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl
@@ -8,7 +8,7 @@
[*
// Akari Aug-19-2024 (created)
tables := construct( MP_Tables );
- traverse( owners,Elements,owner ){
+ traverse( owners,Elements,owner ,owner.MDSMacroPlan().Description().LikeUserLocale( "璁″垝姹囨��" )){
table := select( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
if( isnull( table )){
table := MP_Cell_ScheduleSummary::Create( owner );
diff --git a/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl b/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
index 743331b..a3dce7f 100644
--- a/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
+++ b/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
@@ -31,8 +31,8 @@
traverse( this,NewOfflinePlanRow,row,row.Type() = "1" ){
productID := row.ProductID();
- // productLine := row.ProductionLine();
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID );
+ productLine := row.ProductionLine();
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID + " > " + productLine,ProductID := productID );
traverse( row,NewOfflinePlanCell,cell,cell.NewOfflinePlanColumn().StartDate() >= macroPlan.StartOfPlanning().Date() ){
localColumnHandle := localColumnIndexTree.GetHandle( cell.NewOfflinePlanColumn().StartDate().AsQUILL() );
localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
--
Gitblit v1.9.3