From e4edcfd0b987b239526f5375881b919789782dad Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 13 十一月 2023 09:32:03 +0800
Subject: [PATCH] 修改优先级因子的一些功能和关系

---
 _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
index 1ee6b28..3341541 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
@@ -6,28 +6,38 @@
   DefinitionID: 'Responsedef_WebButton_OnClick'
   Precondition:
   [*
-    feedback := Translations::FilllingCapacity_ValidateInput();
-    checkValue := not Coefficient.Text() = '' and not PriorityFactorName.Text() = '';
-    
-    if(not checkValue )
-    {
-      feedback := Translations::PriorityFactor_CheckNameValid();
-      editData := DataHolderEditPriorityFactor.Data();
-      checkValue := not PriorityFactor::CheckNameValid( MacroPlan,editData.BusinessType(),[Real]Coefficient.Text(),PriorityFactorName.Text(),Desc.Text());
-    
+    checkValue := true;
+    if( PriorityFactorName.Text() = ''){
+      feedback := Translations::PriorityFactor_CheckNameNull();
+      checkValue := false;
     }
-    
     return checkValue
   *]
   QuillAction
   {
     Body:
     [*
-      priortyFactor := select( MacroPlan,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
-      if( not isnull( priortyFactor )){
-        WebMessageBox::Error( "绯荤粺鍐呭凡瀛樺湪璇ヤ紭鍏堢骇鍥犲瓙");
+      businessType := DataHolderBusinessTyoeSelect.Data( );
+      if( NewFlag.Checked() ){
+       // New
+        repeatOne := select( businessType,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
+        if( not isnull( repeatOne )){
+          WebMessageBox::Error( Translations::PriorityFactor_CheckNameValid() ); 
+        }else{
+          Form.ClickBtnOK();
+        }
       }else {
-        Form.ClickBtnOK(); 
+              if (EditFlag.Checked() and PriorityFactorNameCache.Text() <>PriorityFactorName.Text()){
+                  // Edit
+                  repeatOne:=select(businessType, PriorityFactor, pf, pf.Name() = PriorityFactorName.Text());
+                  if (not isnull(repeatOne)){
+                      WebMessageBox::Error (Translations::PriorityFactor_CheckNameValid () );
+                  }else{
+                      Form.ClickBtnOK();
+                  }
+              }else{
+                  Form.ClickBtnOK();
+              }
       }
     *]
     GroupServerCalls: false

--
Gitblit v1.9.3