From 729de9e254cb300d6937508eb7f7e1f24607acf7 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 18 十一月 2024 17:21:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def | 2 +-
_Main/BL/Type_LockPeriod/Method_Enable.qbl | 21 +++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/_Main/BL/Type_LockPeriod/Method_Enable.qbl b/_Main/BL/Type_LockPeriod/Method_Enable.qbl
index 56456a3..8582f7c 100644
--- a/_Main/BL/Type_LockPeriod/Method_Enable.qbl
+++ b/_Main/BL/Type_LockPeriod/Method_Enable.qbl
@@ -9,16 +9,15 @@
// Akari Oct-30-2024 (created)
offlinePlanRow := select( offlinePlanTable,Row,row,row.ProductID() = this.ProductInStockingPoint_MP().ProductID() and row.StockingPointID() = this.ProductInStockingPoint_MP().StockingPointID() );
- offlinePlanCells := selectset( offlinePlanRow, Cell,cell,cell.Column().TimeUnit() = "Day" );
- offlinePlanCellIndexTree := NamedValueTree::Create();
- for( i := 0; i< offlinePlanCells.Size(); i++ ){
- offlinePlanCell := offlinePlanCells.Element( i );
- offlinePlanCellHandle := offlinePlanCellIndexTree.GetHandle( offlinePlanCell.Column().StartDate().AsQUILL() );
- offlinePlanCellIndexTree.Root().AddChild( offlinePlanCellHandle,i );
- }
-
-
- if( not this.IsEnable() ){
+ if( not this.IsEnable() and not isnull( offlinePlanRow )){
+ offlinePlanCells := selectset( offlinePlanRow, Cell,cell,cell.Column().TimeUnit() = "Day" );
+ offlinePlanCellIndexTree := NamedValueTree::Create();
+ for( i := 0; i< offlinePlanCells.Size(); i++ ){
+ offlinePlanCell := offlinePlanCells.Element( i );
+ offlinePlanCellHandle := offlinePlanCellIndexTree.GetHandle( offlinePlanCell.Column().StartDate().AsQUILL() );
+ offlinePlanCellIndexTree.Root().AddChild( offlinePlanCellHandle,i );
+ }
+
this.IsEnable( true );
pispips := selectset( this,ProductInStockingPoint_MP.ProductInStockingPointInPeriod.astype( ProductInStockingPointInPeriodPlanningLeaf ),period,period.Period_MP().StartDate() <= this.LockDate() );
@@ -58,6 +57,8 @@
}
}
ProductInStockingPointInPeriod::LockUnlockPlanning( pispips, true, true );
+ }else{
+ info( "Archive data [" + this.ProductInStockingPoint_MP().Name() + "] is null.")
}
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
index 87cac3a..4645ca5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
@@ -43,7 +43,7 @@
if( result = "Error" ){
WebMessageBox::Error( "杩滅▼鏈嶅姟鍣ㄨ繑鍥炰簡涓�涓敊璇細" + message );
}else{
- WebMessageBox::Information( message );
+ WebMessageBox::Information( message,Translations::MessageBox_OK() );
}
}
WebMessageBox::Success( "涓嬪彂鎴愬姛" );
--
Gitblit v1.9.3