From ea56fab48d2ed55b4de46f4500565415535056b0 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 17 十月 2023 18:07:24 +0800
Subject: [PATCH] Move to GlobalOTDSOP
---
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuRelaeaseNewVersion_OnClick.def | 4
_Main/BL/Type_VersionControl/StaticMethod_CreateNewVersion.qbl | 2
_Main/BL/Type_VersionControl/StaticMethod_GetVersionInfo.qbl | 6 +-
_Main/BL/Relations/Relation_VersionStatus_GlobalOTDSOP_GlobalOTDSOP_VersionStatus.qbl | 23 +++++++
_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderFresh_OnClick.def | 2
_Main/BL/Type_VersionControl/StaticMethod_FindLatestVersion.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 16 +++--
_Main/BL/Type_VersionControl/StaticMethod_CopyVersion.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuSaveNewVersion_OnClick.def | 2
_Main/BL/Type_VersionControl/StaticMethod_ReleaseNewVersion.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def | 3
_Main/BL/Type_VersionControl/StaticMethod_FindByFullVersionID.qbl | 2
_Main/BL/Type_VersionStatus/StaticMethod_GetBusinessTypeStatus.qbl | 2
_Main/BL/Type_VersionControl/StaticMethod_CreateNewSceneVersion.qbl | 2
_Main/BL/EDI/Broker_Broker_OTD_VersionControl.qbl | 2
_Main/BL/Type_VersionControl/StaticMethod_FindLatestUpdateVersion.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderCopy_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderRelease_OnClick.def | 2
_Main/BL/Type_VersionControl/StaticMethod_Create.qbl | 2
_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetOutputVersionData.qbl | 4
_Main/BL/Type_VersionStatus/StaticMethod_CreateOrUpdate.qbl | 2
_Main/BL/Type_VersionStatus/StaticMethod_FindLatestStatus.qbl | 4
_Main/BL/Relations/Relation_VersionControl_GlobalOTDSOP_GlobalOTDSOP_VersionControl.qbl | 23 +++++++
/dev/null | 23 -------
_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetVersionData.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def | 4
_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDSOP_GlobalOTDSOP_MappingVersionContr.qbl | 23 +++++++
_Main/BL/Type_VersionControl/StaticMethod_FindReleasedVersions.qbl | 7 +
28 files changed, 114 insertions(+), 64 deletions(-)
diff --git a/_Main/BL/EDI/Broker_Broker_OTD_VersionControl.qbl b/_Main/BL/EDI/Broker_Broker_OTD_VersionControl.qbl
index b3723db..80c5ce1 100644
--- a/_Main/BL/EDI/Broker_Broker_OTD_VersionControl.qbl
+++ b/_Main/BL/EDI/Broker_Broker_OTD_VersionControl.qbl
@@ -2,7 +2,7 @@
#parent: #root
EDIBroker Broker_OTD_VersionControl
{
- MDSDefinition: GlobalOTDTable
+ MDSDefinition: GlobalOTDSOP
TimeZone: 'ACT'
UseOSTimeZone: false
EDIModelLink.Destination MappingVersionControl
diff --git a/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDSOP_GlobalOTDSOP_MappingVersionContr.qbl b/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDSOP_GlobalOTDSOP_MappingVersionContr.qbl
new file mode 100644
index 0000000..7415d35
--- /dev/null
+++ b/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDSOP_GlobalOTDSOP_MappingVersionContr.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation MappingVersionControl_GlobalOTDSOP_GlobalOTDSOP_MappingVersionControl
+{
+ #keys: '1[412960.0.337760056]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[412960.0.337760058][412960.0.337760057][412960.0.337760059]'
+ Cardinality: '0to1'
+ ObjectDefinition: MappingVersionControl
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide MappingVersionControl
+ {
+ #keys: '3[412960.0.337760061][412960.0.337760060][412960.0.337760062]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDTable_GlobalOTDTable_MappingVersionC.qbl b/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDTable_GlobalOTDTable_MappingVersionC.qbl
deleted file mode 100644
index 39dd1eb..0000000
--- a/_Main/BL/Relations/Relation_MappingVersionControl_GlobalOTDTable_GlobalOTDTable_MappingVersionC.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation MappingVersionControl_GlobalOTDTable_GlobalOTDTable_MappingVersionControl
-{
- #keys: '1[412960.0.150120043]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[412960.0.150120045][412960.0.150120044][412960.0.150120046]'
- Cardinality: '0to1'
- ObjectDefinition: MappingVersionControl
- OwningSide: 'Reference'
- }
- RelationSide.RightSide MappingVersionControl
- {
- #keys: '3[412960.0.150120048][412960.0.150120047][412960.0.150120049]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_VersionControl_GlobalOTDSOP_GlobalOTDSOP_VersionControl.qbl b/_Main/BL/Relations/Relation_VersionControl_GlobalOTDSOP_GlobalOTDSOP_VersionControl.qbl
new file mode 100644
index 0000000..7e3d31e
--- /dev/null
+++ b/_Main/BL/Relations/Relation_VersionControl_GlobalOTDSOP_GlobalOTDSOP_VersionControl.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation VersionControl_GlobalOTDSOP_GlobalOTDSOP_VersionControl
+{
+ #keys: '1[412960.0.337760078]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[412960.0.337760080][412960.0.337760079][412960.0.337760081]'
+ Cardinality: '0to1'
+ ObjectDefinition: VersionControl
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide VersionControl
+ {
+ #keys: '3[412960.0.337760083][412960.0.337760082][412960.0.337760084]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_VersionControl_GlobalOTDTable_GlobalOTDTable_VersionControl.qbl b/_Main/BL/Relations/Relation_VersionControl_GlobalOTDTable_GlobalOTDTable_VersionControl.qbl
deleted file mode 100644
index bb27705..0000000
--- a/_Main/BL/Relations/Relation_VersionControl_GlobalOTDTable_GlobalOTDTable_VersionControl.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation VersionControl_GlobalOTDTable_GlobalOTDTable_VersionControl
-{
- #keys: '1[412960.0.134860006]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[412960.0.134860008][412960.0.134860007][412960.0.134860009]'
- Cardinality: '0to1'
- ObjectDefinition: VersionControl
- OwningSide: 'Reference'
- }
- RelationSide.RightSide VersionControl
- {
- #keys: '3[412960.0.134860011][412960.0.134860010][412960.0.134860012]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDSOP_GlobalOTDSOP_VersionStatus.qbl b/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDSOP_GlobalOTDSOP_VersionStatus.qbl
new file mode 100644
index 0000000..2615f94
--- /dev/null
+++ b/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDSOP_GlobalOTDSOP_VersionStatus.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation VersionStatus_GlobalOTDSOP_GlobalOTDSOP_VersionStatus
+{
+ #keys: '1[412960.0.337760095]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[412960.0.337760097][412960.0.337760096][412960.0.337760098]'
+ Cardinality: '0to1'
+ ObjectDefinition: VersionStatus
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide VersionStatus
+ {
+ #keys: '3[412960.0.337760100][412960.0.337760099][412960.0.337760101]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDTable_GlobalOTDTable_VersionStatus.qbl b/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDTable_GlobalOTDTable_VersionStatus.qbl
deleted file mode 100644
index effee95..0000000
--- a/_Main/BL/Relations/Relation_VersionStatus_GlobalOTDTable_GlobalOTDTable_VersionStatus.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation VersionStatus_GlobalOTDTable_GlobalOTDTable_VersionStatus
-{
- #keys: '1[412960.0.134830056]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[412960.0.134830058][412960.0.134830057][412960.0.134830059]'
- Cardinality: '0to1'
- ObjectDefinition: VersionStatus
- OwningSide: 'Reference'
- }
- RelationSide.RightSide VersionStatus
- {
- #keys: '3[412960.0.134830061][412960.0.134830060][412960.0.134830062]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Type_GlobalDTOTable/StaticMethod_GetOutputVersionData.qbl b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetOutputVersionData.qbl
similarity index 96%
rename from _Main/BL/Type_GlobalDTOTable/StaticMethod_GetOutputVersionData.qbl
rename to _Main/BL/Type_GlobalOTDSOP/StaticMethod_GetOutputVersionData.qbl
index a8610b8..14bc629 100644
--- a/_Main/BL/Type_GlobalDTOTable/StaticMethod_GetOutputVersionData.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetOutputVersionData.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetOutputVersionData (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
MacroPlan macroplan,
String businessname
)
@@ -66,6 +66,6 @@
}
// Send Data To DB
- owner.Broker_OTD_VersionControlToDB().Execute();
+ // owner.Broker_OTD_VersionControlToDB().Execute();
*]
}
diff --git a/_Main/BL/Type_GlobalDTOTable/StaticMethod_GetVersionData.qbl b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetVersionData.qbl
similarity index 95%
rename from _Main/BL/Type_GlobalDTOTable/StaticMethod_GetVersionData.qbl
rename to _Main/BL/Type_GlobalOTDSOP/StaticMethod_GetVersionData.qbl
index b094140..7a8a609 100644
--- a/_Main/BL/Type_GlobalDTOTable/StaticMethod_GetVersionData.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_GetVersionData.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetVersionData (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businessname
)
{
@@ -17,7 +17,7 @@
}
// Get Data From DB
- owner.Broker_OTD_VersionControl().Execute();
+ //owner.Broker_OTD_VersionControl().Execute();
// Get Data list to deal
listtodeal := selectset( owner, MappingVersionControl, item, item.DataTo() = businesstype );
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_CopyVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_CopyVersion.qbl
index bf6fb53..2f00e3e 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_CopyVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_CopyVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CopyVersion (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businessname
) as VersionControl
{
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_Create.qbl b/_Main/BL/Type_VersionControl/StaticMethod_Create.qbl
index 22a6355..1136335 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_Create.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Create (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businesstype,
String caltype,
DateTime createtime,
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_CreateNewSceneVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_CreateNewSceneVersion.qbl
index 450646d..b886d30 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_CreateNewSceneVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_CreateNewSceneVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateNewSceneVersion (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businessname
) as VersionControl
{
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_CreateNewVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_CreateNewVersion.qbl
index 8f05fb1..403fc6d 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_CreateNewVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_CreateNewVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateNewVersion (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businessname
) as VersionControl
{
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_FindByFullVersionID.qbl b/_Main/BL/Type_VersionControl/StaticMethod_FindByFullVersionID.qbl
index a281109..a71d287 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_FindByFullVersionID.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_FindByFullVersionID.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FindByFullVersionID (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String versionid
) as VersionControl
{
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_FindLatestUpdateVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_FindLatestUpdateVersion.qbl
index 4450bf4..a352c1f 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_FindLatestUpdateVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_FindLatestUpdateVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FindLatestUpdateVersion (
- GlobalOTDTable globalotdtable,
+ GlobalOTDSOP globalotdsop,
String businesstype
) as VersionControl
{
@@ -11,7 +11,7 @@
// Administrator Sep-13-2023 (created)
// Get the latest version data
- latestversion := maxselect( globalotdtable,
+ latestversion := maxselect( globalotdsop,
VersionControl,
version,
version.BusinessType()=businesstype and version.IsReleased()=true,
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_FindLatestVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_FindLatestVersion.qbl
index df4f8f4..ee37c6c 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_FindLatestVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_FindLatestVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FindLatestVersion (
- GlobalOTDTable globalotdtable,
+ GlobalOTDSOP globalotdsop,
String businesstype
) as VersionControl
{
@@ -11,7 +11,7 @@
// Administrator Sep-13-2023 (created)
// Get the latest version data
- latestversion := maxselect( globalotdtable,
+ latestversion := maxselect( globalotdsop,
VersionControl,
version,
version.BusinessType()=businesstype,
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_FindReleasedVersions.qbl b/_Main/BL/Type_VersionControl/StaticMethod_FindReleasedVersions.qbl
index 7e7ec19..59dd8e3 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_FindReleasedVersions.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_FindReleasedVersions.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FindReleasedVersions (
- GlobalOTDTable globalotdtable,
+ GlobalOTDSOP globalotdsop,
String businesstype,
String versionid
) as owning VersionControls
@@ -12,7 +12,10 @@
// Administrator Sep-13-2023 (created)
// Get the latest version data
- latestversion := selectset( globalotdtable, VersionControl, version, version.BusinessType()=businesstype and version.IsReleased()=true and version.VersionID().FindString( versionid, 0 ) = 0 );
+ latestversion := selectset( globalotdsop,
+ VersionControl,
+ version,
+ version.BusinessType()=businesstype and version.IsReleased()=true and version.VersionID().FindString( versionid, 0 ) = 0 );
return &latestversion;
*]
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_GetVersionInfo.qbl b/_Main/BL/Type_VersionControl/StaticMethod_GetVersionInfo.qbl
index 03b2084..9efc81f 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_GetVersionInfo.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_GetVersionInfo.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetVersionInfo (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businessname
) as owning Strings
{
@@ -9,9 +9,9 @@
TextBody:
[*
// Administrator Sep-13-2023 (created)
- businesstyoe := GlobalOTDTable::GetBusinessTypeName( businessname );
+ businesstype := GlobalOTDTable::GetBusinessTypeName( businessname );
result := construct( Strings );
- rootversion := VersionControl::FindLatestVersion( owner, businesstyoe );
+ rootversion := VersionControl::FindLatestVersion( owner, businesstype );
if( not isnull( rootversion ) ){
result.Add( rootversion.VersionID() );
diff --git a/_Main/BL/Type_VersionControl/StaticMethod_ReleaseNewVersion.qbl b/_Main/BL/Type_VersionControl/StaticMethod_ReleaseNewVersion.qbl
index f90a939..c488456 100644
--- a/_Main/BL/Type_VersionControl/StaticMethod_ReleaseNewVersion.qbl
+++ b/_Main/BL/Type_VersionControl/StaticMethod_ReleaseNewVersion.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod ReleaseNewVersion (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businesstype
)
{
diff --git a/_Main/BL/Type_VersionStatus/StaticMethod_CreateOrUpdate.qbl b/_Main/BL/Type_VersionStatus/StaticMethod_CreateOrUpdate.qbl
index a33f467..3621c15 100644
--- a/_Main/BL/Type_VersionStatus/StaticMethod_CreateOrUpdate.qbl
+++ b/_Main/BL/Type_VersionStatus/StaticMethod_CreateOrUpdate.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateOrUpdate (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String businesstype,
String businessname,
DateTime lastreleasetime,
diff --git a/_Main/BL/Type_VersionStatus/StaticMethod_FindLatestStatus.qbl b/_Main/BL/Type_VersionStatus/StaticMethod_FindLatestStatus.qbl
index 5a58dc6..6fc83ee 100644
--- a/_Main/BL/Type_VersionStatus/StaticMethod_FindLatestStatus.qbl
+++ b/_Main/BL/Type_VersionStatus/StaticMethod_FindLatestStatus.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FindLatestStatus (
- GlobalOTDTable globalotdtable,
+ GlobalOTDSOP globalotdsop,
String businesstype
) as VersionStatus
{
@@ -11,7 +11,7 @@
// Administrator Sep-13-2023 (created)
// Get the latest version data
- lateststatus := select( globalotdtable, VersionStatus, version, version.BusinessType()=businesstype );
+ lateststatus := select( globalotdsop, VersionStatus, version, version.BusinessType()=businesstype );
return lateststatus;
*]
diff --git a/_Main/BL/Type_VersionStatus/StaticMethod_GetBusinessTypeStatus.qbl b/_Main/BL/Type_VersionStatus/StaticMethod_GetBusinessTypeStatus.qbl
index dec4ba1..71785cd 100644
--- a/_Main/BL/Type_VersionStatus/StaticMethod_GetBusinessTypeStatus.qbl
+++ b/_Main/BL/Type_VersionStatus/StaticMethod_GetBusinessTypeStatus.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetBusinessTypeStatus (
- GlobalOTDTable owner,
+ GlobalOTDSOP owner,
String rootversionid
)
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index d2fe1c9..d2aa450 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
@@ -19,13 +19,14 @@
// New version
globalotdtable := GlobalOTDTable;
+ globalotdsop := GlobalOTDSOP;
testbusinesstype := "闆嗗洟";
if( data.IsCreateNewVersion() ){
- VersionControl::CreateNewSceneVersion( globalotdtable, testbusinesstype );
+ VersionControl::CreateNewSceneVersion( globalotdsop, testbusinesstype );
}else{
- VersionControl::CopyVersion( globalotdtable, testbusinesstype );
+ VersionControl::CopyVersion( globalotdsop, testbusinesstype );
}
- versionname := VersionControl::GetVersionInfo( globalotdtable, testbusinesstype ).Element( 3 );
+ versionname := VersionControl::GetVersionInfo( globalotdsop, testbusinesstype ).Element( 3 );
// Get Version Name
if( data.Name() = "" ){
@@ -33,10 +34,11 @@
}
// Get Business Type from Scenario Name
- businesstype := select( globalotdtable,
- BusinessType,
- b,
- b.ScenarioName()=data.ScenarioName() ).BusinessTypeName();
+ businesstype := guard( select( globalotdtable,
+ BusinessType,
+ b,
+ b.ScenarioName()=data.ScenarioName() ).BusinessTypeName(),
+ "" );
data.BusinessType( businesstype );
// Copy scenario
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def
index 9c2d77f..078fc6e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def
@@ -17,8 +17,7 @@
[*
// Edit scenario
dlg := construct( DialogCreateEditScenario );
- dlg.dropDownStringListGeneral().Visible( selection.EnableSync() );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
+ dlg.DropDownListGeneral().Visible( selection.EnableSync() );
dlg.checkboxIsKeyProduct().Visible( selection.EnableSync() );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( selection.EnableSync() );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuRelaeaseNewVersion_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuRelaeaseNewVersion_OnClick.def
index 745d231..e47f974 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuRelaeaseNewVersion_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuRelaeaseNewVersion_OnClick.def
@@ -18,12 +18,12 @@
Body:
[*
// Copy scenario
- owner := GlobalOTDTable;
+ owner := GlobalOTDSOP;
macroplan := MacroPlan;
testbusinesstype := "闆嗗洟";
VersionControl::ReleaseNewVersion( owner, testbusinesstype );
- GlobalOTDTable::GetOutputVersionData( owner, macroplan, testbusinesstype );
+ GlobalOTDSOP::GetOutputVersionData( owner, macroplan, testbusinesstype );
selection.SetReleased();
versionname := VersionControl::GetVersionInfo( owner, testbusinesstype ).Element( 3 );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuSaveNewVersion_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuSaveNewVersion_OnClick.def
index 1f8b93b..8b48d40 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuSaveNewVersion_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_TIANMA_JITUAN_ListScenario_MenuSaveNewVersion_OnClick.def
@@ -18,7 +18,7 @@
Body:
[*
// Copy scenario
- owner := GlobalOTDTable;
+ owner := GlobalOTDSOP;
macroplan := MacroPlan;
testbusinesstype := "闆嗗洟";
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderCopy_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderCopy_OnClick.def
index ff0fa8b..583d85c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderCopy_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderCopy_OnClick.def
@@ -9,7 +9,7 @@
{
Body:
[*
- owner := GlobalOTDTable;
+ owner := GlobalOTDSOP;
testbusinesstype := "闆嗗洟";
rootversionid := VersionControl::GetVersionInfo( owner, testbusinesstype ).Element( 2 );
dlg := construct( DialogVersionIDCopy );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderFresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderFresh_OnClick.def
index d0a18a1..481d119 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderFresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderFresh_OnClick.def
@@ -9,7 +9,7 @@
{
Body:
[*
- owner := GlobalOTDTable;
+ owner := GlobalOTDSOP;
testbusinesstype := "闆嗗洟";
//GlobalOTDTable::GetVersionData( owner, testbusinesstype );
rootversionid := VersionControl::GetVersionInfo( owner, testbusinesstype ).Element( 0 );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderRelease_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderRelease_OnClick.def
index a3136f5..fdaf048 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderRelease_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/Response_PanelVersionOfSOPHeader_ButtonVersionOfSOPHeaderRelease_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- owner := GlobalOTDTable;
+ owner := GlobalOTDSOP;
macroplan := MacroPlan;
testbusinesstype := "闆嗗洟";
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def
index 9a4348d..1a4367c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def
@@ -21,8 +21,8 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'GlobalOTDTable'
- Source: 'GlobalOTDTable'
+ DataType: 'GlobalOTDSOP'
+ Source: 'GlobalOTDSOP'
Taborder: 0
Transformation: 'VersionStatus'
]
--
Gitblit v1.9.3