From 7738d23499684bc91a6907ddbe7f892983aa6de2 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 04 十二月 2024 17:35:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
index b450973..96372d0 100644
--- a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
+++ b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
@@ -14,7 +14,7 @@
allProductionLines := selectuniquevalues( newNOPT, NewOfflinePlanRow, tempNOPR, true, tempNOPR.ProductionLine() );
traverse ( allProductionLines, Elements, pl
- // , pl = "CC MoMo"
+ // , pl = "CC ZKG"
)
{
// 涓嬬嚎璁″垝褰撳墠浜х嚎涓嬬殑琛�
@@ -24,14 +24,15 @@
preNOPCell := null( NewOfflinePlanCell );
traverse ( newNOPT, NewOfflinePlanColumn, nopc
- // , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 16 ) // 娴嬭瘯鏃跺彲浠ヨ繃婊ゆ椂闂�
+ // , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 7 ) // 娴嬭瘯鏃跺彲浠ヨ繃婊ゆ椂闂�
)
{
for ( i := 1; i < 10; i++ ) {
nopcell := select( noprs, Elements.NewOfflinePlanCell, tempNOPC, tempNOPC.NewOfflinePlanColumn() = nopc and tempNOPC.OrderNr() = i and tempNOPC.Order() <> "" );
// 鎹㈠瀷鎹熷け鍙傛暟
- cls := select( macroPlan, ChangeLossSetting, tempCLS,
+ cls := select( macroPlan, ChangeLossSetting, tempCLS,
+ tempCLS.Unit().ID() = pl and
tempCLS.ProductFirst().ID() = guard( preNOPCell.NewOfflinePlanRow().ProductID(), "" ) and
tempCLS.ProductSecond().ID() = guard( nopcell.NewOfflinePlanRow().ProductID(), "" ) and
tempCLS.StartDate() <= nopc.StartDate() and
--
Gitblit v1.9.3