From 4c8356907a350b92bdda8bff783bcc89decdc7fc Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 18 九月 2024 20:15:15 +0800
Subject: [PATCH] 优化
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def | 4 ++--
_Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl | 3 ++-
_Main/BL/Type_OfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl | 9 ++++++---
3 files changed, 10 insertions(+), 6 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() );
}
}
}
diff --git a/_Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl b/_Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl
index 41f3317..955bdcf 100644
--- a/_Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl
+++ b/_Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl
@@ -12,7 +12,8 @@
// 鐢熸垚涓嬬嚎璁″垝琛�
traverse ( macroPlan, Unit, u, u.HasCapacityTypeTime()
- and u.Name() = "eMotor Assy (France)" // 娴嬭瘯鏃跺彲浠ヨ繃婊�
+ // and u.Name() = "eMotor Assy (France)" // 娴嬭瘯鏈湴鍦烘櫙鏃跺彲浠ヨ繃婊�
+ // and u.Name() = "CC-MoMo" // 娴嬭瘯瀹為檯鍦烘櫙鏃跺彲浠ヨ繃婊�
) {
// 鍒涘缓浜х嚎琛�
opt.OfflinePlanRow( relnew, ProductionLine := u.ID(), ProductID := "", Type := "0" );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
index 6e9147c..f843c03 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
@@ -23,7 +23,7 @@
Properties:
[
DataBinding: 'DataHolderDialogData.Data.LoadingCapacity'
- Label: '瑁呰浇瀹归噺'
+ Label: '瑁呰浇瀹归噺锛堟墭/杞︼級'
Taborder: 5
]
}
@@ -34,7 +34,7 @@
Properties:
[
DataBinding: 'DataHolderDialogData.Data.TransportPrice'
- Label: '杩愯緭鍗曚綅 (RMB/杞�)'
+ Label: '杩愯緭浠锋牸 (RMB/杞�)'
Taborder: 6
]
}
--
Gitblit v1.9.3