From a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 12:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
index ee7c9fd..de27233 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
@@ -35,24 +35,26 @@
}
traverse( noptable, NewOfflinePlanRow, noprow ){
row := table.GetRow( noprow );
- traverse( noprow, NewOfflinePlanCell, nopcell ){
- column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcell.NewOfflinePlanColumn().StartDate() );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- actproductionKey := noprow.ProductID() + column.StartDate().AsQUILL();
- actproductionhandle:= actproductiontree.GetHandle( actproductionKey );
- actproductionindex := guard( actproductiontree.Root().Child( actproductionhandle ),null( NamedValue ));
-
- actproductionqty := 0.0;
- if( not isnull( actproductionindex )){
- actproduction := actproductiondatas.Element( actproductionindex.GetValueAsNumber() );
- actproductionqty := actproduction.ActualOut();
+ if( not isnull( row ) ){
+ traverse( noprow, NewOfflinePlanCell, nopcell ){
+ column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcell.NewOfflinePlanColumn().StartDate() );
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
+ actproductionKey := noprow.ProductID() + column.StartDate().AsQUILL();
+ actproductionhandle:= actproductiontree.GetHandle( actproductionKey );
+ actproductionindex := guard( actproductiontree.Root().Child( actproductionhandle ),null( NamedValue ));
+
+ actproductionqty := 0.0;
+ if( not isnull( actproductionindex )){
+ actproduction := actproductiondatas.Element( actproductionindex.GetValueAsNumber() );
+ actproductionqty := actproduction.ActualOut();
+ }
+ cell.ActualProductionQty( actproductionqty );
+ cell.InventoryWeight( nopcell.InventoryWeight() );
+ // cell.ProductionSerialNumber( nopcell.ProductionSerialNumber() );
+ cell.Quantity( nopcell.Quantity() );
+ // cell.Shift( nopcell.Shift() );
+ // cell.Value( nopcell.Value() );
}
- cell.ActualProductionQty( actproductionqty );
- cell.InventoryWeight( nopcell.InventoryWeight() );
- // cell.ProductionSerialNumber( nopcell.ProductionSerialNumber() );
- cell.Quantity( nopcell.Quantity() );
- // cell.Shift( nopcell.Shift() );
- // cell.Value( nopcell.Value() );
}
}
showtable.Generate( search );
--
Gitblit v1.9.3