From 74247b9d7f5510e1573cfae03182d064c5761b5c Mon Sep 17 00:00:00 2001 From: sj84 Date: Wed, 20 Nov 2024 09:49:51 +0900 Subject: [PATCH] =?UTF-8?q?@=20Ver=205.2.2=20by=20LSJ=20=20-=202024.08.28?= =?UTF-8?q?=20=20-=20Ver=205.2.1=20Modify=20=20-=20Framework=20:=20SmartX?= =?UTF-8?q?=20Framework=20V3.1.1(update:=202019.03.21)=20=20-=20Part11=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95=20=20=20=20OtherBackup(?= =?UTF-8?q?)=20=EC=8B=9C=20=ED=97=A4=EB=8D=94=ED=8C=8C=EC=9D=BC=EC=97=90?= =?UTF-8?q?=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EB=88=84=EB=9D=BD=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20header.EquipmentType=20=3D=20103;=20?= =?UTF-8?q?=20=20=20=20-=202024.11.08=20=20-=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20Admin=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=8B=9C=20Level1=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A/Forms/FormDataBackup_Part11.cs | 1 + INT69DB_2A/Forms/FormInformation.cs | 2 +- INT69DB_2A/Forms/FormUserEditor.cs | 3 +-- INT69DB_2A/Version.txt | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/INT69DB_2A/Forms/FormDataBackup_Part11.cs b/INT69DB_2A/Forms/FormDataBackup_Part11.cs index 623f81a..d805419 100644 --- a/INT69DB_2A/Forms/FormDataBackup_Part11.cs +++ b/INT69DB_2A/Forms/FormDataBackup_Part11.cs @@ -358,6 +358,7 @@ namespace INT69DB_2A.Forms header.LoginId = this.ParentForm.SystemConfig.CurrentUser.ID; header.SerialNumber = this.ParentForm.SystemConfig.SerialNumber; header.EquipmentColumns = this.ParentForm.SystemConfig.EquipmentColumns; + header.EquipmentType = 103; for (int i = 0; i < listSelectedFile.Count; i++) this.CreateHeaderFile(this.ParentForm.PathHeaderFolder, listSelectedFile[i], header); diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 3632e20..7fcb503 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -107,7 +107,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "5.2.1"; + this.labelDisplayVer.Text = "5.2.2"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index 4a24cdf..4b81e1d 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -290,8 +290,7 @@ namespace INT69DB_2A.Forms if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) { - if (this.ParentForm.SystemConfig.IsPart11 == true) - item.ActiveLevel = 9; + item.ActiveLevel = 9; } else { diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index a31d20d..976e1f9 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -14,6 +14,16 @@ 멀티형 2~6열 스틱 계량기 */ +@ Ver 5.2.2 by LSJ + - 2024.08.28 + - Ver 5.2.1 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - Part11 관련 수정 + OtherBackup() 시 헤더파일에 파라미터 누락 + header.EquipmentType = 103; + - 2024.11.08 + - 로그인 Admin 비밀번호 변경 시 Level1로 변경되는 문제 수정 + @ Ver 5.2.1 by CJY - 2024.08.21 - Ver 5.2.0 Modify