From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelOperation_ButtonSalesImport_OnClick.def | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelOperation_ButtonSalesImport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelOperation_ButtonSalesImport_OnClick.def
index c8b312a..efe9b1c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelOperation_ButtonSalesImport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelOperation_ButtonSalesImport_OnClick.def
@@ -14,23 +14,31 @@
Body:
[*
try {
- uploadJsonString := Application.GetFile();
+ uploadJsonString := Application.GetFile();
if ( uploadJsonString <> "" ) {
- uploadJson := JSON::Parse( uploadJsonString );
+ uploadJson := JSON::Parse( uploadJsonString );
Archive::VerifyTheFileName( uploadJson );
- fileName := uploadJson.Get( "name" ).GetString();
- base64String := uploadJson.Get( "data" ).GetString();
+ fileName := uploadJson.Get( "name" ).GetString();
+ base64String := uploadJson.Get( "data" ).GetString();
- webFileBinaryData := BinaryData::FromBase64EncodedString( base64String ).AsBinaryValue();
+ webFileBinaryData := BinaryData::FromBase64EncodedString( base64String ).AsBinaryValue();
- source := FinancialSalesSource::Upload( MacroPlan, webFileBinaryData, fileName );
+ source := FinancialSalesSource::Upload( MacroPlan, webFileBinaryData, fileName );
source.ReadStructure();
//濡傛灉瀛樺湪璁″垝寮�濮嬪悗鐨勬棩鏈熸暟鎹渶瑕佺偣鍑荤‘璁�
if( not source.IsExistFutureMonthData() or
( source.IsExistFutureMonthData() and WebMessageBox::Question( this, Translations::MP_FinancialProductionReport_Question(), 'Yes|No' ) = 0 ) ){
+ FinancialSalesSource::InitializeNew( MacroPlan );
source.AfterImport();
- FinancialSalesSource::InitiateSearch( MacroPlan );
+ productids := selectuniquevalues( DataHolderProduct.Data(), Elements, product, exists( dhGenerations.Data(), Elements, e, e.Generation() = product.Generation() )
+ and exists( dhMQBMLBs.Data(), Elements, e, e.MLBMQB() = product.MQBMLB() )
+ and exists( dhPowers.Data(), Elements, e, e.Power() = product.Power() ), product.ID() );
+
+ table := selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, table.IsShow() );
+ table.Generate( dhSearch.Data(), dhFactorys.Data(), productids );
+ DataHolderTable.Data( table );
+ // DataHolderTable.Data( FinancialSalesSource::InitiateSearch( MacroPlan ) );
}
WebMessageBox::Success( Translations::A_VWED_Success() );
--
Gitblit v1.9.3