From 03da58b39df2f7308b8f6b83525240c1992b2d51 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 09 十月 2024 17:08:17 +0800
Subject: [PATCH] 优化
---
_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl | 3
_Main/BL/Type_DL_EngineRackCell/Attribute_PackagingCapacity.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mDelete_OnClick.def | 19 +
_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl | 80 +++--
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mSelectAll_OnClick.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mNew_OnClick.def | 23 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlContent_ddslProductionLine_OnCreated.def | 22 +
_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyPackagingQuantity.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlActions.def | 40 +++
_Main/BL/Type_DL_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl | 13 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/_ROOT_Component_DialogCreateEditPackagingPlanNewCapability.def | 31 ++
_Main/BL/Type_CC_EngineRackCell/Function_CalcEstimatedTotalCost.qbl | 17 +
_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def | 7
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def | 47 +++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_OnOK.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def | 13
_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_abpContent.def | 10
_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyUnpackingQuantity.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_New.def | 14 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnCancel_OnClick.def | 15 +
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def | 12
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mEdit_OnClick.def | 21 +
_Main/BL/Relations/Relation_PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapa.qbl | 23 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def | 15 +
_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl | 43 ++
_Main/BL/Type_CC_EngineRackCell/Function_CalcTotalCost.qbl | 13 +
/dev/null | 47 ---
_Main/BL/Type_PackagingPlanNewCapability/Attribute_ProductionLine.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_cmContent.def | 69 +++++
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def | 1
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_Edit.def | 16 +
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_lstContent.def | 59 ++++
_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def | 6
_Main/BL/Type_DL_EngineRackCell/Attribute_PlannedInventory.qbl | 7
_Main/BL/Type_PackagingPlanNewCapability/_ROOT_Type_PackagingPlanNewCapability.qbl | 9
36 files changed, 636 insertions(+), 123 deletions(-)
diff --git a/_Main/BL/Relations/Relation_PackagingPlanCapability_MacroPlan_MacroPlan_PackagingPlanCapability.qbl b/_Main/BL/Relations/Relation_PackagingPlanCapability_MacroPlan_MacroPlan_PackagingPlanCapability.qbl
deleted file mode 100644
index 74cacf9..0000000
--- a/_Main/BL/Relations/Relation_PackagingPlanCapability_MacroPlan_MacroPlan_PackagingPlanCapability.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation PackagingPlanCapability_MacroPlan_MacroPlan_PackagingPlanCapability
-{
- #keys: '1[413988.0.1393320363]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide MacroPlan
- {
- #keys: '3[413988.0.1393320365][413988.0.1393320364][413988.0.1393320366]'
- Cardinality: '0to1'
- ObjectDefinition: PackagingPlanCapability
- OwningSide: 'Reference'
- }
- RelationSide.RightSide PackagingPlanCapability
- {
- #keys: '3[413988.0.1393320368][413988.0.1393320367][413988.0.1393320369]'
- Cardinality: '0to1'
- ObjectDefinition: MacroPlan
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapa.qbl b/_Main/BL/Relations/Relation_PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapa.qbl
new file mode 100644
index 0000000..e7a188d
--- /dev/null
+++ b/_Main/BL/Relations/Relation_PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapa.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapability
+{
+ #keys: '1[413988.0.1594771453]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[413988.0.1594771455][413988.0.1594771454][413988.0.1594771456]'
+ Cardinality: '0to1'
+ ObjectDefinition: PackagingPlanNewCapability
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide PackagingPlanNewCapability
+ {
+ #keys: '3[413988.0.1594771458][413988.0.1594771457][413988.0.1594771459]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Function_CalcEstimatedTotalCost.qbl b/_Main/BL/Type_CC_EngineRackCell/Function_CalcEstimatedTotalCost.qbl
new file mode 100644
index 0000000..1c8e4cb
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Function_CalcEstimatedTotalCost.qbl
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcEstimatedTotalCost
+{
+ TextBody:
+ [*
+ // lihongji Oct-9-2024 (created)
+
+ value := this.StorageFeesForRentedWarehouses() +
+ this.OutboundExpensesForRentedWarehouses() +
+ this.ExternalRentalWarehouseTransportationCosts() +
+ this.RentalWarehouseStorageFees() +
+ this.CleaningCost()
+
+ this.EstimatedTotalCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Function_CalcTotalCost.qbl b/_Main/BL/Type_CC_EngineRackCell/Function_CalcTotalCost.qbl
new file mode 100644
index 0000000..06eaa74
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Function_CalcTotalCost.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcTotalCost
+{
+ TextBody:
+ [*
+ // lihongji Oct-9-2024 (created)
+
+ value := this.EstimatedTotalCost() * this.Coefficient();
+
+ this.TotalCost( value );
+ *]
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
index f05cadc..f17862c 100644
--- a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
@@ -12,8 +12,8 @@
// 鍒涘缓琛�
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" ) {
+ traverse ( genrations, Elements, g ) {
+ traverse ( mqbmlbs, Elements, m ) {
macroPlan.CC_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
}
}
@@ -26,58 +26,74 @@
}
// 鍒涘缓鍗曞厓鏍�
- 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 ) {
+ traverse ( macroPlan, CC_EngineRackRow, ccerr ) { // 寰幆琛�
+ info( "褰撳墠閬嶅巻鐨勮锛�", ccerr.Generation(), " ", ccerr.MLB_MQB() );
+ traverse ( macroPlan, CC_EngineRackColumn, ccerc ) { // 寰幆鍒�
+ // 鍙戝姩鏈烘垚鏈弬鏁�
+ lce := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = ccerr.Generation() and tempLCE.MLB_MQB() = ccerr.MLB_MQB() and tempLCE.Factory() = "闀挎槬宸ュ巶"
+ and tempLCE.StartDate() <= ccerc.StartDate() and tempLCE.EndDate() >= ccerc.StartDate().StartOfNextMonth() );
+
+ // 鏂欐灦鎴愭湰鍙傛暟
+ lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "闀挎槬宸ュ巶"
+ and tempLCMR.StartDate() <= ccerc.StartDate() and tempLCMR.EndDate() >= ccerc.StartDate().StartOfNextMonth() );
+
+ // 杩愯緭鎴愭湰鍙傛暟
+ lct := select( macroPlan, LogisticsCostTransport, tempLCT, tempLCT.Product() = "鍙戝姩鏈�" and tempLCT.Origin() = "CC 鍘傚唴搴�" and tempLCT.Destination() = "闀挎槬澶栫搴�" );
+
+ // 褰撳墠鏈堟湯鏈�鍚庝竴澶╂棩鏈�
+ lastDayOfThisMonth := ccerc.StartDate().StartOfNextMonth() - 1;
+
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.ProductInStockingPoint_MP().Product_MP().IsLeaf() and
+ exists( tempPISPIP.ProductInStockingPoint_MP().Product_MP(), AllParent.AsParent, tempPMP, tempPMP.ID() = "鍙戝姩鏈�" ) 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.PackagingCapacity( guard( lce.PackagingCapacity(), 1 ) );
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.Unit() = FinancialProductionReport::GetDefaultCCUnit() 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 ) );
+ cell.StorageFeesForRentedWarehouses( [Number] ( engineSales / guard( lce.PackagingCapacity(), 1 ) * guard( lcmr.WarehousingPrice(), 1 ) ) );
// 澶栫搴撳嚭搴撹垂鐢紙鍙戝姩鏈轰骇閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍑哄簱鍗曚环锛�
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.Unit() = FinancialProductionReport::GetDefaultCCUnit() 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 ) );
+ cell.OutboundExpensesForRentedWarehouses( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 1 ) ) * guard( lcmr.OutboundPrice(), 1 ) );
// 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級 * 鏂欐灦杩愯緭鍗曚环
-
-
+ transportationQuantity := sum( macroPlan, Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
+ tempPIT.Product_MP().Generation() = ccerr.Generation() and
+ tempPIT.Product_MP().MQBMLB() = ccerr.MLB_MQB() and
+ tempPIT.Trip().Departure().Date() >= ccerc.StartDate() and
+ tempPIT.Trip().Arrival().Date() <= lastDayOfThisMonth and
+ tempPIT.Trip().LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID() = "CC 鍘傚唴搴�" and
+ tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() = "闀挎槬澶栫搴�",
+ tempPIT.Quantity()
+ );
+ cell.ExternalRentalWarehouseTransportationCosts( transportationQuantity / guard( lce.PackagingCapacity(), 1 ) / guard( lct.LoadingCapacity(), 1 ) * guard( lct.TransportPrice(), 1 ) );
+
// 澶栫搴撲粨鍌ㄨ垂鐢細鏂欐灦鎬绘暟閲� - 鍙戝姩鏈哄簱瀛� / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級锛屽啀涔樹互绌烘枡鏋朵粨鍌ㄥ崟浠峰緱鍒扮┖鏂欐灦浠撳偍璐圭敤銆傚彂鍔ㄦ満搴撳瓨鍙朅ctual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾枡鏋舵�绘暟閲忛渶瑕佹墜鍔ㄧ淮鎶ゃ��
cell.UnitPriceOfEmptyShelfStorage( lcmr.StoragePrice() );
// 娓呮礂璐圭敤锛氬彂鍔ㄦ満鍏ュ簱閲� / 鍖呰瀹归噺 * 鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
- cell.CleaningCost( guard( engineSales / guard( lce.PackagingCapacity(), 0 ) * lcmr.CleanPrice(), 0 ) );
+ cell.CleaningCost( engineSales / guard( lce.PackagingCapacity(), 1 ) * lcmr.CleanPrice() );
cell.CC_EngineRackColumn( relset, ccerc );
}
diff --git a/_Main/BL/Type_DL_EngineRackCell/Attribute_PackagingCapacity.qbl b/_Main/BL/Type_DL_EngineRackCell/Attribute_PackagingCapacity.qbl
new file mode 100644
index 0000000..4ed17bb
--- /dev/null
+++ b/_Main/BL/Type_DL_EngineRackCell/Attribute_PackagingCapacity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PackagingCapacity
+{
+ #keys: '3[413988.0.1594771571][413988.0.1594771570][413988.0.1594771572]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_DL_EngineRackCell/Attribute_PlannedInventory.qbl b/_Main/BL/Type_DL_EngineRackCell/Attribute_PlannedInventory.qbl
new file mode 100644
index 0000000..c47e977
--- /dev/null
+++ b/_Main/BL/Type_DL_EngineRackCell/Attribute_PlannedInventory.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PlannedInventory
+{
+ #keys: '3[413988.0.1594771558][413988.0.1594771557][413988.0.1594771559]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_DL_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl b/_Main/BL/Type_DL_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
new file mode 100644
index 0000000..5bec7ea
--- /dev/null
+++ b/_Main/BL/Type_DL_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcNumberOfEmptyShelves
+{
+ TextBody:
+ [*
+ // lihongji Oct-9-2024 (created)
+
+ value := guard( this.TotalQuantityOfMaterialRacks() - ( this.PlannedInventory() / this.PackagingCapacity() ), 0 );
+
+ this.NumberOfEmptyShelves( value );
+ *]
+}
diff --git a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
index 3c495c1..f46648f 100644
--- a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
@@ -9,11 +9,14 @@
macroPlan.DL_EngineRackRow( relflush );
macroPlan.DL_EngineRackColumn( relflush );
- // 鍒涘缓琛孍VO5 MLB, EVO5 MQB, GEN3 MLB, GEN3 MQB
- macroPlan.DL_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MLB" );
- macroPlan.DL_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MQB" );
- macroPlan.DL_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MLB" );
- macroPlan.DL_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 ) {
+ traverse ( mqbmlbs, Elements, m ) {
+ macroPlan.DL_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
+ }
+ }
// 鍒涘缓鍒�
indexDate := macroPlan.StartOfPlanning().Date().StartOfMonth();
@@ -23,13 +26,35 @@
}
// 鍒涘缓鍗曞厓鏍�
- traverse ( macroPlan, DL_EngineRackRow, dlerr ) {
- traverse ( macroPlan, DL_EngineRackColumn, dlerc ) {
+ traverse ( macroPlan, DL_EngineRackRow, dlerr ) { // 寰幆琛�
+ info( "褰撳墠閬嶅巻鐨勮锛�", dlerr.Generation(), " ", dlerr.MLB_MQB() );
+ traverse ( macroPlan, DL_EngineRackColumn, dlerc ) { // 寰幆鍒�
+ // 鍙戝姩鏈烘垚鏈弬鏁�
+ lce := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = dlerr.Generation() and tempLCE.MLB_MQB() = dlerr.MLB_MQB() and tempLCE.Factory() = "澶ц繛宸ュ巶"
+ and tempLCE.StartDate() <= dlerc.StartDate() and tempLCE.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
+
+ // 褰撳墠鏈堟湯鏈�鍚庝竴澶╂棩鏈�
+ lastDayOfThisMonth := dlerc.StartDate().StartOfNextMonth() - 1;
+
cell := dlerr.DL_EngineRackCell( relnew );
- // 澶栫搴撳叆搴撹垂鐢紙鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍏ュ簱鍗曚环锛�
+ // 绌烘枡鏋舵暟閲忥細澶ц繛鍘傝浜у搧鐨勬枡鏋舵�绘暟閲� - 鍙戝姩鏈哄簱瀛� / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級
+ plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf() and
+ exists( tempPISPIP.ProductInStockingPoint_MP().Product_MP(), AllParent.AsParent, tempPMP, tempPMP.ID() = "鍙戝姩鏈�" ) and
+ tempPISPIP.ProductInStockingPoint_MP().StockingPointID() = "澶ц繛澶栫搴�" and
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation() and
+ tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB() = dlerr.MLB_MQB() and
+ tempPISPIP.Start().Date() = lastDayOfThisMonth,
+ tempPISPIP.PlannedInventoryLevelEnd() );
+ cell.PackagingCapacity( guard( lce.PackagingCapacity(), 1 ) );
+ cell.PlannedInventory( plannedInventory );
- // 澶栫搴撳嚭搴撹垂鐢紙鍙戝姩鏈轰骇閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍑哄簱鍗曚环锛�
+ // CC澶栫搴撳叆搴撹垂鐢細鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍏ュ簱鍗曚环
+
+ // CC澶栫搴撳嚭搴撹垂鐢細鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍑哄簱鍗曚环
+
+ cell.DL_EngineRackColumn( relset, dlerc );
}
}
*]
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Package\0432.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Package\0432.qbl"
deleted file mode 100644
index d02d839..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Package\0432.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_KW1_Package
-{
- #keys: '3[413988.0.1393320531][413988.0.1393320530][413988.0.1393320532]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Unpacking.qbl
deleted file mode 100644
index 5a1fe7b..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_KW1_Unpacking
-{
- #keys: '3[413988.0.1393320551][413988.0.1393320550][413988.0.1393320552]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Package\0433.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Package\0433.qbl"
deleted file mode 100644
index efed2fa..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Package\0433.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_KW2_Package
-{
- #keys: '3[413988.0.1393320535][413988.0.1393320534][413988.0.1393320536]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Unpacking.qbl
deleted file mode 100644
index cab90a1..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_KW2_Unpacking
-{
- #keys: '3[413988.0.1393320558][413988.0.1393320557][413988.0.1393320559]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Package\0431.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Package\0431.qbl"
deleted file mode 100644
index 2e2ec9b..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Package\0431.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_PL_Package
-{
- #keys: '3[413988.0.1393320527][413988.0.1393320526][413988.0.1393320528]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Unpacking.qbl
deleted file mode 100644
index 103dc2c..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_PL_Unpacking
-{
- #keys: '3[413988.0.1393320565][413988.0.1393320564][413988.0.1393320566]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Package.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Package.qbl
deleted file mode 100644
index fe58dc2..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Package.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_ZKG_Package
-{
- #keys: '3[413988.0.1393320513][413988.0.1393320512][413988.0.1393320514]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Unpacking.qbl
deleted file mode 100644
index 1a4f266..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_ZKG_Unpacking
-{
- #keys: '3[413988.0.1393320572][413988.0.1393320571][413988.0.1393320573]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Package.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Package.qbl
deleted file mode 100644
index ac91d0a..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Package.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_ZKM_Package
-{
- #keys: '3[413988.0.1393320523][413988.0.1393320522][413988.0.1393320524]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Unpacking.qbl
deleted file mode 100644
index 6159947..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute CC_ZKM_Unpacking
-{
- #keys: '3[413988.0.1393320579][413988.0.1393320578][413988.0.1393320580]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Package\0434.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Package\0434.qbl"
deleted file mode 100644
index 88e8f2e..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Package\0434.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_AGW12_Package
-{
- #keys: '3[413988.0.1393320408][413988.0.1393320407][413988.0.1393320409]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Unpacking.qbl
deleted file mode 100644
index 9e4b163..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_AGW12_Unpacking
-{
- #keys: '3[413988.0.1393320464][413988.0.1393320463][413988.0.1393320465]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Package\0435.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Package\0435.qbl"
deleted file mode 100644
index ebafe11..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Package\0435.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_AGW3_Package
-{
- #keys: '3[413988.0.1393320412][413988.0.1393320411][413988.0.1393320413]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Unpacking.qbl
deleted file mode 100644
index a93016d..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_AGW3_Unpacking
-{
- #keys: '3[413988.0.1393320471][413988.0.1393320470][413988.0.1393320472]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Package\0433.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Package\0433.qbl"
deleted file mode 100644
index 8c632f0..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Package\0433.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_KW_Package
-{
- #keys: '3[413988.0.1393320404][413988.0.1393320403][413988.0.1393320405]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Unpacking.qbl
deleted file mode 100644
index cb646ff..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_KW_Unpacking
-{
- #keys: '3[413988.0.1393320478][413988.0.1393320477][413988.0.1393320479]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Package\0432.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Package\0432.qbl"
deleted file mode 100644
index f0b71f5..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Package\0432.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_PL_Package
-{
- #keys: '3[413988.0.1393320400][413988.0.1393320399][413988.0.1393320401]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Unpacking.qbl
deleted file mode 100644
index 81ce2a7..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_PL_Unpacking
-{
- #keys: '3[413988.0.1393320485][413988.0.1393320484][413988.0.1393320486]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Package.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Package.qbl
deleted file mode 100644
index 3b25bc2..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Package.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZKG_Package
-{
- #keys: '3[413988.0.1393320379][413988.0.1393320378][413988.0.1393320380]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Unpacking.qbl
deleted file mode 100644
index cfe312a..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZKG_Unpacking
-{
- #keys: '3[413988.0.1393320499][413988.0.1393320498][413988.0.1393320500]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Package.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Package.qbl
deleted file mode 100644
index fa3e474..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Package.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZKM_Package
-{
- #keys: '3[413988.0.1393320392][413988.0.1393320391][413988.0.1393320393]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Unpacking.qbl
deleted file mode 100644
index dc17ff7..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZKM_Unpacking
-{
- #keys: '3[413988.0.1393320506][413988.0.1393320505][413988.0.1393320507]'
- ValueType: Number
-}
diff --git "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Package\0431.qbl" "b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Package\0431.qbl"
deleted file mode 100644
index 31573cd..0000000
--- "a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Package\0431.qbl"
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZK_Package
-{
- #keys: '3[413988.0.1393320396][413988.0.1393320395][413988.0.1393320397]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Unpacking.qbl b/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Unpacking.qbl
deleted file mode 100644
index 6ff8ba6..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Unpacking.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute DL_ZK_Unpacking
-{
- #keys: '3[413988.0.1393320492][413988.0.1393320491][413988.0.1393320493]'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_PackagingPlanCapability/_ROOT_Type_PackagingPlanCapability.qbl b/_Main/BL/Type_PackagingPlanCapability/_ROOT_Type_PackagingPlanCapability.qbl
deleted file mode 100644
index 3061354..0000000
--- a/_Main/BL/Type_PackagingPlanCapability/_ROOT_Type_PackagingPlanCapability.qbl
+++ /dev/null
@@ -1,9 +0,0 @@
-Quintiq file version 2.0
-#root
-#parent: #DomainModel
-Type PackagingPlanCapability
-{
- #keys: '5[413988.0.1393320360][413988.0.1393320358][0.0.0][413988.0.1393320359][413988.0.1393320361]'
- BaseType: Object
- StructuredName: 'PackagingPlanCapabilitys'
-}
diff --git a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
index cfbbdbf..88d7ea9 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
@@ -79,7 +79,8 @@
// 鑾峰彇鏈�澶у寘瑁呮暟閲�
maxPackageReflection := Reflection::FindAttribute( "PackagingPlanCapability", ppc.PackagingPlanRow().FactoryAbbreviation() + "_" + ppc.PackagingPlanRow().Category() + "_Package" );
- maxPackageQuantity := maxPackageReflection.GetNumber( macroPlan.PackagingPlanCapability() );
+ // maxPackageQuantity := maxPackageReflection.GetNumber( macroPlan.PackagingPlanCapability() ); // 姝ゅ闇�瑕佷慨鏀�
+ maxPackageQuantity := 100000;
// 鑾峰彇鏈�缁堝寘瑁呮暟閲�
finalPackagingQuantity := minvalue( ceil( needPackagingQuantity / ppls.LotSize() ), ceil( ( maxPackageQuantity - prePPC.Package() ) / ppls.LotSize() ) ) * ppls.LotSize();
diff --git a/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyPackagingQuantity.qbl b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyPackagingQuantity.qbl
new file mode 100644
index 0000000..d835504
--- /dev/null
+++ b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyPackagingQuantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaximumDailyPackagingQuantity
+{
+ #keys: '3[413988.0.1594771467][413988.0.1594771466][413988.0.1594771468]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyUnpackingQuantity.qbl b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyUnpackingQuantity.qbl
new file mode 100644
index 0000000..83e015a
--- /dev/null
+++ b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyUnpackingQuantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaximumDailyUnpackingQuantity
+{
+ #keys: '3[413988.0.1594771477][413988.0.1594771476][413988.0.1594771478]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_PackagingPlanNewCapability/Attribute_ProductionLine.qbl b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_ProductionLine.qbl
new file mode 100644
index 0000000..87d5e53
--- /dev/null
+++ b/_Main/BL/Type_PackagingPlanNewCapability/Attribute_ProductionLine.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductionLine
+{
+ #keys: '3[413988.0.1594771444][413988.0.1594771443][413988.0.1594771445]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_PackagingPlanNewCapability/_ROOT_Type_PackagingPlanNewCapability.qbl b/_Main/BL/Type_PackagingPlanNewCapability/_ROOT_Type_PackagingPlanNewCapability.qbl
new file mode 100644
index 0000000..4d79c11
--- /dev/null
+++ b/_Main/BL/Type_PackagingPlanNewCapability/_ROOT_Type_PackagingPlanNewCapability.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type PackagingPlanNewCapability
+{
+ #keys: '5[413988.0.1594210998][413988.0.1594210996][0.0.0][413988.0.1594210997][413988.0.1594210999]'
+ BaseType: Object
+ StructuredName: 'PackagingPlanNewCapabilitys'
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlActions.def
new file mode 100644
index 0000000..8366227
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+ #keys: '[413988.0.1596179622]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btnOk
+ {
+ #keys: '[413988.0.1596179626]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'OK'
+ Taborder: 0
+ ]
+ }
+ Component btnCancel
+ {
+ #keys: '[413988.0.1596179628]'
+ 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_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def
new file mode 100644
index 0000000..f6bf3ff
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def
@@ -0,0 +1,47 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[413988.0.1596179620]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ddslProductionLine
+ {
+ #keys: '[413988.0.1596148502]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.ProductionLine'
+ Label: 'Production line'
+ Taborder: 0
+ ]
+ }
+ Component npMaximumDailyPackagingQuantity
+ {
+ #keys: '[413988.0.1596148605]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.MaximumDailyPackagingQuantity'
+ Label: 'Maximum daily packaging quantity'
+ Taborder: 1
+ ]
+ }
+ Component npMaximumDailyUnpackingQuantity
+ {
+ #keys: '[413988.0.1596148618]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ DataBinding: 'DataHolderDialogData.Data.MaximumDailyUnpackingQuantity'
+ Label: 'Maximum daily unpacking quantity'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_Edit.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_Edit.def
new file mode 100644
index 0000000..b6ffdf5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_Edit.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+Method Edit (
+ PackagingPlanNewCapability selection
+) id:Method_DialogCreateEditPackagingPlanNewCapability_Edit
+{
+ #keys: '[413988.0.1596179841]'
+ Body:
+ [*
+ data := shadow( selection );
+
+ DataHolderDialogData.Data( &data );
+
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_New.def
new file mode 100644
index 0000000..c38f34c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_New.def
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method New () id:Method_DialogCreateEditPackagingPlanNewCapability_New
+{
+ #keys: '[413988.0.1596179843]'
+ Body:
+ [*
+ data := MacroPlan.PackagingPlanNewCapability( relshadow );
+
+ DataHolderDialogData.Data( &data );
+
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_OnOK.def
new file mode 100644
index 0000000..2754e6c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_OnOK.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnOK () id:Method_DialogCreateEditPackagingPlanNewCapability_OnOK
+{
+ #keys: '[413988.0.1596179844]'
+ Body:
+ [*
+ // On ok
+ Form.ApplyChanges();
+
+ data := DataHolderDialogData.Data();
+
+ data.Commit();
+
+ Form.Close();
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..ab6baf1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/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: '[413988.0.1596179632]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.Close();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..7ef6f8d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/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: '[413988.0.1596179631]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ Form.OnOK();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlContent_ddslProductionLine_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlContent_ddslProductionLine_OnCreated.def
new file mode 100644
index 0000000..5c18585
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlContent_ddslProductionLine_OnCreated.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslProductionLine
+Response OnCreated () id:Response_pnlContent_ddslProductionLine_OnCreated
+{
+ #keys: '[413988.0.1596148773]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ uids := selectuniquevalues( MacroPlan, Unit, tempU, true, tempU.ID() );
+
+ this.Strings( uids.Concatenate( ";" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/_ROOT_Component_DialogCreateEditPackagingPlanNewCapability.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/_ROOT_Component_DialogCreateEditPackagingPlanNewCapability.def
new file mode 100644
index 0000000..351d40a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/_ROOT_Component_DialogCreateEditPackagingPlanNewCapability.def
@@ -0,0 +1,31 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogCreateEditPackagingPlanNewCapability
+{
+ #keys: '[413988.0.1596179618]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pnlContent
+ #child: pnlActions
+ Component DataHolderDialogData id:DataHolderDialogData_915
+ {
+ #keys: '[413988.0.1596179977]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'shadow[PackagingPlanNewCapability]*'
+ Properties:
+ [
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ EnterButton: 'btnOk'
+ EscapeButton: 'btnCancel'
+ ExcludeFromActiveComponent: true
+ Padding: 'false'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_abpContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_abpContent.def
new file mode 100644
index 0000000..f9c062d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_abpContent.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component abpContent
+{
+ #keys: '[413988.0.1594809024]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_cmContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_cmContent.def
new file mode 100644
index 0000000..4d8e1b9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_cmContent.def
@@ -0,0 +1,69 @@
+Quintiq file version 2.0
+Component cmContent
+{
+ #keys: '[413988.0.1594809029]'
+ BaseType: 'listContextMenu'
+ Children:
+ [
+ Component MenuSeparator
+ {
+ #keys: '[121142.1.1147171519]'
+ BaseType: 'MenuSeparator'
+ IsDerived: true
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
+ Component mSelectAll
+ {
+ #keys: '[413988.0.1596149028]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'SELECTION_VIEW'
+ Shortcut: 'Ctrl+A'
+ Taborder: 2
+ Title: 'Select all'
+ ]
+ }
+ Component mNew
+ {
+ #keys: '[413988.0.1596149298]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'ADD2'
+ Taborder: 4
+ Title: 'New'
+ ]
+ }
+ Component mEdit
+ {
+ #keys: '[413988.0.1596149554]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ BindOnDoubleClick: true
+ Image: 'PENCIL'
+ Taborder: 5
+ Title: 'Edit'
+ ]
+ }
+ Component mDelete
+ {
+ #keys: '[413988.0.1596149809]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'DELETE'
+ Taborder: 6
+ Title: 'Delete'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_lstContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_lstContent.def
new file mode 100644
index 0000000..1d91fe7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_lstContent.def
@@ -0,0 +1,59 @@
+Quintiq file version 2.0
+Component lstContent
+{
+ #keys: '[413988.0.1594809021]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component deContent
+ {
+ #keys: '[413988.0.1594809022]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'PackagingPlanNewCapability'
+ ]
+ }
+ #child: abpContent
+ Component dslContent
+ {
+ #keys: '[413988.0.1594809027]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: cmContent
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductionLine","title":"ProductionLine","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductionLine"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaximumDailyPackagingQuantity","title":"MaximumDailyPackagingQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaximumDailyPackagingQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaximumDailyUnpackingQuantity","title":"MaximumDailyUnpackingQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaximumDailyUnpackingQuantity"}}]'
+ ContextMenu: 'cmContent'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+ ResponseDefinitions:
+ [
+ DelegatedResponseDefinition OnClick id:Responsedef_lstContent_WebMenu_OnClick
+ {
+ #keys: '[413988.0.1596148973]'
+ Initiator: 'WebMenu'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[3777.0.12953454]'
+ Binding: 'this.Selection()'
+ }
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW1.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW1.def
deleted file mode 100644
index a6f6517..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW1.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_CC_KW1
-{
- #keys: '[413988.0.1402920178]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_CC_KW1
- {
- #keys: '[413988.0.1402920179]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'CC-KW1'
- ]
- }
- Component np_CC_KW1_Package
- {
- #keys: '[413988.0.1402920180]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_KW1_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_CC_KW1_Unpacking
- {
- #keys: '[413988.0.1402920181]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_KW1_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 10
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW2.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW2.def
deleted file mode 100644
index b25bc35..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW2.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_CC_KW2
-{
- #keys: '[413988.0.1402504026]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_CC_KW2
- {
- #keys: '[413988.0.1402504027]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'CC-KW2'
- ]
- }
- Component np_CC_KW2_Package
- {
- #keys: '[413988.0.1402504028]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_KW2_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_CC_KW2_Unpacking
- {
- #keys: '[413988.0.1402504029]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_KW2_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 11
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_PL.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_PL.def
deleted file mode 100644
index 90c0981..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_PL.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_CC_PL
-{
- #keys: '[413988.0.1399553961]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_CC_PL
- {
- #keys: '[413988.0.1399553962]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'CC-PL'
- ]
- }
- Component np_CC_PL_Package
- {
- #keys: '[413988.0.1399553963]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_PL_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_CC_PL_Unpacking
- {
- #keys: '[413988.0.1399553964]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_PL_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 9
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKG.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKG.def
deleted file mode 100644
index 33b13ab..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKG.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_CC_ZKG
-{
- #keys: '[413988.0.1402569628]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_CC_ZKG
- {
- #keys: '[413988.0.1402569629]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'CC-ZKG'
- ]
- }
- Component np_CC_ZKG_Package
- {
- #keys: '[413988.0.1402569630]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_ZKG_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_CC_ZKG_Unpacking
- {
- #keys: '[413988.0.1402569631]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_ZKG_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 7
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKM.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKM.def
deleted file mode 100644
index 7a971dd..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKM.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_CC_ZKM
-{
- #keys: '[413988.0.1402424612]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_CC_ZKM
- {
- #keys: '[413988.0.1402424613]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'CC-ZKM'
- ]
- }
- Component np_CC_ZKM_Package
- {
- #keys: '[413988.0.1402424614]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_ZKM_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_CC_ZKM_Unpacking
- {
- #keys: '[413988.0.1402424615]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.CC_ZKM_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 8
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW12.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW12.def
deleted file mode 100644
index cbf3e80..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW12.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_AGW12
-{
- #keys: '[413988.0.1402504011]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_AGW12
- {
- #keys: '[413988.0.1402504012]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-AGW1+2'
- ]
- }
- Component np_DL_AGW12_Package
- {
- #keys: '[413988.0.1402504013]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_AGW12_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_AGW12_Unpacking
- {
- #keys: '[413988.0.1402504014]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_AGW12_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 5
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW3.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW3.def
deleted file mode 100644
index b81e8a1..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW3.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_AGW3
-{
- #keys: '[413988.0.1402607803]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_AGW3
- {
- #keys: '[413988.0.1402607804]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-AGW3'
- ]
- }
- Component np_DL_AGW3_Package
- {
- #keys: '[413988.0.1402607805]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_AGW3_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_AGW3_Unpacking
- {
- #keys: '[413988.0.1402607806]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_AGW3_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 6
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_KW.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_KW.def
deleted file mode 100644
index e61be02..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_KW.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_KW
-{
- #keys: '[413988.0.1402653329]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_KW
- {
- #keys: '[413988.0.1402653330]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-KW'
- ]
- }
- Component np_DL_KW_Package
- {
- #keys: '[413988.0.1402653331]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_KW_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_KW_Unpacking
- {
- #keys: '[413988.0.1402653332]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_KW_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 4
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_PL.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_PL.def
deleted file mode 100644
index 7380df6..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_PL.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_PL
-{
- #keys: '[413988.0.1402149938]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_PL
- {
- #keys: '[413988.0.1402149939]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-PL'
- ]
- }
- Component np_DL_PL_Package
- {
- #keys: '[413988.0.1402149940]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_PL_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_PL_Unpacking
- {
- #keys: '[413988.0.1402149941]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_PL_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 3
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZK.def
deleted file mode 100644
index b287a96..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZK.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_ZK
-{
- #keys: '[413988.0.1399552827]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_ZK
- {
- #keys: '[413988.0.1399552828]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-ZK'
- ]
- }
- Component np_DL_ZK_Package
- {
- #keys: '[413988.0.1399552829]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZK_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_ZK_Unpacking
- {
- #keys: '[413988.0.1399552830]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZK_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 2
- ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKG\043502.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKG\043502.def"
deleted file mode 100644
index 04e1b41..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKG\043502.def"
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_ZKG
-{
- #keys: '[413988.0.1402148500]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_ZKG
- {
- #keys: '[413988.0.1402289341]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-ZKG'
- ]
- }
- Component np_DL_ZKG_Package
- {
- #keys: '[413988.0.1402317616]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZKG_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_ZKG_Unpacking
- {
- #keys: '[413988.0.1402289354]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZKG_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKM.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKM.def
deleted file mode 100644
index 5acdfd4..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKM.def
+++ /dev/null
@@ -1,47 +0,0 @@
-Quintiq file version 2.0
-Component p_DL_ZKM
-{
- #keys: '[413988.0.1401909922]'
- BaseType: 'WebPanel'
- Children:
- [
- Component L_DL_ZKM
- {
- #keys: '[413988.0.1401909923]'
- BaseType: 'WebLabel'
- Properties:
- [
- Taborder: 0
- Text: 'DL-ZKM'
- ]
- }
- Component np_DL_ZKM_Package
- {
- #keys: '[413988.0.1401909924]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZKM_Package'
- Label: '涓�鏃ユ渶澶у寘瑁呴噺(pcs)'
- Taborder: 1
- ]
- }
- Component np_DL_ZKM_Unpacking
- {
- #keys: '[413988.0.1401909925]'
- BaseType: 'WebNumberPicker'
- Properties:
- [
- DataBinding: 'DataHolderDialog.Data.DL_ZKM_Unpacking'
- Label: '涓�鏃ユ渶澶ф媶鍖呴噺(pcs)'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def
index 5f19dc3..3073f25 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def
@@ -5,18 +5,7 @@
BaseType: 'WebPanel'
Children:
[
- #child: p_DL_ZKG
- #child: p_DL_ZKM
- #child: p_DL_ZK
- #child: p_DL_PL
- #child: p_DL_KW
- #child: p_DL_AGW12
- #child: p_DL_AGW3
- #child: p_CC_ZKG
- #child: p_CC_ZKM
- #child: p_CC_PL
- #child: p_CC_KW1
- #child: p_CC_KW2
+ #child: lstContent
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def
index c7c7d19..4dd3867 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def
@@ -1,14 +1,10 @@
Quintiq file version 2.0
#parent: #root
-Method Opne (
- PackagingPlanCapability ppc
-) id:Method_DialogPackagingPlanCapability_Opne
+Method Opne () id:Method_DialogPackagingPlanCapability_Opne
{
#keys: '[413988.0.1402004588]'
Body:
[*
- DataHolderDialog.Data( ppc );
-
ApplicationMacroPlanner.ShowFormModal( this );
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mDelete_OnClick.def
new file mode 100644
index 0000000..c467e7a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mDelete_OnClick.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: lstContent
+Response OnClick (
+ structured[PackagingPlanNewCapability] selection
+) id:Response_lstContent_mDelete_OnClick
+{
+ #keys: '[413988.0.1596149948]'
+ CanBindMultiple: false
+ DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
+ Initiator: 'mDelete'
+ QuillAction
+ {
+ Body:
+ [*
+ MacroPlan::DeleteObjects( selection );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mEdit_OnClick.def
new file mode 100644
index 0000000..cbf5583
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mEdit_OnClick.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: lstContent
+Response OnClick (
+ PackagingPlanNewCapability selection
+) id:Response_lstContent_mEdit_OnClick
+{
+ #keys: '[413988.0.1596149701]'
+ CanBindMultiple: false
+ DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
+ Initiator: 'mEdit'
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( DialogCreateEditPackagingPlanNewCapability );
+
+ dlg.Edit( selection );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mNew_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mNew_OnClick.def
new file mode 100644
index 0000000..1f9854f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mNew_OnClick.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: lstContent
+Response OnClick () id:Response_lstContent_mNew_OnClick
+{
+ #keys: '[413988.0.1596149457]'
+ CanBindMultiple: false
+ DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
+ Initiator: 'mNew'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( DialogCreateEditPackagingPlanNewCapability );
+
+ dlg.New();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mSelectAll_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mSelectAll_OnClick.def
new file mode 100644
index 0000000..8265145
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mSelectAll_OnClick.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: lstContent
+Response OnClick () id:Response_lstContent_mSelectAll_OnClick
+{
+ #keys: '[413988.0.1596149206]'
+ CanBindMultiple: false
+ DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
+ Initiator: 'mSelectAll'
+ QuillAction
+ {
+ Body:
+ [*
+ this.SelectAll();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def
index 1939db5..6fbfdca 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def
@@ -9,16 +9,6 @@
[
#child: pnlContent
#child: pnlActions
- Component DataHolderDialog
- {
- #keys: '[413988.0.1402317641]'
- BaseType: 'WebDataHolder'
- Databinding: 'PackagingPlanCapability'
- Properties:
- [
- Taborder: 2
- ]
- }
]
Properties:
[
@@ -26,6 +16,8 @@
EnterButton: 'btnOk'
EscapeButton: 'btnCancel'
ExcludeFromActiveComponent: true
+ MinimumColumns: 100
+ MinimumRows: 30
Padding: 'false'
Title: 'Packaging Plan Capability'
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def
index b6e3ae9..ef51892 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def
@@ -16,6 +16,7 @@
EnterButton: 'btnOk'
EscapeButton: 'btnCancel'
ExcludeFromActiveComponent: true
+ MinimumColumns: 100
MinimumRows: 30
Padding: 'false'
Title: 'Packaging Plan Lot Size'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def
index 77e28f7..9200e4d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def
@@ -21,7 +21,7 @@
BaseType: 'WebButton'
Properties:
[
- Label: 'Maximum quantity'
+ Label: 'Maximum unpackaged quantity'
Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def
index 2097279..82a0b5e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def
@@ -9,14 +9,9 @@
{
Body:
[*
- if ( isnull( MacroPlan.PackagingPlanCapability() ) ) {
- MacroPlan.PackagingPlanCapability( relnew );
- }
-
-
dlg := construct( DialogPackagingPlanCapability );
- dlg.Opne( MacroPlan.PackagingPlanCapability() );
+ dlg.Opne();
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3