From 3590abb21c6df36bdc53d4d8d6b86f753223cdfe Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 19 十一月 2024 14:54:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
index 607b785..b4665c0 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
@@ -26,11 +26,12 @@
     }
     traverse( macroPlan, NewAssemblyOnlinePlanRow, aoprow, aoprow.Type() = '1' ){
       row                  := table.GetRow( aoprow );
-      traverse( aoprow, NewAssemblyOnlinePlanCell, aopcell ){
-        column             := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcell.NewAssemblyOnlinePlanColumn().StartDate() );
+      traverse( table, Column, column ){//, aopcolumns.Find( column.StartDate() ) > -1
+        qty                := sum( aoprow, NewAssemblyOnlinePlanCell, aopcell, column.StartDate() <= aopcell.NewAssemblyOnlinePlanColumn().StartDate()
+                                         and column.EndDate() >= aopcell.NewAssemblyOnlinePlanColumn().StartDate(), aopcell.Quantity() );
+        
         cell               := selectobject( row, Cell, cell, cell.Column() = column );
-    //    cell.InventoryWeight( aopcell.InventoryWeight() );
-        cell.Quantity( aopcell.Quantity() );
+        cell.Quantity( qty );
       }
     }
     showtable.Generate( search );

--
Gitblit v1.9.3