From 04e1922be46253daddbf1b47158df58cf3492846 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 19 九月 2024 13:44:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl b/_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
index b1ee27d..bf4f206 100644
--- a/_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
+++ b/_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
@@ -16,7 +16,10 @@
traverse ( allProductionLines, Elements, pl ) {
oprs := selectset( newOPT, OfflinePlanRow, tempORT, tempORT.ProductionLine() = pl and ( tempORT.Type() = "1" or tempORT.Type() = "2" ) );
- traverse ( newOPT, OfflinePlanColumn, opc, opc.ColumnDate() = macroPlan.StartOfPlanning().Date() ) {
+ traverse ( newOPT, OfflinePlanColumn, opc,
+ opc.ColumnDate() >= macroPlan.StartOfPlanning().Date()
+ // opc.ColumnDate() >= macroPlan.StartOfPlanning().Date() and opc.ColumnDate() <= Date::Construct( 2024, 4, 17 ) // 娴嬭瘯鏃跺彲浠ヨ繃婊ゆ椂闂�
+ ) {
for ( i := 1; i < 10; i++ ) {
firstOrderCell := select( oprs, Elements.OfflinePlanCell, tempOPC, tempOPC.OfflinePlanColumn() = opc and tempOPC.Value() = ( "#" + i.Format( "N(LPad0(2))" ) ) );
secondOrderCell := select( oprs, Elements.OfflinePlanCell, tempOPC, tempOPC.OfflinePlanColumn() = opc and tempOPC.Value() = ( "#" + ( i + 1 ).Format( "N(LPad0(2))" ) ) );
@@ -34,8 +37,8 @@
tempOPC.OfflinePlanRow().ProductID() = firstOrderCell.OfflinePlanRow().ProductID()
);
firstQuantityCell.Value( [String] ( [Number]firstQuantityCell.Value() - cls.ChangeLossNr() ) );
- // info( "褰撳墠搴忓彿锛�", i, " 鍗曞厓鏍肩殑鍊硷細", firstCell.Value(), " 浜у搧鍚嶏細", firstCell.OfflinePlanRow().ProductID(),
- // "涓嬩竴涓簭鍙凤細", i + 1, " 鍗曞厓鏍肩殑鍊硷細", secondCell.Value(), " 浜у搧鍚嶏細", secondCell.OfflinePlanRow().ProductID() );
+ // info( "褰撳墠鍒楁椂闂达細", opc.ColumnDate().Format( "Y-M2-D2" ), " 褰撳墠搴忓彿锛�", i, " 鍗曞厓鏍肩殑鍊硷細", firstOrderCell.Value(), " 浜у搧鍚嶏細", firstOrderCell.OfflinePlanRow().ProductID(),
+ // "涓嬩竴涓簭鍙凤細", i + 1, " 鍗曞厓鏍肩殑鍊硷細", secondOrderCell.Value(), " 浜у搧鍚嶏細", secondOrderCell.OfflinePlanRow().ProductID() );
}
}
}
--
Gitblit v1.9.3