diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 2cfde03..1721e33 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("23.05.29.0100")] -[assembly: AssemblyFileVersion("23.05.29.0100")] +[assembly: AssemblyVersion("23.05.31.0830")] +[assembly: AssemblyFileVersion("23.05.31.0830")] diff --git a/Project/StateMachine/_BW.cs b/Project/StateMachine/_BW.cs index 7b7583b..40ef8dd 100644 --- a/Project/StateMachine/_BW.cs +++ b/Project/StateMachine/_BW.cs @@ -95,7 +95,7 @@ namespace Project if (tsScheDayweek.TotalMinutes > 15 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 10) { - try { MakeScheduleDayWeek(); } + try { Mail_MakeScheduleDayWeek(); } catch { } finally { ChkMakeSchDayWeekTime = DateTime.Now; } } @@ -106,7 +106,7 @@ namespace Project DateTime.Now.DayOfWeek != DayOfWeek.Sunday && DateTime.Now.Hour >= 10) { - try { MakeScheduleDay(); } + try { Mail_MakeScheduleDay(); } catch { } finally { ChkMakeSchDay = DateTime.Now; } } diff --git a/Project/StateMachine/_MailService.cs b/Project/StateMachine/_MailService.cs index d41df38..24add3a 100644 --- a/Project/StateMachine/_MailService.cs +++ b/Project/StateMachine/_MailService.cs @@ -234,7 +234,6 @@ namespace Project taJobReportDateList.Dispose(); } - void Mail_JobReportWeek() { var vCate = "JW"; @@ -589,7 +588,7 @@ namespace Project /// /// 스케쥴기한임박알림(일) /// - void MakeScheduleDay() + void Mail_MakeScheduleDay() { var taForm = new DSMailTableAdapters.MailFormTableAdapter(); var taMailData = new DSMailTableAdapters.MailDataTableAdapter(); @@ -766,7 +765,7 @@ namespace Project /// /// 스케쥴기한임박알림(주) /// - void MakeScheduleDayWeek() + void Mail_MakeScheduleDayWeek() { var taForm = new DSMailTableAdapters.MailFormTableAdapter(); @@ -1015,10 +1014,13 @@ namespace Project //오류가 있다 try { - cmd.CommandText = "UPDATE MailData SET SendOK = 1, SendMsg = @msg WHERE(idx = @idx) and isnull(sendok,0) = 0"; + cmd.CommandText = "UPDATE MailData SET SendOK = 1, SendMsg = @msg ,suid=@suid,sdate = @sdate WHERE(idx = @idx) and isnull(sendok,0) = 0"; cmd.Parameters.Clear(); cmd.Parameters.Add("msg", System.Data.SqlDbType.VarChar).Value = sendMsg; cmd.Parameters.Add("idx", System.Data.SqlDbType.Int).Value = idx; + cmd.Parameters.Add("suid", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.no; + cmd.Parameters.Add("sdate", System.Data.SqlDbType.SmallDateTime).Value = DateTime.Now; + //Console.WriteLine(string.Format("Send Complete index={0},Msg={1}", dar["idx"], sendMsg)); //ta.UpdateSendOK(sendMsg, dr.idx); var ucnt = cmd.ExecuteNonQuery(); @@ -1057,10 +1059,12 @@ namespace Project try { sendMsg = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - cmd.CommandText = "UPDATE MailData SET SendOK = 1, SendMsg = @msg WHERE(idx = @idx) and isnull(sendok,0) = 0"; + cmd.CommandText = "UPDATE MailData SET SendOK = 1, SendMsg = @msg, suid = @suid,sdate = @sdate WHERE(idx = @idx) and isnull(sendok,0) = 0"; cmd.Parameters.Clear(); cmd.Parameters.Add("msg", System.Data.SqlDbType.VarChar).Value = sendMsg; cmd.Parameters.Add("idx", System.Data.SqlDbType.Int).Value = idx; + cmd.Parameters.Add("suid", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.no; + cmd.Parameters.Add("sdate", System.Data.SqlDbType.SmallDateTime).Value = DateTime.Now; //Console.WriteLine(string.Format("Send Complete index={0},Msg={1}", dar["idx"], sendMsg)); //ta.UpdateSendOK(sendMsg, dr.idx); var ucnt = cmd.ExecuteNonQuery(); @@ -1080,9 +1084,11 @@ namespace Project { if (msgupdate) { - cmd.CommandText = "UPDATE MailData SET SendMsg = @msg WHERE idx = @idx "; + cmd.CommandText = "UPDATE MailData SET SendMsg = @msg,suid=@suid,sdate=@sdate WHERE idx = @idx "; cmd.Parameters.Clear(); cmd.Parameters.Add("idx", System.Data.SqlDbType.Int).Value = idx; + cmd.Parameters.Add("suid", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.no; + cmd.Parameters.Add("sdate", System.Data.SqlDbType.SmallDateTime).Value = DateTime.Now; var ucnt = cmd.ExecuteNonQuery(); } } diff --git a/SubProject/FCM0000/DSMail.Designer.cs b/SubProject/FCM0000/DSMail.Designer.cs index 504d811..19e372e 100644 --- a/SubProject/FCM0000/DSMail.Designer.cs +++ b/SubProject/FCM0000/DSMail.Designer.cs @@ -900,6 +900,10 @@ namespace FCM0000 { private global::System.Data.DataColumn columnatime; + private global::System.Data.DataColumn columnsuid; + + private global::System.Data.DataColumn columnsdate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public MailDataDataTable() { @@ -1069,6 +1073,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn suidColumn { + get { + return this.columnsuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn sdateColumn { + get { + return this.columnsdate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1122,7 +1142,9 @@ namespace FCM0000 { string fromlist, string SendMsg, int aidx, - string atime) { + string atime, + string suid, + System.DateTime sdate) { MailDataRow rowMailDataRow = ((MailDataRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1141,7 +1163,9 @@ namespace FCM0000 { fromlist, SendMsg, aidx, - atime}; + atime, + suid, + sdate}; rowMailDataRow.ItemArray = columnValuesArray; this.Rows.Add(rowMailDataRow); return rowMailDataRow; @@ -1188,6 +1212,8 @@ namespace FCM0000 { this.columnSendMsg = base.Columns["SendMsg"]; this.columnaidx = base.Columns["aidx"]; this.columnatime = base.Columns["atime"]; + this.columnsuid = base.Columns["suid"]; + this.columnsdate = base.Columns["sdate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1227,6 +1253,10 @@ namespace FCM0000 { base.Columns.Add(this.columnaidx); this.columnatime = new global::System.Data.DataColumn("atime", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnatime); + this.columnsuid = new global::System.Data.DataColumn("suid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsuid); + this.columnsdate = new global::System.Data.DataColumn("sdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsdate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1250,6 +1280,7 @@ namespace FCM0000 { this.columnfromlist.MaxLength = 2147483647; this.columnSendMsg.MaxLength = 255; this.columnatime.MaxLength = 20; + this.columnsuid.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2552,6 +2583,38 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string suid { + get { + try { + return ((string)(this[this.tableMailData.suidColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'MailData\' 테이블의 \'suid\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableMailData.suidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime sdate { + get { + try { + return ((global::System.DateTime)(this[this.tableMailData.sdateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'MailData\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableMailData.sdateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsprojectNull() { @@ -2707,6 +2770,30 @@ namespace FCM0000 { public void SetatimeNull() { this[this.tableMailData.atimeColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssuidNull() { + return this.IsNull(this.tableMailData.suidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsuidNull() { + this[this.tableMailData.suidColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssdateNull() { + return this.IsNull(this.tableMailData.sdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsdateNull() { + this[this.tableMailData.sdateColumn] = global::System.Convert.DBNull; + } } /// @@ -4164,10 +4251,12 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se tableMapping.ColumnMappings.Add("SendMsg", "SendMsg"); tableMapping.ColumnMappings.Add("aidx", "aidx"); tableMapping.ColumnMappings.Add("atime", "atime"); + tableMapping.ColumnMappings.Add("suid", "suid"); + tableMapping.ColumnMappings.Add("sdate", "sdate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [MailData] WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [MailData] WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ((@IsNull_suid = 1 AND [suid] IS NULL) OR ([suid] = @Original_suid)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4187,10 +4276,14 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_atime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_suid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_suid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [tolist], [bcc], [cc], [body], [wuid], [wdate], [SendOK], [fromlist], [SendMsg], [aidx], [atime]) VALUES (@project, @gcode, @cate, @pdate, @subject, @tolist, @bcc, @cc, @body, @wuid, @wdate, @SendOK, @fromlist, @SendMsg, @aidx, @atime); -SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime FROM MailData WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [tolist], [bcc], [cc], [body], [wuid], [wdate], [SendOK], [fromlist], [SendMsg], [aidx], [atime], [suid], [sdate]) VALUES (@project, @gcode, @cate, @pdate, @subject, @tolist, @bcc, @cc, @body, @wuid, @wdate, @SendOK, @fromlist, @SendMsg, @aidx, @atime, @suid, @sdate); +SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate FROM MailData WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4208,10 +4301,12 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [wuid] = @wuid, [wdate] = @wdate, [SendOK] = @SendOK, [fromlist] = @fromlist, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime))); -SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime FROM MailData WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [wuid] = @wuid, [wdate] = @wdate, [SendOK] = @SendOK, [fromlist] = @fromlist, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime, [suid] = @suid, [sdate] = @sdate WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ((@IsNull_suid = 1 AND [suid] IS NULL) OR ([suid] = @Original_suid)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate))); +SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate FROM MailData WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4229,6 +4324,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4247,6 +4344,10 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_atime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_suid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_suid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4264,8 +4365,9 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w" + - "date, SendOK, fromlist, SendMsg, aidx, atime\r\nFROM MailData\r\nWHERE (gcode =" + - " @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(cate, \'\') LIKE @cate)"; + "date, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate\r\nFROM MailData\r\nWH" + + "ERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(cate, \'\') LIKE" + + " @cate)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4378,7 +4480,7 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, global::System.Nullable Original_project, string Original_gcode, string Original_cate, string Original_pdate, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_SendOK, string Original_SendMsg, global::System.Nullable Original_aidx, string Original_atime) { + public virtual int Delete(int Original_idx, global::System.Nullable Original_project, string Original_gcode, string Original_cate, string Original_pdate, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_SendOK, string Original_SendMsg, global::System.Nullable Original_aidx, string Original_atime, string Original_suid, global::System.Nullable Original_sdate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_project.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); @@ -4449,6 +4551,22 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[17].Value = ((string)(Original_atime)); } + if ((Original_suid == null)) { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[19].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[19].Value = ((string)(Original_suid)); + } + if ((Original_sdate.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[21].Value = ((System.DateTime)(Original_sdate.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4485,7 +4603,9 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w string fromlist, string SendMsg, global::System.Nullable aidx, - string atime) { + string atime, + string suid, + global::System.Nullable sdate) { if ((project.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(project.Value)); } @@ -4577,6 +4697,18 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w else { this.Adapter.InsertCommand.Parameters[15].Value = ((string)(atime)); } + if ((suid == null)) { + this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[16].Value = ((string)(suid)); + } + if ((sdate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[17].Value = ((System.DateTime)(sdate.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4614,6 +4746,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w string SendMsg, global::System.Nullable aidx, string atime, + string suid, + global::System.Nullable sdate, int Original_idx, global::System.Nullable Original_project, string Original_gcode, @@ -4625,6 +4759,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w string Original_SendMsg, global::System.Nullable Original_aidx, string Original_atime, + string Original_suid, + global::System.Nullable Original_sdate, int idx) { if ((project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(project.Value)); @@ -4717,77 +4853,105 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w else { this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(atime)); } - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); - if ((Original_project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_project.Value)); + if ((suid == null)) { + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(suid)); + } + if ((sdate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(sdate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); + if ((Original_project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_project.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_gcode)); } if ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_cate)); - } - if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_cate)); + } + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_pdate)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((System.DateTime)(Original_wdate)); if ((Original_SendOK.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((bool)(Original_SendOK.Value)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((bool)(Original_SendOK.Value)); } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; - } - if ((Original_SendMsg == null)) { this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_SendMsg)); - } - if ((Original_aidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_aidx.Value)); - } - else { + if ((Original_SendMsg == null)) { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } - if ((Original_atime == null)) { + else { + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_SendMsg)); + } + if ((Original_aidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_aidx.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_atime)); + if ((Original_atime == null)) { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_atime)); + } + if ((Original_suid == null)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_suid)); + } + if ((Original_sdate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_sdate.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4825,6 +4989,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w string SendMsg, global::System.Nullable aidx, string atime, + string suid, + global::System.Nullable sdate, int Original_idx, global::System.Nullable Original_project, string Original_gcode, @@ -4835,8 +5001,10 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w global::System.Nullable Original_SendOK, string Original_SendMsg, global::System.Nullable Original_aidx, - string Original_atime) { - return this.Update(project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, Original_idx, Original_project, Original_gcode, Original_cate, Original_pdate, Original_wuid, Original_wdate, Original_SendOK, Original_SendMsg, Original_aidx, Original_atime, Original_idx); + string Original_atime, + string Original_suid, + global::System.Nullable Original_sdate) { + return this.Update(project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate, Original_idx, Original_project, Original_gcode, Original_cate, Original_pdate, Original_wuid, Original_wdate, Original_SendOK, Original_SendMsg, Original_aidx, Original_atime, Original_suid, Original_sdate, Original_idx); } } diff --git a/SubProject/FCM0000/DSMail.xsd b/SubProject/FCM0000/DSMail.xsd index 21b5f3f..59dddc0 100644 --- a/SubProject/FCM0000/DSMail.xsd +++ b/SubProject/FCM0000/DSMail.xsd @@ -156,7 +156,7 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se - DELETE FROM [MailData] WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime))) + DELETE FROM [MailData] WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ((@IsNull_suid = 1 AND [suid] IS NULL) OR ([suid] = @Original_suid)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate))) @@ -176,13 +176,17 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se + + + + - INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [tolist], [bcc], [cc], [body], [wuid], [wdate], [SendOK], [fromlist], [SendMsg], [aidx], [atime]) VALUES (@project, @gcode, @cate, @pdate, @subject, @tolist, @bcc, @cc, @body, @wuid, @wdate, @SendOK, @fromlist, @SendMsg, @aidx, @atime); -SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime FROM MailData WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [tolist], [bcc], [cc], [body], [wuid], [wdate], [SendOK], [fromlist], [SendMsg], [aidx], [atime], [suid], [sdate]) VALUES (@project, @gcode, @cate, @pdate, @subject, @tolist, @bcc, @cc, @body, @wuid, @wdate, @SendOK, @fromlist, @SendMsg, @aidx, @atime, @suid, @sdate); +SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate FROM MailData WHERE (idx = SCOPE_IDENTITY()) @@ -200,12 +204,14 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w + + - SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime + SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate FROM MailData WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(cate, '') LIKE @cate) @@ -218,8 +224,8 @@ WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(cate, '') LI - UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [wuid] = @wuid, [wdate] = @wdate, [SendOK] = @SendOK, [fromlist] = @fromlist, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime))); -SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime FROM MailData WHERE (idx = @idx) + UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [wuid] = @wuid, [wdate] = @wdate, [SendOK] = @SendOK, [fromlist] = @fromlist, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime, [suid] = @suid, [sdate] = @sdate WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ((@IsNull_suid = 1 AND [suid] IS NULL) OR ([suid] = @Original_suid)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate))); +SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate, SendOK, fromlist, SendMsg, aidx, atime, suid, sdate FROM MailData WHERE (idx = @idx) @@ -237,6 +243,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w + + @@ -255,6 +263,10 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w + + + + @@ -279,6 +291,8 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, wuid, w + + @@ -409,7 +423,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + @@ -504,7 +518,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + @@ -596,10 +610,18 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, + + + + + + + + - + diff --git a/SubProject/FCM0000/Mail/fMailList.Designer.cs b/SubProject/FCM0000/Mail/fMailList.Designer.cs index a3314bd..bf39409 100644 --- a/SubProject/FCM0000/Mail/fMailList.Designer.cs +++ b/SubProject/FCM0000/Mail/fMailList.Designer.cs @@ -30,17 +30,6 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMailList)); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dSMail = new FCM0000.DSMail(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FCM0000.DSMailTableAdapters.MailDataTableAdapter(); @@ -65,15 +54,24 @@ this.label2 = new System.Windows.Forms.Label(); this.dtSd = new System.Windows.Forms.DateTimePicker(); this.label1 = new System.Windows.Forms.Label(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.arDatagridView1 = new arCtl.arDatagridView(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.subjectDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.fromlistDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tolistDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ccDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wuidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sendOKDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.suid = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sdate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dSMail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.SuspendLayout(); // // dSMail @@ -119,14 +117,14 @@ this.btAdd, this.btDel, this.btSave}); - this.bn.Location = new System.Drawing.Point(0, 499); + this.bn.Location = new System.Drawing.Point(0, 528); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(791, 25); + this.bn.Size = new System.Drawing.Size(855, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -182,7 +180,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -236,13 +233,13 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(791, 36); + this.panel1.Size = new System.Drawing.Size(855, 36); this.panel1.TabIndex = 3; // // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(721, 7); + this.button1.Location = new System.Drawing.Point(785, 7); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(64, 21); this.button1.TabIndex = 5; @@ -292,85 +289,122 @@ this.label1.TabIndex = 0; this.label1.Text = "기간"; // - // fpSpread1 + // arDatagridView1 // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Location = new System.Drawing.Point(0, 36); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(791, 463); - this.fpSpread1.TabIndex = 4; + this.arDatagridView1.A_DelCurrentCell = true; + this.arDatagridView1.A_EnterToTab = true; + this.arDatagridView1.A_KoreanField = null; + this.arDatagridView1.A_UpperField = null; + this.arDatagridView1.A_ViewRownumOnHeader = true; + this.arDatagridView1.AllowUserToAddRows = false; + this.arDatagridView1.AllowUserToDeleteRows = false; + this.arDatagridView1.AutoGenerateColumns = false; + this.arDatagridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.pdateDataGridViewTextBoxColumn, + this.subjectDataGridViewTextBoxColumn, + this.fromlistDataGridViewTextBoxColumn, + this.tolistDataGridViewTextBoxColumn, + this.ccDataGridViewTextBoxColumn, + this.wuidDataGridViewTextBoxColumn, + this.wdateDataGridViewTextBoxColumn, + this.sendOKDataGridViewCheckBoxColumn, + this.suid, + this.sdate, + this.cateDataGridViewTextBoxColumn}); + this.arDatagridView1.DataSource = this.bs; + this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.arDatagridView1.Location = new System.Drawing.Point(0, 36); + this.arDatagridView1.Name = "arDatagridView1"; + this.arDatagridView1.ReadOnly = true; + this.arDatagridView1.RowTemplate.Height = 23; + this.arDatagridView1.Size = new System.Drawing.Size(855, 492); + this.arDatagridView1.TabIndex = 4; // - // fpSpread1_Sheet1 + // pdateDataGridViewTextBoxColumn // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 11; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "전송"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "등록일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "제목"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "발신"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "수신"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "숨은참조"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "참조"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "전송"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "전송시간"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 32F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "SendOK"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "전송"; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "등록일"; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "subject"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "제목"; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "fromlist"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "발신"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "tolist"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "수신"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "bcc"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "숨은참조"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "cc"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "참조"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "SendMsg"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "SendOK"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "전송"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "SendMsg"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "전송시간"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "cate"; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + this.pdateDataGridViewTextBoxColumn.HeaderText = "등록일"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + // + // subjectDataGridViewTextBoxColumn + // + this.subjectDataGridViewTextBoxColumn.DataPropertyName = "subject"; + this.subjectDataGridViewTextBoxColumn.HeaderText = "제목"; + this.subjectDataGridViewTextBoxColumn.Name = "subjectDataGridViewTextBoxColumn"; + this.subjectDataGridViewTextBoxColumn.ReadOnly = true; + // + // fromlistDataGridViewTextBoxColumn + // + this.fromlistDataGridViewTextBoxColumn.DataPropertyName = "fromlist"; + this.fromlistDataGridViewTextBoxColumn.HeaderText = "From"; + this.fromlistDataGridViewTextBoxColumn.Name = "fromlistDataGridViewTextBoxColumn"; + this.fromlistDataGridViewTextBoxColumn.ReadOnly = true; + // + // tolistDataGridViewTextBoxColumn + // + this.tolistDataGridViewTextBoxColumn.DataPropertyName = "tolist"; + this.tolistDataGridViewTextBoxColumn.HeaderText = "To"; + this.tolistDataGridViewTextBoxColumn.Name = "tolistDataGridViewTextBoxColumn"; + this.tolistDataGridViewTextBoxColumn.ReadOnly = true; + // + // ccDataGridViewTextBoxColumn + // + this.ccDataGridViewTextBoxColumn.DataPropertyName = "cc"; + this.ccDataGridViewTextBoxColumn.HeaderText = "CC"; + this.ccDataGridViewTextBoxColumn.Name = "ccDataGridViewTextBoxColumn"; + this.ccDataGridViewTextBoxColumn.ReadOnly = true; + // + // wuidDataGridViewTextBoxColumn + // + this.wuidDataGridViewTextBoxColumn.DataPropertyName = "wuid"; + this.wuidDataGridViewTextBoxColumn.HeaderText = "작성자"; + this.wuidDataGridViewTextBoxColumn.Name = "wuidDataGridViewTextBoxColumn"; + this.wuidDataGridViewTextBoxColumn.ReadOnly = true; + // + // wdateDataGridViewTextBoxColumn + // + this.wdateDataGridViewTextBoxColumn.DataPropertyName = "wdate"; + this.wdateDataGridViewTextBoxColumn.HeaderText = "작성일"; + this.wdateDataGridViewTextBoxColumn.Name = "wdateDataGridViewTextBoxColumn"; + this.wdateDataGridViewTextBoxColumn.ReadOnly = true; + // + // sendOKDataGridViewCheckBoxColumn + // + this.sendOKDataGridViewCheckBoxColumn.DataPropertyName = "SendOK"; + this.sendOKDataGridViewCheckBoxColumn.HeaderText = "전송"; + this.sendOKDataGridViewCheckBoxColumn.Name = "sendOKDataGridViewCheckBoxColumn"; + this.sendOKDataGridViewCheckBoxColumn.ReadOnly = true; + // + // suid + // + this.suid.DataPropertyName = "suid"; + this.suid.HeaderText = "전송자"; + this.suid.Name = "suid"; + this.suid.ReadOnly = true; + // + // sdate + // + this.sdate.DataPropertyName = "sdate"; + this.sdate.HeaderText = "전송시간"; + this.sdate.Name = "sdate"; + this.sdate.ReadOnly = true; + // + // cateDataGridViewTextBoxColumn + // + this.cateDataGridViewTextBoxColumn.DataPropertyName = "cate"; + this.cateDataGridViewTextBoxColumn.HeaderText = "분류"; + this.cateDataGridViewTextBoxColumn.Name = "cateDataGridViewTextBoxColumn"; + this.cateDataGridViewTextBoxColumn.ReadOnly = true; // // fMailList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(791, 524); - this.Controls.Add(this.fpSpread1); + this.ClientSize = new System.Drawing.Size(855, 553); + this.Controls.Add(this.arDatagridView1); this.Controls.Add(this.panel1); this.Controls.Add(this.bn); this.Name = "fMailList"; @@ -383,8 +417,7 @@ this.bn.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -410,13 +443,23 @@ private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripButton btSave; private System.Windows.Forms.Panel panel1; - private FarPoint.Win.Spread.FpSpread fpSpread1; private System.Windows.Forms.Label label1; private System.Windows.Forms.DateTimePicker dtEd; private System.Windows.Forms.Label label2; private System.Windows.Forms.DateTimePicker dtSd; private System.Windows.Forms.Button btRefresh; private System.Windows.Forms.Button button1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private arCtl.arDatagridView arDatagridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn subjectDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn fromlistDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn tolistDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn ccDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wuidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn sendOKDataGridViewCheckBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn suid; + private System.Windows.Forms.DataGridViewTextBoxColumn sdate; + private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fMailList.cs b/SubProject/FCM0000/Mail/fMailList.cs index 1738fd4..a6ff0a5 100644 --- a/SubProject/FCM0000/Mail/fMailList.cs +++ b/SubProject/FCM0000/Mail/fMailList.cs @@ -22,7 +22,7 @@ namespace FCM0000.Mail void fAutoSendSetting_FormClosed(object sender, FormClosedEventArgs e) { - FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); + //FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); } private void mailDataBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -55,7 +55,8 @@ namespace FCM0000.Mail { System.Windows.Forms.MessageBox.Show(ex.Message); } - FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + this.arDatagridView1.AutoResizeColumns(); + // FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } private void btRefresh_Click(object sender, EventArgs e) { diff --git a/SubProject/FCM0000/Mail/fMailList.resx b/SubProject/FCM0000/Mail/fMailList.resx index eb3a091..d3121b3 100644 --- a/SubProject/FCM0000/Mail/fMailList.resx +++ b/SubProject/FCM0000/Mail/fMailList.resx @@ -204,7 +204,10 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 371, 17 + + True + + + True \ No newline at end of file