From 37d5e499ff0d2aa0d4d3d7a4c6ec65ec2ffd1d70 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 21 八月 2024 17:51:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl | 57 +++++
_Main/BL/InfoMessages.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/_ROOT_Component_DialogCustomerDemandPPAIDS.def | 23 ++
_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceDataset_InterfaceDataset_CustomerDema.qbl | 23 ++
_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl | 13 +
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionName.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl | 14
_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl | 8
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Fac.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def | 2
_Main/BL/Type_CustomerDemandPPAIDS/_ROOT_Type_CustomerDemandPPAIDS.qbl | 10 +
_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl | 7
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl | 24 +-
_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceLoginfo_InterfaceLoginfo_CustomerDema.qbl | 23 ++
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def | 17 +
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_FactoryName.qbl | 8
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Product.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def | 23 ++
_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlContent.def | 37 +++
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionFlag.qbl | 8
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_InterfaceTime.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlActions.def | 40 ++++
_Main/BL/Dataset_InterfaceDataset/Daemon_FinishedEngineInventoryInterface#0.qbl | 2
_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl | 2
_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl | 47 ++++
_Main/BL/Type_InterfaceLoginfo/Attribute_IsShow.qbl | 8
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandQty.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnOk_OnClick.def | 15 +
_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandDate.qbl | 8
_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl | 18
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuCustomerDemandPPAIDS_OnClick.def | 23 ++
_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw | 2
_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl | 2
_Main/BL/Type_InventorySummarySource/StaticMethod_Download.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_New.def | 15 +
_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnCancel_OnClick.def | 15 +
38 files changed, 512 insertions(+), 45 deletions(-)
diff --git "a/_Main/BL/Dataset_InterfaceDataset/Daemon_FinishedEngineInventoryInterface\0430.qbl" "b/_Main/BL/Dataset_InterfaceDataset/Daemon_FinishedEngineInventoryInterface\0430.qbl"
index cfbb411..60fb321 100644
--- "a/_Main/BL/Dataset_InterfaceDataset/Daemon_FinishedEngineInventoryInterface\0430.qbl"
+++ "b/_Main/BL/Dataset_InterfaceDataset/Daemon_FinishedEngineInventoryInterface\0430.qbl"
@@ -5,7 +5,7 @@
Frequency: P1DT0H0M0S
Priority: 'Default'
StartDate: 2024-07-19
- StartTimeOfDay: P0DT9H0M0S
+ StartTimeOfDay: P0DT10H0M0S
Text:
[*
options := DatasetFindOptions::Construct( 'InterfaceDataset' ).IncludeOffline( true ); //to load we must search offline datasets.
diff --git a/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl b/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl
index 066ff70..7f710f2 100644
--- a/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl
+++ b/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl
@@ -5,7 +5,7 @@
Frequency: P1DT0H0M0S
Priority: 'Default'
StartDate: 2024-07-19
- StartTimeOfDay: P0DT9H0M0S
+ StartTimeOfDay: P0DT10H0M0S
Text:
[*
options := DatasetFindOptions::Construct( 'InterfaceDataset' ).IncludeOffline( true ); //to load we must search offline datasets.
diff --git a/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl b/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl
index 8706993..a2bfd9f 100644
--- a/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl
+++ b/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl
@@ -5,7 +5,7 @@
Frequency: P1DT0H0M0S
Priority: 'Default'
StartDate: 2024-07-19
- StartTimeOfDay: P0DT9H0M0S
+ StartTimeOfDay: P0DT10H0M0S
Text:
[*
options := DatasetFindOptions::Construct( 'InterfaceDataset' ).IncludeOffline( true ); //to load we must search offline datasets.
diff --git a/_Main/BL/InfoMessages.qbl b/_Main/BL/InfoMessages.qbl
index 9e8ee99..97e2fd6 100644
--- a/_Main/BL/InfoMessages.qbl
+++ b/_Main/BL/InfoMessages.qbl
@@ -106,6 +106,10 @@
{
DefaultText: 'application/json'
}
+ InfoMessage InterfaceDataset_CustomerDemandPPAIDS_Name
+ {
+ DefaultText: 'Customer demand(PPA + IDS)'
+ }
InfoMessage InterfaceDataset_FinishedEngineInventory_Name
{
DefaultText: 'Finished engine inventory'
diff --git a/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceDataset_InterfaceDataset_CustomerDema.qbl b/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceDataset_InterfaceDataset_CustomerDema.qbl
new file mode 100644
index 0000000..4d6561f
--- /dev/null
+++ b/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceDataset_InterfaceDataset_CustomerDema.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation CustomerDemandPPAIDS_InterfaceDataset_InterfaceDataset_CustomerDemandPPAIDS
+{
+ #keys: '1[415136.0.1024850018]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[415136.0.1024850020][415136.0.1024850019][415136.0.1024850021]'
+ Cardinality: '0to1'
+ ObjectDefinition: CustomerDemandPPAIDS
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide CustomerDemandPPAIDS
+ {
+ #keys: '3[415136.0.1024850023][415136.0.1024850022][415136.0.1024850024]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceLoginfo_InterfaceLoginfo_CustomerDema.qbl b/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceLoginfo_InterfaceLoginfo_CustomerDema.qbl
new file mode 100644
index 0000000..f1944f5
--- /dev/null
+++ b/_Main/BL/Relations/Relation_CustomerDemandPPAIDS_InterfaceLoginfo_InterfaceLoginfo_CustomerDema.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation CustomerDemandPPAIDS_InterfaceLoginfo_InterfaceLoginfo_CustomerDemandPPAIDS
+{
+ #keys: '1[415136.0.1027064726]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceLoginfo
+ {
+ #keys: '3[415136.0.1027064728][415136.0.1027064727][415136.0.1027064729]'
+ Cardinality: '0to1'
+ ObjectDefinition: CustomerDemandPPAIDS
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide CustomerDemandPPAIDS
+ {
+ #keys: '3[415136.0.1027064731][415136.0.1027064730][415136.0.1027064732]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceLoginfo
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
index d80aa59..dafddad 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
@@ -78,31 +78,31 @@
//Attribute
//澶栫搴撳叆搴撹垂鐢�
rententercostcellElement := xmlDOM.CreateElement( "cell" );
- rententercostcellElement.SetAttribute( "value", 'RentEnterCost' );
+ rententercostcellElement.SetAttribute( "value", '澶栫搴撳叆搴撹垂鐢�' );//RentEnterCost
attricolumnelement.AppendChild( rententercostcellElement );
//澶栫搴撳嚭搴撹垂鐢�
rentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- rentoutcostcellElement.SetAttribute( "value", 'RentOutCost' );
+ rentoutcostcellElement.SetAttribute( "value", '澶栫搴撳嚭搴撹垂鐢�' );//RentOutCost
attricolumnelement.AppendChild( rentoutcostcellElement );
//鍘傚唴鍒板绉熷簱杩愯緭璐圭敤
factorytorenttranscostcellElement := xmlDOM.CreateElement( "cell" );
- factorytorenttranscostcellElement.SetAttribute( "value", 'FactoryToRentTransCost' );
+ factorytorenttranscostcellElement.SetAttribute( "value", '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤' );//FactoryToRentTransCost
attricolumnelement.AppendChild( factorytorenttranscostcellElement );
//澶栫搴撲粨鍌ㄨ垂鐢�
rentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- rentstoragecostcellElement.SetAttribute( "value", 'RentStorageCost' );
+ rentstoragecostcellElement.SetAttribute( "value", '澶栫搴撲粨鍌ㄨ垂鐢�' );//RentStorageCost
attricolumnelement.AppendChild( rentstoragecostcellElement );
//棰勮鎬昏垂鐢�
estimatedtotalcostcellElement := xmlDOM.CreateElement( "cell" );
- estimatedtotalcostcellElement.SetAttribute( "value", 'EstimatedTotalCost' );
+ estimatedtotalcostcellElement.SetAttribute( "value", '棰勮鎬昏垂鐢�' );//EstimatedTotalCost
attricolumnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
- coefficientcellElement.SetAttribute( "value", 'Coefficient' );
+ coefficientcellElement.SetAttribute( "value", '绯绘暟' );//Coefficient
attricolumnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
- totalcostcellElement.SetAttribute( "value", 'TotalCost' );
+ totalcostcellElement.SetAttribute( "value", '鎬昏垂鐢�' );//TotalCost
attricolumnelement.AppendChild( totalcostcellElement );
}
//澶栫搴撳叆搴撹垂鐢�
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
index 166d84f..82e75c8 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
@@ -98,51 +98,51 @@
//Attribute
//闀挎槬澶栫搴撳叆搴撹垂鐢�
ccrententercostcellElement := xmlDOM.CreateElement( "cell" );
- ccrententercostcellElement.SetAttribute( "value", 'CCRentEnterCost' );
+ ccrententercostcellElement.SetAttribute( "value", '闀挎槬澶栫搴撳叆搴撹垂鐢�' );//CCRentEnterCost
attricolumnelement.AppendChild( ccrententercostcellElement );
//闀挎槬澶栫搴撳嚭搴撹垂鐢�
ccrentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- ccrentoutcostcellElement.SetAttribute( "value", 'CCRentOutCost' );
+ ccrentoutcostcellElement.SetAttribute( "value", '闀挎槬澶栫搴撳嚭搴撹垂鐢�' );//CCRentOutCost
attricolumnelement.AppendChild( ccrentoutcostcellElement );
//闀挎槬闀块�旇繍杈撹垂鐢�
cclongtranscostcellElement := xmlDOM.CreateElement( "cell" );
- cclongtranscostcellElement.SetAttribute( "value", 'CCLongTransCost' );
+ cclongtranscostcellElement.SetAttribute( "value", '闀挎槬闀块�旇繍杈撹垂鐢�' );//CCLongTransCost
attricolumnelement.AppendChild( cclongtranscostcellElement );
//闀挎槬鐭�旇繍杈撹垂鐢�
ccshorttranscostcellElement := xmlDOM.CreateElement( "cell" );
- ccshorttranscostcellElement.SetAttribute( "value", 'CCShortTransCost' );
+ ccshorttranscostcellElement.SetAttribute( "value", '闀挎槬鐭�旇繍杈撹垂鐢�' );//CCShortTransCost
attricolumnelement.AppendChild( ccshorttranscostcellElement );
//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
ccrentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- ccrentstoragecostcellElement.SetAttribute( "value", 'CCRentStorageCost' );
+ ccrentstoragecostcellElement.SetAttribute( "value", '闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�' );//CCRentStorageCost
attricolumnelement.AppendChild( ccrentstoragecostcellElement );
//澶ц繛澶栫搴撳叆搴撹垂鐢�
dlrententercostcellElement := xmlDOM.CreateElement( "cell" );
- dlrententercostcellElement.SetAttribute( "value", 'DLRentEnterCost' );
+ dlrententercostcellElement.SetAttribute( "value", '澶ц繛澶栫搴撳叆搴撹垂鐢�' );//DLRentEnterCost
attricolumnelement.AppendChild( dlrententercostcellElement );
//澶ц繛澶栫搴撳嚭搴撹垂鐢�
dlrentoutcostcellElement := xmlDOM.CreateElement( "cell" );
- dlrentoutcostcellElement.SetAttribute( "value", 'DLRentOutCost' );
+ dlrentoutcostcellElement.SetAttribute( "value", '澶ц繛澶栫搴撳嚭搴撹垂鐢�' );//DLRentOutCost
attricolumnelement.AppendChild( dlrentoutcostcellElement );
//鍘傚唴鍒板绉熷簱杩愯緭璐圭敤
factorytorenttranscostcellElement := xmlDOM.CreateElement( "cell" );
- factorytorenttranscostcellElement.SetAttribute( "value", 'FactoryToRentTransCost' );
+ factorytorenttranscostcellElement.SetAttribute( "value", '鍘傚唴鍒板绉熷簱杩愯緭璐圭敤' );//FactoryToRentTransCost
attricolumnelement.AppendChild( factorytorenttranscostcellElement );
//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
dlrentstoragecostcellElement := xmlDOM.CreateElement( "cell" );
- dlrentstoragecostcellElement.SetAttribute( "value", 'DLRentStorageCost' );
+ dlrentstoragecostcellElement.SetAttribute( "value", '澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�' );//DLRentStorageCost
attricolumnelement.AppendChild( dlrentstoragecostcellElement );
//棰勮鎬昏垂鐢�
estimatedtotalcostcellElement := xmlDOM.CreateElement( "cell" );
- estimatedtotalcostcellElement.SetAttribute( "value", 'EstimatedTotalCost' );
+ estimatedtotalcostcellElement.SetAttribute( "value", '棰勮鎬昏垂鐢�' );//EstimatedTotalCost
attricolumnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
- coefficientcellElement.SetAttribute( "value", 'Coefficient' );
+ coefficientcellElement.SetAttribute( "value", '绯绘暟' );//Coefficient
attricolumnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
- totalcostcellElement.SetAttribute( "value", 'TotalCost' );
+ totalcostcellElement.SetAttribute( "value", '鎬昏垂鐢�' );//TotalCost
attricolumnelement.AppendChild( totalcostcellElement );
}
//闀挎槬澶栫搴撳叆搴撹垂鐢�
diff --git a/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl b/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl
new file mode 100644
index 0000000..63b2f0e
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PackagingCapacity
+{
+ #keys: '3[415754.0.111003142][415754.0.111003141][415754.0.111003143]'
+ Description: '鍖呰瀹归噺'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl b/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl
new file mode 100644
index 0000000..07d9702
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PlannedInventory
+{
+ #keys: '3[415754.0.111003178][415754.0.111003177][415754.0.111003179]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl b/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
new file mode 100644
index 0000000..8970d55
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcNumberOfEmptyShelves
+{
+ TextBody:
+ [*
+ // vwedadmin Aug-20-2024 (created)
+
+ value := guard( [Number] ( this.TotalQuantityOfMaterialRacks() - ( this.PlannedInventory() / this.PackagingCapacity() ) ), 0 );
+
+ this.NumberOfEmptyShelves( value );
+ *]
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
index 87bff90..63f3ec1 100644
--- a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
@@ -9,11 +9,14 @@
macroPlan.CC_EngineRackRow( relflush );
macroPlan.CC_EngineRackColumn( relflush );
- // 鍒涘缓琛孍VO5 MLB, EVO5 MQB, GEN3 MLB, GEN3 MQB
- macroPlan.CC_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MLB" );
- macroPlan.CC_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MQB" );
- macroPlan.CC_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MLB" );
- macroPlan.CC_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MQB" );
+ // 鍒涘缓琛�
+ genrations := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.Generation().TrimBoth() <> "", tempPMP.Generation() );
+ mqbmlbs := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.MQBMLB().TrimBoth() <> "", tempPMP.MQBMLB() );
+ traverse ( genrations, Elements, g, g.ToUpper() = "EVO5" or g.ToUpper() = "GEN3" ) {
+ traverse ( mqbmlbs, Elements, m, m.ToUpper() = "MLB" or m.ToUpper() = "MQB" ) {
+ macroPlan.CC_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
+ }
+ }
// 鍒涘缓鍒�
indexDate := macroPlan.StartOfPlanning().Date().StartOfMonth();
@@ -24,12 +27,54 @@
// 鍒涘缓鍗曞厓鏍�
traverse ( macroPlan, CC_EngineRackRow, ccerr ) {
+
+ // 鍙戝姩鏈烘垚鏈弬鏁�
+ lce := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = ccerr.Generation() and tempLCE.MLB_MQB() = ccerr.MLB_MQB() and tempLCE.Factory() = "闀挎槬宸ュ巶" );
+
+ // 鏂欐灦鎴愭湰鍙傛暟
+ lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "闀挎槬宸ュ巶" );
+
traverse ( macroPlan, CC_EngineRackColumn, ccerc ) {
cell := ccerr.CC_EngineRackCell( relnew );
- // 澶栫搴撳叆搴撹垂鐢紙鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍏ュ簱鍗曚环锛�
+ // 绌烘枡鏋舵暟閲忥紙闀挎槬鍘傝浜у搧鐨勬枡鏋舵�绘暟閲� - 鍙戝姩鏈哄簱瀛� / 鍖呰瀹归噺 锛�
+ lastDayOfThisMonth := ccerc.StartDate().StartOfNextMonth() - 1;
+ plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf() and
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().ParentID() = "浜ф垚鍝�" and
+ tempPISPIP.ProductInStockingPoint_MP().StockingPointID() = "闀挎槬澶栫搴�" and
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation() = ccerr.Generation() and
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB() = ccerr.MLB_MQB() and
+ tempPISPIP.Start().Date() = lastDayOfThisMonth,
+ tempPISPIP.PlannedInventoryLevelEnd() );
+ cell.PackagingCapacity( guard( lce.PackagingCapacity(), 0 ) );
+ cell.PlannedInventory( plannedInventory );
+ // 澶栫搴撳叆搴撹垂鐢紙鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍏ュ簱鍗曚环锛�
+ engineSales := sum( macroPlan, FSImportData, tempFSID,
+ tempFSID.Unit() = "闀挎槬宸ュ巶" and
+ tempFSID.Generation() = ccerr.Generation() and
+ tempFSID.MqbMlb() = ccerr.MLB_MQB() and
+ tempFSID.StartDate().Year() = ccerc.StartDate().Year() and
+ tempFSID.StartDate().Month() = ccerc.StartDate().Month(),
+ tempFSID.Quantity() );
+ cell.StorageFeesForRentedWarehouses( guard( [Number] ( engineSales / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.WarehousingPrice(), 0 ), 0 ) );
+
// 澶栫搴撳嚭搴撹垂鐢紙鍙戝姩鏈轰骇閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍑哄簱鍗曚环锛�
+ engineProductions := sum( macroPlan, FPImportData, tempFPID,
+ tempFPID.Unit() = "闀挎槬宸ュ巶" and
+ tempFPID.Generation() = ccerr.Generation() and
+ tempFPID.MqbMlb() = ccerr.MLB_MQB() and
+ tempFPID.StartDate().Year() = ccerc.StartDate().Year() and
+ tempFPID.StartDate().Month() = ccerc.StartDate().Month(),
+ tempFPID.Quantity() );
+ cell.OutboundExpensesForRentedWarehouses( guard( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.OutboundPrice(), 0 ), 0 ) );
+
+ // 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺/鍖呰瀹归噺/瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級*鏂欐灦杩愯緭鍗曚环
+ // 澶栫搴撲粨鍌ㄨ垂鐢細鏂欐灦鎬绘暟閲�-鍙戝姩鏈哄簱瀛�/鍖呰瀹归噺锛堝悜涓婂彇鏁达級锛屽啀涔樹互绌烘枡鏋朵粨鍌ㄥ崟浠峰緱鍒扮┖鏂欐灦浠撳偍璐圭敤銆傚彂鍔ㄦ満搴撳瓨鍙朅ctual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾枡鏋舵�绘暟閲忛渶瑕佹墜鍔ㄧ淮鎶ゃ��
+ // 娓呮礂璐圭敤锛氬彂鍔ㄦ満鍏ュ簱閲�/鍖呰瀹归噺*鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
+
+ cell.CC_EngineRackColumn( relset, ccerc );
}
}
*]
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandDate.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandDate.qbl
new file mode 100644
index 0000000..f12d5d7
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DemandDate
+{
+ #keys: '3[415136.0.1022289854][415136.0.1022289853][415136.0.1022289855]'
+ Description: '闇�姹傛棩鏈�'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandQty.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandQty.qbl
new file mode 100644
index 0000000..5ae579e
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_DemandQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DemandQty
+{
+ #keys: '3[415136.0.1022289864][415136.0.1022289863][415136.0.1022289865]'
+ Description: '闇�姹傛暟閲�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Fac.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Fac.qbl
new file mode 100644
index 0000000..8c2df4f
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Fac.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Fac
+{
+ #keys: '3[415136.0.1022289894][415136.0.1022289893][415136.0.1022289895]'
+ Description: '宸ュ巶绠�鍐�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_FactoryName.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_FactoryName.qbl
new file mode 100644
index 0000000..b3ad34b
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_FactoryName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute FactoryName
+{
+ #keys: '3[415136.0.1022289884][415136.0.1022289883][415136.0.1022289885]'
+ Description: '宸ュ巶鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_InterfaceTime.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_InterfaceTime.qbl
new file mode 100644
index 0000000..9e8263e
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_InterfaceTime.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute InterfaceTime
+{
+ #keys: '3[415136.0.1022289904][415136.0.1022289903][415136.0.1022289905]'
+ Description: '鎺ュ彛鏃堕棿'
+ ValueType: DateTime
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Product.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Product.qbl
new file mode 100644
index 0000000..6d18ee5
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_Product.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1022289844][415136.0.1022289843][415136.0.1022289845]'
+ Description: '鐗╂枡鍙�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionFlag.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionFlag.qbl
new file mode 100644
index 0000000..b2e9412
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionFlag.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute VersionFlag
+{
+ #keys: '3[415136.0.1022289914][415136.0.1022289913][415136.0.1022289915]'
+ Description: '鐗堟湰鏍囪瘑'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionName.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionName.qbl
new file mode 100644
index 0000000..c88423a
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/Attribute_VersionName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute VersionName
+{
+ #keys: '3[415136.0.1022289874][415136.0.1022289873][415136.0.1022289875]'
+ Description: '鐗堟湰鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
new file mode 100644
index 0000000..e61e4bd
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
@@ -0,0 +1,47 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GenerateData (
+ const MacroPlan macroplan,
+ InterfaceDataset interfaceDataset,
+ String executor,
+ Boolean versionflag
+)
+{
+ Description: '鐢熸垚鍙互涓嬪彂鐨勫鎴烽渶姹傦紙PPA+IDS锛夋暟鎹�'
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-20-2024 (created)
+ cdlast := maxobject( interfaceDataset, CustomerDemandPPAIDS, cd, cd.InterfaceTime(), cd.DemandDate(), cd.Product() );
+ if( not isnull( cdlast ) ){
+ loginfo := cdlast.InterfaceLoginfo();
+ if( not loginfo.IsShow() ){
+ loginfo.Delete();
+ }else{
+ loginfo.Last( false );
+ }
+ interfaceDataset.CustomerDemandPPAIDS( relflush );
+ }
+ nowdate := DateTime::ActualTime();
+ loginfo := interfaceDataset.InterfaceLoginfo( relnew, ExecuteUser := executor
+ , Name := Translations::InterfaceDataset_CustomerDemandPPAIDS_Name()
+ , InterfaceDateTime := DateTime::ActualTime()
+ , Message := '瀹㈡埛闇�姹傦紙PPA+IDS锛夋暟鎹帹閫�'
+ , IsShow := false
+ , Last := true
+ , ReturnSuccess := true
+ , ReturnMsg := 'Success'
+ , Success := true
+ );
+ traverse( macroplan, SalesDemand.astype( Forecast ), forecast ){
+ cd :=interfaceDataset.CustomerDemandPPAIDS( relnew, Product := forecast.ProductID()
+ , DemandDate := forecast.StartDate()
+ , DemandQty := [Number]forecast.Quantity()
+ , VersionName := macroplan.ScenarioName()
+ , InterfaceTime := nowdate
+ , VersionFlag := versionflag
+ );
+ loginfo.CustomerDemandPPAIDS( relinsert, cd );
+ }
+ loginfo.TotalRow( loginfo.CustomerDemandPPAIDS( relsize ) );
+ *]
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/_ROOT_Type_CustomerDemandPPAIDS.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/_ROOT_Type_CustomerDemandPPAIDS.qbl
new file mode 100644
index 0000000..36fb83f
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/_ROOT_Type_CustomerDemandPPAIDS.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type CustomerDemandPPAIDS
+{
+ #keys: '5[415136.0.1022289840][415136.0.1022289838][0.0.0][415136.0.1022289839][415136.0.1022289841]'
+ BaseType: Object
+ Description: '瀹㈡埛闇�姹傦紙PPA+IDS锛�'
+ StructuredName: 'CustomerDemandPPAIDSs'
+}
diff --git a/_Main/BL/Type_InterfaceLoginfo/Attribute_IsShow.qbl b/_Main/BL/Type_InterfaceLoginfo/Attribute_IsShow.qbl
new file mode 100644
index 0000000..60952d7
--- /dev/null
+++ b/_Main/BL/Type_InterfaceLoginfo/Attribute_IsShow.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsShow
+{
+ #keys: '3[415136.0.1027064712][415136.0.1027064711][415136.0.1027064713]'
+ Description: '鏄惁鏄剧ず'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl b/_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl
new file mode 100644
index 0000000..8bd79cf
--- /dev/null
+++ b/_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ ISOValue: 'true'
+ TargetAttribute: IsShow
+}
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
index 7d86e89..4ee873e 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
@@ -68,8 +68,8 @@
if( loginfo.Success() ){
resultJson := JSON::Parse( loginfo.Response() );
- code := resultJson.Get( "code" ).AsString();
- msg := resultJson.Get( "message" ).AsString();
+ code := resultJson.Get( "code" ).GetString();
+ msg := resultJson.Get( "message" ).GetString();
data := resultJson.Get( "data" );
loginfo.ReturnMsg( msg );
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Download.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Download.qbl
index 2f2dbb5..1bba790 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Download.qbl
@@ -85,19 +85,19 @@
//Attribute
//鏈熸湯搴撳瓨
endcellElement := xmlDOM.CreateElement( "cell" );
- endcellElement.SetAttribute( "value", 'EndingInventory' );
+ endcellElement.SetAttribute( "value", '鏈熸湯搴撳瓨' );//EndingInventory
attricolumnelement.AppendChild( endcellElement );
//鏈�灏忓簱瀛�
mincellElement := xmlDOM.CreateElement( "cell" );
- mincellElement.SetAttribute( "value", 'MinimumInventory' );
+ mincellElement.SetAttribute( "value", '鏈�灏忓簱瀛�' );//MinimumInventory
attricolumnelement.AppendChild( mincellElement );
//鏈�澶у簱瀛�
maxcellElement := xmlDOM.CreateElement( "cell" );
- maxcellElement.SetAttribute( "value", 'MaximumInventory' );
+ maxcellElement.SetAttribute( "value", '鏈�澶у簱瀛�' );//MaximumInventory
attricolumnelement.AppendChild( maxcellElement );
//骞冲潎搴撳瓨
avecellElement := xmlDOM.CreateElement( "cell" );
- avecellElement.SetAttribute( "value", 'AverageInventory' );
+ avecellElement.SetAttribute( "value", '骞冲潎搴撳瓨' );//AverageInventory
attricolumnelement.AppendChild( avecellElement );
}
//鏈熸湯搴撳瓨
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
index 62d0044..718c62f 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
@@ -78,39 +78,39 @@
//Attribute
//闀挎槬瑁呴厤璁″垝
ccaqcellElement := xmlDOM.CreateElement( "cell" );
- ccaqcellElement.SetAttribute( "value", 'CCAssemblyPlanQty' );
+ ccaqcellElement.SetAttribute( "value", '闀挎槬瑁呴厤璁″垝' );//CCAssemblyPlanQty
attricolumnelement.AppendChild( ccaqcellElement );
//闀挎槬鐢熶骇璁″垝
ccpqcellElement := xmlDOM.CreateElement( "cell" );
- ccpqcellElement.SetAttribute( "value", 'CCProductionQty' );
+ ccpqcellElement.SetAttribute( "value", '闀挎槬鐢熶骇璁″垝' );//CCProductionQty
attricolumnelement.AppendChild( ccpqcellElement );
//闀挎槬璋冩嫧璁″垝
cctqcellElement := xmlDOM.CreateElement( "cell" );
- cctqcellElement.SetAttribute( "value", 'CCTransferQty' );
+ cctqcellElement.SetAttribute( "value", '闀挎槬璋冩嫧璁″垝' );//CCTransferQty
attricolumnelement.AppendChild( cctqcellElement );
//闀挎槬搴撳瓨
cciqcellElement := xmlDOM.CreateElement( "cell" );
- cciqcellElement.SetAttribute( "value", 'CCInventoryQty' );
+ cciqcellElement.SetAttribute( "value", '闀挎槬搴撳瓨' );//CCInventoryQty
attricolumnelement.AppendChild( cciqcellElement );
//澶ц繛瑁呴厤璁″垝
dlaqcellElement := xmlDOM.CreateElement( "cell" );
- dlaqcellElement.SetAttribute( "value", 'DLAssemblyPlanQty' );
+ dlaqcellElement.SetAttribute( "value", '澶ц繛瑁呴厤璁″垝' );//DLAssemblyPlanQty
attricolumnelement.AppendChild( dlaqcellElement );
//澶ц繛鐢熶骇璁″垝
dlpqcellElement := xmlDOM.CreateElement( "cell" );
- dlpqcellElement.SetAttribute( "value", 'DLProductionQty' );
+ dlpqcellElement.SetAttribute( "value", '澶ц繛鐢熶骇璁″垝' );//DLProductionQty
attricolumnelement.AppendChild( dlpqcellElement );
//澶ц繛璋冩嫧璁″垝
dltqcellElement := xmlDOM.CreateElement( "cell" );
- dltqcellElement.SetAttribute( "value", 'DLTransferQty' );
+ dltqcellElement.SetAttribute( "value", '澶ц繛璋冩嫧璁″垝' );//DLTransferQty
attricolumnelement.AppendChild( dltqcellElement );
//澶ц繛搴撳瓨
dliqcellElement := xmlDOM.CreateElement( "cell" );
- dliqcellElement.SetAttribute( "value", 'DLInventoryQty' );
+ dliqcellElement.SetAttribute( "value", '澶ц繛搴撳瓨' );//DLInventoryQty
attricolumnelement.AppendChild( dliqcellElement );
//闀挎槬 + 澶ц繛 搴撳瓨
tiqcellElement := xmlDOM.CreateElement( "cell" );
- tiqcellElement.SetAttribute( "value", 'TotalInventoryQty' );
+ tiqcellElement.SetAttribute( "value", '闀挎槬 + 澶ц繛搴撳瓨' );//TotalInventoryQty
attricolumnelement.AppendChild( tiqcellElement );
}
//闀挎槬瑁呴厤璁″垝
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
index 77bd762..4509029 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
@@ -44,10 +44,31 @@
BaseType: 'WebMenu'
Properties:
[
- Taborder: 3
+ Taborder: 4
Title: '璁″垝搴撳瓨鏁版嵁鎺ㄩ�佹帴鍙ｆ祴璇�'
]
}
+ Component MenuInterface367
+ {
+ #keys: '[415136.0.1024980241]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Separator: true
+ Taborder: 3
+ ]
+ }
+ Component MenuCustomerDemandPPAIDS
+ {
+ #keys: '[415136.0.1024980263]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'FLAG_AMBER'
+ Taborder: 5
+ Title: 'Customer demand(PPA + IDS)'
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuCustomerDemandPPAIDS_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuCustomerDemandPPAIDS_OnClick.def
new file mode 100644
index 0000000..c1c6094
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuCustomerDemandPPAIDS_OnClick.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: ContextMenuInterface/MenuCustomerDemandPPAIDS
+Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_MenuCustomerDemandPPAIDS_OnClick
+{
+ #keys: '[415136.0.1024980283]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan ) and not isnull( InterfaceDataset );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+
+ dlg := construct( DialogCustomerDemandPPAIDS );
+ dlg.Title( Translations::InterfaceDataset_CustomerDemandPPAIDS_Name() );
+ dlg.New( Translations::InterfaceDataset_CustomerDemandPPAIDS_Name() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlActions.def
new file mode 100644
index 0000000..7f463be
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+ #keys: '[415136.0.1022501788]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btnOk
+ {
+ #keys: '[415136.0.1022501792]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'OK'
+ Taborder: 0
+ ]
+ }
+ Component btnCancel
+ {
+ #keys: '[415136.0.1022501794]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Cancel'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Border: true
+ ExcludeFromActiveComponent: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Padding: 'true'
+ Style: 'footer'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlContent.def
new file mode 100644
index 0000000..3030534
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Component_pnlContent.def
@@ -0,0 +1,37 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[415136.0.1022501786]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component rbgVersionFlag
+ {
+ #keys: '[415136.0.1022501839]'
+ BaseType: 'WebRadioButtonGroup'
+ Properties:
+ [
+ ButtonLabels: '鍙戝竷鐗堟湰;姹囨姤鐗堟湰'
+ ButtonValues: 'true;false'
+ Taborder: 0
+ Title: '鐗堟湰鏍囪瘑'
+ ]
+ }
+ Component efInterfacename
+ {
+ #keys: '[415136.0.1022501890]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ Label: '鎺ュ彛鍚嶇О'
+ Taborder: 1
+ Visible: false
+ ]
+ }
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_New.def
new file mode 100644
index 0000000..76b6d83
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_New.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+Method New (
+ String name
+) id:Method_DialogCustomerDemandPPAIDS_New
+{
+ #keys: '[415136.0.1022502059]'
+ Body:
+ [*
+ // Edit Product(s)
+ efInterfacename.Text( name );
+
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def
new file mode 100644
index 0000000..4cbb8f8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnOK () id:Method_DialogCustomerDemandPPAIDS_OnOK
+{
+ #keys: '[415136.0.1022502154]'
+ Body:
+ [*
+ // On ok
+ Form.ApplyChanges();
+
+ if( efInterfacename.Text() = Translations::InterfaceDataset_CustomerDemandPPAIDS_Name() ){
+ CustomerDemandPPAIDS::GenerateData( MacroPlan, InterfaceDataset, QuintiqUser::CurrentUser().DisplayName(), ifexpr( rbgVersionFlag.BoundValue() = "true", true, false ) );
+ }
+
+ Form.Close();
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..871ca36
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnCancel_OnClick.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnCancel
+Response OnClick () id:Response_pnlActions_btnCancel_OnClick
+{
+ #keys: '[415136.0.1022501798]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.Close();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..7e47a2d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Response_pnlActions_btnOk_OnClick.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnOk
+Response OnClick () id:Response_pnlActions_btnOk_OnClick
+{
+ #keys: '[415136.0.1022501797]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.OnOK();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/_ROOT_Component_DialogCustomerDemandPPAIDS.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/_ROOT_Component_DialogCustomerDemandPPAIDS.def
new file mode 100644
index 0000000..0a9f844
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/_ROOT_Component_DialogCustomerDemandPPAIDS.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogCustomerDemandPPAIDS
+{
+ #keys: '[415136.0.1022501784]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pnlContent
+ #child: pnlActions
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ EnterButton: 'btnOk'
+ EscapeButton: 'btnCancel'
+ ExcludeFromActiveComponent: true
+ Image: 'FLAG_AMBER'
+ Padding: 'false'
+ Title: 'Customer demand(PPA + IDS)'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
index f544dae..ff3e0e4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
@@ -14,6 +14,8 @@
Body:
[*
CC_EngineRackCell::CreateData( MacroPlan );
+
+ WebMessageBox::Success( Translations::A_VWED_Success() );
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw b/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
index dbdb6c2..30d67af 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
@@ -30,7 +30,7 @@
FormCC_EngineRackReport_MatrixEditor531
{
gridColor: '#c4c4c4'
- totalHeaderWidth: 200
+ totalHeaderWidth: 500
attributeHeaderWidthRatio: 0.6
nameHeaderWidthRatio: 0.4
columnWidth: 100
--
Gitblit v1.9.3