From ab46ccb924b83e6bce5a6c977005c6e6545377b0 Mon Sep 17 00:00:00 2001 From: backuppc Date: Thu, 18 Dec 2025 15:22:54 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EA=B0=80=EC=8B=A0=EC=B2=AD=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20=EB=A9=94=EC=84=B8=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EB=82=A0=EC=A7=9C=EC=97=90=20=EB=A7=9E=EA=B2=8C=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=B3=80=EA=B2=BD=EB=90=98=EA=B2=8C?= =?UTF-8?q?=ED=95=A8.=20=EC=8B=9C=EC=9E=91=EC=9D=BC=EC=9E=90=EA=B0=80=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EC=9D=BC=EC=9E=90=EB=B3=B4=EB=8B=A4=20?= =?UTF-8?q?=ED=81=B4=EB=95=8C=EC=97=90=EB=8A=94=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EC=9D=BC=EC=9E=90=EB=8A=94=20=EC=8B=9C=EC=9E=91=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EC=97=90=20=EB=A7=9E=EC=B6=94=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtConfirm/fHolyRequestAdd.Designer.cs | 2 +- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 36 ++++++++++++- .../FPJ0000/OtConfirm/fHolyRequestAdd.resx | 50 +++++++++---------- 3 files changed, 60 insertions(+), 28 deletions(-) diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index b312d60..9784998 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -112,6 +112,7 @@ namespace FPJ0000.OtConfirm this.tbSD.Name = "tbSD"; this.tbSD.Size = new System.Drawing.Size(381, 38); this.tbSD.TabIndex = 3; + this.tbSD.ValueChanged += new System.EventHandler(this.tbSD_ValueChanged); // // tbED // @@ -434,7 +435,6 @@ namespace FPJ0000.OtConfirm // dSKuntae // this.dSKuntae.DataSetName = "DSKuntae"; - this.dSKuntae.Namespace = "http://tempuri.org/DSKuntae.xsd"; this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // // rad2 diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index bd511ef..e7065bb 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -541,6 +541,7 @@ namespace FPJ0000.OtConfirm Dictionary holydata = new Dictionary(); string updateuserinfo = string.Empty; + string updateuserdate = string.Empty; private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) { var uiddt = this.cmbUser.SelectedValue; @@ -550,11 +551,27 @@ namespace FPJ0000.OtConfirm if (uid == "System.Data.DataRowView") return; if (updateuserinfo.Equals(uid)) return; - var basedate = DateTime.Now.AddDays(-1).ToShortDateString(); + UpdateMessage(); + } + void UpdateMessage() + { + var uiddt = this.cmbUser.SelectedValue; + if (uiddt == null) return; + var uid = uiddt.ToString(); + if (uid.isEmpty()) return; + if (uid == "System.Data.DataRowView") return; + + + var basedate = tbSD.Value.AddDays(-1).ToString("yyyy-MM-dd"); + + if (updateuserinfo.Equals(uid) && updateuserdate.Equals(basedate)) return; + + holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate); this.richTextBox1.Clear(); - if (holydata.Any()) richTextBox1.AppendText($"[기준:{basedate}] => "); + richTextBox1.AppendText($"[기준:{basedate}] => "); + if(holydata.Any()==false) richTextBox1.Text += "등록된 근태자료가 없습니다"; foreach (var item in holydata) { var val = item.Value.Split('|'); @@ -575,7 +592,12 @@ namespace FPJ0000.OtConfirm } if (holydata.Any()) + { updateuserinfo = uid; //업데이트한 사용자 id 기록 + updateuserdate = basedate; + } + + } private void radioButton1_CheckedChanged_1(object sender, EventArgs e) @@ -587,5 +609,15 @@ namespace FPJ0000.OtConfirm { } + + private void tbSD_ValueChanged(object sender, EventArgs e) + { + UpdateMessage(); + if(tbED.Value < tbSD.Value) + { + FCOMMON.Util.MsgE("종료일자를 시작일자로 변경합니다"); + tbED.Value = tbSD.Value; + } + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx index 92a5226..e995ea4 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx @@ -1,17 +1,17 @@  -