From b068efe67a223c53e2d608b553d327ca61bfd1e9 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 01 十一月 2024 16:59:22 +0800
Subject: [PATCH] 客户需求存档bug
---
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def | 2
/dev/null | 9 ----
_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl | 16 ++++++-
_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def | 2
_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl | 50 +++++++++++++++----------
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def | 2
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Response_pnlLeft_88_ddslFactory_OnCreated.def | 18 +++++++++
10 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/_Main/BL/Relations/Relation_InterfaceForecast_InterfaceDataset_InterfaceDataset_InterfaceForeca.qbl b/_Main/BL/Relations/Relation_InterfaceForecast_InterfaceDataset_InterfaceDataset_InterfaceForeca.qbl
deleted file mode 100644
index c04afe5..0000000
--- a/_Main/BL/Relations/Relation_InterfaceForecast_InterfaceDataset_InterfaceDataset_InterfaceForeca.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation InterfaceForecast_InterfaceDataset_InterfaceDataset_InterfaceForecast
-{
- #keys: '1[415136.0.1136940384]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide InterfaceDataset
- {
- #keys: '3[415136.0.1136940386][415136.0.1136940385][415136.0.1136940387]'
- Cardinality: '0to1'
- ObjectDefinition: InterfaceForecast
- OwningSide: 'Reference'
- }
- RelationSide.RightSide InterfaceForecast
- {
- #keys: '3[415136.0.1136940389][415136.0.1136940388][415136.0.1136940390]'
- Cardinality: '1toN'
- ObjectDefinition: InterfaceDataset
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
index 28f43a3..cd645ae 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
@@ -29,7 +29,7 @@
, Name := Translations::InterfaceDataset_AOnlineAndMOfflinePlanMS64_Name()
, InterfaceDateTime := nowdate
, Message := '瑁呴厤涓婄嚎璁″垝 + 鏈哄姞涓嬬嚎璁″垝 - MS64'
- , IsShow := false
+ // , IsShow := false
, Last := true
, ReturnSuccess := true
, ReturnMsg := 'Success'
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index de8c96f..bad399c 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -28,7 +28,7 @@
, Name := Translations::InterfaceDataset_AOnlineAndMOfflinePlanPIR_Name()
, InterfaceDateTime := nowdate
, Message := '瑁呴厤涓婄嚎璁″垝 + 鏈哄姞涓嬬嚎璁″垝 - PIR'
- , IsShow := false
+ // , IsShow := false
, Last := true
, ReturnSuccess := true
, ReturnMsg := 'Success'
diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
index 1cf28e8..f97e7fb 100644
--- a/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
@@ -8,23 +8,33 @@
[*
// 鐢勫叞楦� Jun-25-2024 (created)
weekstart := periods.Element( 0 );
+
monthstart := periods.Element( 0 );
traverse( periods, Elements, periodtime ){
periodname := periodtime.Format( "M2/D2/Y" );
this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
+ weekend := ( weekstart + Duration::Days( 6 ) ).Date();
+ if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
+ weekstart := periodtime;
+ }
if( periodtime = weekstart ){
weekperiodname := weekstart.Format( "M2/D2/Y" );
- this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart + Duration::Days( 6 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
- weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
+ this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
+
+ }
+ if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
+ monthstart := periodtime;
}
if( periodtime = monthstart ){
monthperiodname := monthstart.Format( "M2/D2/Y" );
enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
- monthstart := monthstart.StartOfNextMonth();
+
}
+ weekstart := periodtime.StartOfNextWeek();
+ monthstart := periodtime.StartOfNextMonth();
}
*]
}
diff --git a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
index 0cbe54d..db43831 100644
--- a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
@@ -2,6 +2,7 @@
#parent: #root
StaticMethod GenerateData (
InterfaceDataset interface,
+ const MacroPlan macroplan,
RecycleBin recycle,
const Archive archive
)
@@ -11,10 +12,16 @@
[*
// 鐢勫叞楦� Aug-20-2024 (created)
interface.CustomerDemandIDS( relflush );
- interface.CustomerDemandIDSSearch( relflush );
+ //interface.CustomerDemandIDSSearch( relflush );
+ info( '-------------------------Start---------------------');
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 := '瀹㈡埛闇�姹�' );
+ if( isnull( interface.CustomerDemandIDSSearch() ) ){
+ interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
+ }
+ idstable := selectobject( interface, CustomerDemandIDS, idstable, idstable.ID() = '瀹㈡埛闇�姹�' );
+ if( isnull( idstable ) ){
+ idstable := interface.CustomerDemandIDS( relnew, ID := '瀹㈡埛闇�姹�', Name := '瀹㈡埛闇�姹�' );
+ }
binaryValue := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
source := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
source.ReadStructure();
@@ -23,14 +30,12 @@
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() ) );
- //}
+ ppadates := selectuniquevalues( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA', forecast.StartDate() );
periods := idsdates.Union( ppadates );
- periods := selectuniquevalues( periods, Elements, e, e );
- idstable.GenerateColumn( periods.Sort() );
+ periods := selectuniquevalues( periods, Elements, e, not exists( idstable, Column, column, column.StartDate() = e ), e );
+ if( periods.Size() > 0 ){
+ idstable.GenerateColumn( periods.Sort() );
+ }
traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
traverse( table, GeneralExcelImportAndExportDataRow, row ){
productcell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 2 );
@@ -41,22 +46,27 @@
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() );
+ 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() );
+ traverse ( macroplan, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.Product_MP() ) and forecast.Origin() = 'PPA' ){
+ traverse( forecast, PlanningSalesDemandInPeriod, sdip ){
+ idsrow := idstable.GetRowByUnit( forecast.ProductID(), forecast.SalesSegmentName() );
+ daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), sdip.StartDate() );
+ weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), sdip.StartDate() );
+ monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), sdip.StartDate() );
+ info( '-----------------', isnull( idsrow ), isnull( daycolumn ), isnull( weekcolumn ), isnull( monthcolumn ), sdip.StartDate() );
+ idsrow.SetCellValue( daycolumn, [Number]sdip.Quantity() );
+ idsrow.SetCellValue( weekcolumn, [Number]sdip.Quantity() );
+ idsrow.SetCellValue( monthcolumn, [Number]sdip.Quantity() );
+ }
}
source.Delete();
+ info( '-------------------------End---------------------');
*]
}
diff --git a/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl b/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
index 12d072c..2e3eff1 100644
--- a/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
@@ -17,8 +17,8 @@
TextBody:
[*
// 鐢勫叞楦� Oct-30-2024 (created)
- if( iscustomdemand ){//鍏ㄥ勾鏃ュ害闇�姹�/瀹㈡埛闇�姹�
- CustomerDemandIDS::GenerateData( this, recyclebin, archive );
+ if( iscustomdemand ){//鍏ㄥ勾鏃ュ害闇�姹�/瀹㈡埛闇�姹�
+ CustomerDemandIDS::GenerateData( this, macroplan, recyclebin, archive );
}
if( isofflineplan ){//鍚勪骇绾夸笅绾胯鍒�
OfflinePlanArchiveVersion::RefreshData( this, macroplan, archive );
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Date.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Date.qbl
deleted file mode 100644
index 1112fa9..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Date.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Date
-{
- #keys: '3[415136.0.1136940360][415136.0.1136940359][415136.0.1136940361]'
- Description: '鏃ユ湡'
- ValueType: Date
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Factory.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Factory.qbl
deleted file mode 100644
index 4dc2060..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Factory.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Factory
-{
- #keys: '3[415136.0.1136940363][415136.0.1136940362][415136.0.1136940364]'
- Description: '宸ュ巶'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Generation.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Generation.qbl
deleted file mode 100644
index 382bcbe..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Generation.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Generation
-{
- #keys: '3[415136.0.1136940366][415136.0.1136940365][415136.0.1136940367]'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_MLBMQB.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_MLBMQB.qbl
deleted file mode 100644
index 72745af..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_MLBMQB.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute MLBMQB
-{
- #keys: '3[415136.0.1136940369][415136.0.1136940368][415136.0.1136940370]'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Origin.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Origin.qbl
deleted file mode 100644
index 99bd907..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Origin.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Origin
-{
- #keys: '3[415136.0.1136940398][415136.0.1136940397][415136.0.1136940399]'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_PartNumber.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_PartNumber.qbl
deleted file mode 100644
index 316b918..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_PartNumber.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute PartNumber
-{
- #keys: '3[415136.0.1136940372][415136.0.1136940371][415136.0.1136940373]'
- Description: '闆朵欢鍙�'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Power.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Power.qbl
deleted file mode 100644
index 77a32b4..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Power.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Power
-{
- #keys: '3[415136.0.1136940375][415136.0.1136940374][415136.0.1136940376]'
- ValueType: String
-}
diff --git a/_Main/BL/Type_InterfaceForecast/Attribute_Quantity.qbl b/_Main/BL/Type_InterfaceForecast/Attribute_Quantity.qbl
deleted file mode 100644
index 69a83ca..0000000
--- a/_Main/BL/Type_InterfaceForecast/Attribute_Quantity.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Quantity
-{
- #keys: '3[415136.0.1136940378][415136.0.1136940377][415136.0.1136940379]'
- ValueType: Real
-}
diff --git a/_Main/BL/Type_InterfaceForecast/DefaultValue_Factory.qbl b/_Main/BL/Type_InterfaceForecast/DefaultValue_Factory.qbl
deleted file mode 100644
index 49653fb..0000000
--- a/_Main/BL/Type_InterfaceForecast/DefaultValue_Factory.qbl
+++ /dev/null
@@ -1,6 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-DefaultValue
-{
- TargetAttribute: Factory
-}
diff --git a/_Main/BL/Type_InterfaceForecast/DefaultValue_Generation.qbl b/_Main/BL/Type_InterfaceForecast/DefaultValue_Generation.qbl
deleted file mode 100644
index 9e5b51e..0000000
--- a/_Main/BL/Type_InterfaceForecast/DefaultValue_Generation.qbl
+++ /dev/null
@@ -1,6 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-DefaultValue
-{
- TargetAttribute: Generation
-}
diff --git a/_Main/BL/Type_InterfaceForecast/DefaultValue_MLBMQB.qbl b/_Main/BL/Type_InterfaceForecast/DefaultValue_MLBMQB.qbl
deleted file mode 100644
index 9ddeec7..0000000
--- a/_Main/BL/Type_InterfaceForecast/DefaultValue_MLBMQB.qbl
+++ /dev/null
@@ -1,6 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-DefaultValue
-{
- TargetAttribute: MLBMQB
-}
diff --git a/_Main/BL/Type_InterfaceForecast/DefaultValue_PartNumber.qbl b/_Main/BL/Type_InterfaceForecast/DefaultValue_PartNumber.qbl
deleted file mode 100644
index cead834..0000000
--- a/_Main/BL/Type_InterfaceForecast/DefaultValue_PartNumber.qbl
+++ /dev/null
@@ -1,6 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-DefaultValue
-{
- TargetAttribute: PartNumber
-}
diff --git a/_Main/BL/Type_InterfaceForecast/DefaultValue_Power.qbl b/_Main/BL/Type_InterfaceForecast/DefaultValue_Power.qbl
deleted file mode 100644
index 4922731..0000000
--- a/_Main/BL/Type_InterfaceForecast/DefaultValue_Power.qbl
+++ /dev/null
@@ -1,6 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-DefaultValue
-{
- TargetAttribute: Power
-}
diff --git a/_Main/BL/Type_InterfaceForecast/StaticMethod_ArchivedData.qbl b/_Main/BL/Type_InterfaceForecast/StaticMethod_ArchivedData.qbl
deleted file mode 100644
index 0a0552f..0000000
--- a/_Main/BL/Type_InterfaceForecast/StaticMethod_ArchivedData.qbl
+++ /dev/null
@@ -1,33 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod ArchivedData (
- InterfaceDataset interfaceDataset,
- MacroPlan macroPlan
-)
-{
- TextBody:
- [*
- traverse ( macroPlan, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.Product_MP() ) ){
- // factory := f.Origin().Tokenize( "-" ).Element( 0 );
- product := forecast.Product_MP();
- traverse( forecast, PlanningSalesDemandInPeriod, sdip ){
- itrcf := selectobject( interfaceDataset, InterfaceForecast, tempITRCF, tempITRCF.PartNumber() = forecast.ProductID() and tempITRCF.Date() = sdip.StartDate() );
-
- if ( not isnull( itrcf ) ) {
- itrcf.Delete();
- }
-
- interfaceDataset.InterfaceForecast( relnew,
- Date := sdip.StartDate(),
- Factory := forecast.SalesSegmentName(),
- PartNumber := forecast.ProductID(),
- Quantity := sdip.Quantity(),
- Generation := product.Generation(),
- MLBMQB := product.MQBMLB(),
- Power := product.Power(),
- Origin := forecast.Origin()
- );
- }
- }
- *]
-}
diff --git a/_Main/BL/Type_InterfaceForecast/_ROOT_Type_InterfaceForecast.qbl b/_Main/BL/Type_InterfaceForecast/_ROOT_Type_InterfaceForecast.qbl
deleted file mode 100644
index 5f8de80..0000000
--- a/_Main/BL/Type_InterfaceForecast/_ROOT_Type_InterfaceForecast.qbl
+++ /dev/null
@@ -1,9 +0,0 @@
-Quintiq file version 2.0
-#root
-#parent: #DomainModel
-Type InterfaceForecast
-{
- #keys: '5[415136.0.1136940357][415136.0.1136940355][0.0.0][415136.0.1136940356][415136.0.1136940358]'
- BaseType: Object
- StructuredName: 'InterfaceForecasts'
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Response_pnlLeft_88_ddslFactory_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Response_pnlLeft_88_ddslFactory_OnCreated.def
new file mode 100644
index 0000000..81ddd11
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Response_pnlLeft_88_ddslFactory_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlLeft_88/ddslFactory
+Response OnCreated () id:Response_pnlLeft_88_ddslFactory_OnCreated
+{
+ #keys: '[415136.0.1271601330]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ valueString := "All";
+
+ this.Strings( valueString.Concat( ";" ).Concat( FinancialProductionReport::GetDefaultCCUnit().Concat( ";" ) ).Concat( FinancialProductionReport::GetDefaultDLUnit() ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
index e7d653c..7d2fc9a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
@@ -10,7 +10,7 @@
Body:
[*
//鍒濆鍖�
- CustomerDemandIDS::GenerateData( InterfaceDataset, RecycleBin, Archive );
+ //CustomerDemandIDS::GenerateData( InterfaceDataset, RecycleBin, Archive );
dhSearch.Data( InterfaceDataset.CustomerDemandIDSSearch() );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def
index 6b29c26..a47aeb3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def
@@ -14,7 +14,7 @@
Body:
[*
FinancialProductionSource::Initialize( MacroPlan );
- excelsource := selectobject( MacroPlan, FinancialProductionSource, excelsource, excelsource.IsImport() );
+ excelsource := maxobject( MacroPlan, FinancialProductionSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
if( not isnull( excelsource ) ){
excelsource.AfterImport();
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
index 0182c4e..b42d5d3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
@@ -14,7 +14,7 @@
Body:
[*
FinancialSalesSource::InitializeNew( MacroPlan );
- excelsource := selectobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport() );
+ excelsource := maxobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
if( not isnull( excelsource ) ){
excelsource.AfterImport();
}
--
Gitblit v1.9.3