From eedb70fb1485575c0f75f47081b40bfe0552fba8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 27 八月 2024 17:30:18 +0800
Subject: [PATCH] 接口日志删除bug
---
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl | 5 +-
_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl | 9 ++--
_Main/BL/Type_InterfaceLoginfo/StaticMethod_SyncMiddle.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormEventType/Component_listContextMenuEventType.def | 10 -----
/dev/null | 16 --------
_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl | 6 ++-
_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl | 5 +-
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def | 2
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 12 +++---
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def | 2
10 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
index 8c5280d..4246842 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
@@ -15,9 +15,8 @@
TextBody:
[*
// 鐢勫叞楦� Aug-23-2024 (created)
- cdlast := maxobject( owner, AOnlineAndMOfflinePlanMS64, cd, cd.StartDate(), cd.EndDate(), cd.Werk() );
- if( not isnull( cdlast ) ){
- loginfo := cdlast.InterfaceLoginfo();
+ loginfo := maxobject( owner, InterfaceLoginfo, loginfo, loginfo.Name() = Translations::InterfaceDataset_AOnlineAndMOfflinePlanMS64_Name(), loginfo.InterfaceDateTime() );
+ if( not isnull( loginfo ) ){
if( not loginfo.IsShow() ){
loginfo.Delete();
}else{
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index 7a835d1..6c48d50 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -12,9 +12,8 @@
TextBody:
[*
// 鐢勫叞楦� Aug-23-2024 (created)
- cdlast := maxobject( owner, AOnlineAndMOfflinePlanPIR, cd, cd.StartDate(), cd.EndDate(), cd.Werk() );
- if( not isnull( cdlast ) ){
- loginfo := cdlast.InterfaceLoginfo();
+ loginfo := maxobject( owner, InterfaceLoginfo, loginfo, loginfo.Name() = Translations::InterfaceDataset_AOnlineAndMOfflinePlanPIR_Name(), loginfo.InterfaceDateTime() );
+ if( not isnull( loginfo ) ){
if( not loginfo.IsShow() ){
loginfo.Delete();
}else{
@@ -38,7 +37,7 @@
loginfo.AOnlineAndMOfflinePlanPIR( relinsert, pir );
traverse( macroplan, AssemblyOnlinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
traverse( column, AssemblyOnlinePlanCell, cell, ( werk = 'All' or cell.AssemblyOnlinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
- and cell.AssemblyOnlinePlanRow().RowNr() = '1' ){
+ and cell.AssemblyOnlinePlanRow().Type() = '1' ){
quantityrow := cell.AssemblyOnlinePlanRow();
if( not exists( productids, Elements, e, e = quantityrow.ProductID() ) ){
productids.Add( quantityrow.ProductID() );
@@ -53,13 +52,14 @@
traverse( macroplan, OfflinePlanTable, table ){
traverse( table, OfflinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
traverse( column, OfflinePlanCell, cell, ( werk = 'All' or cell.OfflinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
- and ( cell.OfflinePlanRow().ProductionLine() <> 'DL_MOMO' or cell.OfflinePlanRow().ProductionLine() <> 'CC_MOMO' ) ){
+ and ( cell.OfflinePlanRow().ProductionLine() <> 'DL_MOMO' or cell.OfflinePlanRow().ProductionLine() <> 'CC_MOMO' )
+ and cell.OfflinePlanRow().Type() = '1' ){
row := cell.OfflinePlanRow();
if( not exists( productids, Elements, e, e = row.ProductID() ) ){
productids.Add( row.ProductID() );
}
pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.ColumnDate() );
- if( isnull( pir ) ){
+ if( isnull( pirdata ) ){
pirdata := pir.PIRData( relnew, Product := row.ProductID()
, PlanningDate := column.ColumnDate()
, PlanningQty := 0 );
diff --git a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
index d33daa3..08cd41e 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
@@ -11,9 +11,8 @@
TextBody:
[*
// 鐢勫叞楦� Aug-20-2024 (created)
- cdlast := maxobject( interfaceDataset, AssemblyOnlinePlanPPPSPush, cd, cd.InterfaceTime(), cd.PlanningDate(), cd.Product() );
- if( not isnull( cdlast ) ){
- loginfo := cdlast.InterfaceLoginfo();
+ loginfo := maxobject( interfaceDataset, InterfaceLoginfo, loginfo, loginfo.Name() = Translations::InterfaceDataset_AssemblyOnlinePlanPPPSPush_Name(), loginfo.InterfaceDateTime() );
+ if( not isnull( loginfo ) ){
if( not loginfo.IsShow() ){
loginfo.Delete();
}else{
@@ -33,11 +32,11 @@
, Success := true
);
traverse( macroplan, AssemblyOnlinePlanColumn, column ){
- traverse( column, AssemblyOnlinePlanCell, cell, cell.Value() <> '' and cell.AssemblyOnlinePlanRow().RowNr() = '1' ){
+ traverse( column, AssemblyOnlinePlanCell, cell, cell.Value() <> '' and cell.AssemblyOnlinePlanRow().Type() = '1' ){
quantityrow := cell.AssemblyOnlinePlanRow();
ordercell := selectobject( column, AssemblyOnlinePlanCell, ocell, ocell.AssemblyOnlinePlanRow().ProductID() = quantityrow.ProductID()
and ocell.AssemblyOnlinePlanRow().ProductionLine() = quantityrow.ProductionLine()
- and ocell.AssemblyOnlinePlanRow().RowNr() = '2' );
+ and ocell.AssemblyOnlinePlanRow().Type() = '2' );
cd :=interfaceDataset.AssemblyOnlinePlanPPPSPush( relnew, Product := quantityrow.ProductID()
, PlanningDate := column.ColumnDate()
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
index 6ab92b1..c09496a 100644
--- a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
@@ -11,9 +11,8 @@
TextBody:
[*
// 鐢勫叞楦� Aug-20-2024 (created)
- cdlast := maxobject( interfaceDataset, CustomerDemandPPAIDS, cd, cd.InterfaceTime(), cd.DemandDate(), cd.Product() );
- if( not isnull( cdlast ) ){
- loginfo := cdlast.InterfaceLoginfo();
+ loginfo := maxobject( interfaceDataset, InterfaceLoginfo, loginfo, loginfo.Name() = Translations::InterfaceDataset_CustomerDemandPPAIDS_Name(), loginfo.InterfaceDateTime() );
+ if( not isnull( loginfo ) ){
if( not loginfo.IsShow() ){
loginfo.Delete();
}else{
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_SyncMiddle.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_SyncMiddle.qbl
index 2c269ac..6d3fbe2 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_SyncMiddle.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_SyncMiddle.qbl
@@ -14,7 +14,7 @@
loginfo := selectobject( owner, InterfaceLoginfo, loginfo, loginfo.Name() = middle.Name() and loginfo.IsShow() = false and loginfo.Last() = true );
loginfo.FinishTime( middle.FinishTime() );
loginfo.Response( middle.Response() );
- loginfo.IsShow( false );
+ loginfo.IsShow( true );
middle.Delete();
}
*]
diff --git a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
index a9cb34f..5f8a675 100644
--- a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
+++ b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl
@@ -8,8 +8,10 @@
[*
traverse( timeIntervals_i, Elements, eti ){
leadingeti := eti.LeadingETI();
+
if( leadingeti.SubscribingETI( relsize ) = 1 ){
part := leadingeti.Participation();
+
if( part.ExplicitTimeInterval( relsize ) = 1 ){
part.Event().Delete();
}
@@ -17,9 +19,9 @@
leadingeti.Delete();
}
}
- if( not isnull( leadingeti ) ){
+ if( not isnull( eti ) ){
subscription := selectobject( eti, Participation.Event.LeadingParticipation.Subscription, subscription, subscription.Calendar().CalendarID() = eti.Participation().Calendar().CalendarID() );
- if( subscription.ExplicitTimeInterval( relsize ) = 1 ){
+ if( not isnull( subscription ) and subscription.ExplicitTimeInterval( relsize ) = 1 ){
subscription.Delete();
}else{
eti.Delete();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def
index 17d686c..47c63f3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def
@@ -17,7 +17,7 @@
currentuser := QuintiqUser::CurrentUser().DisplayName();
- AOnlineAndMOfflinePlanMS64::GenerateData( InterfaceDataset, efFactory.Text(), dsStartDate.Date(), dsEndDate.Date(), efVersionFrom.Text(), efVersionTo.Text(), cbActiveVersion.Checked(), dhProducts.Data(), currentuser );
+ AOnlineAndMOfflinePlanMS64::GenerateData( InterfaceDataset, ddslFactory.Text(), dsStartDate.Date(), dsEndDate.Date(), efVersionFrom.Text(), efVersionTo.Text(), cbActiveVersion.Checked(), dhProducts.Data(), currentuser );
Form.Close();
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
index 9287f6e..45026ea 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
@@ -10,7 +10,7 @@
mdsinstance := select( componentmds, ComponentMDSKinds.ComponentMDSInstances, m, m.MDSID().MDSKey() = ddlMacroPlan.Data().DatasetMDSID() );
handle := mdsinstance.GetMDSHandle()
macroplan := handle.AsMacroPlan();
- AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, efFactory.Text(), macroplan, dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
+ AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), macroplan, dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
Form.Close();
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Component_listContextMenuEventType.def b/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Component_listContextMenuEventType.def
index fa6f348..b6fcbe6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Component_listContextMenuEventType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Component_listContextMenuEventType.def
@@ -38,16 +38,6 @@
Title: 'Delete'
]
}
- Component MenuTest
- {
- #keys: '[415136.0.729921977]'
- BaseType: 'WebMenu'
- Properties:
- [
- Taborder: 6
- Title: 'test'
- ]
- }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Response_listContextMenuEventType_MenuTest_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Response_listContextMenuEventType_MenuTest_OnClick.def
deleted file mode 100644
index 3e6cf8d..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEventType/Response_listContextMenuEventType_MenuTest_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: listContextMenuEventType/MenuTest
-Response OnClick () id:Response_listContextMenuEventType_MenuTest_OnClick
-{
- #keys: '[415136.0.729922011]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebMenu_OnClick'
- QuillAction
- {
- Body:
- [*
- LibCal_EventType::Test( LibCal_GlobalState.dhGlobalCalendarRegistry().Data() );
- *]
- GroupServerCalls: false
- }
-}
--
Gitblit v1.9.3