Merge branch 'main' into HEAD

# Conflicts:
#	INT_PT002/Forms/FormMain.cs

INT_PT002/Controls/User/ControlMenuUserUserEditor.cs

@@ -460,9 +460,9 @@ namespace INT_PT002.Controls
             time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
             this.SelectedUserItem.DateLogin = time;
             time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
-            this.SelectedUserItem.DateExpireRegister = time;
-            time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
             this.SelectedUserItem.DateExpireLogin = time;
+            time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+            this.SelectedUserItem.DateExpireRegister = time;
 
             this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true;
             this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true;
@@ -497,9 +497,9 @@ namespace INT_PT002.Controls
             time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
             this.SelectedUserItem.DateLogin = time;
             time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
-            this.SelectedUserItem.DateExpireRegister = time;
-            time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
             this.SelectedUserItem.DateExpireLogin = time;
+            time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+            this.SelectedUserItem.DateExpireRegister = time;
 
             this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true;
             this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true;
@@ -528,8 +528,8 @@ namespace INT_PT002.Controls
             this.textBoxPassword.Text = item.Password;
             this.labelExpiryDateOfAccount.Text = item.ExpireAccount.ToString();
             this.labelExpiryDateOfPassword.Text = item.ExpirePassword.ToString();
-            this.labelExpiryDateOfAccount2.Text = string.Format("{0:yy/MM/dd} ~ {1:yy/MM/dd}", item.DateRegister, item.DateExpireRegister);
-            this.labelExpiryDateOfPassword2.Text = string.Format("{0:yy/MM/dd} ~ {1:yy/MM/dd}", item.DateLogin, item.DateExpireLogin);
+            this.labelExpiryDateOfAccount2.Text = string.Format("{0:yy/MM/dd} ~ {1:yy/MM/dd}", item.DateRegister, item.DateExpireLogin);
+            this.labelExpiryDateOfPassword2.Text = string.Format("{0:yy/MM/dd} ~ {1:yy/MM/dd}", item.DateLogin, item.DateExpireRegister);
 
             this.CheckBoxCheckedAsLevel(item.Status);
 

INT_PT002/DataStore/Define.cs

@@ -82,6 +82,15 @@ namespace INT_PT002.DataStore
             Equipment,
         }
 
+        public enum E_ProcessStatus2
+        {
+            _0_None = 0,
+            _1_Initial,
+            _2_MovementAndProductEntry,
+            _3_Measuring,
+            _4_DischargeAndReturnToOrigin,
+        }
+
         public enum E_ProcessStatus
         {
             _0_None = 0,

INT_PT002/DialogForms/DialogFormLogOn.cs

@@ -224,9 +224,9 @@ namespace INT_PT002.Forms
                 time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.ParentForm.CurrentSystemStatus.CurrentUser.DateLogin = time;
                 time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time;
-                time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = time;
+                time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time;
 
                 this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true;
                 this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true;

INT_PT002/Forms/FormMain.cs

@@ -246,7 +246,11 @@ namespace INT_PT002.Forms
         }
         private void CreateForm()
         {
+<<<<<<< HEAD
             this.ChildFormMainDisplay = new FormMainDisplay3(this);
+=======
+            this.ChildFormMainDisplay = new FormMainDisplay4(this);
+>>>>>>> main
             this.ChildFormMenu = new FormMenu(this);
 
             this.smartForm1.MainForm = this;