From 4b378f728e849b2ab8480057e0cbdf4f7f13e0d7 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Fri, 20 May 2022 22:04:42 +0900
Subject: [PATCH] ...

---
 Project/Properties/AssemblyInfo.cs    |  4 ++--
 SubProject/FCOMMON/DataBaseManager.cs | 18 ++++++++++++++++++
 SubProject/FCOMMON/fMagam.Designer.cs |  1 +
 SubProject/FCOMMON/fMagam.cs          | 24 ++++++++++++++++++++++--
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 1e568b3..6335a26 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.05.10.1115")]
-[assembly: AssemblyFileVersion("22.05.10.1115")]
+[assembly: AssemblyVersion("22.05.20.2150")]
+[assembly: AssemblyFileVersion("22.05.20.2150")]
diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs
index da162e6..afcabb2 100644
--- a/SubProject/FCOMMON/DataBaseManager.cs
+++ b/SubProject/FCOMMON/DataBaseManager.cs
@@ -226,7 +226,25 @@ namespace FCOMMON
 			return datacnt == 1;
 
 		}
+		public static bool DelMagamList(string mon)
+		{
+			var gcode = FCOMMON.info.Login.gcode;
 
+			//해당기간내의 마감 자료를 조회해서 넣는다.
+			var cn = getCn();
+			cn.Open();
+
+			var retval = new List<string>();
+			string sql = "delete from EETGW_Magam where  gcode=@gcode and pdate = @pdate";
+			var cmd = new SqlCommand(sql, cn);
+			cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode;
+			cmd.Parameters.Add("pdate", System.Data.SqlDbType.VarChar).Value = mon;
+			var datacnt = int.Parse(cmd.ExecuteNonQuery().ToString());
+			cn.Close();
+			cn.Dispose();
+			return datacnt == 1;
+
+		}
 		public static List<string> GetMagamList()
 		{
 			var gcode = FCOMMON.info.Login.gcode;
diff --git a/SubProject/FCOMMON/fMagam.Designer.cs b/SubProject/FCOMMON/fMagam.Designer.cs
index e453393..a628ca8 100644
--- a/SubProject/FCOMMON/fMagam.Designer.cs
+++ b/SubProject/FCOMMON/fMagam.Designer.cs
@@ -60,6 +60,7 @@ namespace FCOMMON
 			this.button1.TabIndex = 2;
 			this.button1.Text = "선택 마감 삭제";
 			this.button1.UseVisualStyleBackColor = true;
+			this.button1.Click += new System.EventHandler(this.button1_Click);
 			// 
 			// listView1
 			// 
diff --git a/SubProject/FCOMMON/fMagam.cs b/SubProject/FCOMMON/fMagam.cs
index fefda21..58922cf 100644
--- a/SubProject/FCOMMON/fMagam.cs
+++ b/SubProject/FCOMMON/fMagam.cs
@@ -45,12 +45,32 @@ namespace FCOMMON
 		{
 			///마감작업
 			var data = textBox1.Text.Trim();
-			if (FCOMMON.Util.MsgQ($"{data} 월 자료를 마감할까요?") != DialogResult.Yes) return;
+			if (FCOMMON.Util.MsgQ($"{data} 월 자료를 마감할까요?\n마감을 하게 되면 업무일지/휴가/근태 정보를 변경할 수 없습니다") != DialogResult.Yes) return;
 
 			var rlt = FCOMMON.DBM.AddMagamList(data);
 			if (rlt == false)
 			{
-				FCOMMON.Util.MsgE("저장 실패");
+				FCOMMON.Util.MsgE("마감 등록 실패");
+			}
+			refreshList();
+		}
+
+		private void button1_Click(object sender, EventArgs e)
+		{
+			///마감작업
+			///
+			if(listView1.FocusedItem == null)
+			{
+				Util.MsgE("아래 목록에서 마감취소할 자료를 선택 하세요");
+				return;
+			}
+			var data = listView1.FocusedItem.Text.Trim();
+			if (FCOMMON.Util.MsgQ($"{data} 월 자료의 마감을 취소 할까요?") != DialogResult.Yes) return;
+
+			var rlt = FCOMMON.DBM.DelMagamList(data);
+			if (rlt == false)
+			{
+				FCOMMON.Util.MsgE("마감 취소 실패");
 			}
 			refreshList();
 		}