From fb6175169ec3f76e0362ffb66c142a761d97d7ed Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期一, 25 九月 2023 17:07:05 +0800
Subject: [PATCH] Fix Operation Cost & Customer Order Fresh
---
_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def | 3 ++-
_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def | 3 ++-
_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP订单_OnClick.def | 4 ++--
_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl | 5 ++++-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
index 3713cc9..1e71d79 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
@@ -41,7 +41,10 @@
if( count - [Number](count/1000) * 1000 = 0 or count = totalcount ){
info( "Now is dealing with the " + count.AsQUILL() + "OperationCost " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" );
}
- id := item.OrganCode() + "_" + item.ProductID() + "_" + item.ProcessSection() + "_" + item.Line();
+ id := item.OrganCode() + "_" + item.ProductID() + "_" + item.ProcessSection();
+ if( guard( item.Line(), "" ).Length() > 0 ) {
+ id := id + "_" + item.Line();
+ }
operation := Operation::FindOperationTypeIndex( id );
account := Account_MP::FindByName( this, "Operation cost" );
isfromdb := false;
diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
index 45c9fec..b4361d5 100644
--- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
+++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
@@ -131,13 +131,13 @@
// todo 鍒堕�犳垚鏈�-16
info( "InventoryCost Finished, Start OperationCost Mapping" );
- //macroPlan.MappingOperationCostData( businessTypes );
+ macroPlan.MappingOperationCostData( businessTypes );
// 璁㈠崟棰勬祴-17
Forecast::DoSync( macroPlan, businessTypes ,globalOTDTable);
// 璁㈠崟闇�姹�-18
- CustomerOrder::DoSync( macroPlan, businessTypes,globalOTDTable);
+ CustomerOrder::DoSync( macroPlan, businessTypes, globalOTDTable);
//鍒犻櫎澶氫綑鎶ラ敊鏁版嵁-19
macroPlan.DeleteSnaityCheck();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
index b6057a9..44c70d6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
@@ -11,8 +11,9 @@
Body:
[*
macroplan := MacroPlan;
+ global := GlobalOTDTable;
businesstypes := DataHolderOrderLockGlobal.Data().BusinessType().Tokenize( ',' );
- CustomerOrder::DoSync( macroplan, businesstypes );
+ CustomerOrder::DoSync( macroplan, businesstypes, global );
*]
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button687_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP\350\256\242\345\215\225_OnClick.def"
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button687_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP\350\256\242\345\215\225_OnClick.def"
index 6698b0e..e2bd314 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button687_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP\350\256\242\345\215\225_OnClick.def"
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: Button687
-Response OnClick () id:Response_Frm_TEST_Button687_OnClick
+#parent: ButtonERP璁㈠崟
+Response OnClick () id:Response_Frm_TEST_ButtonERP璁㈠崟_OnClick
{
#keys: '[414724.0.164341791]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def
index 7f726bf..55c933a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def
@@ -44,12 +44,13 @@
Taborder: 0
]
}
- Component Button687
+ Component ButtonERP璁㈠崟
{
#keys: '[414724.0.164341716]'
BaseType: 'WebButton'
Properties:
[
+ Label: 'ERP璁㈠崟'
Taborder: 3
]
}
--
Gitblit v1.9.3