From 654fce62637fc073b97efde22c2b4adf5d6ed792 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 24 七月 2024 16:42:33 +0800
Subject: [PATCH] 库存数据（机加库存）接口
---
_Main/BL/Type_MachineStockData/Attribute_Product.qbl | 8
_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl | 33 ++
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_ListInterfaceLoginfo.def | 42 ++
_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listActionBarPageMachineStockData.def | 10
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupDebug.def | 15
_Main/BL/InfoMessages.qbl | 18 +
_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallToken.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def | 2
_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw | 119 +++++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_ShowAllDay.def | 63 +++
_Main/BL/Type_MachineStockData/_ROOT_Type_MachineStockData.qbl | 10
_Main/BL/Type_MachineStockData/Attribute_Inventory.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/_ROOT_Component_FormInterfaceLoginfo.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listContextMenuMachineStockData.def | 10
_Main/BL/Type_MachineStockData/Attribute_LineType.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuInterface_OnClick.def | 16 +
_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl | 32 ++
_Main/BL/Type_MachineStockData/Attribute_MaterialNo.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def | 35 ++
_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl | 30 +
_Main/BL/Type_MachineStockData/Attribute_Total.qbl | 7
_Main/BL/Type_MachineStockData/Attribute_FacName.qbl | 8
_Main/BL/Type_MachineStockData/Attribute_Fac.qbl | 8
_Main/BL/Type_MachineStockData/StaticMethod_GetRequestBody.qbl | 15
_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl | 16 +
_Main/BL/Type_MachineStockData/Attribute_Unit.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_PanelHeader_144_ckbIsAllDay_OnChanged.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def | 42 ++
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listContextMenuInterfaceLoginfo.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/_ROOT_Component_FormMachineStockData.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listActionBarPageInterfaceLoginfo.def | 10
_Main/BL/Type_MachineStockData/Attribute_AllTotal.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_ListList_MenuEdit_OnClick.def | 21 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def | 13
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuMachineStockData_OnClick.def | 16 +
_Main/UI/MacroPlannerWebApp/Views/Interface_loginfo_view.vw | 146 +++++++++
_Main/BL/Type_MachineStockData/Attribute_DDay.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader#144.def | 36 +
_Main/BL/Type_MachineStockData/Attribute_Date.qbl | 7
_Main/BL/Type_MachineStockData/Attribute_MaterialName.qbl | 8
_Main/BL/Relations/Relation_MachineStockData_InterfaceLoginfo_InterfaceLoginfo_MachineStockData.qbl | 23 +
42 files changed, 907 insertions(+), 28 deletions(-)
diff --git a/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl b/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl
new file mode 100644
index 0000000..066ff70
--- /dev/null
+++ b/_Main/BL/Dataset_InterfaceDataset/Daemon_MachineStockInterface.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+Daemon MachineStockInterface
+{
+ Frequency: P1DT0H0M0S
+ Priority: 'Default'
+ StartDate: 2024-07-19
+ StartTimeOfDay: P0DT9H0M0S
+ Text:
+ [*
+ options := DatasetFindOptions::Construct( 'InterfaceDataset' ).IncludeOffline( true ); //to load we must search offline datasets.
+ mdskey := DatasetController::FindUnique( options );
+
+ MDSInterfaceDataset::Root( mdskey ) -> MachineStockData::Synchronize( "Administrator" );
+ *]
+}
diff --git a/_Main/BL/InfoMessages.qbl b/_Main/BL/InfoMessages.qbl
index 902eb83..272954f 100644
--- a/_Main/BL/InfoMessages.qbl
+++ b/_Main/BL/InfoMessages.qbl
@@ -94,9 +94,25 @@
{
DefaultText: 'application/json'
}
+ InfoMessage InterfaceDataset_MachineStockData_Name
+ {
+ DefaultText: 'Machine stock data'
+ }
+ InfoMessage InterfaceDataset_MachineStockData_Secret
+ {
+ DefaultText: '527077575449641087'
+ }
+ InfoMessage InterfaceDataset_MachineStockData_URL
+ {
+ DefaultText: '/data-service/api/service/post-data/V1.101/2f6c42fe895c45bdb2e8e1ca8489b5a2'
+ }
InfoMessage InterfaceDataset_ShippingActualData_Name
{
DefaultText: 'Shipping actual data'
+ }
+ InfoMessage InterfaceDataset_ShippingActualData_Secret
+ {
+ DefaultText: '527088907855069215'
}
InfoMessage InterfaceDataset_ShippingActualData_URL
{
@@ -104,7 +120,7 @@
}
InfoMessage InterfaceDataset_Token_URL
{
- DefaultText: '/authorization/token/api/open/token/generateToken?grant_type=client_credentials&client_id=19KxoxPF25cy96K8TL&client_secret=514390007906041965'
+ DefaultText: '/authorization/token/api/open/token/generateToken?grant_type=client_credentials&client_id=19KxoxPF25cy96K8TL&client_secret='
}
InfoMessage MP_ChangeLossSetting_CheckNull
{
diff --git a/_Main/BL/Relations/Relation_MachineStockData_InterfaceLoginfo_InterfaceLoginfo_MachineStockData.qbl b/_Main/BL/Relations/Relation_MachineStockData_InterfaceLoginfo_InterfaceLoginfo_MachineStockData.qbl
new file mode 100644
index 0000000..178bddd
--- /dev/null
+++ b/_Main/BL/Relations/Relation_MachineStockData_InterfaceLoginfo_InterfaceLoginfo_MachineStockData.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation MachineStockData_InterfaceLoginfo_InterfaceLoginfo_MachineStockData
+{
+ #keys: '1[415136.0.931886865]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceLoginfo
+ {
+ #keys: '3[415136.0.931886867][415136.0.931886866][415136.0.931886868]'
+ Cardinality: '0to1'
+ ObjectDefinition: MachineStockData
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide MachineStockData
+ {
+ #keys: '3[415136.0.931886870][415136.0.931886869][415136.0.931886871]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceLoginfo
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
index 56b7dcb..c5083ec 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterface.qbl
@@ -10,23 +10,33 @@
// 鐢勫叞楦� Jul-22-2024 (created)
address := Translations::InterfaceDataset_Address();
httpinterface := HTTPInterface::Create( address,80);
-
- if( loginfo.Name() = Translations::InterfaceDataset_ShippingActualData_Name() ){//鍙戣繍瀹為檯鏁版嵁
-
- httpinterface.URL( Translations::InterfaceDataset_ShippingActualData_URL() );
- httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
- httpinterface.PostMethod( true );
- try{
- httpinterface.AddHeader("Authorization",InterfaceLoginfo::CallToken())
+ try{
+ if( loginfo.Name() = Translations::InterfaceDataset_ShippingActualData_Name() ){//鍙戣繍瀹為檯鏁版嵁
+
+ httpinterface.URL( Translations::InterfaceDataset_ShippingActualData_URL() );
+ httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
+ httpinterface.PostMethod( true );
+ httpinterface.AddHeader("Authorization",InterfaceLoginfo::CallToken( Translations::InterfaceDataset_ShippingActualData_Secret() ))
httpinterface.Call( loginfo.RequestBody() );
result := httpinterface.Result();
loginfo.Response( result );
loginfo.Success( true );
- }onerror{
- loginfo.ReturnMsg( e.GeneralInformation() );
+ } else if ( loginfo.Name() = Translations::InterfaceDataset_MachineStockData_Name() ){//搴撳瓨鏁版嵁锛堟満鍔犲簱瀛橈級
+ httpinterface.URL( Translations::InterfaceDataset_MachineStockData_URL() );
+ httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
+ httpinterface.PostMethod( true );
+ httpinterface.AddHeader("Authorization",InterfaceLoginfo::CallToken( Translations::InterfaceDataset_MachineStockData_Secret() ))
+
+ httpinterface.Call( loginfo.RequestBody() );
+
+ result := httpinterface.Result();
+ loginfo.Response( result );
+ loginfo.Success( true );
}
+ }onerror{
+ loginfo.ReturnMsg( e.GeneralInformation() );
}
//鍚庣画鍏叡澶勭悊
loginfo.FinishTime( DateTime::ActualTime() );
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallToken.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallToken.qbl
index a29e443..a186eae 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallToken.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallToken.qbl
@@ -1,6 +1,8 @@
Quintiq file version 2.0
#parent: #root
-StaticMethod CallToken () as String
+StaticMethod CallToken (
+ String secret
+) as String
{
TextBody:
[*
@@ -8,7 +10,7 @@
address := Translations::InterfaceDataset_Address();
httpinterface := HTTPInterface::Create( address,80);
- httpinterface.URL( Translations::InterfaceDataset_Token_URL() );
+ httpinterface.URL( Translations::InterfaceDataset_Token_URL() + secret );
httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
httpinterface.PostMethod( false );
httpinterface.Call();
diff --git a/_Main/BL/Type_MachineStockData/Attribute_AllTotal.qbl b/_Main/BL/Type_MachineStockData/Attribute_AllTotal.qbl
new file mode 100644
index 0000000..b3eb4eb
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_AllTotal.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute AllTotal
+{
+ #keys: '3[415136.0.931886946][415136.0.931886945][415136.0.931886947]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_DDay.qbl b/_Main/BL/Type_MachineStockData/Attribute_DDay.qbl
new file mode 100644
index 0000000..d1a9eef
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_DDay.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DDay
+{
+ #keys: '3[415136.0.931886953][415136.0.931886952][415136.0.931886954]'
+ Description: '鏃ユ湡'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Date.qbl b/_Main/BL/Type_MachineStockData/Attribute_Date.qbl
new file mode 100644
index 0000000..4bc883d
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Date.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Date
+{
+ #keys: '3[415136.0.931886848][415136.0.931886847][415136.0.931886849]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Fac.qbl b/_Main/BL/Type_MachineStockData/Attribute_Fac.qbl
new file mode 100644
index 0000000..3330234
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Fac.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Fac
+{
+ #keys: '3[415136.0.931886928][415136.0.931886927][415136.0.931886929]'
+ Description: '宸ュ巶code'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_FacName.qbl b/_Main/BL/Type_MachineStockData/Attribute_FacName.qbl
new file mode 100644
index 0000000..c29b23b
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_FacName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute FacName
+{
+ #keys: '3[415136.0.931886918][415136.0.931886917][415136.0.931886919]'
+ Description: '宸ュ巶鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Inventory.qbl b/_Main/BL/Type_MachineStockData/Attribute_Inventory.qbl
new file mode 100644
index 0000000..b983b8f
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Inventory.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Inventory
+{
+ #keys: '3[415136.0.931886842][415136.0.931886841][415136.0.931886843]'
+ Description: '瀵瑰簲鏃ユ湡鐨勫疄闄呭簱瀛樻暟閲�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_LineType.qbl b/_Main/BL/Type_MachineStockData/Attribute_LineType.qbl
new file mode 100644
index 0000000..bcae9ae
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_LineType.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute LineType
+{
+ #keys: '3[415136.0.931886957][415136.0.931886956][415136.0.931886958]'
+ Description: '浜х嚎绫诲瀷'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_MaterialName.qbl b/_Main/BL/Type_MachineStockData/Attribute_MaterialName.qbl
new file mode 100644
index 0000000..f566022
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_MaterialName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaterialName
+{
+ #keys: '3[415136.0.931886910][415136.0.931886909][415136.0.931886911]'
+ Description: '闆朵欢鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_MaterialNo.qbl b/_Main/BL/Type_MachineStockData/Attribute_MaterialNo.qbl
new file mode 100644
index 0000000..9da74c7
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_MaterialNo.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaterialNo
+{
+ #keys: '3[415136.0.931886900][415136.0.931886899][415136.0.931886901]'
+ Description: '闆朵欢鍙�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Product.qbl b/_Main/BL/Type_MachineStockData/Attribute_Product.qbl
new file mode 100644
index 0000000..a249e20
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Product.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.931886845][415136.0.931886844][415136.0.931886846]'
+ Description: '浜у搧'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Total.qbl b/_Main/BL/Type_MachineStockData/Attribute_Total.qbl
new file mode 100644
index 0000000..9691ce7
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Total.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Total
+{
+ #keys: '3[415136.0.931886936][415136.0.931886935][415136.0.931886937]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachineStockData/Attribute_Unit.qbl b/_Main/BL/Type_MachineStockData/Attribute_Unit.qbl
new file mode 100644
index 0000000..0fb83f7
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/Attribute_Unit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Unit
+{
+ #keys: '3[415136.0.931886839][415136.0.931886838][415136.0.931886840]'
+ Description: '搴撳瓨鐐逛俊鎭�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl b/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl
new file mode 100644
index 0000000..d070932
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl
@@ -0,0 +1,32 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GenerateData (
+ InterfaceLoginfo owner,
+ StringToDate cnv,
+ JSON item
+) as MachineStockData
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jul-17-2024 (created)
+ material_no := guard( item.Get( "material_no").GetString(),"");
+ material_name := guard( item.Get( "material_name").GetString(),"");
+ fac_name := guard( item.Get( "fac_name").GetString(),"");
+ fac := guard( item.Get( "fac").GetString(),"");
+ total := guard( item.Get( "total").GetReal(), 0 );
+ all_total := guard( item.Get( "all_total").GetReal(), 0 );
+ dday := guard( item.Get( "dday").GetString(),"");
+ line_type := guard( item.Get( "fac").GetString(),"");
+
+ msdata := owner.MachineStockData( relnew, MaterialNo := material_no
+ , MaterialName := material_name
+ , Fac := fac
+ , FacName := fac_name
+ , Total := total
+ , AllTotal := all_total
+ , DDay := cnv.Convert( dday )
+ , LineType := line_type );
+
+ return msdata;
+ *]
+}
diff --git a/_Main/BL/Type_MachineStockData/StaticMethod_GetRequestBody.qbl b/_Main/BL/Type_MachineStockData/StaticMethod_GetRequestBody.qbl
new file mode 100644
index 0000000..3751bf2
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/StaticMethod_GetRequestBody.qbl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetRequestBody (
+ Date date
+) as String
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jul-19-2024 (created)
+ json := JSON::Object()
+ .Add( "inParam", JSON::Object().Add( "dday", date.Format( "Y-M2-D2" ) ).Add( "fac", "" ) ).Build();
+ requestbody := json.AsString();
+ return requestbody
+ *]
+}
diff --git a/_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl b/_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl
new file mode 100644
index 0000000..6bc9761
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Synchronize (
+ InterfaceDataset owner,
+ String executor
+)
+{
+ TextBody:
+ [*
+ //// 鐢勫叞楦� Jul-17-2024 (created)
+ date := Date::ActualDate();
+ loginfo := owner.InterfaceLoginfo( relnew, ExecuteUser := executor
+ , Name := Translations::InterfaceDataset_MachineStockData_Name()
+ , InterfaceDateTime := DateTime::ActualTime()
+ , Message := '搴撳瓨鏁版嵁锛堟満鍔犲簱瀛橈級'
+ , RequestBody := MachineStockData::GetRequestBody( date ) );
+
+ data := InterfaceLoginfo::CallInterface( owner, loginfo );
+ if( not isnull( data ) ){
+
+ cnv2 := StringToDate::StandardConverter();
+ cnv2.SetCustomConversion();
+ cnv2.CustomFormatString( 'yyyy-MM-dd' );
+
+ // sadatalist := construct( ShippingActualDatas );
+ for( seq := 0;seq < data.Size();seq++){
+ item := data.Get(seq);
+ MachineStockData::GenerateData( loginfo, cnv2, item );
+ // sadatalist.Add( sadata );
+ }
+ }
+ *]
+}
diff --git a/_Main/BL/Type_MachineStockData/_ROOT_Type_MachineStockData.qbl b/_Main/BL/Type_MachineStockData/_ROOT_Type_MachineStockData.qbl
new file mode 100644
index 0000000..429b55e
--- /dev/null
+++ b/_Main/BL/Type_MachineStockData/_ROOT_Type_MachineStockData.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type MachineStockData
+{
+ #keys: '5[415136.0.931886835][415136.0.931886833][0.0.0][415136.0.931886834][415136.0.931886836]'
+ BaseType: Object
+ Description: '搴撳瓨鏁版嵁锛堟満鍔犲簱瀛橈級'
+ StructuredName: 'MachineStockDatas'
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupDebug.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupDebug.def
index 3069a9f..a24dc49 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupDebug.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupDebug.def
@@ -16,6 +16,21 @@
Taborder: 0
]
}
+ Component ButtonInterface
+ {
+ #keys: '[415136.0.931576995]'
+ BaseType: 'WebButton'
+ Children:
+ [
+ #child: ContextMenuInterface
+ ]
+ Properties:
+ [
+ Image: 'ARROW_SHUFFLE'
+ Label: 'Interface'
+ Taborder: 1
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
new file mode 100644
index 0000000..8367d24
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+Component ContextMenuInterface
+{
+ #keys: '[415136.0.931500880]'
+ BaseType: 'WebContextMenu'
+ Children:
+ [
+ Component MenuInterface
+ {
+ #keys: '[415136.0.931500881]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'DOCUMENT'
+ Taborder: 0
+ Title: 'Interface loginfo'
+ ]
+ }
+ Component MenuMachineStockData
+ {
+ #keys: '[415136.0.931501127]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'SPREADSHEET'
+ Taborder: 1
+ Title: 'Machine stock data'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuInterface_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuInterface_OnClick.def
new file mode 100644
index 0000000..7544bbd
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuInterface_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: ContextMenuInterface/MenuInterface
+Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_MenuInterface_OnClick
+{
+ #keys: '[415136.0.931500984]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ ApplicationScope.ViewManager().ResetUserViewById( "Interface_loginfo_view", true);
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuMachineStockData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuMachineStockData_OnClick.def
new file mode 100644
index 0000000..352d640
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuMachineStockData_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: ContextMenuInterface/MenuMachineStockData
+Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_MenuMachineStockData_OnClick
+{
+ #keys: '[415136.0.932240790]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ ApplicationScope.ViewManager().ResetUserViewById( "Machine_stock_data", true);
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_ListInterfaceLoginfo.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_ListInterfaceLoginfo.def
new file mode 100644
index 0000000..9c5085b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_ListInterfaceLoginfo.def
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component ListInterfaceLoginfo
+{
+ #keys: '[415136.0.931545401]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorInterfaceLoginfo
+ {
+ #keys: '[415136.0.931545402]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'external[InterfaceDataset]'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'InterfaceLoginfo'
+ ]
+ }
+ #child: listActionBarPageInterfaceLoginfo
+ Component DataSetLevelInterfaceLoginfo
+ {
+ #keys: '[415136.0.931545407]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuInterfaceLoginfo
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ExecuteUser","title":"ExecuteUser","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ExecuteUser"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InterfaceDateTime","title":"InterfaceDateTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InterfaceDateTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FinishTime","title":"FinishTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FinishTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Message","title":"Message","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Message"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Success","title":"Success","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Success"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReturnSuccess","title":"ReturnSuccess","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReturnSuccess"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReturnMsg","title":"ReturnMsg","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReturnMsg"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Last","title":"Last","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Last"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"TotalRow","title":"TotalRow","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"TotalRow"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"RequestBody","title":"RequestBody","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"RequestBody"}}]'
+ ContextMenu: 'listContextMenuInterfaceLoginfo'
+ SortCriteria: 'desc:InterfaceDateTime'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listActionBarPageInterfaceLoginfo.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listActionBarPageInterfaceLoginfo.def
new file mode 100644
index 0000000..5e6a83a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listActionBarPageInterfaceLoginfo.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageInterfaceLoginfo
+{
+ #keys: '[415136.0.931545404]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listContextMenuInterfaceLoginfo.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listContextMenuInterfaceLoginfo.def
new file mode 100644
index 0000000..e02fdda
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Component_listContextMenuInterfaceLoginfo.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuInterfaceLoginfo
+{
+ #keys: '[415136.0.931545409]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/_ROOT_Component_FormInterfaceLoginfo.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/_ROOT_Component_FormInterfaceLoginfo.def
new file mode 100644
index 0000000..884db36
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/_ROOT_Component_FormInterfaceLoginfo.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormInterfaceLoginfo
+{
+ #keys: '[415136.0.931210186]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: ListInterfaceLoginfo
+ ]
+ Properties:
+ [
+ Image: 'DOCUMENT'
+ Title: 'Interface loginfo'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def
new file mode 100644
index 0000000..f9f1e69
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component ListMachineStockData
+{
+ #keys: '[415136.0.931501240]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorMachineStockData
+ {
+ #keys: '[415136.0.931501241]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'InterfaceDataset'
+ Source: 'InterfaceDataset'
+ Taborder: 0
+ Transformation: 'InterfaceLoginfo.MachineStockData'
+ ]
+ }
+ #child: listActionBarPageMachineStockData
+ Component DataSetLevelMachineStockData
+ {
+ #keys: '[415136.0.931501246]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuMachineStockData
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialNo","title":"MaterialNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialName","title":"MaterialName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FacName","title":"FacName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FacName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LineType","title":"LineType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LineType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DDay","title":"DDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Total","title":"Total","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Total"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"AllTotal","title":"AllTotal","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"AllTotal"}}]'
+ ContextMenu: 'listContextMenuMachineStockData'
+ SortCriteria: 'desc:DDay'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listActionBarPageMachineStockData.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listActionBarPageMachineStockData.def
new file mode 100644
index 0000000..b082d74
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listActionBarPageMachineStockData.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageMachineStockData
+{
+ #keys: '[415136.0.931501243]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listContextMenuMachineStockData.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listContextMenuMachineStockData.def
new file mode 100644
index 0000000..e8477ce
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_listContextMenuMachineStockData.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuMachineStockData
+{
+ #keys: '[415136.0.931501248]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/_ROOT_Component_FormMachineStockData.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/_ROOT_Component_FormMachineStockData.def
new file mode 100644
index 0000000..5e5e176
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/_ROOT_Component_FormMachineStockData.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormMachineStockData
+{
+ #keys: '[415136.0.931501186]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: ListMachineStockData
+ ]
+ Properties:
+ [
+ Image: 'SPREADSHEET'
+ Title: 'Machine stock data'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def
index e5d9661..15c2afa 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def
@@ -29,7 +29,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Calendar.CalendarID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Calendar.CalendarID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.EventType.Name","title":"浜嬩欢绫诲瀷","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.EventType.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Subject","title":"浜嬩欢","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Subject"}},{"attribute":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"StartDate","title":"寮�濮嬫棩鏈�","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.Start().Date()"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.StartTimeOfDay","title":"寮�濮嬫椂闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.StartTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"缁撴潫鏃ユ湡","title":"缁撴潫鏃ユ湡","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.End().Date()"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.EndTimeOfDay","title":"缁撴潫鏃堕棿","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.EndTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Description","title":"澶囨敞","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Description"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Calendar.CalendarID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Calendar.CalendarID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.EventType.Name","title":"浜嬩欢绫诲瀷","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.EventType.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Subject","title":"浜嬩欢","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Subject"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Start","title":"寮�濮嬫棩鏈�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Start"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"End","title":"缁撴潫鏃ユ湡","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"End"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Description","title":"澶囨敞","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Description"}}]'
ContextMenu: 'listContextMenu967'
SortCriteria: 'desc:Start'
Taborder: 2
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
index c4af7a8..56e3225 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
@@ -29,7 +29,7 @@
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
ShowLabel: false
- Taborder: 8
+ Taborder: 9
]
}
Component dhStartTimeOfDay
@@ -39,7 +39,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 9
+ Taborder: 10
]
}
Component durEndTimeOfDay
@@ -54,7 +54,7 @@
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
ShowLabel: false
- Taborder: 12
+ Taborder: 13
]
}
Component dhEndTimeOfDay
@@ -64,7 +64,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 13
+ Taborder: 14
]
}
Component edtDescription
@@ -79,7 +79,7 @@
Multiline: true
NumberOfColumns: 29
ShowLabel: false
- Taborder: 15
+ Taborder: 16
]
}
Component dsStartDate
@@ -90,7 +90,7 @@
[
DateFormat: 'DMMY'
Label: '寮�濮嬫棩鏈�'
- Taborder: 6
+ Taborder: 7
]
}
Component dhStartDate
@@ -100,7 +100,7 @@
Databinding: 'Date'
Properties:
[
- Taborder: 7
+ Taborder: 8
]
}
Component lblDescription id:lblDescription_456
@@ -111,7 +111,7 @@
[
Label: '澶囨敞'
NumberOfColumns: 0
- Taborder: 14
+ Taborder: 15
]
}
Component ButtonCreate
@@ -121,7 +121,7 @@
Properties:
[
Label: '鏂板'
- Taborder: 16
+ Taborder: 17
]
}
Component ddslType id:ddslType_360
@@ -192,7 +192,6 @@
Properties:
[
DataType: 'structured[LibCal_EventType]'
- FixedFilter: 'object.IsLeaf()'
Source: 'dhEventTypes'
Taborder: 0
Transformation: 'Elements'
@@ -201,6 +200,7 @@
]
Properties:
[
+ AllowEmpty: true
DisplayField: 'Name'
Label: '浜嬩欢绫诲瀷'
NumberOfColumns: 15
@@ -215,7 +215,7 @@
[
DateFormat: 'DMMY'
Label: '缁撴潫鏃ユ湡'
- Taborder: 10
+ Taborder: 11
]
}
Component dhEndDate
@@ -225,7 +225,19 @@
Databinding: 'Date'
Properties:
[
- Taborder: 11
+ Taborder: 12
+ ]
+ }
+ Component ckbIsAllDay id:ckbIsAllDay_812
+ {
+ #keys: '[415136.0.926885762]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ CheckboxType: 'toggle'
+ Label: 'All day'
+ NumberOfColumns: 0
+ Taborder: 6
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def
index cdb645c..196d498 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def
@@ -12,10 +12,21 @@
Properties:
[
Image: 'DELETE'
- Taborder: 3
+ Taborder: 4
Title: 'Delete'
]
}
+ Component MenuEdit
+ {
+ #keys: '[415136.0.925451472]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'PENCIL'
+ Taborder: 3
+ Title: 'Edit'
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
index 57599a5..a3aacd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -20,7 +20,7 @@
startTimeOfDay := durStartTimeOfDay.Duration();
endDate := dsEndDate.Date();
endTimeOfDay := durEndTimeOfDay.Duration();
- isAllDay := false;
+ isAllDay := ckbIsAllDay.Checked();
eventType := ddslType.Text();
capacity := Real::MinReal(); // Always fill the capacity.
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_ShowAllDay.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_ShowAllDay.def
new file mode 100644
index 0000000..a3194f3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_ShowAllDay.def
@@ -0,0 +1,63 @@
+Quintiq file version 2.0
+#parent: #root
+Method ShowAllDay () id:Method_LibCal_dlgMultipleEvent_ShowAllDay
+{
+ #keys: '[415136.0.926885827]'
+ Body:
+ [*
+ // Show the controls according to the state of ckbAllDay.
+ // Keep as is when running in days only mode.
+ if( not LibCal_Event::USE_ONLY_DAYS() )
+ {
+ if( ckbIsAllDay.Checked() )
+ {
+ // Store the EndDate before updating the StartTime, otherwise setting the StartTime can already have influenced the EndDate.
+ endDate := dsEndDate.Date();
+
+ // Set to whole day if this is not yet the case.
+ if( durStartTimeOfDay.Duration() <> Duration::Zero() )
+ {
+ durStartTimeOfDay.Duration( Duration::Zero() );
+ }
+
+ if( durEndTimeOfDay.Duration() <> Duration::Zero() )
+ {
+ durEndTimeOfDay.Duration( Duration::Zero() );
+ dsEndDate.Date( endDate + 1 );
+ }
+
+ // Disable the controls.
+ durStartTimeOfDay.Enabled( false, "All day is selected" );
+ durEndTimeOfDay .Enabled( false, "All day is selected" );
+ }
+ else
+ {
+ if( durStartTimeOfDay.Duration() <> dhStartTimeOfDay.Data() )
+ {
+ durStartTimeOfDay.Duration( dhStartTimeOfDay.Data() );
+ }
+
+ if( durEndTimeOfDay.Duration() <> dhEndTimeOfDay.Data() )
+ {
+ durEndTimeOfDay.Duration( dhEndTimeOfDay.Data() );
+
+ // During initialization, just take over the value from the DataHolder.
+ endDate := dsEndDate.Date();
+ if( endDate.IsInfinite() )
+ {
+ endDate := dhEndDate.Data();
+ }
+ // See if the EndDate must be corrected.
+ else if( dhEndTimeOfDay.Data() <> Duration::Zero() )
+ {
+ endDate := endDate - 1;
+ }
+ dsEndDate.Date( endDate );
+ }
+
+ durStartTimeOfDay.Enabled( true, "" );
+ durEndTimeOfDay .Enabled( true, "" );
+ }
+ }
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_ListList_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_ListList_MenuEdit_OnClick.def
new file mode 100644
index 0000000..f4e9cb1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_ListList_MenuEdit_OnClick.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: ListList
+Response OnClick (
+ LibCal_ExplicitTimeInterval selection
+) id:Response_ListList_MenuEdit_OnClick
+{
+ #keys: '[415136.0.925451544]'
+ CanBindMultiple: false
+ DefinitionID => /ListList/Responsedef_ListList_WebMenu_OnClick
+ Initiator: 'MenuEdit'
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( LibCal_dlgEditTimeInterval );
+ dlg.edtComment().Visible( false )
+ dlg.Edit( selection );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_PanelHeader_144_ckbIsAllDay_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_PanelHeader_144_ckbIsAllDay_OnChanged.def
new file mode 100644
index 0000000..2f86201
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_PanelHeader_144_ckbIsAllDay_OnChanged.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: PanelHeader_144/ckbIsAllDay_812
+Response OnChanged () id:Response_MacroPlanner_pnlStartTime_ckbIsAllDay_OnChanged
+{
+ #keys: '[415136.0.926885761]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ //鏄惁鏄竴鏁村ぉ
+ Form.ShowAllDay();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Interface_loginfo_view.vw b/_Main/UI/MacroPlannerWebApp/Views/Interface_loginfo_view.vw
new file mode 100644
index 0000000..cc85355
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Views/Interface_loginfo_view.vw
@@ -0,0 +1,146 @@
+Quintiq file version 2.0
+{
+ viewcontents
+ {
+ forms
+ {
+ form_FormInterfaceLoginfo
+ {
+ title: 'QMacroPlanner::FormInterfaceLoginfo'
+ shown: true
+ componentID: 'QMacroPlanner::FormInterfaceLoginfo'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 16
+ columnPosition: 1
+ columnSpan: 12
+ }
+ components
+ {
+ FormInterfaceLoginfo_ListInterfaceLoginfo
+ {
+ }
+ FormInterfaceLoginfo_DataSetLevelInterfaceLoginfo
+ {
+ groupDepth: -1
+ sort: 'DESC:InterfaceDateTime'
+ column_Name
+ {
+ columnId: 'Name'
+ dataPath: 'Name'
+ dataType: 'string'
+ index: 0
+ subtotals: ''
+ width: 150
+ }
+ column_ExecuteUser
+ {
+ columnId: 'ExecuteUser'
+ dataPath: 'ExecuteUser'
+ dataType: 'string'
+ index: 1
+ subtotals: ''
+ width: 150
+ }
+ column_InterfaceDateTime
+ {
+ columnId: 'InterfaceDateTime'
+ dataPath: 'InterfaceDateTime'
+ dataType: 'datetime'
+ index: 2
+ subtotals: ''
+ width: 150
+ }
+ column_FinishTime
+ {
+ columnId: 'FinishTime'
+ dataPath: 'FinishTime'
+ dataType: 'datetime'
+ index: 3
+ subtotals: ''
+ width: 150
+ }
+ column_Message
+ {
+ columnId: 'Message'
+ dataPath: 'Message'
+ dataType: 'string'
+ index: 4
+ subtotals: ''
+ width: 150
+ }
+ column_Success
+ {
+ columnId: 'Success'
+ dataPath: 'Success'
+ dataType: 'boolean'
+ index: 5
+ subtotals: ''
+ width: 150
+ }
+ column_ReturnSuccess
+ {
+ columnId: 'ReturnSuccess'
+ dataPath: 'ReturnSuccess'
+ dataType: 'boolean'
+ index: 6
+ subtotals: ''
+ width: 150
+ }
+ column_ReturnMsg
+ {
+ columnId: 'ReturnMsg'
+ dataPath: 'ReturnMsg'
+ dataType: 'string'
+ index: 7
+ subtotals: ''
+ width: 150
+ }
+ column_Last
+ {
+ columnId: 'Last'
+ dataPath: 'Last'
+ dataType: 'boolean'
+ index: 8
+ subtotals: ''
+ width: 150
+ }
+ column_TotalRow
+ {
+ columnId: 'TotalRow'
+ dataPath: 'TotalRow'
+ dataType: 'number'
+ index: 9
+ subtotals: ''
+ width: 150
+ }
+ column_RequestBody
+ {
+ columnId: 'RequestBody'
+ dataPath: 'RequestBody'
+ dataType: 'string'
+ index: 10
+ subtotals: ''
+ width: 150
+ }
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
+ page: ''
+ group: ''
+ index: 22
+ image: 'DOCUMENT'
+ description: ''
+ }
+ formatversion: 2
+ id: 'Interface_loginfo_view'
+ name: 'Interface loginfo view'
+ isglobal: false
+ isroot: true
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw b/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
new file mode 100644
index 0000000..0c37faa
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
@@ -0,0 +1,119 @@
+Quintiq file version 2.0
+{
+ viewcontents
+ {
+ forms
+ {
+ form_FormMachineStockData
+ {
+ title: 'QMacroPlanner::FormMachineStockData'
+ shown: true
+ componentID: 'QMacroPlanner::FormMachineStockData'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 15
+ columnPosition: 1
+ columnSpan: 12
+ }
+ components
+ {
+ FormMachineStockData_ListMachineStockData
+ {
+ }
+ FormMachineStockData_DataSetLevelMachineStockData
+ {
+ groupDepth: -1
+ sort: 'DESC:DDay'
+ column_MaterialNo
+ {
+ columnId: 'MaterialNo'
+ dataPath: 'MaterialNo'
+ dataType: 'string'
+ index: 0
+ subtotals: ''
+ width: 150
+ }
+ column_MaterialName
+ {
+ columnId: 'MaterialName'
+ dataPath: 'MaterialName'
+ dataType: 'string'
+ index: 1
+ subtotals: ''
+ width: 150
+ }
+ column_Fac
+ {
+ columnId: 'Fac'
+ dataPath: 'Fac'
+ dataType: 'string'
+ index: 2
+ subtotals: ''
+ width: 150
+ }
+ column_FacName
+ {
+ columnId: 'FacName'
+ dataPath: 'FacName'
+ dataType: 'string'
+ index: 3
+ subtotals: ''
+ width: 150
+ }
+ column_LineType
+ {
+ columnId: 'LineType'
+ dataPath: 'LineType'
+ dataType: 'string'
+ index: 4
+ subtotals: ''
+ width: 150
+ }
+ column_DDay
+ {
+ columnId: 'DDay'
+ dataPath: 'DDay'
+ dataType: 'date'
+ index: 5
+ subtotals: ''
+ width: 150
+ }
+ column_Total
+ {
+ columnId: 'Total'
+ dataPath: 'Total'
+ dataType: 'real'
+ index: 6
+ subtotals: ''
+ width: 150
+ }
+ column_AllTotal
+ {
+ columnId: 'AllTotal'
+ dataPath: 'AllTotal'
+ dataType: 'real'
+ index: 7
+ subtotals: ''
+ width: 150
+ }
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
+ page: ''
+ group: ''
+ index: 23
+ image: 'SPREADSHEET'
+ description: ''
+ }
+ formatversion: 2
+ id: 'Machine_stock_data'
+ name: 'Machine stock data'
+ isglobal: false
+ isroot: true
+}
--
Gitblit v1.9.3