From f6d33f5430e3c12423daeaf44dac7f88bd61cf81 Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期四, 21 九月 2023 17:24:04 +0800
Subject: [PATCH] Merge branch 'dev_yx' into dev

---
 _Main/BL/Type_MappingSaleBudge/StaticMethod_GetSheetByYear.qbl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/BL/Type_MappingSaleBudge/StaticMethod_GetSheetByYear.qbl b/_Main/BL/Type_MappingSaleBudge/StaticMethod_GetSheetByYear.qbl
index 124d7ff..21a4a50 100644
--- a/_Main/BL/Type_MappingSaleBudge/StaticMethod_GetSheetByYear.qbl
+++ b/_Main/BL/Type_MappingSaleBudge/StaticMethod_GetSheetByYear.qbl
@@ -13,7 +13,7 @@
     result := sum( parent, 
                    MappingCapacityAndSaleBudge, 
                    item, 
-                   productNo.Find( item.ProductCode() ) > -1,
+                   item.YearNo() = yearNo and productNo.Find( item.ProductCode() ) > -1,
                    item.GetCapacityInSheetInYear() );
     return result;
   *]

--
Gitblit v1.9.3