From 6dfdd89e69bd8b01d15f6fe0264bfab0ab67d2eb Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期日, 08 十月 2023 10:57:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj
---
_Main/BL/Type_BusinessType/StaticMethod_GetScenarioNamesStr.qbl | 10 +++++-----
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 7 +++++++
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick#549.def | 2 +-
_Main/BL/Type_FillingCapacityOrder/Attribute_OrderType.qbl | 1 +
_Main/BL/Type_ScenarioManager/StaticMethod_AvailableScenarioNames.qbl | 4 ++--
_Main/BL/Type_FillingCapacityOrder/Attribute_State.qbl | 8 ++++++++
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick#545.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral#549.def | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnCreated.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def | 2 +-
_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl | 2 +-
_Main/BL/Type_Scenario/Attribute_ScenarioName.qbl | 8 ++++++++
14 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/_Main/BL/Type_BusinessType/StaticMethod_GetBusinessNameStr.qbl b/_Main/BL/Type_BusinessType/StaticMethod_GetScenarioNamesStr.qbl
similarity index 69%
rename from _Main/BL/Type_BusinessType/StaticMethod_GetBusinessNameStr.qbl
rename to _Main/BL/Type_BusinessType/StaticMethod_GetScenarioNamesStr.qbl
index 7496f0f..130ee5a 100644
--- a/_Main/BL/Type_BusinessType/StaticMethod_GetBusinessNameStr.qbl
+++ b/_Main/BL/Type_BusinessType/StaticMethod_GetScenarioNamesStr.qbl
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-StaticMethod GetBusinessNameStr (
+StaticMethod GetScenarioNamesStr (
GlobalOTDTable owner
) as String
{
@@ -9,18 +9,18 @@
// NBoTk Sep-7-2023 (created)
// 鑾峰彇businessType 闆嗗悎
result := "";
- businessTypeList := construct( structured[String]);
+ scenarioNameList := construct( structured[String]);
traverse( owner,BusinessType,b)
{
- businessTypeList.Add( b.BusinessTypeName());
+ scenarioNameList.Add( b.ScenarioName() );
}
// 濡傛灉瀛樺湪businessType鏁版嵁 鍒欒繑鍥� : a,b,c
- if( not isnull( businessTypeList ) )
+ if( not isnull( scenarioNameList ) )
{
- result := businessTypeList.Concatenate( ";" );
+ result := scenarioNameList.Concatenate( ";" );
}
// 娴嬭瘯鏁版嵁
diff --git a/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl b/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
index e428bb7..1728622 100644
--- a/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
+++ b/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
@@ -58,7 +58,7 @@
// 鏂板/鏇存柊
result := CustomerOrder::FindById( macroPlan, id );
if( isnull( result ) ) {
- CustomerOrder::Create( product, stockingPoint, id, orderDate, quantity, price,
+ result := CustomerOrder::Create( product, stockingPoint, id, orderDate, quantity, price,
priorityName, salesSegmentName, currencyId, unitOfMeasureName,
false, customerName, customerId, orderId, orderLineId, true, true, true );
} else {
diff --git a/_Main/BL/Type_FillingCapacityOrder/Attribute_OrderType.qbl b/_Main/BL/Type_FillingCapacityOrder/Attribute_OrderType.qbl
index da22dcc..29434aa 100644
--- a/_Main/BL/Type_FillingCapacityOrder/Attribute_OrderType.qbl
+++ b/_Main/BL/Type_FillingCapacityOrder/Attribute_OrderType.qbl
@@ -3,5 +3,6 @@
Attribute OrderType
{
#keys: '3[414382.0.394820190][414382.0.394820189][414382.0.394820191]'
+ Description: '璁㈠崟绫诲瀷鍖呮嫭锛堝弽绛俱�佹巿鏉冿級'
ValueType: String
}
diff --git a/_Main/BL/Type_FillingCapacityOrder/Attribute_State.qbl b/_Main/BL/Type_FillingCapacityOrder/Attribute_State.qbl
new file mode 100644
index 0000000..fa630ba
--- /dev/null
+++ b/_Main/BL/Type_FillingCapacityOrder/Attribute_State.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute State
+{
+ #keys: '3[414702.0.533501330][414702.0.533501329][414702.0.533501331]'
+ Description: '鐘舵�侊紙鏈啿鍑忋�佸凡鍐插噺锛�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_Scenario/Attribute_ScenarioName.qbl b/_Main/BL/Type_Scenario/Attribute_ScenarioName.qbl
new file mode 100644
index 0000000..d40aac3
--- /dev/null
+++ b/_Main/BL/Type_Scenario/Attribute_ScenarioName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ScenarioName
+{
+ #keys: '3[412960.0.288500040][412960.0.288500039][412960.0.288500041]'
+ Description: '鍦烘櫙鍚嶇О锛屽搴斾簨涓氶儴&缁勭粐缂栫爜缁存姢涓淮鎶ょ殑鍦烘櫙鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_ScenarioManager/StaticMethod_AvailableBusinessTypes.qbl b/_Main/BL/Type_ScenarioManager/StaticMethod_AvailableScenarioNames.qbl
similarity index 84%
rename from _Main/BL/Type_ScenarioManager/StaticMethod_AvailableBusinessTypes.qbl
rename to _Main/BL/Type_ScenarioManager/StaticMethod_AvailableScenarioNames.qbl
index 3c1a81f..4956f3d 100644
--- a/_Main/BL/Type_ScenarioManager/StaticMethod_AvailableBusinessTypes.qbl
+++ b/_Main/BL/Type_ScenarioManager/StaticMethod_AvailableScenarioNames.qbl
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-StaticMethod AvailableBusinessTypes (
+StaticMethod AvailableScenarioNames (
GlobalOTDTable globalOTDTable
) as String
{
@@ -16,7 +16,7 @@
//}
// 浣跨敤businessType鑾峰彇鏁版嵁
- strings := BusinessType::GetBusinessNameStr( globalOTDTable);
+ strings := BusinessType::GetScenarioNamesStr( globalOTDTable);
return strings;
*]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
index f8a1684..158887f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
@@ -46,8 +46,8 @@
Properties:
[
AllowEmpty: true
- DataBinding: 'DataHolderDialogData.Data.BusinessType'
- Label: 'BusinessType'
+ DataBinding: 'DataHolderDialogData.Data.ScenarioName'
+ Label: 'Scenario Name'
Taborder: 4
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index b8022af..b488de3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
@@ -32,6 +32,13 @@
data.Name( versionname );
}
+ // Get Business Type from Scenario Name
+ businesstype := select( globalotdtable,
+ BusinessType,
+ b,
+ b.ScenarioName()=data.ScenarioName() ).BusinessTypeName();
+ data.BusinessType( businesstype );
+
// Copy scenario
if( isnull( data.WrappedInstance() ) )
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnCreated.def
index e693b84..ff9a42e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnCreated.def
@@ -9,7 +9,7 @@
{
Body:
[*
- strings := BusinessType::GetBusinessNameStr( GlobalOTDTable );
+ strings := BusinessType::GetScenarioNamesStr( GlobalOTDTable );
this.Strings(strings);
list := PriorityPolicy::GetDataByBusinessType( MacroPlan, PriorityPolicyBusinessType.Text());
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick\043545.def"
index 560aeb3..8e69dc4 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick\043545.def"
@@ -16,7 +16,7 @@
dlg := construct( DialogCreateEditScenario );
dlg.checkboxEnableSync().Visible( true );
dlg.dropDownStringListGeneral().Visible( true );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableBusinessTypes(GlobalOTDTable) );
+ dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
dlg.checkboxIsKeyProduct().Visible( true );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( true );
dlg.NewScenario( ScenarioManager, selection, true );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick.def
index ff086e5..4c3b7f0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenarioAndDoSync_OnClick.def
@@ -17,7 +17,7 @@
dlg := construct( DialogCreateEditScenario );
dlg.checkboxEnableSync().Visible( true );
dlg.dropDownStringListGeneral().Visible( true );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableBusinessTypes(GlobalOTDTable) );
+ dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
dlg.checkboxIsKeyProduct().Visible( true );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( true );
parent := selection.Element( 0 ).Parent();
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick\043549.def"
index 4e81457..607ae7d 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick\043549.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick\043549.def"
@@ -17,7 +17,7 @@
dlg.checkboxEnableSync().Checked( false );
dlg.checkboxEnableSync().Visible( false );
dlg.dropDownStringListGeneral().Visible( false );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableBusinessTypes(GlobalOTDTable) );
+ dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
dlg.checkboxIsKeyProduct().Visible( false );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( false );
dlg.NewScenario( ScenarioManager, selection );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick.def
index 52b82cf..55945ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuCreateScenario_OnClick.def
@@ -18,7 +18,7 @@
dlg.checkboxEnableSync().Checked( false );
dlg.checkboxEnableSync().Visible( false );
dlg.dropDownStringListGeneral().Visible( false );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableBusinessTypes(GlobalOTDTable) );
+ dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
dlg.checkboxIsKeyProduct().Visible( false );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( false );
parent := selection.Element( 0 ).Parent();
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 8fbf279..9c2d77f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScenarioManager/Response_ListScenario_MenuEdit_OnClick.def
@@ -18,7 +18,7 @@
// Edit scenario
dlg := construct( DialogCreateEditScenario );
dlg.dropDownStringListGeneral().Visible( selection.EnableSync() );
- dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableBusinessTypes(GlobalOTDTable) );
+ dlg.dropDownStringListGeneral().Strings( ScenarioManager::AvailableScenarioNames( GlobalOTDTable ) );
dlg.checkboxIsKeyProduct().Visible( selection.EnableSync() );
dlg.checkboxCreatePurchaseSupplyProduct().Visible( selection.EnableSync() );
--
Gitblit v1.9.3