From 69296cb82cbac409959d82417ad0eddf07f51bbb Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 29 十月 2024 17:41:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Views/PackagingPlan.vw | 109 ++++
_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def | 15
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def | 28 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def | 24
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan#780.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def | 25
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/_ROOT_Component_DialogPublishPlan.def | 6
_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def | 38
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def | 8
_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl | 43
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def | 4
_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp | 5
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan#119.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def | 26 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def | 24
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def | 20
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnCancel_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 104 ++++
_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl | 27
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll#720.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def | 1
_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl | 9
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def | 24
_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_PostLayingProcessing.qbl | 8
_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL#545.def | 29
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def | 15
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def | 16
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 38
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan#679.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand#462.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonOfflinePlanArchiveRe.def | 16
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixEditorActionBarPageTable.def | 10
_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Response_pnlActions_btnOk_OnClick.def | 5
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def | 8
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def | 2
_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_SetLineLayingOrEmptyingStatus.qbl | 22
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def | 19
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlActions.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod#858.def | 35 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def | 20
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit#844.def | 24
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPublish_ButtonPublish_OnClick.def | 18
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def | 20
_Main/UI/MacroPlannerWebApp/Views/Offline__plan_archive_report.vw | 116 ++++
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration_ddslGeneration_OnSelectionChanged#187.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def | 6
_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_LineLayingOrEmptying.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def | 14
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def | 35 +
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan#520.def | 33 +
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelPower_ddslPower_OnSelectionChanged#136.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def | 19
_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl | 12
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelMLBMQB_ddslMQBMLB_OnSelectionChanged#456.def | 2
_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl | 21
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def | 19
/dev/null | 19
_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC#847.def | 29
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixeditorContextMenuTable.def | 10
_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl | 9
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/_ROOT_Component_FormOfflinePlanArchive.def | 43 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine#603.def | 24
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def | 11
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelProduct_ddslProduct_OnSelectionChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def | 19
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration.def | 1
_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def | 6
75 files changed, 1,342 insertions(+), 184 deletions(-)
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index a2c55cc..ab4f0b9 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -51,25 +51,25 @@
}
}
- //traverse( version, OfflinePlanTable, table ){
- // traverse( table, OfflinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
- // traverse( column, OfflinePlanCell, cell, ( werk = 'All' or cell.OfflinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
- // and ( cell.OfflinePlanRow().ProductionLine() <> 'DL_MOMO' or cell.OfflinePlanRow().ProductionLine() <> 'CC_MOMO' )
- // and cell.OfflinePlanRow().Type() = '1' ){
- // row := cell.OfflinePlanRow();
- // if( not exists( productids, Elements, e, e = row.ProductID() ) ){
- // productids.Add( row.ProductID() );
- // }
- // pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.ColumnDate() );
- // if( isnull( pirdata ) ){
- // pirdata := pir.PIRData( relnew, Product := row.ProductID()
- // , PlanningDate := column.ColumnDate()
- // , PlanningQty := 0 );
- // }
- // pirdata.PlanningQty( pirdata.PlanningQty() + [Number]cell.Value() );
- // }
- // }
- //}
+ traverse( owner, OfflinePlanArchiveVersion, table ){
+ traverse( table, Column, column, column.StartDate() >= startdate and column.StartDate() <= enddate ){
+ traverse( column, Cell, cell, ( werk = 'All' or cell.Row().ProductionLine().FindString( werk, 0 ) > -1 )
+ and ( cell.Row().ProductionLine() <> 'DL_MOMO' or cell.Row().ProductionLine() <> 'CC_MOMO' )
+ and cell.Row().Type() = '1' ){
+ row := cell.Row();
+ if( not exists( productids, Elements, e, e = row.ProductID() ) ){
+ productids.Add( row.ProductID() );
+ }
+ pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.StartDate() );
+ if( isnull( pirdata ) ){
+ pirdata := pir.PIRData( relnew, Product := row.ProductID()
+ , PlanningDate := column.StartDate()
+ , PlanningQty := 0 );
+ }
+ pirdata.PlanningQty( pirdata.PlanningQty() + [Number]cell.Value() );
+ }
+ }
+ }
traverse( productids, Elements, e ){
for( date := startdate.StartOfWeek(); date <= enddate; date := ( date + Duration::Days( 1 ) ).Date() ){
if( not exists( pir, PIRData, pirdata, pirdata.Product() = e and pirdata.PlanningDate() = date ) ){
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl
deleted file mode 100644
index 0cbe54d..0000000
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl
+++ /dev/null
@@ -1,62 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod GenerateData (
- InterfaceDataset interface,
- RecycleBin recycle,
- const Archive archive
-)
-{
- Description: '鐢熸垚鍙互涓嬪彂鐨勫鎴烽渶姹傦紙PPA+IDS锛夋暟鎹�'
- TextBody:
- [*
- // 鐢勫叞楦� Aug-20-2024 (created)
- interface.CustomerDemandIDS( relflush );
- interface.CustomerDemandIDSSearch( relflush );
- allunit := CustomerDemandIDS::GetDefaultAllUnit();
- interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
- idstable := interface.CustomerDemandIDS( relnew, ID := '瀹㈡埛闇�姹�', Name := '瀹㈡埛闇�姹�' );
- binaryValue := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
- source := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
- source.ReadStructure();
- Transaction::Transaction().Propagate( attribute( GeneralExcelImportAndExportDataColumn, ColumnIndex ) );
- cnv2 := StringToDate::StandardConverter();
- cnv2.SetCustomConversion();
- cnv2.CustomFormatString( "yyyy/MM/dd" );
- idsdates := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, column.ColumnIndex() > 2, cnv2.Convert( column.Name() ) );
- ppadates := selectuniquevalues( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA', forecast.Date() );
- //ppadates := construct( Dates );
- //traverse( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA' ){
- // ppadates := ppadates.Union( selectuniquevalues( forecast, PlanningSalesDemandInPeriod, salesdemand, salesdemand.StartDate() ) );
- //}
- periods := idsdates.Union( ppadates );
- periods := selectuniquevalues( periods, Elements, e, e );
- idstable.GenerateColumn( periods.Sort() );
- traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
- traverse( table, GeneralExcelImportAndExportDataRow, row ){
- productcell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 2 );
- factorycell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 0 );
- idsrow := idstable.GetRowByUnit( productcell.Value(), factorycell.Value() );
- traverse( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() > 2 ){
- period := cnv2.Convert( cell.GeneralExcelImportAndExportDataColumn().Name() );
- daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), period );
- weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), period );
- monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), period );
- idsrow.SetCellValue( daycolumn, [Number]cell.Value() );
- idsrow.SetCellValue( weekcolumn, [Number]cell.Value() );
- idsrow.SetCellValue( monthcolumn, [Number]cell.Value() );
- }
- }
- }
- traverse( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA' ){
- idsrow := idstable.GetRowByUnit( forecast.PartNumber(), forecast.Factory() );
- daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), forecast.Date() );
- weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), forecast.Date() );
- monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), forecast.Date() );
- idsrow.SetCellValue( daycolumn, [Number]forecast.Quantity() );
- idsrow.SetCellValue( weekcolumn, [Number]forecast.Quantity() );
- idsrow.SetCellValue( monthcolumn, [Number]forecast.Quantity() );
- }
-
- source.Delete();
- *]
-}
diff --git a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
index a95a5bc..1eae1e9 100644
--- a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
@@ -34,7 +34,7 @@
and tempLCE.StartDate() <= dlerc.StartDate() and tempLCE.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
// 鏂欐灦鎴愭湰鍙傛暟
- lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "闀挎槬宸ュ巶"
+ lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "澶ц繛宸ュ巶"
and tempLCMR.StartDate() <= dlerc.StartDate() and tempLCMR.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
// 杩愯緭鎴愭湰鍙傛暟
@@ -100,7 +100,6 @@
tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() = "澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�",
tempPIT.Quantity()
);
-
cell.CCLineHaulCost( [Number] ( guard( transportationQuantity2 / lce.PackagingCapacity() / lct1.LoadingCapacity(), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );
// CC鐭�旇繍杈撹垂鐢細璋冩嫧鏁伴噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺 * 鏂欐灦杩愯緭鍗曚环
@@ -108,24 +107,25 @@
// DL澶栫搴撳叆搴撹垂鐢細鍙戝姩鏈哄叆搴撻噺 / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍏ュ簱鍗曚环
inventoryQuantity := sum( macroPlan, SalesDemand.astype( Forecast ), tempF,
- tempF.Product_MP().Generation() = dlerr.Generation() and
- tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
- tempF.StockingPointID() = "澶ц繛澶栫搴�" and
- ( tempF.StartDate() - 2 ).Year() = dlerc.StartDate().Year() and
- ( tempF.StartDate() - 2 ).Month() = dlerc.StartDate().Month(),
+ tempF.Product_MP().Generation() = dlerr.Generation() and
+ tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
+ tempF.StockingPointID() = "澶ц繛澶栫搴�" and
+ tempF.StartDate() >= ( dlerc.StartDate() - 2 ) and
+ tempF.StartDate() <= ( lastDayOfThisMonth - 2 ),
tempF.FulfilledQuantity() );
// info( "鏃堕棿锛�", dlerc.StartDate().Format( "Y-M2-D2" ), " 鍏ュ簱鏁伴噺锛�", inventoryQuantity, " 鍖呰瀹归噺锛�", guard( lce.PackagingCapacity(), 0 ),
// " 瑁呰浇瀹归噺锛�", guard( lct1.LoadingCapacity(), 0 ) ); // 娴嬭瘯杈撳嚭
- cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.WarehousingPrice(), 1 ) ) );
+ cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lce.WarehousingPrice(), 1 ) ) );
// DL澶栫搴撳嚭搴撹垂鐢細鍙戝姩鏈哄嚭搴撻噺 / 鏂欐灦瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍑哄簱鍗曚环
outboundQuantity := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ), tempPISPIPPL,
tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation() and
tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().MQBMLB() = dlerr.MLB_MQB() and
- tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID() = "澶ц繛鍦哄唴搴�" and
+ tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID() = "澶ц繛鍘傚唴搴�" and
tempPISPIPPL.Start().Date() >= dlerc.StartDate() and
tempPISPIPPL.End().Date() <= lastDayOfThisMonth,
tempPISPIPPL.NewSupplyQuantity() );
+ // info( "鏁伴噺锛�", outboundQuantity, " 鍖呰铻嶅垱锛�", guard( lce.PackagingCapacity(), 0 ), " 鍑哄簱鍗曚环锛�", guard( lcmr.OutboundPrice(), 0 ) );
cell.DLOutboundExpensesForRentedWarehouses( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.OutboundPrice(), 1 ) ) );
// DL澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦杩愯緭鍗曚环
@@ -149,10 +149,11 @@
tempF.Product_MP().Generation() = dlerr.Generation() and
tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
tempF.StockingPointID() = "澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�" and
- ( tempF.StartDate() - 2 ).Year() = dlerc.StartDate().Year() and
- ( tempF.StartDate() - 2 ).Month() = dlerc.StartDate().Month(),
- tempF.FulfilledQuantity() );
- cell.CleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
+ tempF.StartDate().Year() = dlerc.StartDate().Year() and
+ tempF.StartDate().Month() = dlerc.StartDate().Month(),
+ tempF.Quantity() );
+ // info( "鏁伴噺锛�", clearnQuantity, " 鍖呰瀹归噺锛�", guard( lce.PackagingCapacity(), 0 ), " 娓呮礂鍗曚环锛�", guard( lcmr.CleanPrice(), 0 ) );
+ cell.CCCleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
// DL澶栫搴撴竻娲楄垂鐢細鍙戝姩鏈哄叆搴撻噺 / 鍖呰瀹归噺 * 鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
cell.CleaningCost( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
diff --git a/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
index 3853c35..7e014c0 100644
--- a/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
@@ -13,7 +13,6 @@
owner.FPImportData( relflush );
ccunit := FinancialProductionReport::GetDefaultCCUnit();
dlunit := FinancialProductionReport::GetDefaultDLUnit();
- //allunit := FinancialProductionReport::GetDefaultAllUnit();
source := owner.FinancialProductionSource( relnew, IsImport := false, Name := FinancialProductionReport::GetDefaultName() );
table := source.FinancialProductionReport( relnew, ID := source.Name(), Name := source.Name(), IsImport := false );
source.FinancialProductionReport( relnew, ID := source.Name() + 'Show', Name := source.Name(), IsImport := false, IsShow := true );
@@ -29,15 +28,13 @@
if( iscc or isdl ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and ( pispip.Start() + Duration::Days( 1 ) ).Date() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
//鑾峰彇宸ュ巶琛�
factoryrow := table.GetRowByUnit( pisp.Product_MP(), ifexpr( iscc, ccunit, dlunit ) );
- //鑾峰彇鍚堣琛�
- // allrow := table.GetRowByUnit( pisp.Product_MP(), allunit );
productids.Add( pisp.ProductID() );
//褰損roduct planning鐨勬棩鏈熷尯闂村湪闇�瑕佺殑鏃ユ湡鍖洪棿鍐�
- traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ){
- dayperiodtime := pispip.Start().Date();
+ traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and ( pispip.Start() + Duration::Days( 1 ) ).Date() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ){
+ dayperiodtime := ( pispip.Start() + Duration::Days( 1 ) ).Date();
dayperiodname := dayperiodtime.Format( "M2/D2/Y" );
periodtime := dayperiodtime.StartOfMonth();
periodname := periodtime.Format( "M2/D2/Y" );
@@ -51,8 +48,5 @@
}
}
}
-
- //factorys := selectset( owner, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() );
- //showtable.Generate( search, factorys, productids );
*]
}
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
index 1d0e66d..7fa7381 100644
--- a/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
@@ -13,7 +13,6 @@
}
owner.FSImportData( relflush );
productids := construct( Strings );
- //allunit := FinancialSalesReport::GetDefaultAllUnit();
ccunit := FinancialSalesReport::GetDefaultCCUnit();
dlunit := FinancialSalesReport::GetDefaultDLUnit();
ccsalessegment := FinancialSalesReport::GetSalesSegmentCC();
@@ -32,7 +31,7 @@
table.GenerateColumn( owner );
//棣栧厛鍦╢orecast鐣岄潰鏌ユ壘sales segment涓洪暱鏄ョ殑鎵�鏈夐渶姹傦紝璇嗗埆鍑篗LB鐨勬墍鏈変骇鍝侊紝姣忎釜浜у搧鎸夋湀姹囨�婚渶姹傛暟閲�
- traverse( owner, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.SalesSegment_MP() ) and forecast.StartDate() <= startofnextyear and forecast.Quantity() <> 0
+ traverse( owner, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.SalesSegment_MP() ) and ( forecast.StartDate() + Duration::Days( 1 ) ).Date() < startofnextyear and forecast.Quantity() <> 0
and exists( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 ) ){
salessegment := forecast.SalesSegment_MP();
parentsalessegments := salessegment.GetAllParent();
@@ -47,17 +46,14 @@
//Forecast鐨凷ales Segment涓洪暱鏄ワ紝璇嗗埆鍑篗LB鐨勬墍鏈変骇鍝佹眹鎬�
//澶ц繛璐㈠姟閿�閲忥細棣栧厛鍦╢orecast鐣岄潰鏌ユ壘Sales Segment鏄ぉ娲ュ拰浣涘北鐨勬墍鏈夐渶姹傦紝姣忎釜浜у搧鎸夋湀姹囨�婚渶姹傛暟閲� and forecast.Product_MP().MQBMLB() = 'MLB' )
if( ( iscc and product.MQBMLB() = 'MLB' ) or ( isccrent and product.MQBMLB() = 'MQB' ) or isdl ){
-
- //鑾峰彇鍚堣琛�
- // allrow := table.GetRow( allunit, product );
//鑾峰彇宸ュ巶琛�
factoryrow := table.GetRow( ifexpr( isdl, dlunit, ccunit ), product );
productids.Add( forecast.ProductID() );
- traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 ){
- dayperiodtime := psdip.StartDate();
+ traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 and ( psdip.StartDate() + Duration::Days( 1 ) ).Date() < startofnextyear ){
+ dayperiodtime := ( psdip.StartDate() + Duration::Days( 1 ) ).Date();//psdip.StartDate();
dayperiodname := dayperiodtime.Format( "M2/D2/Y" );
- periodtime := psdip.StartDate().StartOfMonth();
+ periodtime := dayperiodtime.StartOfMonth();
periodname := periodtime.Format( "M2/D2/Y" );
// info( '-------------------------', periodname, periodtime );
daycolumn := selectobject( table, FinancialSalesColumn, column, column.Name() = dayperiodname and column.Period() = dayperiodtime and column.IsDay() );
@@ -67,23 +63,21 @@
factoryrow.Initialize( column, quantity );
factoryrow.Initialize( daycolumn, quantity );
- // allrow.Initialize( column, quantity );
}
}
}
//浠嶱roduct planning鏌ユ壘搴撳瓨鐐逛负澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴擄紝鍙朜ew supply瀛楁鎸夋湀姹囨�婚渶姹傛暟閲�
traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID() = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�' ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and ( pispip.Start() + Duration::Days( 1 ) ).Date() < startofnextyear
and ( pispip.DependentDemandAndSalesDemandQuantity() <> 0 or pispip.NewSupplyQuantity() <> 0 ) ) ){//浜у搧涓篗QB
product := pisp.Product_MP();
- // allrow := table.GetRow( allunit, product );
factoryrow := table.GetRow( dlunit, product );
productids.Add( pisp.ProductID() );
traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical()
- and pispip.Period_MP().StartDate() < startofnextyear
+ and ( pispip.Start() + Duration::Days( 1 ) ).Date() < startofnextyear
and ( pispip.DependentDemandAndSalesDemandQuantity() <> 0 or pispip.NewSupplyQuantity() <> 0 ) ){
- dayperiodtime := pispip.Start().Date();
+ dayperiodtime := ( pispip.Start() + Duration::Days( 1 ) ).Date();//pispip.Start().Date();
dayperiodname := dayperiodtime.Format( "M2/D2/Y" );
periodtime := dayperiodtime.StartOfMonth();
periodname := periodtime.Format( "M2/D2/Y" );
@@ -93,7 +87,6 @@
factoryrow.Initialize( column, quantity );//鍙朤otal Demand瀛楁鎸夋湀姹囨�婚渶姹傛暟閲�
factoryrow.Initialize( daycolumn, quantity );
- // allrow.Initialize( column, quantity );
}
}
// }
diff --git a/_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_LineLayingOrEmptying.qbl b/_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_LineLayingOrEmptying.qbl
new file mode 100644
index 0000000..4be362b
--- /dev/null
+++ b/_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_LineLayingOrEmptying.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute LineLayingOrEmptying
+{
+ #keys: '3[415754.0.554840210][415754.0.554840209][415754.0.554840211]'
+ Description: '閾虹嚎鎴栬�呮媺绌�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_PostLayingProcessing.qbl b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_PostLayingProcessing.qbl
new file mode 100644
index 0000000..b1f1cf1
--- /dev/null
+++ b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_PostLayingProcessing.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod PostLayingProcessing (
+ MacroPlan macroPlan
+)
+{
+ Description: '閾虹嚎鍚庣画澶勭悊'
+}
diff --git a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
index b4505ca..3392f2e 100644
--- a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
@@ -68,6 +68,9 @@
// info( "褰撳墠浜х嚎锛�", pl, " 澶勭悊鎷夌┖--------------------------" );
traverse ( drainPs, Elements, p ) {
traverse ( p, ExplicitTimeInterval, eti ) {
+ // 璁剧疆鍗曞厓鏍间负鎷夌┖
+ NewAssemblyOnlinePlanCell::SetLineLayingOrEmptyingStatus( macroPlan, eti.Start().Date(), "鎷夌┖", pl );
+
// info( "寮�濮嬫椂闂达細", eti.Start().Format( "Y-M2-D2" ), " 缁撴潫鏃堕棿锛�", eti.End().Format( "Y-M2-D2" ) );
naopc := select( macroPlan, NewAssemblyOnlinePlanColumn, tempNAOPC, tempNAOPC.StartDate() = ( eti.Start().Date() - 1 ) );
@@ -97,6 +100,9 @@
// 澶勭悊閾虹嚎
traverse ( lineLyingPs, Elements, p ) {
traverse ( p, ExplicitTimeInterval, eti ) {
+ // 璁剧疆鍗曞厓鏍间负鎷夌┖
+ NewAssemblyOnlinePlanCell::SetLineLayingOrEmptyingStatus( macroPlan, eti.Start().Date(), "閾虹嚎", pl );
+
info( "寮�濮嬫椂闂达細", eti.Start().Format( "Y-M2-D2" ), " 缁撴潫鏃堕棿锛�", eti.End().Format( "Y-M2-D2" ) );
cell := minselect( macroPlan, NewAssemblyOnlinePlanRow.NewAssemblyOnlinePlanCell, tempNAOPCell,
@@ -111,5 +117,8 @@
}
}
}
+
+ // 澶勭悊閾虹嚎鍚庣画澶勭悊
+ NewAssemblyOnlinePlanCell::PostLayingProcessing( macroPlan );
*]
}
diff --git a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_SetLineLayingOrEmptyingStatus.qbl b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_SetLineLayingOrEmptyingStatus.qbl
new file mode 100644
index 0000000..b4ff60f
--- /dev/null
+++ b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_SetLineLayingOrEmptyingStatus.qbl
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SetLineLayingOrEmptyingStatus (
+ MacroPlan macroPlan,
+ Date date,
+ String status,
+ String pl
+)
+{
+ Description: '璁剧疆鍗曞厓鏍奸摵绾挎垨鑰呮媺绌虹姸鎬�'
+ TextBody:
+ [*
+ cells := selectset( macroPlan, NewAssemblyOnlinePlanRow.NewAssemblyOnlinePlanCell, tempNAOPCell,
+ tempNAOPCell.NewAssemblyOnlinePlanRow().ProductionLine() = pl and
+ tempNAOPCell.NewAssemblyOnlinePlanColumn().StartDate() = date and
+ tempNAOPCell.NewAssemblyOnlinePlanRow().Type() = "1" );
+
+ traverse ( cells, Elements, c ) {
+ c.LineLayingOrEmptying( status );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
index ccbf580..6eeb85d 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
@@ -1,16 +1,16 @@
Quintiq file version 2.0
#parent: #root
Method GetRow (
- const AssemblyOnlinePlanRow aoprow
+ const NewOfflinePlanRow noprow
) as OfflinePlanArchiveRow
{
TextBody:
[*
// 鐢勫叞楦� Oct-11-2024 (created)
- row := selectobject( this, Row, row, row.ProductID() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
+ row := selectobject( this, Row, row, row.ProductID() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() );
if( isnull( row ) ){
- row := this.Row( relnew, ProductID := aoprow.ProductID(), ProductionLine := aoprow.ProductionLine(), Type := aoprow.Type() );
+ row := this.Row( relnew, ProductID := noprow.ProductID(), ProductionLine := noprow.ProductionLine(), Type := noprow.Type() );
//鍒濆鍖栧崟鍏冩牸
row.InitializeCell();
}
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_GenerateData.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_GenerateData.qbl
deleted file mode 100644
index 0cbe54d..0000000
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_GenerateData.qbl
+++ /dev/null
@@ -1,62 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod GenerateData (
- InterfaceDataset interface,
- RecycleBin recycle,
- const Archive archive
-)
-{
- Description: '鐢熸垚鍙互涓嬪彂鐨勫鎴烽渶姹傦紙PPA+IDS锛夋暟鎹�'
- TextBody:
- [*
- // 鐢勫叞楦� Aug-20-2024 (created)
- interface.CustomerDemandIDS( relflush );
- interface.CustomerDemandIDSSearch( relflush );
- allunit := CustomerDemandIDS::GetDefaultAllUnit();
- interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
- idstable := interface.CustomerDemandIDS( relnew, ID := '瀹㈡埛闇�姹�', Name := '瀹㈡埛闇�姹�' );
- binaryValue := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
- source := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
- source.ReadStructure();
- Transaction::Transaction().Propagate( attribute( GeneralExcelImportAndExportDataColumn, ColumnIndex ) );
- cnv2 := StringToDate::StandardConverter();
- cnv2.SetCustomConversion();
- cnv2.CustomFormatString( "yyyy/MM/dd" );
- idsdates := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, column.ColumnIndex() > 2, cnv2.Convert( column.Name() ) );
- ppadates := selectuniquevalues( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA', forecast.Date() );
- //ppadates := construct( Dates );
- //traverse( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA' ){
- // ppadates := ppadates.Union( selectuniquevalues( forecast, PlanningSalesDemandInPeriod, salesdemand, salesdemand.StartDate() ) );
- //}
- periods := idsdates.Union( ppadates );
- periods := selectuniquevalues( periods, Elements, e, e );
- idstable.GenerateColumn( periods.Sort() );
- traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
- traverse( table, GeneralExcelImportAndExportDataRow, row ){
- productcell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 2 );
- factorycell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 0 );
- idsrow := idstable.GetRowByUnit( productcell.Value(), factorycell.Value() );
- traverse( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() > 2 ){
- period := cnv2.Convert( cell.GeneralExcelImportAndExportDataColumn().Name() );
- daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), period );
- weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), period );
- monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), period );
- idsrow.SetCellValue( daycolumn, [Number]cell.Value() );
- idsrow.SetCellValue( weekcolumn, [Number]cell.Value() );
- idsrow.SetCellValue( monthcolumn, [Number]cell.Value() );
- }
- }
- }
- traverse( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA' ){
- idsrow := idstable.GetRowByUnit( forecast.PartNumber(), forecast.Factory() );
- daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), forecast.Date() );
- weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), forecast.Date() );
- monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), forecast.Date() );
- idsrow.SetCellValue( daycolumn, [Number]forecast.Quantity() );
- idsrow.SetCellValue( weekcolumn, [Number]forecast.Quantity() );
- idsrow.SetCellValue( monthcolumn, [Number]forecast.Quantity() );
- }
-
- source.Delete();
- *]
-}
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
index a22c383..9b9f152 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
@@ -7,30 +7,33 @@
{
TextBody:
[*
- //鏍规嵁褰撳墠鐗堟湰鐨勮閰嶄笂绾胯鍒�
- allunit := AssemblyOnlinePlanVersion::GetDefaultAllUnit();
- name := AssemblyOnlinePlanVersion::GetDefaultName();
- search := interface.AssemblyOnlinePlanVersionSearch( relnew, Product := allunit, ProductionLine := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
- table := selectobject( interface, AssemblyOnlinePlanVersion, version, not version.IsShow() );
+ //鏍规嵁褰撳墠鐗堟湰鐨勪笅绾胯鍒�
+ allunit := OfflinePlanArchiveVersion::GetDefaultAllUnit();
+ name := OfflinePlanArchiveVersion::GetDefaultName();
+ search := interface.OfflinePlanArchiveSearch( relnew, Product := allunit, ProductionLine := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ table := selectobject( interface, OfflinePlanArchiveVersion, version, not version.IsShow() );
if( isnull( table ) ){
- table := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name );
+ table := interface.OfflinePlanArchiveVersion( relnew, ID := name, Name := name );
}
- showtable := selectobject( interface, AssemblyOnlinePlanVersion, version, version.IsShow() );
+ showtable := selectobject( interface, OfflinePlanArchiveVersion, version, version.IsShow() );
if( isnull( table ) ){
- showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true );
+ showtable := interface.OfflinePlanArchiveVersion( relnew, ID := name, Name := name, IsShow := true );
}
- aopcolumns := selectuniquevalues( macroPlan, AssemblyOnlinePlanColumn, aopcolumn, not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcolumn.ColumnDate() ), aopcolumn.ColumnDate() );
- table.GenerateColumn( aopcolumns, search.TimeUnit(), search.StartDate(), search.EndDate() );
- traverse( macroPlan, AssemblyOnlinePlanRow, aoprow ){
- row := table.GetRow( aoprow );
- traverse( aoprow, AssemblyOnlinePlanCell, aopcell ){
- column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcell.AssemblyOnlinePlanColumn().ColumnDate() );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.InventoryWeight( aopcell.InventoryWeight() );
- cell.ProductionSerialNumber( aopcell.ProductionSerialNumber() );
- cell.Quantity( aopcell.Quantity() );
- cell.Shift( aopcell.Shift() );
- cell.Value( aopcell.Value() );
+ nopcolumns := selectuniquevalues( macroPlan, NewOfflinePlanTable.NewOfflinePlanColumn, nopcolumn, not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcolumn.StartDate() ), nopcolumn.StartDate() );
+ table.GenerateColumn( nopcolumns, search.TimeUnit(), search.StartDate(), search.EndDate() );
+ traverse( macroPlan, NewOfflinePlanTable, noptable ){
+
+ traverse( noptable, NewOfflinePlanRow, noprow ){
+ row := table.GetRow( noprow );
+ traverse( noprow, NewOfflinePlanCell, nopcell ){
+ column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcell.NewOfflinePlanColumn().StartDate() );
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
+ cell.InventoryWeight( nopcell.InventoryWeight() );
+ // cell.ProductionSerialNumber( nopcell.ProductionSerialNumber() );
+ cell.Quantity( nopcell.Quantity() );
+ // cell.Shift( nopcell.Shift() );
+ // cell.Value( nopcell.Value() );
+ }
}
}
//showtable.Generate( search, products );
diff --git a/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl b/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
index 628ac49..c4e2762 100644
--- a/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
@@ -8,10 +8,11 @@
value := ifexpr( this.PackagingPlanRow().Factory() = "闀挎槬宸ュ巶", this.CC_PackagingInventory(),
this.InitialPackagingInventory() + guard( this.Previous().PackagingInventory() +
- guard( this.Package(), 0.0 ) -
- ifexpr( this.TransferIn() > 0.0, 0, this.Unpacking() ),
- 0.0 )
- - this.Out()
+ this.TransferIn() +
+ guard( this.Package(), 0.0 ) -
+ ifexpr( this.TransferIn() > 0.0, 0, this.Unpacking() ),
+ 0.0 )
+ - this.Out()
);
this.PackagingInventory( value );
diff --git a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
index 4e84001..e45b9e4 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
@@ -65,14 +65,12 @@
// 鍑�闇�姹�&鍓╀綑搴撳瓨&渚涘簲閲�
cell.NetDemand( cell.NetDemand() + pispipl.DependentDemandAndSalesDemandQuantity() );
cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
- cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
}
// 闀挎槬宸ュ巶璁剧疆鍊�
if ( factory = "闀挎槬宸ュ巶" ) {
// 鍓╀綑搴撳瓨&渚涘簲閲�
cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
- cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
// 鍑�闇�姹傘�愬彧鍙栫嚎杈瑰簱銆�&鍖呰搴撳瓨&闈炲寘瑁呭簱瀛�
if ( pisp.StockingPointID().Regex( "澶栫搴�" ) ) {
@@ -83,6 +81,11 @@
}
}
+ // 璁剧疆New Supply锛岀函鐢熶骇鍊�
+ traverse ( pispipl, NewSupply, ns, ns.PeriodTask_MP().istype( PeriodTaskOperation ) ) {
+ cell.NewSupply( cell.NewSupply() + ns.Quantity() );
+ }
+
// 璁剧疆鍓嶄竴澶╁簱瀛�
if ( pispipl.Start().Date() = macroPlan.StartOfPlanning().Date() ) {
prePISPIPL := pispipl.PreviousPlanningPISPIP().astype( ProductInStockingPointInPeriodPlanningLeaf ); // 鍓嶄竴涓猵ispippl
diff --git a/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp b/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
index c96f0b8..c8ae0df 100644
--- a/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
+++ b/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
@@ -2,6 +2,11 @@
#parent: #root
TypeRepresentation NewAssemblyOnlinePlanCell
{
+ AttributeRepresentation LineLayingOrEmptying
+ {
+ Alignment: 'Right'
+ AttributeKey: '[415754.0.554840209]'
+ }
AttributeRepresentation Order
{
Alignment: 'Right'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
index 5d56dca..10f9121 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
@@ -27,6 +27,17 @@
Taborder: 1
]
}
+ Component ButtonOfflinePlanArchiveReport
+ {
+ #keys: '[415136.0.1255420048]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'PAPER_JET'
+ Label: 'Offline plan archive'
+ Taborder: 2
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonOfflinePlanArchiveRe.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonOfflinePlanArchiveRe.def
new file mode 100644
index 0000000..1b1824d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonOfflinePlanArchiveRe.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: ActionBarGroupArchiveReport/ButtonOfflinePlanArchiveReport
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonOfflinePlanArchiveReport_OnClick
+{
+ #keys: '[415136.0.1255420166]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ ApplicationScope.ViewManager().ResetUserViewById( "Offline__plan_archive_report", true);
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPublish_ButtonPublish_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPublish_ButtonPublish_OnClick.def
new file mode 100644
index 0000000..888bb0d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPublish_ButtonPublish_OnClick.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: ActionBarGroupPublish/ButtonPublish
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupPublish_ButtonPublish_OnClick
+{
+ #keys: '[415136.0.1255982999]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( DialogPublishPlan );
+
+ ApplicationMacroPlanner.ShowFormModal( dlg );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlActions.def
similarity index 84%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlActions.def
index 7ac917e..5b65a74 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlActions.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlActions
{
- #keys: '[413988.0.1292313213]'
+ #keys: '[415136.0.1255981718]'
BaseType: 'WebPanel'
Children:
[
Component btnOk
{
- #keys: '[413988.0.1292313217]'
+ #keys: '[415136.0.1255981722]'
BaseType: 'WebButton'
Properties:
[
@@ -17,7 +17,7 @@
}
Component btnCancel
{
- #keys: '[413988.0.1292313219]'
+ #keys: '[415136.0.1255981724]'
BaseType: 'WebButton'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
new file mode 100644
index 0000000..38e1838
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAll\043720.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlAll id:pnlAll_720
+{
+ #keys: '[415136.0.1255982465]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblAll
+ {
+ #keys: '[415136.0.1255982466]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: 'All'
+ Taborder: 0
+ ]
+ }
+ Component cbAll
+ {
+ #keys: '[415136.0.1255982467]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 5
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
new file mode 100644
index 0000000..738092a
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlAssembleOnlinePlan id:pnlAssembleOnlinePlan_679
+{
+ #keys: '[415136.0.1255982426]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblAssembleOnlinePlan
+ {
+ #keys: '[415136.0.1255982427]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '瑁呴厤涓婄嚎璁″垝'
+ Taborder: 0
+ ]
+ }
+ Component cbAssembleOnlinePlan
+ {
+ #keys: '[415136.0.1255982428]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def
new file mode 100644
index 0000000..ab5e221
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlContent.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[415136.0.1255981716]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: pnlCustomDemand_462
+ #child: pnlOfflinePlan_520
+ #child: pnlAssembleOnlinePlan_679
+ #child: pnlInventoryPlan_119
+ #child: pnlAll_720
+ #child: pnlShiftPlan_780
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
new file mode 100644
index 0000000..4255081
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlCustomDemand\043462.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlCustomDemand id:pnlCustomDemand_462
+{
+ #keys: '[415136.0.1255981813]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblCustomDemand
+ {
+ #keys: '[415136.0.1255981814]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鍏ㄥ勾鏃ュ害闇�姹�'
+ Taborder: 0
+ ]
+ }
+ Component cbCustomDemand
+ {
+ #keys: '[415136.0.1255981815]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
new file mode 100644
index 0000000..fde59fb
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlInventoryPlan\043119.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlInventoryPlan id:pnlInventoryPlan_119
+{
+ #keys: '[415136.0.1255982447]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblInventoryPlan
+ {
+ #keys: '[415136.0.1255982448]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '璁″垝搴撳瓨'
+ Taborder: 0
+ ]
+ }
+ Component cbInventoryPlan
+ {
+ #keys: '[415136.0.1255982449]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 4
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
new file mode 100644
index 0000000..c14d76e
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlOfflinePlan\043520.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlOfflinePlan id:pnlOfflinePlan_520
+{
+ #keys: '[415136.0.1255981829]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblOfflinePlan
+ {
+ #keys: '[415136.0.1255981830]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '涓嬬嚎璁″垝'
+ Taborder: 0
+ ]
+ }
+ Component cbOfflinePlan
+ {
+ #keys: '[415136.0.1255981831]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
new file mode 100644
index 0000000..ff7f552
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+Component pnlShiftPlan id:pnlShiftPlan_780
+{
+ #keys: '[415136.0.1255982410]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblShiftPlan
+ {
+ #keys: '[415136.0.1255982411]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鐝璁″垝'
+ Taborder: 0
+ ]
+ }
+ Component cbShiftPlan
+ {
+ #keys: '[415136.0.1255982412]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 2
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
new file mode 100644
index 0000000..f3ed1c0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnOK () id:Method_DialogPublishPlan_OnOK
+{
+ #keys: '[415136.0.1255982634]'
+ Body:
+ [*
+ this.ApplyChanges();
+
+ showlabel := '鏄惁鍙戦��';
+ plannames := construct( Strings );
+ if( cbCustomDemand.Checked() ){
+ plannames.Add( lblCustomDemand.Label() );
+ }
+ if( cbOfflinePlan.Checked() ){
+ plannames.Add( lblOfflinePlan.Label() );
+ }
+ if( cbShiftPlan.Checked() ){
+ plannames.Add( lblShiftPlan.Label() );
+ }
+ if( cbAssembleOnlinePlan.Checked() ){
+ plannames.Add( lblAssembleOnlinePlan.Label() );
+ }
+ if( cbInventoryPlan.Checked() ){
+ plannames.Add( lblInventoryPlan.Label() );
+ }
+
+ showlabel := showlabel.Concat( plannames.Concatenate( "銆�" ) ).Concat( '锛�' );
+
+ if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
+ }
+
+ this.Close();
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnCancel_OnClick.def
similarity index 88%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnCancel_OnClick.def
index 2917a99..589f151 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnCancel_OnClick.def
@@ -2,7 +2,7 @@
#parent: pnlActions/btnCancel
Response OnClick () id:Response_pnlActions_btnCancel_OnClick
{
- #keys: '[413988.0.1292313223]'
+ #keys: '[415136.0.1255981728]'
DefinitionID: 'Responsedef_WebButton_OnClick'
GroupServerCalls: true
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..18496fa
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnOk
+Response OnClick () id:Response_pnlActions_btnOk_OnClick
+{
+ #keys: '[415136.0.1255981727]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not ( not cbCustomDemand.Checked() and not cbOfflinePlan.Checked() and not cbShiftPlan.Checked() and not cbAssembleOnlinePlan.Checked() and not cbInventoryPlan.Checked() );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ Form.OnOK();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def
new file mode 100644
index 0000000..6b953b1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlAll_720_cbAll_OnChanged.def
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: pnlAll_720/cbAll
+Response OnChanged () id:Response_pnlAll_720_cbAll_OnChanged
+{
+ #keys: '[415136.0.1255982464]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if( this.Checked() ){
+ cbCustomDemand.Checked( true );
+ cbOfflinePlan.Checked( true );
+ cbShiftPlan.Checked( true );
+ cbAssembleOnlinePlan.Checked( true );
+ cbInventoryPlan.Checked( true );
+ }else{
+ cbCustomDemand.Checked( false );
+ cbOfflinePlan.Checked( false );
+ cbShiftPlan.Checked( false );
+ cbAssembleOnlinePlan.Checked( false );
+ cbInventoryPlan.Checked( false );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/_ROOT_Component_DialogPublishPlan.def
similarity index 72%
copy from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/_ROOT_Component_DialogPublishPlan.def
index 338e32f..2a0601d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/_ROOT_Component_DialogPublishPlan.def
@@ -1,9 +1,9 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
-OrphanComponent DialogUpperLimitOfTransferCapacity
+OrphanComponent DialogPublishPlan
{
- #keys: '[413988.0.1292313209]'
+ #keys: '[415136.0.1255981714]'
BaseType: 'WebForm'
Children:
[
@@ -16,6 +16,8 @@
EnterButton: 'btnOk'
EscapeButton: 'btnCancel'
ExcludeFromActiveComponent: true
+ Image: 'INBOX_OUT'
Padding: 'false'
+ Title: '鍙戝竷璁″垝'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
index 0a4ead9..46f7baf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
@@ -6,23 +6,16 @@
Body:
[*
this.ApplyChanges();
- info( '------------------',cbCustomDemand.Checked()
- ,cbOfflinePlan.Checked()
- ,cbShiftPlan.Checked()
- ,cbAssembleOnlinePlan.Checked()
- ,cbInventoryPlan.Checked()
- ,cbTRCDemand.Checked()
- ,cbTransferPlan.Checked()
- ,cbPackagePlan.Checked() );
- showlabel := '鏄惁瀛樻。';
- if( cbCustomDemand.Checked()
- or cbOfflinePlan.Checked()
- or cbShiftPlan.Checked()
- or cbAssembleOnlinePlan.Checked()
- or cbInventoryPlan.Checked()
- or cbTRCDemand.Checked()
- or cbTransferPlan.Checked()
- or cbPackagePlan.Checked() ){
+
+ //showlabel := '鏄惁瀛樻。';
+ //if( cbCustomDemand.Checked()
+ // or cbOfflinePlan.Checked()
+ // or cbShiftPlan.Checked()
+ // or cbAssembleOnlinePlan.Checked()
+ // or cbInventoryPlan.Checked()
+ // or cbTRCDemand.Checked()
+ // or cbTransferPlan.Checked()
+ // or cbPackagePlan.Checked() ){
showlabel := '鏄惁瀛樻。';
plannames := construct( Strings );
if( cbCustomDemand.Checked() ){
@@ -50,14 +43,13 @@
plannames.Add( lblPackagePlan.Label() );
}
showlabel := showlabel.Concat( plannames.Concatenate( "銆�" ) ).Concat( '锛�' );
- info( '*****************************' );
+ // info( '*****************************' );
if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
}
- }else{
- info( '************###########*****************' );
- WebMessageBox::Information( this, '鏈�夋嫨浠讳綍璁″垝杩涜瀛樻。' )
- }
-
+ //}else{
+ // info( '************###########*****************' );
+ // WebMessageBox::Information( this, '鏈�夋嫨浠讳綍璁″垝杩涜瀛樻。' )
+ //}
this.Close();
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Response_pnlActions_btnOk_OnClick.def
index 133d6e9..7245689 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Response_pnlActions_btnOk_OnClick.def
@@ -4,6 +4,11 @@
{
#keys: '[415136.0.1249021383]'
DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not ( not cbCustomDemand.Checked() and not cbOfflinePlan.Checked() and not cbShiftPlan.Checked() and not cbAssembleOnlinePlan.Checked() and not cbInventoryPlan.Checked()
+ and not cbTRCDemand.Checked() and not cbTransferPlan.Checked() and not cbPackagePlan.Checked() );
+ *]
QuillAction
{
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def"
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def
rename to "_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def"
index 026faf2..678f281 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def"
@@ -1,66 +1,71 @@
Quintiq file version 2.0
-Component pnlCCFactory
+Component pCC id:pCC_847
{
- #keys: '[413988.1.30911852]'
+ #keys: '[413988.1.37281166]'
BaseType: 'WebPanel'
Children:
[
- Component npUpperLimitOfTransferCapacityZKGCC
+ Component CC_ZKG
{
- #keys: '[413988.1.30912074]'
+ #keys: '[413988.1.37281167]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKGCC'
Label: 'ZKG(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 0
]
}
- Component npUpperLimitOfTransferCapacityZKMCC
+ Component CC_ZKM
{
- #keys: '[413988.1.30912108]'
+ #keys: '[413988.1.37281168]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKMCC'
Label: 'ZKM(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 1
]
}
- Component npUpperLimitOfTransferCapacityPLCC
+ Component CC_PL
{
- #keys: '[413988.1.30912136]'
+ #keys: '[413988.1.37281169]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPLCC'
Label: 'PL(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 2
]
}
- Component npUpperLimitOfTransferCapacityKWCC
+ Component CC_KW
{
- #keys: '[413988.1.30912164]'
+ #keys: '[413988.1.37281170]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKWCC'
Label: 'KW(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 3
]
}
- Component npUpperLimitOfTransferCapacityAGWCC
+ Component CC_AGW
{
- #keys: '[413988.1.30912192]'
+ #keys: '[413988.1.37281171]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGWCC'
Label: 'AGW(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 4
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def"
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def
rename to "_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def"
index 4cae144..28c05c9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def"
@@ -1,66 +1,71 @@
Quintiq file version 2.0
-Component pnlDLFactory
+Component pDL id:pDL_545
{
- #keys: '[413988.1.30911840]'
+ #keys: '[413988.1.37281160]'
BaseType: 'WebPanel'
Children:
[
- Component npUpperLimitOfTransferCapacityZKG id:npUpperLimitOfTransferCapacityZKG_715
+ Component DL_ZKG
{
- #keys: '[413988.1.30911967]'
+ #keys: '[413988.1.37281161]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKG'
Label: 'ZKG(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 0
]
}
- Component npUpperLimitOfTransferCapacityZKM id:npUpperLimitOfTransferCapacityZKM_844
+ Component DL_ZKM
{
- #keys: '[413988.1.30911990]'
+ #keys: '[413988.1.37281162]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKM'
Label: 'ZKM(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 1
]
}
- Component npUpperLimitOfTransferCapacityPL id:npUpperLimitOfTransferCapacityPL_603
+ Component DL_PL
{
- #keys: '[413988.1.30912013]'
+ #keys: '[413988.1.37281163]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPL'
Label: 'PL(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 2
]
}
- Component npUpperLimitOfTransferCapacityKW id:npUpperLimitOfTransferCapacityKW_858
+ Component DL_KW
{
- #keys: '[413988.1.30912036]'
+ #keys: '[413988.1.37281164]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKW'
Label: 'KW(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 3
]
}
- Component npUpperLimitOfTransferCapacityAGW id:npUpperLimitOfTransferCapacityAGW_545
+ Component DL_AGW
{
- #keys: '[413988.1.30912059]'
+ #keys: '[413988.1.37281165]'
BaseType: 'WebNumberPicker'
Properties:
[
DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGW'
Label: 'AGW(pcs)'
+ Mask: 'NUMBER'
Min: '0'
Taborder: 4
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def
similarity index 84%
copy from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def
copy to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def
index 7ac917e..8c9c873 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlActions
{
- #keys: '[413988.0.1292313213]'
+ #keys: '[413988.1.35911888]'
BaseType: 'WebPanel'
Children:
[
Component btnOk
{
- #keys: '[413988.0.1292313217]'
+ #keys: '[413988.1.35911892]'
BaseType: 'WebButton'
Properties:
[
@@ -17,7 +17,7 @@
}
Component btnCancel
{
- #keys: '[413988.0.1292313219]'
+ #keys: '[413988.1.35911894]'
BaseType: 'WebButton'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def
new file mode 100644
index 0000000..bb29f81
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[413988.1.35911886]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: pnlContent481
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def
new file mode 100644
index 0000000..869911b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pnlContent481
+{
+ #keys: '[413988.1.37281159]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: pDL_545
+ #child: pCC_847
+ ]
+ Properties:
+ [
+ Orientation: 'tab'
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def
similarity index 88%
copy from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def
index 2917a99..04619b4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def
@@ -2,7 +2,7 @@
#parent: pnlActions/btnCancel
Response OnClick () id:Response_pnlActions_btnCancel_OnClick
{
- #keys: '[413988.0.1292313223]'
+ #keys: '[413988.1.35911898]'
DefinitionID: 'Responsedef_WebButton_OnClick'
GroupServerCalls: true
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def
similarity index 89%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def
index 14ca6da..a228358 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def
@@ -2,7 +2,7 @@
#parent: pnlActions/btnOk
Response OnClick () id:Response_pnlActions_btnOk_OnClick
{
- #keys: '[413988.0.1292313222]'
+ #keys: '[413988.1.35911897]'
DefinitionID: 'Responsedef_WebButton_OnClick'
GroupServerCalls: true
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def
similarity index 78%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def
index 338e32f..4a48f54 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def
@@ -1,9 +1,9 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
-OrphanComponent DialogUpperLimitOfTransferCapacity
+OrphanComponent DialogULOTC
{
- #keys: '[413988.0.1292313209]'
+ #keys: '[413988.1.35911884]'
BaseType: 'WebForm'
Children:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
deleted file mode 100644
index 153f57a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
+++ /dev/null
@@ -1,14 +0,0 @@
-Quintiq file version 2.0
-Component pnlContent
-{
- #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlCCFactory'. The file / folder structure might be corrupted due to integration."
- #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlDLFactory'. The file / folder structure might be corrupted due to integration."
- #keys: '[413988.0.1292313211]'
- BaseType: 'WebPanel'
- Properties:
- [
- Orientation: 'tab'
- Padding: 'true'
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def
index cd9201e..8f8312f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().ProductionLine() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().ProductionLine() <> selection ){
dhSearch.Data().ProductionLine( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def
index e7e654d..59ad2ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().Product() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Product() <> selection ){
dhSearch.Data().Product( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
index 82300e2..4b71402 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().Unit() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Unit() <> selection ){
dhSearch.Data().Unit( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration.def
index 3780ff7..216bcb3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration.def
@@ -15,7 +15,6 @@
Taborder: 0
]
}
- #child: PanelGeneration743
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration743.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration743.def
deleted file mode 100644
index e3a5cc0..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelGeneration743.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-Component PanelGeneration743
-{
- #keys: '[415136.0.1137311846]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddslGeneration859
- {
- #keys: '[415136.0.1137311847]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- Label: 'Generation'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
index 9ec5aa3..b932d01 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
@@ -19,6 +19,7 @@
]
Properties:
[
+ FixedSize: true
Taborder: 3
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnSelectionChanged.def
deleted file mode 100644
index 66ebb77..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnSelectionChanged.def
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelGeneration743/ddslGeneration859
-Response OnSelectionChanged () id:Response_PanelGeneration743_ddslGeneration859_OnSelectionChanged
-{
- #keys: '[415136.0.1137311844]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- if( dhSearch.Data().Generation() <> selection ){
- dhSearch.Data().Generation( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration_ddslGeneration_OnSelectionChanged\043187.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration_ddslGeneration_OnSelectionChanged\043187.def"
index 0b31a25..4bd09b7 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration_ddslGeneration_OnSelectionChanged\043187.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration_ddslGeneration_OnSelectionChanged\043187.def"
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().Generation() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Generation() <> selection ){
dhSearch.Data().Generation( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelMLBMQB_ddslMQBMLB_OnSelectionChanged\043456.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelMLBMQB_ddslMQBMLB_OnSelectionChanged\043456.def"
index 5aa3925..7323c5e 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelMLBMQB_ddslMQBMLB_OnSelectionChanged\043456.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelMLBMQB_ddslMQBMLB_OnSelectionChanged\043456.def"
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().MqbMlb() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().MqbMlb() <> selection ){
dhSearch.Data().MqbMlb( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelPower_ddslPower_OnSelectionChanged\043136.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelPower_ddslPower_OnSelectionChanged\043136.def"
index 12302f8..e1f38f9 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelPower_ddslPower_OnSelectionChanged\043136.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelPower_ddslPower_OnSelectionChanged\043136.def"
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().Power() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Power() <> selection ){
dhSearch.Data().Power( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelProduct_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
index 244f1c8..5213ddd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
@@ -9,7 +9,7 @@
{
Body:
[*
- if( dhSearch.Data().Product() <> selection ){
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Product() <> selection ){
dhSearch.Data().Product( selection );
// DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
index 8efba69..f8c1a45 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
@@ -14,6 +14,21 @@
#keys: '[415136.0.1121750597]'
BaseType: 'WebDataHolder'
Databinding: 'CustomerDemandIDSSearch'
+ Children:
+ [
+ Component deSearch
+ {
+ #keys: '[415136.0.1256142023]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'CustomerDemandIDSSearch'
+ ]
+ }
+ ]
Properties:
[
Taborder: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
new file mode 100644
index 0000000..59c4aeb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -0,0 +1,104 @@
+Quintiq file version 2.0
+Component MatrixEditorTable
+{
+ #keys: '[415136.0.1252790401]'
+ BaseType: 'WebMatrixEditor'
+ Children:
+ [
+ Component MatrixEditorCellTable
+ {
+ #keys: '[415136.0.1252790402]'
+ BaseType: 'WebMatrixEditorCell'
+ Children:
+ [
+ Component DataExtractorCells
+ {
+ #keys: '[415136.0.1252790403]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
+ FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Attributes: 'Value'
+ Column: 'Column'
+ Row: 'Row'
+ Taborder: 0
+ ]
+ }
+ Component MatrixEditorRowsTable
+ {
+ #keys: '[415136.0.1252790404]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractorRows
+ {
+ #keys: '[415136.0.1252790405]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ Description: "( search.Generation() = '<All>' or object.Product_MP().Generation() = search.Generation() ) and ( search.MqbMlb() = '<All>' or object.Product_MP().MQBMLB() = search.MqbMlb() ) and ( search.Power() = '<All>' or object.Product_MP().Power() = search.Power() )"
+ FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
+ FixedFilter: "( search.Product() = '<All>' or object.ProductID() = search.Product() ) and ( search.ProductionLine() = '<All>' or object.ProductionLine() = search.ProductionLine() )"
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'OfflinePlanArchiveVersion.Row'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'ProductID'
+ SortCriteria: 'ProductID'
+ Taborder: 1
+ ]
+ }
+ Component MatrixEditorColumnsTable
+ {
+ #keys: '[415136.0.1252790406]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractorColumns
+ {
+ #keys: '[415136.0.1252790407]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
+ FixedFilter: 'object.TimeUnit() = search.TimeUnit() and object.StartDate() >= search.StartDate() and object.StartDate() <= search.EndDate()'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'OfflinePlanArchiveVersion.Column'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'ColumnName'
+ SortCriteria: 'StartDate'
+ Taborder: 2
+ ]
+ }
+ #child: matrixEditorActionBarPageTable
+ #child: matrixeditorContextMenuTable
+ ]
+ Properties:
+ [
+ Columns: 'MatrixEditorColumnsTable'
+ ContextMenu: 'matrixeditorContextMenuTable'
+ Rows: 'MatrixEditorRowsTable'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def
new file mode 100644
index 0000000..c507369
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+Component PanelHeader
+{
+ #keys: '[415136.0.1252790294]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelProduct
+ #child: PanelPeriod_858
+ #child: PanelTimeUnit
+ #child: PanelOperation
+ #child: PanelProductLine_603
+ #child: PanelUnit_844
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
new file mode 100644
index 0000000..e4f2a8d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component PanelOperation
+{
+ #keys: '[415136.0.1252790299]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ButtonSearch
+ {
+ #keys: '[415136.0.1252790300]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'VIEW'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 5
+ Visible: false
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
new file mode 100644
index 0000000..1afed44
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+Component PanelPeriod id:PanelPeriod_858
+{
+ #keys: '[415136.0.1252790303]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component DateSelectorStart
+ {
+ #keys: '[415136.0.1252790304]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: 'Start date'
+ Taborder: 0
+ ]
+ }
+ Component DateSelectorEnd
+ {
+ #keys: '[415136.0.1252790305]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Date: 9999-12-31
+ Label: 'End date'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
new file mode 100644
index 0000000..1e02c6b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+Component PanelProduct
+{
+ #keys: '[415136.0.1252790306]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ddslProduct
+ {
+ #keys: '[415136.0.1252790307]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ FixedSize: false
+ Label: 'Product'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Taborder: 2
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
new file mode 100644
index 0000000..8ab29fe
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component PanelProductLine id:PanelProductLine_603
+{
+ #keys: '[415136.0.1252790297]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ddslMQBMLB
+ {
+ #keys: '[415136.0.1252790298]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: 'MQB/MLB'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def
new file mode 100644
index 0000000..4c488b9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+Component PanelTable
+{
+ #keys: '[415136.0.1252790400]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: MatrixEditorTable
+ ]
+ Properties:
+ [
+ Taborder: 2
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
new file mode 100644
index 0000000..ab3b485
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+Component PanelTimeUnit
+{
+ #keys: '[415136.0.1252790301]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component RadioButtonGroupUseForTimeUnit
+ {
+ #keys: '[415136.0.1252790302]'
+ BaseType: 'WebRadioButtonGroup'
+ Properties:
+ [
+ ButtonLabels: 'Day;Week;Month'
+ ButtonValues: 'Day;Week;Month'
+ Orientation: 'horizontal'
+ Taborder: 0
+ Title: 'Periods'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 4
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def"
new file mode 100644
index 0000000..9539dc9
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def"
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component PanelUnit id:PanelUnit_844
+{
+ #keys: '[415136.0.1252790295]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ddslUnit
+ {
+ #keys: '[415136.0.1252790296]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: 'Unit'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixEditorActionBarPageTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixEditorActionBarPageTable.def
new file mode 100644
index 0000000..802811d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixEditorActionBarPageTable.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixEditorActionBarPageTable
+{
+ #keys: '[415136.0.1252790408]'
+ BaseType: 'matrixEditorActionBarPage'
+ Properties:
+ [
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixeditorContextMenuTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixeditorContextMenuTable.def
new file mode 100644
index 0000000..dfbd80d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_matrixeditorContextMenuTable.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixeditorContextMenuTable
+{
+ #keys: '[415136.0.1252790409]'
+ BaseType: 'matrixeditorContextMenu'
+ Properties:
+ [
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
new file mode 100644
index 0000000..daae334
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+#parent: PanelPeriod_858/DateSelectorEnd
+Response OnChanged () id:Response_PanelPeriod_858_DateSelectorEnd_OnChanged
+{
+ #keys: '[415136.0.1252790286]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ //鏃ユ湡鏀瑰彉鍚庡埛鏂版樉绀�
+ if( this.Date() < DateSelectorStart.Date() ){
+ this.HintError( 'The end date cannot be less than the start date!' );
+ }else{
+ if( dhSearch.Data().EndDate() <> this.Date() ){
+ dhSearch.Data().EndDate( this.Date() );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def
new file mode 100644
index 0000000..8343107
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+#parent: PanelPeriod_858/DateSelectorStart
+Response OnChanged () id:Response_PanelPeriod_858_DateSelectorStart_OnChanged
+{
+ #keys: '[415136.0.1252790287]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ //鏃ユ湡鏀瑰彉鍚庡埛鏂版樉绀�
+ if( this.Date() > DateSelectorEnd.Date() ){
+ this.HintError( 'The start date cannot be later than the end date!' );
+ }else{
+ if( dhSearch.Data().StartDate() <> this.Date() ){
+ dhSearch.Data().StartDate( this.Date() );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def
similarity index 64%
copy from _Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def
index ba613be..af3422d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def
@@ -1,15 +1,15 @@
Quintiq file version 2.0
-#parent: PanelGeneration743/ddslGeneration859
-Response OnCreated () id:Response_PanelGeneration743_ddslGeneration859_OnCreated
+#parent: PanelProductLine_603/ddslMQBMLB
+Response OnCreated () id:Response_PanelProductLine_603_ddslMQBMLB_OnCreated
{
- #keys: '[415136.0.1137311845]'
+ #keys: '[415136.0.1252790291]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
{
Body:
[*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
+ values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.ProductionLine() );
valueString := values.Concatenate( ";" );
valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def
new file mode 100644
index 0000000..3f7615c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: PanelProductLine_603/ddslMQBMLB
+Response OnSelectionChanged () id:Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged
+{
+ #keys: '[415136.0.1252790290]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().ProductionLine() <> selection ){
+ dhSearch.Data().ProductionLine( selection );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
similarity index 65%
rename from _Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
index ba613be..a87af75 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
@@ -1,15 +1,15 @@
Quintiq file version 2.0
-#parent: PanelGeneration743/ddslGeneration859
-Response OnCreated () id:Response_PanelGeneration743_ddslGeneration859_OnCreated
+#parent: PanelProduct/ddslProduct
+Response OnCreated () id:Response_PanelProduct_ddslProduct_OnCreated
{
- #keys: '[415136.0.1137311845]'
+ #keys: '[415136.0.1252790285]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
{
Body:
[*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
+ values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.ProductID() );
valueString := values.Concatenate( ";" );
valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
new file mode 100644
index 0000000..95d20d3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: PanelProduct/ddslProduct
+Response OnSelectionChanged () id:Response_PanelProduct_ddslProduct_OnSelectionChanged
+{
+ #keys: '[415136.0.1252790284]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Product() <> selection ){
+ dhSearch.Data().Product( selection );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
new file mode 100644
index 0000000..533f7a1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
+Response OnChanged () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged
+{
+ #keys: '[415136.0.1252790289]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ //鍖洪棿鏀瑰彉鍚庡埛鏂版樉绀�
+ if( dhSearch.Data().TimeUnit() <> this.BoundValue() ){
+ dhSearch.Data().TimeUnit( this.BoundValue() );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
new file mode 100644
index 0000000..c047bee
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
+Response OnCreated () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated
+{
+ #keys: '[415136.0.1252790288]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ this.ButtonValues( Translations::MP_GlobalParameters_Day() + ';' + Translations::MP_GlobalParameters_Week() + ';' + Translations::MP_GlobalParameters_Month() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
similarity index 65%
copy from _Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
index ba613be..b3212b9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelGeneration743_ddslGeneration859_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
@@ -1,15 +1,15 @@
Quintiq file version 2.0
-#parent: PanelGeneration743/ddslGeneration859
-Response OnCreated () id:Response_PanelGeneration743_ddslGeneration859_OnCreated
+#parent: PanelUnit_844/ddslUnit
+Response OnCreated () id:Response_PanelUnit_844_ddslUnit_OnCreated
{
- #keys: '[415136.0.1137311845]'
+ #keys: '[415136.0.1252790293]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
{
Body:
[*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
+ values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Type() );
valueString := values.Concatenate( ";" );
valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
new file mode 100644
index 0000000..4757452
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: PanelUnit_844/ddslUnit
+Response OnSelectionChanged () id:Response_PanelUnit_844_ddslUnit_OnSelectionChanged
+{
+ #keys: '[415136.0.1252790292]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if( not isnull( dhSearch.Data() ) and dhSearch.Data().Unit() <> selection ){
+ dhSearch.Data().Unit( selection );
+ // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/_ROOT_Component_FormOfflinePlanArchive.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/_ROOT_Component_FormOfflinePlanArchive.def
new file mode 100644
index 0000000..df873ef
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/_ROOT_Component_FormOfflinePlanArchive.def
@@ -0,0 +1,43 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormOfflinePlanArchive
+{
+ #keys: '[415136.0.1252790190]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ Component dhSearch id:dhSearch_715
+ {
+ #keys: '[415136.0.1252790226]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'OfflinePlanArchiveSearch'
+ Children:
+ [
+ Component deSearch
+ {
+ #keys: '[415136.0.1252790227]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'OfflinePlanArchiveSearch'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+ }
+ #child: PanelHeader
+ #child: PanelTable
+ ]
+ Properties:
+ [
+ Image: 'PAPER_JET'
+ Title: 'Offline plan archive'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def
index 4c092f7..de3d677 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def
@@ -5,11 +5,15 @@
#keys: '[413988.0.1292330611]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
QuillAction
{
Body:
[*
- dlg := construct( DialogUpperLimitOfTransferCapacity );
+ dlg := construct( DialogULOTC );
ApplicationMacroPlanner.ShowFormModal( dlg );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Offline__plan_archive_report.vw b/_Main/UI/MacroPlannerWebApp/Views/Offline__plan_archive_report.vw
new file mode 100644
index 0000000..462b783
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Views/Offline__plan_archive_report.vw
@@ -0,0 +1,116 @@
+Quintiq file version 2.0
+{
+ viewcontents
+ {
+ forms
+ {
+ form_FormOfflinePlanArchive
+ {
+ title: 'QMacroPlanner::FormOfflinePlanArchive'
+ shown: true
+ componentID: 'QMacroPlanner::FormOfflinePlanArchive'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 15
+ columnPosition: 1
+ columnSpan: 12
+ }
+ components
+ {
+ FormOfflinePlanArchive_PanelHeader
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelUnit
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelProductLine
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelProduct
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelPeriod
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelTimeUnit
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelOperation
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_PanelTable
+ {
+ sizeRatio: 1
+ }
+ FormOfflinePlanArchive_MatrixEditorTable
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 200
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormOfflinePlanArchive.MatrixEditorTable'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_Value
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Value'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'StartDate'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'ProductID'"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
+ page: ''
+ group: ''
+ index: 30
+ image: 'PAPER_JET'
+ description: ''
+ }
+ formatversion: 2
+ id: 'Offline__plan_archive_report'
+ name: 'Offline plan archive report'
+ isglobal: false
+ isroot: true
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/PackagingPlan.vw b/_Main/UI/MacroPlannerWebApp/Views/PackagingPlan.vw
index 84e6ea8..72d0f28 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/PackagingPlan.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/PackagingPlan.vw
@@ -27,6 +27,115 @@
{
sizeRatio: 1
}
+ FormPackagingPlan_MatrixEditor493
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 224
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormPackagingPlan.MatrixEditor493'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_NetDemand
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'NetDemand'
+ }
+ attribute_NewSupply
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'NewSupply'
+ }
+ attribute_EndingInventory
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 2
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'EndingInventory'
+ }
+ attribute_Out
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 3
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Out'
+ }
+ attribute_TransferIn
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 4
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'TransferIn'
+ }
+ attribute_UnpackagedInventory
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 5
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'UnpackagedInventory'
+ }
+ attribute_PackagingInventory
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 6
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'PackagingInventory'
+ }
+ attribute_Package
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 7
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Package'
+ }
+ attribute_Unpacking
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 8
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Unpacking'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'StartDate'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'ProductID';datamember:'StockingPointID'"
+ }
+ }
+ }
+ }
+ }
}
}
form_FormGeneralSettings
--
Gitblit v1.9.3