From 8e6b4fbf0ced25ea7bed8fc8fa8364bb104d05c2 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 24 五月 2024 16:18:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def | 16 +++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def | 18 ++++++
_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl | 32 ++++++----
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl | 12 ++++
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl | 8 ++
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def | 3
_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl | 23 +++++++
_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl | 9 +++
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl | 7 ++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def | 37 ++++++++++++
_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl | 7 ++
11 files changed, 158 insertions(+), 14 deletions(-)
diff --git a/_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl b/_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl
new file mode 100644
index 0000000..6e283ed
--- /dev/null
+++ b/_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation RequirementImportExecutionStatus_Archive_Archive_RequirementImportExecutionStatus
+{
+ #keys: '1[414996.0.382770175]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide Archive
+ {
+ #keys: '3[414996.0.382770177][414996.0.382770176][414996.0.382770178]'
+ Cardinality: '0to1'
+ ObjectDefinition: RequirementImportExecutionStatus
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide RequirementImportExecutionStatus
+ {
+ #keys: '3[414996.0.382770180][414996.0.382770179][414996.0.382770181]'
+ Cardinality: '1toN'
+ ObjectDefinition: Archive
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
index d157263..f14945f 100644
--- a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
@@ -27,17 +27,25 @@
info( json );
// 璋冪敤鎺ュ彛
- //url := "/PR/Import";
- //i := HTTPInterface::Create( archive.JavaInterfaceAddress(), archive.JavaInterfacePort() );
- //i.URL( url );
- //i.PostMethod( true );
- //
- //try {
- // i.Call( json );
- //
- // htmlresult := i.Result();
- //} onerror {
- //
- //}
+ url := "/PR/Import";
+
+ i := HTTPInterface::Create( archive.JavaInterfaceAddress(), archive.JavaInterfacePort() );
+ i.URL( url );
+ i.PostMethod( true );
+ i.MediaType( "application/json" );
+
+ i.Call( json );
+
+ htmlresult := i.Result();
+
+ respJSON := JSON::Parse( htmlresult );
+ code := respJSON.Get( "code" ).GetNumber();
+ message := respJSON.Get( "message" ).GetString();
+
+ if ( code = 200 ) {
+
+ } else {
+ error( message );
+ }
*]
}
diff --git a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
index f59c374..3fca737 100644
--- a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
@@ -27,8 +27,13 @@
filePath := archive.FileArchivePath() + "\" + "temp" + "\";
OS::CreateDirectory( filePath );
+ // 鍒涘缓鎵ц鐘舵��
+ archive.RequirementImportExecutionStatus( relnew,
+ ExecutionStatus := "InProgress",
+ ExecutionUserName := userName );
+
if ( prBinaryValue.Size() > 0 ) {
- Archive::HandlePR( archive, macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath );
+ archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath );
} else if ( ppBinaryValue.Size() > 0 ) {
Archive::HandlePP( archive, macroPlan, userName, ppFileName, ppBinaryValue, isPPArchive, filePath );
} else if ( budgetBinaryValue.Size() > 0 ) {
diff --git a/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl
new file mode 100644
index 0000000..6253cd4
--- /dev/null
+++ b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ExecutionRespMessage
+{
+ #keys: '3[414996.0.382770258][414996.0.382770257][414996.0.382770259]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl
new file mode 100644
index 0000000..cb1a02e
--- /dev/null
+++ b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ExecutionStatus
+{
+ #keys: '3[414996.0.382747512][414996.0.382747511][414996.0.382747513]'
+ Description:
+ [*
+ InProgress // 鎵ц涓�
+ Complete // 鎵ц瀹屾垚
+ *]
+ ValueType: String
+}
diff --git a/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl
new file mode 100644
index 0000000..f35e4b8
--- /dev/null
+++ b/_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ExecutionUserName
+{
+ #keys: '3[414996.0.382747367][414996.0.382747366][414996.0.382747368]'
+ Description: '鎵ц鐢ㄦ埛'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl b/_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl
new file mode 100644
index 0000000..f0b6d60
--- /dev/null
+++ b/_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type RequirementImportExecutionStatus
+{
+ #keys: '5[414996.0.382770155][414996.0.382770153][0.0.0][414996.0.382770154][414996.0.382770156]'
+ BaseType: Object
+ StructuredName: 'RequirementImportExecutionStatuss'
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
index 7a2883b..75c409e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
@@ -31,6 +31,43 @@
Taborder: 1
]
}
+ Component dhRequirementImportExecutionStatus
+ {
+ #keys: '[414996.0.387620344]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'RequirementImportExecutionStatus'
+ Children:
+ [
+ Component deRequirementImportExecutionStatus
+ {
+ #keys: '[414996.0.387620380]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'Archive'
+ FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
+ FixedFilter: 'object.ExecutionUserName() = userName'
+ Source: 'Archive'
+ Taborder: 0
+ Transformation: 'RequirementImportExecutionStatus'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 2
+ ]
+ }
+ Component dhUserName
+ {
+ #keys: '[414996.0.387620508]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'String*'
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
new file mode 100644
index 0000000..2860d95
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: abgRequirementPreprocessing/dhRequirementImportExecutionStatus
+Response OnDataChanged () id:Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecutionStatus_OnDataChanged
+{
+ #keys: '[414996.0.387621135]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ if ( not isnull( this.Data() ) ) {
+
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def
new file mode 100644
index 0000000..f76bb67
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: abgRequirementPreprocessing/dhUserName
+Response OnCreated () id:Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated
+{
+ #keys: '[414996.0.387620588]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ this.Data( ApplicationMacroPlanner.GetUserName() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def
index cf3fc7b..43d9cf4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def
@@ -6,7 +6,7 @@
Body:
[*
Form.ApplyChanges();
-
+
Archive::RequirementProcessing( Archive, MacroPlan, ApplicationMacroPlanner.GetUserName(),
efPR.Text() , guard( dhBinaryDataPR.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ), cPR.Checked(),
efPP.Text() , guard( dhBinaryDataPP.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ), cPP.Checked(),
@@ -15,6 +15,7 @@
efCurve.Text() , guard( dhBinaryDataCurve.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ),
efIDS.Text() , guard( dhBinaryDataIDS.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ) );
+
Form.Close();
*]
}
--
Gitblit v1.9.3