From 0605be7550a4f22802eba113591cc7596cf55ffc Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 22 八月 2024 17:01:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
index 5d5f39e..68ce532 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
@@ -6,7 +6,14 @@
   Body:
   [*
     // On ok
-    Form.ApplyChanges();
+    
+    if ( isnull( DataHolderDialogData.Data() ) ) {
+      ShiftDayTime::CreateData( MacroPlan, dtsStart.DateTime(),
+                                dtsEnd.DateTime(), ddslName.Text() );
+    } else {
+      ShiftDayTime::EditData( MacroPlan, DataHolderDialogData.Data(), dtsStart.DateTime(),
+                                dtsEnd.DateTime(), ddslName.Text() );
+    }
     
     Form.Close();
   *]

--
Gitblit v1.9.3