diff --git a/JobReportMailService/CSetting.cs b/JobReportMailService/CSetting.cs index 13c536c..6f4061a 100644 --- a/JobReportMailService/CSetting.cs +++ b/JobReportMailService/CSetting.cs @@ -7,12 +7,14 @@ namespace JobReportMailService { public class CSetting : arUtil.Setting { - public string connstr { get; set; } + // public string connstr { get; set; } + public Boolean autoRun { get; set; } + public Boolean autoRunData { get; set; } public override void AfterLoad() { //throw new NotImplementedException(); - if (connstr == "") - connstr = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"; + //if (connstr == "") + // connstr = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"; } public override void AfterSave() { diff --git a/JobReportMailService/DataSet1.Designer.cs b/JobReportMailService/DataSet1.Designer.cs index a1190c9..83a3367 100644 --- a/JobReportMailService/DataSet1.Designer.cs +++ b/JobReportMailService/DataSet1.Designer.cs @@ -24,14 +24,14 @@ namespace JobReportMailService { [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")] public partial class DataSet1 : global::System.Data.DataSet { - private vMailingProjectScheduleDataTable tablevMailingProjectSchedule; - private MailAutoDataTable tableMailAuto; private MailDataDataTable tableMailData; private MailFormDataTable tableMailForm; + private vMailingProjectScheduleDataTable tablevMailingProjectSchedule; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -60,9 +60,6 @@ namespace JobReportMailService { if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); - if ((ds.Tables["vMailingProjectSchedule"] != null)) { - base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"])); - } if ((ds.Tables["MailAuto"] != null)) { base.Tables.Add(new MailAutoDataTable(ds.Tables["MailAuto"])); } @@ -72,6 +69,9 @@ namespace JobReportMailService { if ((ds.Tables["MailForm"] != null)) { base.Tables.Add(new MailFormDataTable(ds.Tables["MailForm"])); } + if ((ds.Tables["vMailingProjectSchedule"] != null)) { + base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -90,16 +90,6 @@ namespace JobReportMailService { this.Relations.CollectionChanged += schemaChangedHandler; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Browsable(false)] - [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public vMailingProjectScheduleDataTable vMailingProjectSchedule { - get { - return this.tablevMailingProjectSchedule; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -130,6 +120,16 @@ namespace JobReportMailService { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public vMailingProjectScheduleDataTable vMailingProjectSchedule { + get { + return this.tablevMailingProjectSchedule; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -197,9 +197,6 @@ namespace JobReportMailService { this.Reset(); global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXml(reader); - if ((ds.Tables["vMailingProjectSchedule"] != null)) { - base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"])); - } if ((ds.Tables["MailAuto"] != null)) { base.Tables.Add(new MailAutoDataTable(ds.Tables["MailAuto"])); } @@ -209,6 +206,9 @@ namespace JobReportMailService { if ((ds.Tables["MailForm"] != null)) { base.Tables.Add(new MailFormDataTable(ds.Tables["MailForm"])); } + if ((ds.Tables["vMailingProjectSchedule"] != null)) { + base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -242,12 +242,6 @@ namespace JobReportMailService { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars(bool initTable) { - this.tablevMailingProjectSchedule = ((vMailingProjectScheduleDataTable)(base.Tables["vMailingProjectSchedule"])); - if ((initTable == true)) { - if ((this.tablevMailingProjectSchedule != null)) { - this.tablevMailingProjectSchedule.InitVars(); - } - } this.tableMailAuto = ((MailAutoDataTable)(base.Tables["MailAuto"])); if ((initTable == true)) { if ((this.tableMailAuto != null)) { @@ -266,6 +260,12 @@ namespace JobReportMailService { this.tableMailForm.InitVars(); } } + this.tablevMailingProjectSchedule = ((vMailingProjectScheduleDataTable)(base.Tables["vMailingProjectSchedule"])); + if ((initTable == true)) { + if ((this.tablevMailingProjectSchedule != null)) { + this.tablevMailingProjectSchedule.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -276,20 +276,14 @@ namespace JobReportMailService { this.Namespace = "http://tempuri.org/DataSet1.xsd"; this.EnforceConstraints = true; this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; - this.tablevMailingProjectSchedule = new vMailingProjectScheduleDataTable(); - base.Tables.Add(this.tablevMailingProjectSchedule); this.tableMailAuto = new MailAutoDataTable(); base.Tables.Add(this.tableMailAuto); this.tableMailData = new MailDataDataTable(); base.Tables.Add(this.tableMailData); this.tableMailForm = new MailFormDataTable(); base.Tables.Add(this.tableMailForm); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private bool ShouldSerializevMailingProjectSchedule() { - return false; + this.tablevMailingProjectSchedule = new vMailingProjectScheduleDataTable(); + base.Tables.Add(this.tablevMailingProjectSchedule); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -310,6 +304,12 @@ namespace JobReportMailService { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializevMailingProjectSchedule() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -365,9 +365,6 @@ namespace JobReportMailService { return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public delegate void vMailingProjectScheduleRowChangeEventHandler(object sender, vMailingProjectScheduleRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void MailAutoRowChangeEventHandler(object sender, MailAutoRowChangeEvent e); @@ -377,453 +374,8 @@ namespace JobReportMailService { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void MailFormRowChangeEventHandler(object sender, MailFormRowChangeEvent e); - /// - ///Represents the strongly named DataTable class. - /// - [global::System.Serializable()] - [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class vMailingProjectScheduleDataTable : global::System.Data.TypedTableBase { - - private global::System.Data.DataColumn columnidx; - - private global::System.Data.DataColumn columnpdate; - - private global::System.Data.DataColumn columnname; - - private global::System.Data.DataColumn columnuserManager; - - private global::System.Data.DataColumn columnseq; - - private global::System.Data.DataColumn columntitle; - - private global::System.Data.DataColumn columnsw; - - private global::System.Data.DataColumn columnew; - - private global::System.Data.DataColumn columnswa; - - private global::System.Data.DataColumn columnprogress; - - private global::System.Data.DataColumn columnewa; - - private global::System.Data.DataColumn columnww; - - private global::System.Data.DataColumn columnmemo; - - private global::System.Data.DataColumn columnsidx; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleDataTable() { - this.TableName = "vMailingProjectSchedule"; - this.BeginInit(); - this.InitClass(); - this.EndInit(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal vMailingProjectScheduleDataTable(global::System.Data.DataTable table) { - this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { - this.CaseSensitive = table.CaseSensitive; - } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { - this.Locale = table.Locale; - } - if ((table.Namespace != table.DataSet.Namespace)) { - this.Namespace = table.Namespace; - } - this.Prefix = table.Prefix; - this.MinimumCapacity = table.MinimumCapacity; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected vMailingProjectScheduleDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { - this.InitVars(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn idxColumn { - get { - return this.columnidx; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn pdateColumn { - get { - return this.columnpdate; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn nameColumn { - get { - return this.columnname; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn userManagerColumn { - get { - return this.columnuserManager; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn seqColumn { - get { - return this.columnseq; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn titleColumn { - get { - return this.columntitle; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn swColumn { - get { - return this.columnsw; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn ewColumn { - get { - return this.columnew; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn swaColumn { - get { - return this.columnswa; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn progressColumn { - get { - return this.columnprogress; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn ewaColumn { - get { - return this.columnewa; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn wwColumn { - get { - return this.columnww; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn memoColumn { - get { - return this.columnmemo; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn sidxColumn { - get { - return this.columnsidx; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Browsable(false)] - public int Count { - get { - return this.Rows.Count; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRow this[int index] { - get { - return ((vMailingProjectScheduleRow)(this.Rows[index])); - } - } - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowChanging; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowChanged; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowDeleting; - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowDeleted; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void AddvMailingProjectScheduleRow(vMailingProjectScheduleRow row) { - this.Rows.Add(row); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRow AddvMailingProjectScheduleRow(int idx, string pdate, string name, string userManager, int seq, string title, int sw, int ew, int swa, int progress, int ewa, int ww, string memo, int sidx) { - vMailingProjectScheduleRow rowvMailingProjectScheduleRow = ((vMailingProjectScheduleRow)(this.NewRow())); - object[] columnValuesArray = new object[] { - idx, - pdate, - name, - userManager, - seq, - title, - sw, - ew, - swa, - progress, - ewa, - ww, - memo, - sidx}; - rowvMailingProjectScheduleRow.ItemArray = columnValuesArray; - this.Rows.Add(rowvMailingProjectScheduleRow); - return rowvMailingProjectScheduleRow; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRow FindBysidxidx(int sidx, int idx) { - return ((vMailingProjectScheduleRow)(this.Rows.Find(new object[] { - sidx, - idx}))); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public override global::System.Data.DataTable Clone() { - vMailingProjectScheduleDataTable cln = ((vMailingProjectScheduleDataTable)(base.Clone())); - cln.InitVars(); - return cln; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { - return new vMailingProjectScheduleDataTable(); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal void InitVars() { - this.columnidx = base.Columns["idx"]; - this.columnpdate = base.Columns["pdate"]; - this.columnname = base.Columns["name"]; - this.columnuserManager = base.Columns["userManager"]; - this.columnseq = base.Columns["seq"]; - this.columntitle = base.Columns["title"]; - this.columnsw = base.Columns["sw"]; - this.columnew = base.Columns["ew"]; - this.columnswa = base.Columns["swa"]; - this.columnprogress = base.Columns["progress"]; - this.columnewa = base.Columns["ewa"]; - this.columnww = base.Columns["ww"]; - this.columnmemo = base.Columns["memo"]; - this.columnsidx = base.Columns["sidx"]; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitClass() { - this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnidx); - this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnpdate); - this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnname); - this.columnuserManager = new global::System.Data.DataColumn("userManager", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnuserManager); - this.columnseq = new global::System.Data.DataColumn("seq", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnseq); - this.columntitle = new global::System.Data.DataColumn("title", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columntitle); - this.columnsw = new global::System.Data.DataColumn("sw", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnsw); - this.columnew = new global::System.Data.DataColumn("ew", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnew); - this.columnswa = new global::System.Data.DataColumn("swa", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnswa); - this.columnprogress = new global::System.Data.DataColumn("progress", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnprogress); - this.columnewa = new global::System.Data.DataColumn("ewa", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnewa); - this.columnww = new global::System.Data.DataColumn("ww", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnww); - this.columnmemo = new global::System.Data.DataColumn("memo", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnmemo); - this.columnsidx = new global::System.Data.DataColumn("sidx", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnsidx); - this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnsidx, - this.columnidx}, true)); - this.columnidx.AllowDBNull = false; - this.columnpdate.MaxLength = 10; - this.columnname.MaxLength = 255; - this.columnuserManager.MaxLength = 50; - this.columntitle.MaxLength = 100; - this.columnww.ReadOnly = true; - this.columnmemo.MaxLength = 2147483647; - this.columnsidx.AllowDBNull = false; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRow NewvMailingProjectScheduleRow() { - return ((vMailingProjectScheduleRow)(this.NewRow())); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { - return new vMailingProjectScheduleRow(builder); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override global::System.Type GetRowType() { - return typeof(vMailingProjectScheduleRow); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowChanged(e); - if ((this.vMailingProjectScheduleRowChanged != null)) { - this.vMailingProjectScheduleRowChanged(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowChanging(e); - if ((this.vMailingProjectScheduleRowChanging != null)) { - this.vMailingProjectScheduleRowChanging(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowDeleted(e); - if ((this.vMailingProjectScheduleRowDeleted != null)) { - this.vMailingProjectScheduleRowDeleted(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { - base.OnRowDeleting(e); - if ((this.vMailingProjectScheduleRowDeleting != null)) { - this.vMailingProjectScheduleRowDeleting(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void RemovevMailingProjectScheduleRow(vMailingProjectScheduleRow row) { - this.Rows.Remove(row); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { - global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); - global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); - DataSet1 ds = new DataSet1(); - global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); - any1.Namespace = "http://www.w3.org/2001/XMLSchema"; - any1.MinOccurs = new decimal(0); - any1.MaxOccurs = decimal.MaxValue; - any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; - sequence.Items.Add(any1); - global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); - any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; - any2.MinOccurs = new decimal(1); - any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; - sequence.Items.Add(any2); - global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); - attribute1.Name = "namespace"; - attribute1.FixedValue = ds.Namespace; - type.Attributes.Add(attribute1); - global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); - attribute2.Name = "tableTypeName"; - attribute2.FixedValue = "vMailingProjectScheduleDataTable"; - type.Attributes.Add(attribute2); - type.Particle = sequence; - global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { - global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); - global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { - global::System.Xml.Schema.XmlSchema schema = null; - dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { - schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); - s2.SetLength(0); - schema.Write(s2); - if ((s1.Length == s2.Length)) { - s1.Position = 0; - s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { - ; - } - if ((s1.Position == s1.Length)) { - return type; - } - } - } - } - finally { - if ((s1 != null)) { - s1.Close(); - } - if ((s2 != null)) { - s2.Close(); - } - } - } - xs.Add(dsSchema); - return type; - } - } + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void vMailingProjectScheduleRowChangeEventHandler(object sender, vMailingProjectScheduleRowChangeEvent e); /// ///Represents the strongly named DataTable class. @@ -2313,375 +1865,501 @@ namespace JobReportMailService { } /// - ///Represents strongly named DataRow class. + ///Represents the strongly named DataTable class. /// - public partial class vMailingProjectScheduleRow : global::System.Data.DataRow { + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class vMailingProjectScheduleDataTable : global::System.Data.TypedTableBase { - private vMailingProjectScheduleDataTable tablevMailingProjectSchedule; + private global::System.Data.DataColumn columnidx; + + private global::System.Data.DataColumn columnpdate; + + private global::System.Data.DataColumn columnname; + + private global::System.Data.DataColumn columnuserManager; + + private global::System.Data.DataColumn columnseq; + + private global::System.Data.DataColumn columntitle; + + private global::System.Data.DataColumn columnsw; + + private global::System.Data.DataColumn columnew; + + private global::System.Data.DataColumn columnswa; + + private global::System.Data.DataColumn columnprogress; + + private global::System.Data.DataColumn columnewa; + + private global::System.Data.DataColumn columnww; + + private global::System.Data.DataColumn columnmemo; + + private global::System.Data.DataColumn columnsidx; + + private global::System.Data.DataColumn columngcode; + + private global::System.Data.DataColumn columnstatus; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal vMailingProjectScheduleRow(global::System.Data.DataRowBuilder rb) : - base(rb) { - this.tablevMailingProjectSchedule = ((vMailingProjectScheduleDataTable)(this.Table)); + public vMailingProjectScheduleDataTable() { + this.TableName = "vMailingProjectSchedule"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int idx { + internal vMailingProjectScheduleDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected vMailingProjectScheduleDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn idxColumn { get { - return ((int)(this[this.tablevMailingProjectSchedule.idxColumn])); - } - set { - this[this.tablevMailingProjectSchedule.idxColumn] = value; + return this.columnidx; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string pdate { + public global::System.Data.DataColumn pdateColumn { get { - if (this.IspdateNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevMailingProjectSchedule.pdateColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.pdateColumn] = value; + return this.columnpdate; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string name { + public global::System.Data.DataColumn nameColumn { get { - if (this.IsnameNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevMailingProjectSchedule.nameColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.nameColumn] = value; + return this.columnname; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string userManager { + public global::System.Data.DataColumn userManagerColumn { get { - if (this.IsuserManagerNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevMailingProjectSchedule.userManagerColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.userManagerColumn] = value; + return this.columnuserManager; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int seq { + public global::System.Data.DataColumn seqColumn { get { - if (this.IsseqNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.seqColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.seqColumn] = value; + return this.columnseq; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string title { + public global::System.Data.DataColumn titleColumn { get { - if (this.IstitleNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevMailingProjectSchedule.titleColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.titleColumn] = value; + return this.columntitle; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int sw { + public global::System.Data.DataColumn swColumn { get { - if (this.IsswNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.swColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.swColumn] = value; + return this.columnsw; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int ew { + public global::System.Data.DataColumn ewColumn { get { - if (this.IsewNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.ewColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.ewColumn] = value; + return this.columnew; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int swa { + public global::System.Data.DataColumn swaColumn { get { - if (this.IsswaNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.swaColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.swaColumn] = value; + return this.columnswa; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int progress { + public global::System.Data.DataColumn progressColumn { get { - if (this.IsprogressNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.progressColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.progressColumn] = value; + return this.columnprogress; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int ewa { + public global::System.Data.DataColumn ewaColumn { get { - if (this.IsewaNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.ewaColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.ewaColumn] = value; + return this.columnewa; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int ww { + public global::System.Data.DataColumn wwColumn { get { - if (this.IswwNull()) { - return 0; - } - else { - return ((int)(this[this.tablevMailingProjectSchedule.wwColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.wwColumn] = value; + return this.columnww; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string memo { + public global::System.Data.DataColumn memoColumn { get { - if (this.IsmemoNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevMailingProjectSchedule.memoColumn])); - } - } - set { - this[this.tablevMailingProjectSchedule.memoColumn] = value; + return this.columnmemo; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int sidx { + public global::System.Data.DataColumn sidxColumn { get { - return ((int)(this[this.tablevMailingProjectSchedule.sidxColumn])); - } - set { - this[this.tablevMailingProjectSchedule.sidxColumn] = value; + return this.columnsidx; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IspdateNull() { - return this.IsNull(this.tablevMailingProjectSchedule.pdateColumn); + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetpdateNull() { - this[this.tablevMailingProjectSchedule.pdateColumn] = global::System.Convert.DBNull; + public global::System.Data.DataColumn statusColumn { + get { + return this.columnstatus; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsnameNull() { - return this.IsNull(this.tablevMailingProjectSchedule.nameColumn); + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetnameNull() { - this[this.tablevMailingProjectSchedule.nameColumn] = global::System.Convert.DBNull; + public vMailingProjectScheduleRow this[int index] { + get { + return ((vMailingProjectScheduleRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event vMailingProjectScheduleRowChangeEventHandler vMailingProjectScheduleRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddvMailingProjectScheduleRow(vMailingProjectScheduleRow row) { + this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsuserManagerNull() { - return this.IsNull(this.tablevMailingProjectSchedule.userManagerColumn); + public vMailingProjectScheduleRow AddvMailingProjectScheduleRow( + int idx, + string pdate, + string name, + string userManager, + int seq, + string title, + string sw, + string ew, + string swa, + int progress, + string ewa, + int ww, + string memo, + int sidx, + string gcode, + string status) { + vMailingProjectScheduleRow rowvMailingProjectScheduleRow = ((vMailingProjectScheduleRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + idx, + pdate, + name, + userManager, + seq, + title, + sw, + ew, + swa, + progress, + ewa, + ww, + memo, + sidx, + gcode, + status}; + rowvMailingProjectScheduleRow.ItemArray = columnValuesArray; + this.Rows.Add(rowvMailingProjectScheduleRow); + return rowvMailingProjectScheduleRow; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetuserManagerNull() { - this[this.tablevMailingProjectSchedule.userManagerColumn] = global::System.Convert.DBNull; + public vMailingProjectScheduleRow FindByidxsidx(int idx, int sidx) { + return ((vMailingProjectScheduleRow)(this.Rows.Find(new object[] { + idx, + sidx}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsseqNull() { - return this.IsNull(this.tablevMailingProjectSchedule.seqColumn); + public override global::System.Data.DataTable Clone() { + vMailingProjectScheduleDataTable cln = ((vMailingProjectScheduleDataTable)(base.Clone())); + cln.InitVars(); + return cln; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetseqNull() { - this[this.tablevMailingProjectSchedule.seqColumn] = global::System.Convert.DBNull; + protected override global::System.Data.DataTable CreateInstance() { + return new vMailingProjectScheduleDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IstitleNull() { - return this.IsNull(this.tablevMailingProjectSchedule.titleColumn); + internal void InitVars() { + this.columnidx = base.Columns["idx"]; + this.columnpdate = base.Columns["pdate"]; + this.columnname = base.Columns["name"]; + this.columnuserManager = base.Columns["userManager"]; + this.columnseq = base.Columns["seq"]; + this.columntitle = base.Columns["title"]; + this.columnsw = base.Columns["sw"]; + this.columnew = base.Columns["ew"]; + this.columnswa = base.Columns["swa"]; + this.columnprogress = base.Columns["progress"]; + this.columnewa = base.Columns["ewa"]; + this.columnww = base.Columns["ww"]; + this.columnmemo = base.Columns["memo"]; + this.columnsidx = base.Columns["sidx"]; + this.columngcode = base.Columns["gcode"]; + this.columnstatus = base.Columns["status"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SettitleNull() { - this[this.tablevMailingProjectSchedule.titleColumn] = global::System.Convert.DBNull; + private void InitClass() { + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); + this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpdate); + this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnname); + this.columnuserManager = new global::System.Data.DataColumn("userManager", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuserManager); + this.columnseq = new global::System.Data.DataColumn("seq", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnseq); + this.columntitle = new global::System.Data.DataColumn("title", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columntitle); + this.columnsw = new global::System.Data.DataColumn("sw", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsw); + this.columnew = new global::System.Data.DataColumn("ew", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnew); + this.columnswa = new global::System.Data.DataColumn("swa", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnswa); + this.columnprogress = new global::System.Data.DataColumn("progress", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnprogress); + this.columnewa = new global::System.Data.DataColumn("ewa", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnewa); + this.columnww = new global::System.Data.DataColumn("ww", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnww); + this.columnmemo = new global::System.Data.DataColumn("memo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmemo); + this.columnsidx = new global::System.Data.DataColumn("sidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsidx); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); + this.columnstatus = new global::System.Data.DataColumn("status", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnstatus); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx, + this.columnsidx}, true)); + this.columnidx.AllowDBNull = false; + this.columnpdate.MaxLength = 10; + this.columnname.MaxLength = 255; + this.columnuserManager.MaxLength = 50; + this.columntitle.MaxLength = 100; + this.columnsw.MaxLength = 10; + this.columnew.MaxLength = 10; + this.columnswa.MaxLength = 10; + this.columnewa.MaxLength = 10; + this.columnww.ReadOnly = true; + this.columnmemo.MaxLength = 2147483647; + this.columnsidx.AllowDBNull = false; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; + this.columnstatus.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsswNull() { - return this.IsNull(this.tablevMailingProjectSchedule.swColumn); + public vMailingProjectScheduleRow NewvMailingProjectScheduleRow() { + return ((vMailingProjectScheduleRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetswNull() { - this[this.tablevMailingProjectSchedule.swColumn] = global::System.Convert.DBNull; + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new vMailingProjectScheduleRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsewNull() { - return this.IsNull(this.tablevMailingProjectSchedule.ewColumn); + protected override global::System.Type GetRowType() { + return typeof(vMailingProjectScheduleRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetewNull() { - this[this.tablevMailingProjectSchedule.ewColumn] = global::System.Convert.DBNull; + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.vMailingProjectScheduleRowChanged != null)) { + this.vMailingProjectScheduleRowChanged(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsswaNull() { - return this.IsNull(this.tablevMailingProjectSchedule.swaColumn); + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.vMailingProjectScheduleRowChanging != null)) { + this.vMailingProjectScheduleRowChanging(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetswaNull() { - this[this.tablevMailingProjectSchedule.swaColumn] = global::System.Convert.DBNull; + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.vMailingProjectScheduleRowDeleted != null)) { + this.vMailingProjectScheduleRowDeleted(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsprogressNull() { - return this.IsNull(this.tablevMailingProjectSchedule.progressColumn); + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.vMailingProjectScheduleRowDeleting != null)) { + this.vMailingProjectScheduleRowDeleting(this, new vMailingProjectScheduleRowChangeEvent(((vMailingProjectScheduleRow)(e.Row)), e.Action)); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetprogressNull() { - this[this.tablevMailingProjectSchedule.progressColumn] = global::System.Convert.DBNull; + public void RemovevMailingProjectScheduleRow(vMailingProjectScheduleRow row) { + this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsewaNull() { - return this.IsNull(this.tablevMailingProjectSchedule.ewaColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetewaNull() { - this[this.tablevMailingProjectSchedule.ewaColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IswwNull() { - return this.IsNull(this.tablevMailingProjectSchedule.wwColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetwwNull() { - this[this.tablevMailingProjectSchedule.wwColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsmemoNull() { - return this.IsNull(this.tablevMailingProjectSchedule.memoColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetmemoNull() { - this[this.tablevMailingProjectSchedule.memoColumn] = global::System.Convert.DBNull; + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DataSet1 ds = new DataSet1(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "vMailingProjectScheduleDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; } } @@ -3854,36 +3532,414 @@ namespace JobReportMailService { } /// - ///Row event argument class + ///Represents strongly named DataRow class. /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public class vMailingProjectScheduleRowChangeEvent : global::System.EventArgs { + public partial class vMailingProjectScheduleRow : global::System.Data.DataRow { - private vMailingProjectScheduleRow eventRow; - - private global::System.Data.DataRowAction eventAction; + private vMailingProjectScheduleDataTable tablevMailingProjectSchedule; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRowChangeEvent(vMailingProjectScheduleRow row, global::System.Data.DataRowAction action) { - this.eventRow = row; - this.eventAction = action; + internal vMailingProjectScheduleRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tablevMailingProjectSchedule = ((vMailingProjectScheduleDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleRow Row { + public int idx { get { - return this.eventRow; + return ((int)(this[this.tablevMailingProjectSchedule.idxColumn])); + } + set { + this[this.tablevMailingProjectSchedule.idxColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataRowAction Action { + public string pdate { get { - return this.eventAction; + if (this.IspdateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.pdateColumn])); + } } + set { + this[this.tablevMailingProjectSchedule.pdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string name { + get { + if (this.IsnameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.nameColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.nameColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string userManager { + get { + if (this.IsuserManagerNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.userManagerColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.userManagerColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int seq { + get { + if (this.IsseqNull()) { + return 0; + } + else { + return ((int)(this[this.tablevMailingProjectSchedule.seqColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.seqColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string title { + get { + if (this.IstitleNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.titleColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.titleColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string sw { + get { + if (this.IsswNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.swColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.swColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ew { + get { + if (this.IsewNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.ewColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.ewColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string swa { + get { + if (this.IsswaNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.swaColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.swaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int progress { + get { + if (this.IsprogressNull()) { + return 0; + } + else { + return ((int)(this[this.tablevMailingProjectSchedule.progressColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.progressColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ewa { + get { + if (this.IsewaNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.ewaColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.ewaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int ww { + get { + if (this.IswwNull()) { + return 0; + } + else { + return ((int)(this[this.tablevMailingProjectSchedule.wwColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.wwColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string memo { + get { + if (this.IsmemoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.memoColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.memoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int sidx { + get { + return ((int)(this[this.tablevMailingProjectSchedule.sidxColumn])); + } + set { + this[this.tablevMailingProjectSchedule.sidxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tablevMailingProjectSchedule.gcodeColumn])); + } + set { + this[this.tablevMailingProjectSchedule.gcodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string status { + get { + if (this.IsstatusNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevMailingProjectSchedule.statusColumn])); + } + } + set { + this[this.tablevMailingProjectSchedule.statusColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspdateNull() { + return this.IsNull(this.tablevMailingProjectSchedule.pdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpdateNull() { + this[this.tablevMailingProjectSchedule.pdateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsnameNull() { + return this.IsNull(this.tablevMailingProjectSchedule.nameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetnameNull() { + this[this.tablevMailingProjectSchedule.nameColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsuserManagerNull() { + return this.IsNull(this.tablevMailingProjectSchedule.userManagerColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetuserManagerNull() { + this[this.tablevMailingProjectSchedule.userManagerColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsseqNull() { + return this.IsNull(this.tablevMailingProjectSchedule.seqColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetseqNull() { + this[this.tablevMailingProjectSchedule.seqColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IstitleNull() { + return this.IsNull(this.tablevMailingProjectSchedule.titleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SettitleNull() { + this[this.tablevMailingProjectSchedule.titleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsswNull() { + return this.IsNull(this.tablevMailingProjectSchedule.swColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetswNull() { + this[this.tablevMailingProjectSchedule.swColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsewNull() { + return this.IsNull(this.tablevMailingProjectSchedule.ewColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetewNull() { + this[this.tablevMailingProjectSchedule.ewColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsswaNull() { + return this.IsNull(this.tablevMailingProjectSchedule.swaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetswaNull() { + this[this.tablevMailingProjectSchedule.swaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsprogressNull() { + return this.IsNull(this.tablevMailingProjectSchedule.progressColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetprogressNull() { + this[this.tablevMailingProjectSchedule.progressColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsewaNull() { + return this.IsNull(this.tablevMailingProjectSchedule.ewaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetewaNull() { + this[this.tablevMailingProjectSchedule.ewaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswwNull() { + return this.IsNull(this.tablevMailingProjectSchedule.wwColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwwNull() { + this[this.tablevMailingProjectSchedule.wwColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsmemoNull() { + return this.IsNull(this.tablevMailingProjectSchedule.memoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetmemoNull() { + this[this.tablevMailingProjectSchedule.memoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsstatusNull() { + return this.IsNull(this.tablevMailingProjectSchedule.statusColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetstatusNull() { + this[this.tablevMailingProjectSchedule.statusColumn] = global::System.Convert.DBNull; } } @@ -3988,192 +4044,45 @@ namespace JobReportMailService { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class vMailingProjectScheduleRowChangeEvent : global::System.EventArgs { + + private vMailingProjectScheduleRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public vMailingProjectScheduleRowChangeEvent(vMailingProjectScheduleRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public vMailingProjectScheduleRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace JobReportMailService.DataSet1TableAdapters { - /// - ///Represents the connection and commands used to retrieve and save data. - /// - [global::System.ComponentModel.DesignerCategoryAttribute("code")] - [global::System.ComponentModel.ToolboxItem(true)] - [global::System.ComponentModel.DataObjectAttribute(true)] - [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + - ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public partial class vMailingProjectScheduleTableAdapter : global::System.ComponentModel.Component { - - private global::System.Data.SqlClient.SqlDataAdapter _adapter; - - private global::System.Data.SqlClient.SqlConnection _connection; - - private global::System.Data.SqlClient.SqlTransaction _transaction; - - private global::System.Data.SqlClient.SqlCommand[] _commandCollection; - - private bool _clearBeforeFill; - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vMailingProjectScheduleTableAdapter() { - this.ClearBeforeFill = true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { - get { - if ((this._adapter == null)) { - this.InitAdapter(); - } - return this._adapter; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal global::System.Data.SqlClient.SqlConnection Connection { - get { - if ((this._connection == null)) { - this.InitConnection(); - } - return this._connection; - } - set { - this._connection = value; - if ((this.Adapter.InsertCommand != null)) { - this.Adapter.InsertCommand.Connection = value; - } - if ((this.Adapter.DeleteCommand != null)) { - this.Adapter.DeleteCommand.Connection = value; - } - if ((this.Adapter.UpdateCommand != null)) { - this.Adapter.UpdateCommand.Connection = value; - } - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - if ((this.CommandCollection[i] != null)) { - ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; - } - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal global::System.Data.SqlClient.SqlTransaction Transaction { - get { - return this._transaction; - } - set { - this._transaction = value; - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - this.CommandCollection[i].Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.DeleteCommand != null))) { - this.Adapter.DeleteCommand.Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.InsertCommand != null))) { - this.Adapter.InsertCommand.Transaction = this._transaction; - } - if (((this.Adapter != null) - && (this.Adapter.UpdateCommand != null))) { - this.Adapter.UpdateCommand.Transaction = this._transaction; - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { - get { - if ((this._commandCollection == null)) { - this.InitCommandCollection(); - } - return this._commandCollection; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool ClearBeforeFill { - get { - return this._clearBeforeFill; - } - set { - this._clearBeforeFill = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitAdapter() { - this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); - global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); - tableMapping.SourceTable = "Table"; - tableMapping.DataSetTable = "vMailingProjectSchedule"; - tableMapping.ColumnMappings.Add("idx", "idx"); - tableMapping.ColumnMappings.Add("pdate", "pdate"); - tableMapping.ColumnMappings.Add("name", "name"); - tableMapping.ColumnMappings.Add("userManager", "userManager"); - tableMapping.ColumnMappings.Add("seq", "seq"); - tableMapping.ColumnMappings.Add("title", "title"); - tableMapping.ColumnMappings.Add("sw", "sw"); - tableMapping.ColumnMappings.Add("ew", "ew"); - tableMapping.ColumnMappings.Add("swa", "swa"); - tableMapping.ColumnMappings.Add("progress", "progress"); - tableMapping.ColumnMappings.Add("ewa", "ewa"); - tableMapping.ColumnMappings.Add("ww", "ww"); - tableMapping.ColumnMappings.Add("memo", "memo"); - tableMapping.ColumnMappings.Add("sidx", "sidx"); - this._adapter.TableMappings.Add(tableMapping); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitConnection() { - this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::JobReportMailService.Properties.Settings.Default.CS; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; - this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, pdate, name, userManager, seq, title, sw, ew, swa, progress, ewa, ww" + - ", memo, sidx\r\nFROM vMailingProjectSchedule\r\nORDER BY pdate, idx, seq"; - this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [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.Fill, true)] - public virtual int Fill(DataSet1.vMailingProjectScheduleDataTable dataTable) { - this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((this.ClearBeforeFill == true)) { - dataTable.Clear(); - } - int returnValue = this.Adapter.Fill(dataTable); - return returnValue; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [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.Select, true)] - public virtual DataSet1.vMailingProjectScheduleDataTable GetData() { - this.Adapter.SelectCommand = this.CommandCollection[0]; - DataSet1.vMailingProjectScheduleDataTable dataTable = new DataSet1.vMailingProjectScheduleDataTable(); - this.Adapter.Fill(dataTable); - return dataTable; - } - } - /// ///Represents the connection and commands used to retrieve and save data. /// @@ -5133,11 +5042,11 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, SendOK, this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "SELECT COUNT(*) as cnt\r\nFROM MailData\r\nWHERE aidx=@aidx and atime=@atime and " + - "pdate=@pdate and cate=@cate"; + this._commandCollection[2].CommandText = "SELECT COUNT(*) AS cnt\r\nFROM MailData\r\nWHERE (aidx = @aidx) AND (atime = @a" + + "time) AND (pdate = @pdate) AND (cate = @cate)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6469,6 +6378,203 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class vMailingProjectScheduleTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public vMailingProjectScheduleTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "vMailingProjectSchedule"; + tableMapping.ColumnMappings.Add("idx", "idx"); + tableMapping.ColumnMappings.Add("pdate", "pdate"); + tableMapping.ColumnMappings.Add("name", "name"); + tableMapping.ColumnMappings.Add("userManager", "userManager"); + tableMapping.ColumnMappings.Add("seq", "seq"); + tableMapping.ColumnMappings.Add("title", "title"); + tableMapping.ColumnMappings.Add("sw", "sw"); + tableMapping.ColumnMappings.Add("ew", "ew"); + tableMapping.ColumnMappings.Add("swa", "swa"); + tableMapping.ColumnMappings.Add("progress", "progress"); + tableMapping.ColumnMappings.Add("ewa", "ewa"); + tableMapping.ColumnMappings.Add("ww", "ww"); + tableMapping.ColumnMappings.Add("memo", "memo"); + tableMapping.ColumnMappings.Add("sidx", "sidx"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("status", "status"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::JobReportMailService.Properties.Settings.Default.CS; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT idx, pdate, name, userManager, seq, title, sw, ew, swa, progress, ewa, ww" + + ", memo, sidx, gcode, status\r\nFROM vMailingProjectSchedule\r\nWHERE (gcode = @" + + "gcode)\r\nORDER BY pdate, idx, seq"; + 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, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(DataSet1.vMailingProjectScheduleDataTable dataTable, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Select, true)] + public virtual DataSet1.vMailingProjectScheduleDataTable GetData(string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + DataSet1.vMailingProjectScheduleDataTable dataTable = new DataSet1.vMailingProjectScheduleDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/JobReportMailService/DataSet1.cs b/JobReportMailService/DataSet1.cs new file mode 100644 index 0000000..6a41e6a --- /dev/null +++ b/JobReportMailService/DataSet1.cs @@ -0,0 +1,7 @@ +namespace JobReportMailService +{ +} + +namespace JobReportMailService +{ +} \ No newline at end of file diff --git a/JobReportMailService/DataSet1.xsd b/JobReportMailService/DataSet1.xsd index 8b4d5eb..9599f18 100644 --- a/JobReportMailService/DataSet1.xsd +++ b/JobReportMailService/DataSet1.xsd @@ -7,37 +7,6 @@ - - - - - - SELECT idx, pdate, name, userManager, seq, title, sw, ew, swa, progress, ewa, ww, memo, sidx -FROM vMailingProjectSchedule -ORDER BY pdate, idx, seq - - - - - - - - - - - - - - - - - - - - - - - @@ -290,43 +259,43 @@ SELECT idx, project, gcode, cate, pdate, subject, tolist, bcc, cc, body, SendOK, - + SELECT COUNT(*) AS Expr1 FROM MailData WHERE (aidx = @aidx) AND (pdate = @pdate) AND (atime = @atime) AND (cate = @cate) - - - - + + + + - - SELECT COUNT(*) as cnt + + SELECT COUNT(*) AS cnt FROM MailData -WHERE aidx=@aidx and atime=@atime and pdate=@pdate and cate=@cate +WHERE (aidx = @aidx) AND (atime = @atime) AND (pdate = @pdate) AND (cate = @cate) - - - - + + + + - + UPDATE MailData SET SendOK = 1, SendMsg = @msg WHERE (idx = @idx) - - + + @@ -453,6 +422,42 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se + + + + + + SELECT idx, pdate, name, userManager, seq, title, sw, ew, swa, progress, ewa, ww, memo, sidx, gcode, status +FROM vMailingProjectSchedule +WHERE (gcode = @gcode) +ORDER BY pdate, idx, seq + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -461,6 +466,270 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -494,11 +763,35 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se - - - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -508,281 +801,26 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -794,5 +832,10 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se + + + + + \ No newline at end of file diff --git a/JobReportMailService/DataSet1.xss b/JobReportMailService/DataSet1.xss index 51ba194..ecc6c28 100644 --- a/JobReportMailService/DataSet1.xss +++ b/JobReportMailService/DataSet1.xss @@ -6,10 +6,10 @@ --> - - - + + + \ No newline at end of file diff --git a/JobReportMailService/JobReportMailService.csproj b/JobReportMailService/JobReportMailService.csproj index 7a993e2..2d8a7c4 100644 --- a/JobReportMailService/JobReportMailService.csproj +++ b/JobReportMailService/JobReportMailService.csproj @@ -62,6 +62,9 @@ + + DataSet1.xsd + True True @@ -115,6 +118,12 @@ fJobReportDay.cs + + Form + + + fSetup.cs + Model1.tt @@ -232,6 +241,9 @@ fJobReportDay.cs + + fSetup.cs + MDIParent1.cs diff --git a/JobReportMailService/MDIParent1.Designer.cs b/JobReportMailService/MDIParent1.Designer.cs index e8068b0..41268a2 100644 --- a/JobReportMailService/MDIParent1.Designer.cs +++ b/JobReportMailService/MDIParent1.Designer.cs @@ -72,14 +72,14 @@ namespace JobReportMailService this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new System.Windows.Forms.ToolStrip(); - this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.bt1 = new System.Windows.Forms.ToolStripButton(); + this.bt2 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.bt3 = new System.Windows.Forms.ToolStripButton(); + this.bt4 = new System.Windows.Forms.ToolStripButton(); + this.bt5 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.bt6 = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); @@ -325,8 +325,9 @@ namespace JobReportMailService // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(115, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.optionsToolStripMenuItem.Text = "옵션(&O)"; + this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // // windowsMenu // @@ -432,83 +433,83 @@ namespace JobReportMailService // toolStrip // this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newToolStripButton, - this.openToolStripButton, + this.bt1, + this.bt2, this.toolStripSeparator1, - this.saveToolStripButton, - this.printToolStripButton, - this.toolStripButton2, + this.bt3, + this.bt4, + this.bt5, this.toolStripSeparator2, - this.toolStripButton1}); + this.bt6}); this.toolStrip.Location = new System.Drawing.Point(0, 24); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(709, 25); this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // - // newToolStripButton + // bt1 // - this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); - this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.newToolStripButton.Name = "newToolStripButton"; - this.newToolStripButton.Size = new System.Drawing.Size(95, 22); - this.newToolStripButton.Text = "업무일지(일)"; - this.newToolStripButton.Click += new System.EventHandler(this.ShowNewForm); + this.bt1.Image = ((System.Drawing.Image)(resources.GetObject("bt1.Image"))); + this.bt1.ImageTransparentColor = System.Drawing.Color.Black; + this.bt1.Name = "bt1"; + this.bt1.Size = new System.Drawing.Size(95, 22); + this.bt1.Text = "업무일지(일)"; + this.bt1.Click += new System.EventHandler(this.ShowNewForm); // - // openToolStripButton + // bt2 // - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(95, 22); - this.openToolStripButton.Text = "업무일지(주)"; - this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); + this.bt2.Image = ((System.Drawing.Image)(resources.GetObject("bt2.Image"))); + this.bt2.ImageTransparentColor = System.Drawing.Color.Black; + this.bt2.Name = "bt2"; + this.bt2.Size = new System.Drawing.Size(95, 22); + this.bt2.Text = "업무일지(주)"; + this.bt2.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // - // saveToolStripButton + // bt3 // - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(83, 22); - this.saveToolStripButton.Text = "스케쥴(일)"; - this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripButton_Click); + this.bt3.Image = ((System.Drawing.Image)(resources.GetObject("bt3.Image"))); + this.bt3.ImageTransparentColor = System.Drawing.Color.Black; + this.bt3.Name = "bt3"; + this.bt3.Size = new System.Drawing.Size(83, 22); + this.bt3.Text = "스케쥴(일)"; + this.bt3.Click += new System.EventHandler(this.saveToolStripButton_Click); // - // printToolStripButton + // bt4 // - this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); - this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripButton.Name = "printToolStripButton"; - this.printToolStripButton.Size = new System.Drawing.Size(83, 22); - this.printToolStripButton.Text = "스케쥴(주)"; - this.printToolStripButton.Click += new System.EventHandler(this.printToolStripButton_Click); + this.bt4.Image = ((System.Drawing.Image)(resources.GetObject("bt4.Image"))); + this.bt4.ImageTransparentColor = System.Drawing.Color.Black; + this.bt4.Name = "bt4"; + this.bt4.Size = new System.Drawing.Size(83, 22); + this.bt4.Text = "스케쥴(주)"; + this.bt4.Click += new System.EventHandler(this.printToolStripButton_Click); // - // toolStripButton2 + // bt5 // - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Black; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(107, 22); - this.toolStripButton2.Text = "스케쥴없음(주)"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + this.bt5.Image = ((System.Drawing.Image)(resources.GetObject("bt5.Image"))); + this.bt5.ImageTransparentColor = System.Drawing.Color.Black; + this.bt5.Name = "bt5"; + this.bt5.Size = new System.Drawing.Size(107, 22); + this.bt5.Text = "스케쥴없음(주)"; + this.bt5.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); // - // toolStripButton1 + // bt6 // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Black; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(111, 22); - this.toolStripButton1.Text = "메일생성및전송"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.bt6.Image = ((System.Drawing.Image)(resources.GetObject("bt6.Image"))); + this.bt6.ImageTransparentColor = System.Drawing.Color.Black; + this.bt6.Name = "bt6"; + this.bt6.Size = new System.Drawing.Size(111, 22); + this.bt6.Text = "메일생성및전송"; + this.bt6.Click += new System.EventHandler(this.toolStripButton1_Click); // // statusStrip // @@ -596,15 +597,15 @@ namespace JobReportMailService private System.Windows.Forms.ToolStripMenuItem contentsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem indexToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem; - private System.Windows.Forms.ToolStripButton newToolStripButton; - private System.Windows.Forms.ToolStripButton openToolStripButton; - private System.Windows.Forms.ToolStripButton saveToolStripButton; - private System.Windows.Forms.ToolStripButton printToolStripButton; + private System.Windows.Forms.ToolStripButton bt1; + private System.Windows.Forms.ToolStripButton bt2; + private System.Windows.Forms.ToolStripButton bt3; + private System.Windows.Forms.ToolStripButton bt4; private System.Windows.Forms.ToolTip toolTip; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton bt6; + private System.Windows.Forms.ToolStripButton bt5; } } diff --git a/JobReportMailService/MDIParent1.cs b/JobReportMailService/MDIParent1.cs index 6f300af..1e04102 100644 --- a/JobReportMailService/MDIParent1.cs +++ b/JobReportMailService/MDIParent1.cs @@ -17,6 +17,7 @@ namespace JobReportMailService public MDIParent1() { InitializeComponent(); + Pub.init(); } private void ShowNewForm(object sender, EventArgs e) @@ -137,6 +138,22 @@ namespace JobReportMailService private void MDIParent1_Load(object sender, EventArgs e) { this.Text = "mail service " + Application.ProductVersion.ToString(); + + if(Pub.setting.autoRun) + { + bt1.PerformClick(); + bt2.PerformClick(); + bt3.PerformClick(); + bt4.PerformClick(); + bt5.PerformClick(); + bt6.PerformClick(); + } + } + + private void optionsToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new fSetup(); + f.ShowDialog(); } } } diff --git a/JobReportMailService/MDIParent1.resx b/JobReportMailService/MDIParent1.resx index ec93bd7..1c74706 100644 --- a/JobReportMailService/MDIParent1.resx +++ b/JobReportMailService/MDIParent1.resx @@ -301,7 +301,7 @@ 126, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAELSURBVDhPrZDJasJQGIXzUvoO9TX0jcQuSulCLUUECwot @@ -312,7 +312,7 @@ NIsAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJYSURBVDhPvZFbSBNQHIf30ENPFmlRCEWWhD0MA0Oqh5Ck @@ -328,7 +328,7 @@ sW+3kJ1Cb3y8PNm4wYN1a9xY7z5f/d+MQPATMS7uX9kMtOAAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIvSURBVDhPrZLdS9NRGMd//0L33QRddFtTYzgXq8GvXENZ @@ -344,7 +344,7 @@ TkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid @@ -360,7 +360,7 @@ gg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid @@ -376,7 +376,7 @@ gg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid diff --git a/JobReportMailService/Properties/AssemblyInfo.cs b/JobReportMailService/Properties/AssemblyInfo.cs index da875d4..6bf25a2 100644 --- a/JobReportMailService/Properties/AssemblyInfo.cs +++ b/JobReportMailService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.06.07.1050")] -[assembly: AssemblyFileVersion("21.06.07.1050")] +[assembly: AssemblyVersion("22.01.08.1250")] +[assembly: AssemblyFileVersion("22.01.08.1250")] diff --git a/JobReportMailService/Pub.cs b/JobReportMailService/Pub.cs index 6a2e537..b26f7d9 100644 --- a/JobReportMailService/Pub.cs +++ b/JobReportMailService/Pub.cs @@ -8,7 +8,8 @@ namespace JobReportMailService { public static class Pub { - public static string vGcode = "EET1P"; + // public static string vGcode = "EET1P"; + public static CSetting setting; public static string MailSort(string addr, string except) { if (string.IsNullOrEmpty(except)) return addr; @@ -19,5 +20,10 @@ namespace JobReportMailService if (alist.Count < 1) return string.Empty; return string.Join(";", alist); } + public static void init() + { + setting = new CSetting(); + setting.Load(); + } } } diff --git a/JobReportMailService/fJobReportDay.Designer.cs b/JobReportMailService/fJobReportDay.Designer.cs index e0e0e74..2c4fb36 100644 --- a/JobReportMailService/fJobReportDay.Designer.cs +++ b/JobReportMailService/fJobReportDay.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReportDay)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fJobReportDay // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fJobReportDay.cs b/JobReportMailService/fJobReportDay.cs index 47209ca..ee0b8f8 100644 --- a/JobReportMailService/fJobReportDay.cs +++ b/JobReportMailService/fJobReportDay.cs @@ -76,6 +76,9 @@ namespace JobReportMailService }); timer1.Start(); + + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() @@ -85,17 +88,6 @@ namespace JobReportMailService var db = new EEEntities(); - //메일양식이 지정되어있는지 체크 - var MailJD = db.MailForm.Where(t => t.gcode == Pub.vGcode & t.cate == "JD").FirstOrDefault(); - //var MailJW = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JW").FirstOrDefault(); - - if (MailJD == null) - { - //토,일요일에는 동작하지 않는다 - addmsg("업무일지 미작성 메일 양식이 입력되지 않았습니다"); - return; - } - //기준일자는 오늘부터 -15일이다 var sd = DateTime.Now.AddDays(-15); var ed = DateTime.Now; @@ -103,163 +95,187 @@ namespace JobReportMailService var str_ed = ed.ToShortDateString(); var str_dt = DateTime.Now.ToShortDateString(); - //대상 사용자 목록을 추출한다 - db = new EEEntities(); - var users = db.vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); - Dictionary uids = new Dictionary(); - foreach (var user in users) + var gcodelist = db.MailForm.GroupBy(t => t.gcode).ToList(); + foreach(var gcodedata in gcodelist) { - //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 - var userinfo = user.FirstOrDefault(); + //메일양식이 지정되어있는지 체크 + var vGcode = gcodedata.Key; + if (string.IsNullOrEmpty(vGcode)) continue; - //퇴사자 확인 - db = new EEEntities(); - var userdata = db.vGroupUser.Where(t => t.id == userinfo.id).FirstOrDefault(); - if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; + var MailJD = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault(); + //var MailJW = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JW").FirstOrDefault(); - //사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다. - if (userdata.useJobReport != null && userdata.useJobReport == false) continue; - - db = new EEEntities(); - var Exists = db.MailData.Where(t => t.gcode == Pub.vGcode && t.wuid == userinfo.id && t.pdate == str_dt && t.cate == "JD").Any(); - if (Exists == false) uids.Add(userinfo.id, userinfo.name); //자동생성된 자료가 없는 경우에만 처리한다 - } - - - addmsg($"{uids.Count} 명의 전체 사용자가 확인 되었습니다"); - - //먼저 날짜목록을 가져온다 - db = new EEEntities(); - var lstDate = db.JobReport - .Where(t => t.gcode == Pub.vGcode && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0) - .OrderBy(t => t.pdate) - .GroupBy(t => t.pdate).ToList(); - - //날짜대로 루프를 돈다 - List days = new List(); - foreach (var dateitem in lstDate) - { - var jobdata = dateitem.FirstOrDefault(); - var dt = DateTime.Parse(jobdata.pdate); - if (dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) continue; - - //이 날짜가 휴일인지 체크한다. - db = new EEEntities(); - var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault(); - if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue; - - //이날짜에는 8시간을 근무 해야 한다 - days.Add(DateTime.Parse(jobdata.pdate)); - } - addmsg($"{days.Count} 건의 일자가 확인 되었습니다(기간:{str_sd}~{str_ed}"); - - //사용자 목록과 날짜 목록을 모두 수집했다 - List totWarnList = new List(); - foreach (var uid in uids) - { - if(uid.Key == "320854") - Console.WriteLine("테스트"); - - //이사용자의 날짜별 근무시간을 확인한다. - db = new EEEntities(); - var UserDatas = db.vJobReportForUser.Where(t => t.gcode == Pub.vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList(); - - Dictionary WarnList = new Dictionary(); - foreach (var dt in days.OrderBy(t => t)) + if (MailJD == null) { - var dtstr = dt.ToShortDateString(); - var userdata = UserDatas.Where(t => t.pdate == dtstr); //해당날짜의 데이터를 확인한다. - var hrs = 0.0; - if (userdata.Any()) hrs = (double)userdata.Sum(t => t.hrs); - - //자료를 입력하지 않았거나, 입력시간이 8시간 미만이면 경고한다 - if (hrs < 8.0) - { - WarnList.Add(dt, hrs); - totWarnList.Add(new ReportUserData { date = dt, hrs = hrs, uid = uid.Key, uname = uid.Value }); //전체알림시에 사용하는 목록 - } + //토,일요일에는 동작하지 않는다 + addmsg($"[{vGcode}]업무일지 미작성 메일 양식이 입력되지 않았습니다"); + continue; } - if (WarnList.Count > 0) + + + //대상 사용자 목록을 추출한다 + db = new EEEntities(); + var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id); + Dictionary uids = new Dictionary(); + foreach (var user in users) { - addmsg($"{uid.Value}({uid.Key}) 의 경고 일수는 {WarnList.Count} 건 입니다"); + //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 + var userinfo = user.FirstOrDefault(); + + //퇴사자 확인 + db = new EEEntities(); + var userdata = db.vGroupUser.Where(t => t.gcode == vGcode && t.id == userinfo.id).FirstOrDefault(); + if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; + + //사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다. + if (userdata.useJobReport != null && userdata.useJobReport == false) continue; db = new EEEntities(); - var userinfo = db.vGroupUser.Where(t => t.id == uid.Key).FirstOrDefault(); - if (userinfo == null) + var Exists = db.MailData.Where(t => t.gcode == vGcode && t.wuid == userinfo.id && t.pdate == str_dt && t.cate == "JD").Any(); + if (Exists == false) uids.Add(userinfo.id, userinfo.name); //자동생성된 자료가 없는 경우에만 처리한다 + } + + + addmsg($"[{vGcode}] {uids.Count} 명의 전체 사용자가 확인 되었습니다"); + + //먼저 날짜목록을 가져온다 + db = new EEEntities(); + var lstDate = db.JobReport + .Where(t => t.gcode == vGcode && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0) + .OrderBy(t => t.pdate) + .GroupBy(t => t.pdate).ToList(); + + //날짜대로 루프를 돈다 + List days = new List(); + foreach (var dateitem in lstDate) + { + var jobdata = dateitem.FirstOrDefault(); + var dt = DateTime.Parse(jobdata.pdate); + if (dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) continue; + + //이 날짜가 휴일인지 체크한다. + db = new EEEntities(); + var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault(); + if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue; + + //이날짜에는 8시간을 근무 해야 한다 + days.Add(DateTime.Parse(jobdata.pdate)); + } + addmsg($"[{vGcode}] {days.Count} 건의 일자가 확인 되었습니다(기간:{str_sd}~{str_ed}"); + + //사용자 목록과 날짜 목록을 모두 수집했다 + List totWarnList = new List(); + foreach (var uid in uids) + { + //if (uid.Key == "320854") + // Console.WriteLine("테스트"); + + //이사용자의 날짜별 근무시간을 확인한다. + db = new EEEntities(); + var UserDatas = db.vJobReportForUser.Where(t => t.gcode == vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList(); + + Dictionary WarnList = new Dictionary(); + foreach (var dt in days.OrderBy(t => t)) { - addmsg($"{uid.Value}({uid.Key}) 의 사용자 정보를 확인 할 수 없습니다"); + var dtstr = dt.ToShortDateString(); + var userdata = UserDatas.Where(t => t.pdate == dtstr); //해당날짜의 데이터를 확인한다. + var hrs = 0.0; + if (userdata.Any()) hrs = (double)userdata.Sum(t => t.hrs); + + //자료를 입력하지 않았거나, 입력시간이 8시간 미만이면 경고한다 + if (hrs < 8.0) + { + WarnList.Add(dt, hrs); + totWarnList.Add(new ReportUserData { date = dt, hrs = hrs, uid = uid.Key, uname = uid.Value }); //전체알림시에 사용하는 목록 + } } - else if (string.IsNullOrEmpty(userinfo.email)) + + if (WarnList.Count > 0) { - addmsg($"{uid.Value}({uid.Key}) 의 메일 정보가 존재하지 않습니다"); + addmsg($"[{vGcode}] {uid.Value}({uid.Key}) 의 경고 일수는 {WarnList.Count} 건 입니다"); + + db = new EEEntities(); + var userinfo = db.vGroupUser.Where(t => t.gcode == vGcode && t.id == uid.Key).FirstOrDefault(); + if (userinfo == null) + { + addmsg($"[{vGcode}] {uid.Value}({uid.Key}) 의 사용자 정보를 확인 할 수 없습니다"); + } + else if (string.IsNullOrEmpty(userinfo.email)) + { + addmsg($"[{vGcode}] {uid.Value}({uid.Key}) 의 메일 정보가 존재하지 않습니다"); + } + else + { + //일별경고(월요일제외) + + if (DateTime.Now.DayOfWeek != DayOfWeek.Monday && MailJD != null) + { + var mail_subject = MailJD.subject.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); + var mail_to = MailJD.tolist.Replace("{담당자}", userinfo.email); + var mail_cc = string.Empty; // + if (MailJD.cc != null) mail_cc = MailJD.cc.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJD.bcc != null) mail_bcc = MailJD.bcc.Replace("{담당자}", userinfo.email); + var mail_body = MailJD.body.Replace("{담당자}", userinfo.name); + mail_body = mail_body.Replace("{사번}", userinfo.id); + + //메일본문을 생성해서 진행해야함 + var mail_content = "

일자별 정보

"; + mail_content += $"
조회기간 : {str_sd}~{str_ed}"; + mail_content += "
"; + foreach (var warnitem in WarnList) + { + mail_content += $""; + } + mail_content += "
날짜요일시간
{warnitem.Key.ToShortDateString()}{warnitem.Key.DayOfWeek.ToString()}{warnitem.Value.ToString()}
"; + + //메일데이터를 생성한다. + //mail_to = "chikyun.kim@amkor.co.kr"; + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + + mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) + { + db = new EEEntities(); + db.MailData.Add(new MailData + { + gcode = vGcode, + cate = "JD", + subject = mail_subject, + fromlist = userinfo.email, + tolist = Pub.MailSort(mail_to, MailJD.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_body.Replace("{내용}", mail_content), + wuid = "dev", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"[{vGcode}] {userinfo.name}({userinfo.email}) 메일 전송 완료(day)"); + System.Threading.Thread.Sleep(10000); + } + else + { + addmsg($"[{vGcode}] 받는사람이 소거되어 메일을 생성하지 않습니다"); + } + } + } + System.Threading.Thread.Sleep(3000); } else { - //일별경고(월요일제외) - - if (DateTime.Now.DayOfWeek != DayOfWeek.Monday && MailJD != null) - { - var mail_subject = MailJD.subject.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); - var mail_to = MailJD.tolist.Replace("{담당자}", userinfo.email); - var mail_cc = string.Empty; // - if (MailJD.cc != null) mail_cc = MailJD.cc.Replace("{담당자}", userinfo.email); - var mail_bcc = string.Empty; - if (MailJD.bcc != null) mail_bcc = MailJD.bcc.Replace("{담당자}", userinfo.email); - var mail_body = MailJD.body.Replace("{담당자}", userinfo.name); - mail_body = mail_body.Replace("{사번}", userinfo.id); - - //메일본문을 생성해서 진행해야함 - var mail_content = "

일자별 정보

"; - mail_content += $"
조회기간 : {str_sd}~{str_ed}"; - mail_content += "
"; - foreach (var warnitem in WarnList) - { - mail_content += $""; - } - mail_content += "
날짜요일시간
{warnitem.Key.ToShortDateString()}{warnitem.Key.DayOfWeek.ToString()}{warnitem.Value.ToString()}
"; - - //메일데이터를 생성한다. - //mail_to = "chikyun.kim@amkor.co.kr"; - //mail_bcc = string.Empty; - //mail_cc = string.Empty; - - mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); - if (string.IsNullOrEmpty(mail_to) == false) - { - db = new EEEntities(); - db.MailData.Add(new MailData - { - gcode = Pub.vGcode, - cate = "JD", - subject = mail_subject, - fromlist = userinfo.email, - tolist = Pub.MailSort(mail_to, MailJD.exceptmail), - bcc = mail_bcc, - cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), - pdate = DateTime.Now.ToShortDateString(), - body = mail_body.Replace("{내용}", mail_content), - wuid = userinfo.id, - wdate = DateTime.Now, - }); - db.SaveChanges(); - addmsg($"{userinfo.name}({userinfo.email}) 메일 전송 완료(day)"); - System.Threading.Thread.Sleep(10000); - } - else - { - addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); - } - } + addmsg($"[{vGcode}] {uid.Value}({uid.Key}) 미 작성 일자가 없습니다"); } - System.Threading.Thread.Sleep(3000); - } - else - { - addmsg($"{uid.Value}({uid.Key}) 미 작성 일자가 없습니다"); + } + System.Threading.Thread.Sleep(500); } + + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -273,16 +289,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } diff --git a/JobReportMailService/fJobReportDay.resx b/JobReportMailService/fJobReportDay.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fJobReportDay.resx +++ b/JobReportMailService/fJobReportDay.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fJobReportWeek.Designer.cs b/JobReportMailService/fJobReportWeek.Designer.cs index d8cabf1..81e7738 100644 --- a/JobReportMailService/fJobReportWeek.Designer.cs +++ b/JobReportMailService/fJobReportWeek.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReportWeek)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fJobReportWeek // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fJobReportWeek.cs b/JobReportMailService/fJobReportWeek.cs index 5e9aef4..528b34c 100644 --- a/JobReportMailService/fJobReportWeek.cs +++ b/JobReportMailService/fJobReportWeek.cs @@ -71,9 +71,11 @@ namespace JobReportMailService } Task.Delay(Delaytime).Wait(); } - + }); timer1.Start(); + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() @@ -83,16 +85,6 @@ namespace JobReportMailService var db = new EEEntities(); - //메일양식이 지정되어있는지 체크 - var MailJW = db.MailForm.Where(t => t.gcode == Pub.vGcode & t.cate == "JW").FirstOrDefault(); - - if (MailJW == null) - { - //토,일요일에는 동작하지 않는다 - addmsg("업무일지 미작성(주간) 메일 양식이 입력되지 않았습니다"); - return; - } - //기준일자는 오늘부터 -15일이다 var sd = DateTime.Now.AddDays(-15); var ed = DateTime.Now; @@ -100,180 +92,205 @@ namespace JobReportMailService var str_ed = ed.ToShortDateString(); var str_dt = DateTime.Now.ToShortDateString(); - //오늘날짜로 주간 데이터가 등록되어있느지 확인한다. - db = new EEEntities(); - var Existweek = db.MailData.Where(t => t.gcode == Pub.vGcode && t.cate == "JW" && t.wuid == "395552" && t.pdate == str_dt).Any(); - if (Existweek) + var gcodelist = db.MailForm.GroupBy(t => t.gcode).ToList(); + foreach (var gcodedata in gcodelist) { - addmsg($"주간일자({str_dt}) 보고 메일이 이미 등록되어 있습니다"); - return; - } + //메일양식이 지정되어있는지 체크 + var vGcode = gcodedata.Key; + if (string.IsNullOrEmpty(vGcode)) continue; - //대상 사용자 목록을 추출한다 - db = new EEEntities(); - var users = db.vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); - Dictionary uids = new Dictionary(); - foreach (var user in users) - { - //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 - var userinfo = user.FirstOrDefault(); + //메일양식이 지정되어있는지 체크 + var MailJW = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JW").FirstOrDefault(); - //퇴사자 확인 - db = new EEEntities(); - var userdata = db.vGroupUser.Where(t => t.id == userinfo.id).FirstOrDefault(); - if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; - - //사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다. - if (userdata.useJobReport != null && userdata.useJobReport == false) continue; - - //이 대상의 이메일이 받는 사람에 제외되어있다면 처리하지 않는다. - var exxptolist = MailJW.exceptmail.ToUpper().Split(';'); - if (exxptolist.Contains(userdata.email.ToUpper()) == false) + if (MailJW == null) { - //모두대상으로 처리한다 - if (userdata.email.ToUpper() != ("BongSeok.Jung@amkor.co.kr").ToUpper()) - uids.Add(userinfo.id, userinfo.name); - } - else addmsg("주간 제외대상자임 " + userdata.email); - } - - addmsg($"{uids.Count} 명의 전체 사용자가 확인 되었습니다"); - - //먼저 날짜목록을 가져온다 - db = new EEEntities(); - var lstDate = db.JobReport - .Where(t => t.gcode == Pub.vGcode && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0) - .OrderBy(t => t.pdate) - .GroupBy(t => t.pdate).ToList(); - - //날짜대로 루프를 돈다 - List days = new List(); - foreach (var dateitem in lstDate) - { - var jobdata = dateitem.FirstOrDefault(); - var dt = DateTime.Parse(jobdata.pdate); - if (dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) continue; - - //이 날짜가 휴일인지 체크한다. - db = new EEEntities(); - var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault(); - if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue; - - //이날짜에는 8시간을 근무 해야 한다 - days.Add(DateTime.Parse(jobdata.pdate)); - } - addmsg($"{days.Count} 건의 일자가 확인 되었습니다(기간:{str_sd}~{str_ed}"); - - //사용자 목록과 날짜 목록을 모두 수집했다 - List totWarnList = new List(); - foreach (var uid in uids) - { - //이사용자의 날짜별 근무시간을 확인한다. - db = new EEEntities(); - var UserDatas = db.vJobReportForUser.Where(t => t.gcode == Pub.vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList(); - - Dictionary WarnList = new Dictionary(); - foreach (var dt in days.OrderBy(t => t)) - { - var dtstr = dt.ToShortDateString(); - var userdata = UserDatas.Where(t => t.pdate == dtstr); //해당날짜의 데이터를 확인한다. - var hrs = 0.0; - if (userdata.Any()) hrs = (double)userdata.Sum(t => t.hrs); - - //자료를 입력하지 않았거나, 입력시간이 8시간 미만이면 경고한다 - if (hrs < 8.0) - { - //WarnList.Add(dt, hrs); - totWarnList.Add(new ReportUserData { date = dt, hrs = hrs, uid = uid.Key, uname = uid.Value }); //전체알림시에 사용하는 목록 - } + //토,일요일에는 동작하지 않는다 + addmsg($"[{vGcode}] 업무일지 미작성(주간) 메일 양식이 입력되지 않았습니다"); + continue; } - } - - if (totWarnList.Count > 0) - { - addmsg($"주간 경고 데이터는 {totWarnList.Count} 건 입니다"); - - //오늘잘짜로 등록된 자료가 있으면 처리하지 안흔다. - //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 + //오늘날짜로 주간 데이터가 등록되어있느지 확인한다. db = new EEEntities(); - - var mail_subject = MailJW.subject; - var mail_to = MailJW.tolist;//.Replace("{담당자}", userinfo.email); - var pmail_cc = new List(); // - if (MailJW.cc != null) pmail_cc = MailJW.cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries).ToList();//.Replace("{담당자}", userinfo.email); - var mail_bcc = string.Empty; - if (MailJW.bcc != null) mail_bcc = MailJW.bcc;//.Replace("{담당자}", userinfo.email); - var mail_body = MailJW.body;//.Replace("{담당자}", userinfo.name); - - //메일본문을 생성해서 진행해야함 - var vmail_body = "

담당자별 정보

"; - vmail_body += "
조회기간 : " + sd.ToShortDateString() + "~" + ed.ToShortDateString(); - - //참고데이터를 추가한다 - var usergrplist = totWarnList.OrderBy(t => t.uname).GroupBy(t => t.uid).ToList(); - foreach (var item in usergrplist) + var Existweek = db.MailData.Where(t => t.gcode == vGcode && t.cate == "JW" && t.pdate == str_dt).Any(); + if (Existweek) { - var fitem = item.FirstOrDefault(); + addmsg($"[{vGcode}] 주간일자({str_dt}) 보고 메일이 이미 등록되어 있습니다"); + continue; + } + + //대상 사용자 목록을 추출한다 + db = new EEEntities(); + var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id); + Dictionary uids = new Dictionary(); + foreach (var user in users) + { + //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 + var userinfo = user.FirstOrDefault(); + + //퇴사자 확인 db = new EEEntities(); - var userinfo = db.vGroupUser.Where(t => t.id == fitem.uid).FirstOrDefault(); - var username = string.Empty; - if (userinfo != null) + var userdata = db.vGroupUser.Where(t => t.gcode == vGcode && t.id == userinfo.id).FirstOrDefault(); + if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; + + //사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다. + if (userdata.useJobReport != null && userdata.useJobReport == false) continue; + + //이 대상의 이메일이 받는 사람에 제외되어있다면 처리하지 않는다. + var exxptolist = MailJW.exceptmail.ToUpper().Split(';'); + if (exxptolist.Contains(userdata.email.ToUpper()) == false) { - if (string.IsNullOrEmpty(userinfo.email) == false) - { - //if (pmail_cc.Contains(userinfo.email) == false) - // pmail_cc.Add(userinfo.email); - } - username = userinfo.name; + //모두대상으로 처리한다 + //if (userdata.email.ToUpper() != ("BongSeok.Jung@amkor.co.kr").ToUpper()) + uids.Add(userinfo.id, userinfo.name); } + else addmsg($"[{vGcode}] 주간 제외대상자임 " + userdata.email); } - vmail_body += "
"; - var mail_cc = string.Join(";", pmail_cc); //모든 대상을 세미콜론으로 붙인다. - foreach (var warnitem in usergrplist) - { - var item = warnitem.FirstOrDefault(); - vmail_body += $""; - } - vmail_body += "
담당자일자별시간
{item.uname}({item.uid})"; - foreach (var ii in warnitem.OrderBy(t => t.date)) - { - vmail_body += $" {ii.date.ToString("MM/dd")}({ii.hrs}h)"; - } - vmail_body += "
"; - - //메일데이터를 생성한다. - //mail_bcc = string.Empty; - //mail_cc = string.Empty; - //mail_to = "chikyun.kim@amkor.co.kr"; + addmsg($"[{vGcode}] {uids.Count} 명의 전체 사용자가 확인 되었습니다"); + //먼저 날짜목록을 가져온다 db = new EEEntities(); - mail_to = Pub.MailSort(mail_to, MailJW.exceptmail); - if (string.IsNullOrEmpty(mail_to) == false) + var lstDate = db.JobReport + .Where(t => t.gcode == vGcode && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0) + .OrderBy(t => t.pdate) + .GroupBy(t => t.pdate).ToList(); + + //날짜대로 루프를 돈다 + List days = new List(); + foreach (var dateitem in lstDate) { - db.MailData.Add(new MailData + var jobdata = dateitem.FirstOrDefault(); + var dt = DateTime.Parse(jobdata.pdate); + if (dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) continue; + + //이 날짜가 휴일인지 체크한다. + db = new EEEntities(); + var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault(); + if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue; + + //이날짜에는 8시간을 근무 해야 한다 + days.Add(DateTime.Parse(jobdata.pdate)); + } + addmsg($"[{vGcode}] {days.Count} 건의 일자가 확인 되었습니다(기간:{str_sd}~{str_ed}"); + + //사용자 목록과 날짜 목록을 모두 수집했다 + List totWarnList = new List(); + foreach (var uid in uids) + { + //이사용자의 날짜별 근무시간을 확인한다. + db = new EEEntities(); + var UserDatas = db.vJobReportForUser.Where(t => t.gcode == vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList(); + + Dictionary WarnList = new Dictionary(); + foreach (var dt in days.OrderBy(t => t)) { - gcode = Pub.vGcode, - cate = "JW", - subject = mail_subject, - fromlist = "EETGW@amkor.co.kr", - tolist = Pub.MailSort(mail_to, MailJW.exceptmail), - bcc = mail_bcc, - cc = Pub.MailSort(mail_cc, MailJW.exceptmailcc), - pdate = DateTime.Now.ToShortDateString(), - body = mail_body.Replace("{내용}", vmail_body), - wuid = "395552", - wdate = DateTime.Now, - }); - db.SaveChanges(); - addmsg("주간 알림데이터가 등록되었습니다"); + var dtstr = dt.ToShortDateString(); + var userdata = UserDatas.Where(t => t.pdate == dtstr); //해당날짜의 데이터를 확인한다. + var hrs = 0.0; + if (userdata.Any()) hrs = (double)userdata.Sum(t => t.hrs); + + //자료를 입력하지 않았거나, 입력시간이 8시간 미만이면 경고한다 + if (hrs < 8.0) + { + //WarnList.Add(dt, hrs); + totWarnList.Add(new ReportUserData { date = dt, hrs = hrs, uid = uid.Key, uname = uid.Value }); //전체알림시에 사용하는 목록 + } + } + } - else + + if (totWarnList.Count > 0) { - addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); + addmsg($"[{vGcode}] 주간 경고 데이터는 {totWarnList.Count} 건 입니다"); + + //오늘잘짜로 등록된 자료가 있으면 처리하지 안흔다. + //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다 + db = new EEEntities(); + + var mail_subject = MailJW.subject; + var mail_to = MailJW.tolist;//.Replace("{담당자}", userinfo.email); + var pmail_cc = new List(); // + if (MailJW.cc != null) pmail_cc = MailJW.cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries).ToList();//.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJW.bcc != null) mail_bcc = MailJW.bcc;//.Replace("{담당자}", userinfo.email); + var mail_body = MailJW.body;//.Replace("{담당자}", userinfo.name); + + //메일본문을 생성해서 진행해야함 + var vmail_body = "

담당자별 정보

"; + vmail_body += "
조회기간 : " + sd.ToShortDateString() + "~" + ed.ToShortDateString(); + + //참고데이터를 추가한다 + var usergrplist = totWarnList.OrderBy(t => t.uname).GroupBy(t => t.uid).ToList(); + foreach (var item in usergrplist) + { + var fitem = item.FirstOrDefault(); + db = new EEEntities(); + var userinfo = db.vGroupUser.Where(t => t.gcode == vGcode && t.id == fitem.uid).FirstOrDefault(); + var username = string.Empty; + if (userinfo != null) + { + if (string.IsNullOrEmpty(userinfo.email) == false) + { + //if (pmail_cc.Contains(userinfo.email) == false) + // pmail_cc.Add(userinfo.email); + } + username = userinfo.name; + } + } + + vmail_body += "
"; + var mail_cc = string.Join(";", pmail_cc); //모든 대상을 세미콜론으로 붙인다. + foreach (var warnitem in usergrplist) + { + var item = warnitem.FirstOrDefault(); + vmail_body += $""; + } + vmail_body += "
담당자일자별시간
{item.uname}({item.uid})"; + foreach (var ii in warnitem.OrderBy(t => t.date)) + { + vmail_body += $" {ii.date.ToString("MM/dd")}({ii.hrs}h)"; + } + vmail_body += "
"; + + //메일데이터를 생성한다. + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + //mail_to = "chikyun.kim@amkor.co.kr"; + + db = new EEEntities(); + mail_to = Pub.MailSort(mail_to, MailJW.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) + { + db.MailData.Add(new MailData + { + gcode = vGcode, + cate = "JW", + subject = mail_subject, + fromlist = "EETGW@amkor.co.kr", + tolist = Pub.MailSort(mail_to, MailJW.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJW.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_body.Replace("{내용}", vmail_body), + wuid = "dev", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"[{vGcode}] 주간 알림데이터가 등록되었습니다"); + } + else + { + addmsg($"[{vGcode}] 받는사람이 소거되어 메일을 생성하지 않습니다"); + } } + + + System.Threading.Thread.Sleep(500); + } + + + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -285,16 +302,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } } diff --git a/JobReportMailService/fJobReportWeek.resx b/JobReportMailService/fJobReportWeek.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fJobReportWeek.resx +++ b/JobReportMailService/fJobReportWeek.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fNoScheduleDayWeek.Designer.cs b/JobReportMailService/fNoScheduleDayWeek.Designer.cs index ee9a232..2344036 100644 --- a/JobReportMailService/fNoScheduleDayWeek.Designer.cs +++ b/JobReportMailService/fNoScheduleDayWeek.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fNoScheduleDayWeek)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fNoScheduleDayWeek // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fNoScheduleDayWeek.cs b/JobReportMailService/fNoScheduleDayWeek.cs index 5f07fd1..5009207 100644 --- a/JobReportMailService/fNoScheduleDayWeek.cs +++ b/JobReportMailService/fNoScheduleDayWeek.cs @@ -75,25 +75,16 @@ namespace JobReportMailService }); timer1.Start(); + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() { addmsg("스케쥴입력(주) 미 작성자 추출 작업을 시작 합니다"); - var db = new EEEntities(); - //메일양식이 지정되어있는지 체크 - var MailJD = db.MailForm.AsNoTracking().Where(t => t.gcode == Pub.vGcode & t.cate == "SN").FirstOrDefault(); - - if (MailJD == null) - { - //토,일요일에는 동작하지 않는다 - addmsg("메일 양식(SN)이 입력되지 않았습니다"); - return; - } - //기준일자는 오늘부터 -15일이다 var sd = DateTime.Now.AddDays(-15); var ed = DateTime.Now; @@ -101,118 +92,142 @@ namespace JobReportMailService var str_ed = ed.ToShortDateString(); var str_dt = DateTime.Now.ToShortDateString(); - //오늘날짜로 데이터가 등록되어있느지 확인한다. - db = new EEEntities(); - var Existweek = db.MailData.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.cate == "SN" && t.wuid == "395552" && t.pdate == str_dt).Any(); - if (Existweek) + var gcodelist = db.MailForm.GroupBy(t => t.gcode).ToList(); + foreach (var gcodedata in gcodelist) { - addmsg($"스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); - return; - } + //메일양식이 지정되어있는지 체크 + var vGcode = gcodedata.Key; + if (string.IsNullOrEmpty(vGcode)) continue; - //대상 사용자 목록을 추출한다 - //var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); - //var users = new DataSet1.vMailingProjectScheduleDataTable(); - //ta.Fill(users); - db = new EEEntities(); - var projects = db.Projects.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.status == "진행" && (t.isdel == null || t.isdel == false)).OrderBy(t => t.sdate).ToList(); - // db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + //메일양식이 지정되어있는지 체크 + var MailJD = db.MailForm.AsNoTracking().Where(t => t.gcode == vGcode & t.cate == "SN").FirstOrDefault(); - addmsg($"{projects.Count} 건의 데이터가 확인 되었습니다"); - - //메일데이터 생성 - var body = new System.Text.StringBuilder(); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - - //var gp = projects.GroupBy(t => t.idx); - foreach (var row in projects) - { - - //스케쥴에서 데이터를 찾는다. - var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.project == row.idx).Any(); - if (cnt == true) continue; //등록되었다 - - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - } - body.AppendLine("
시작일상태번호Project요청Champion협업만료일수량외주금액자체금액절감액CR/CF
{row.sdate}{row.status}{row.idx}{row.name}{row.reqstaff}{row.userManager}{row.usermain}/{row.usersub}/{row.userhw2}{row.edate}{row.cnt}{row.costo}{row.costn}{row.costo - row.costn}{row.orderno}
"); - - //일별경고(월요일제외) - - if (MailJD != null) - { - var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); - var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); - var mail_cc = string.Empty; // - if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); - var mail_bcc = string.Empty; - if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); - var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); - //mail_body = mail_body.Replace("{사번}", userinfo.id); - - //메일본문을 생성해서 진행해야함 - var mail_content = mail_body.Replace("{data}", body.ToString()); - - //메일데이터를 생성한다. - //mail_to = "chikyun.kim@amkor.co.kr"; - //mail_bcc = string.Empty; - //mail_cc = string.Empty; - - mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); - if (string.IsNullOrEmpty(mail_to) == false) + if (MailJD == null) { - db = new EEEntities(); - db.MailData.Add(new MailData + //토,일요일에는 동작하지 않는다 + addmsg($"[{vGcode}] 메일 양식(SN)이 입력되지 않았습니다"); + continue; + } + + //오늘날짜로 데이터가 등록되어있느지 확인한다. + db = new EEEntities(); + var Existweek = db.MailData.AsNoTracking().Where(t => t.gcode == vGcode && t.cate == "SN" && t.pdate == str_dt).Any(); + if (Existweek) + { + addmsg($"[{vGcode}] 스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); + continue; + } + + //대상 사용자 목록을 추출한다 + //var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); + //var users = new DataSet1.vMailingProjectScheduleDataTable(); + //ta.Fill(users); + db = new EEEntities(); + var projects = db.Projects.AsNoTracking().Where(t => t.gcode == vGcode && t.status == "진행" && (t.isdel == null || t.isdel == false)).OrderBy(t => t.sdate).ToList(); + // db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + + addmsg($"[{vGcode}] {projects.Count} 건의 데이터가 확인 되었습니다"); + + //메일데이터 생성 + var body = new System.Text.StringBuilder(); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + + //var gp = projects.GroupBy(t => t.idx); + foreach (var row in projects) + { + + //스케쥴에서 데이터를 찾는다. + var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == vGcode && t.project == row.idx).Any(); + if (cnt == true) continue; //등록되었다 + + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + } + body.AppendLine("
시작일상태번호Project요청Champion협업만료일수량외주금액자체금액절감액CR/CF
{row.sdate}{row.status}{row.idx}{row.name}{row.reqstaff}{row.userManager}{row.usermain}/{row.usersub}/{row.userhw2}{row.edate}{row.cnt}{row.costo}{row.costn}{row.costo - row.costn}{row.orderno}
"); + + //일별경고(월요일제외) + + if (MailJD != null) + { + var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); + var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); + var mail_cc = string.Empty; // + if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); + var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); + //mail_body = mail_body.Replace("{사번}", userinfo.id); + + //메일본문을 생성해서 진행해야함 + var mail_content = mail_body.Replace("{data}", body.ToString()); + + //메일데이터를 생성한다. + //mail_to = "chikyun.kim@amkor.co.kr"; + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + + mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) { - gcode = Pub.vGcode, - cate = "SN", - subject = mail_subject, - fromlist = "eetgw@amkor.co.kr", - tolist = Pub.MailSort(mail_to, MailJD.exceptmail), - bcc = mail_bcc, - cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), - pdate = DateTime.Now.ToShortDateString(), - body = mail_content, - wuid = "395552", - wdate = DateTime.Now, - }); - db.SaveChanges(); - addmsg($"메일 전송 완료(no스케쥴week)"); - System.Threading.Thread.Sleep(10000); - } - else - { - addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); + db = new EEEntities(); + db.MailData.Add(new MailData + { + gcode = vGcode, + cate = "SN", + subject = mail_subject, + fromlist = "EETGW@amkor.co.kr", + tolist = Pub.MailSort(mail_to, MailJD.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_content, + wuid = "DEV", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"[{vGcode}] 메일 전송 완료(no스케쥴week)"); + System.Threading.Thread.Sleep(10000); + } + else + { + addmsg($"[{vGcode}] 받는사람이 소거되어 메일을 생성하지 않습니다"); + } } + + System.Threading.Thread.Sleep(500); + } + + + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -224,16 +239,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } diff --git a/JobReportMailService/fNoScheduleDayWeek.resx b/JobReportMailService/fNoScheduleDayWeek.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fNoScheduleDayWeek.resx +++ b/JobReportMailService/fNoScheduleDayWeek.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fScheduleDay.Designer.cs b/JobReportMailService/fScheduleDay.Designer.cs index e3f1e6f..57f74d3 100644 --- a/JobReportMailService/fScheduleDay.Designer.cs +++ b/JobReportMailService/fScheduleDay.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fScheduleDay)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fScheduleDay // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fScheduleDay.cs b/JobReportMailService/fScheduleDay.cs index 1df61fa..c9cf9ff 100644 --- a/JobReportMailService/fScheduleDay.cs +++ b/JobReportMailService/fScheduleDay.cs @@ -26,8 +26,8 @@ namespace JobReportMailService { if (taskwait) { - if(task != null) - task.Wait(1000); + if (task != null) + task.Wait(1000); continue; } @@ -50,7 +50,7 @@ namespace JobReportMailService ConsoleTime = DateTime.Now; } } - else if (DateTime.Now.Hour < 10 ) //10시부터 동작한다 + else if (DateTime.Now.Hour < 10) //10시부터 동작한다 { if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0) { @@ -76,6 +76,8 @@ namespace JobReportMailService }); timer1.Start(); + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() @@ -84,19 +86,6 @@ namespace JobReportMailService var db = new EEEntities(); - - //메일양식이 지정되어있는지 체크 - var MailJD = db.MailForm.Where(t => t.gcode == Pub.vGcode & t.cate == "SJ").FirstOrDefault(); - - if (MailJD == null) - { - //토,일요일에는 동작하지 않는다 - addmsg("메일 양식(SJ)이 입력되지 않았습니다"); - return; - } - - - //기준일자는 오늘부터 -15일이다 var sd = DateTime.Now.AddDays(-15); var ed = DateTime.Now; @@ -104,121 +93,143 @@ namespace JobReportMailService var str_ed = ed.ToShortDateString(); var str_dt = DateTime.Now.ToShortDateString(); - //오늘날짜로 데이터가 등록되어있느지 확인한다. - db = new EEEntities(); - var Existweek = db.MailData.Where(t => t.gcode == Pub.vGcode && t.cate == "SJ" && t.wuid == "395552" && t.pdate == str_dt).Any(); - if (Existweek) + var gcodelist = db.MailForm.GroupBy(t => t.gcode).ToList(); + foreach (var gcodedata in gcodelist) { - addmsg($"스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); - return; - } + //메일양식이 지정되어있는지 체크 + var vGcode = gcodedata.Key; + if (string.IsNullOrEmpty(vGcode)) continue; - //대상 사용자 목록을 추출한다 - var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); - var users = new DataSet1.vMailingProjectScheduleDataTable(); - ta.Fill(users); - //var users = db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + //메일양식이 지정되어있는지 체크 + var MailJD = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "SJ").FirstOrDefault(); - addmsg($"{users.Count} 명의 데이터가 확인 되었습니다"); - - //메일데이터 생성 - var body = new System.Text.StringBuilder(); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - - var gp = users.GroupBy(t => t.idx); - foreach (var row in gp) - { - var prc = row.Sum(t => t.progress) / row.Count(); - var dr = row.FirstOrDefault(); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine(""); - //여기에 스케쥴이 들어가야한다 - body.AppendLine($""); - } - body.AppendLine("
진행(%)ProjectChampion등록일스케쥴
{prc}[{dr.idx}] {dr.name}{dr.userManager}{dr.pdate}"); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - var ll = row.OrderBy(t => t.seq).ToList(); - foreach (var srow in ll) + if (MailJD == null) { + //토,일요일에는 동작하지 않는다 + addmsg($"[{vGcode}] 메일 양식(SJ)이 입력되지 않았습니다"); + continue; + } + + //오늘날짜로 데이터가 등록되어있느지 확인한다. + db = new EEEntities(); + var Existweek = db.MailData.Where(t => t.gcode == vGcode && t.cate == "SJ" && t.pdate == str_dt).Any(); + if (Existweek) + { + addmsg($"[{vGcode}] 스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); + continue; + } + + //대상 사용자 목록을 추출한다 + var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); + var users = new DataSet1.vMailingProjectScheduleDataTable(); + ta.Fill(users,vGcode); + //var users = db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + + addmsg($"[{vGcode}] {users.Count} 명의 데이터가 확인 되었습니다"); + + //메일데이터 생성 + var body = new System.Text.StringBuilder(); + body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료% 
"); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + + var gp = users.GroupBy(t => t.idx); + foreach (var row in gp) + { + var prc = row.Sum(t => t.progress) / row.Count(); + var dr = row.FirstOrDefault(); body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine(""); + //여기에 스케쥴이 들어가야한다 body.AppendLine($""); } body.AppendLine("
진행(%)ProjectChampion등록일스케쥴
{srow.seq}{srow.title}{srow.sw}{srow.ew}{srow.swa}{srow.ewa}{srow.progress}{srow.memo}{prc}[{dr.idx}] {dr.name}{dr.userManager}{dr.pdate}"); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + var ll = row.OrderBy(t => t.seq).ToList(); + foreach (var srow in ll) + { + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + } + body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료% 
{srow.seq}{srow.title}{srow.sw}{srow.ew}{srow.swa}{srow.ewa}{srow.progress}{srow.memo}
"); + body.AppendLine("
"); - body.AppendLine("
"); - //일별경고(월요일제외) + //일별경고(월요일제외) - if (MailJD != null) - { - var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); - var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); - var mail_cc = string.Empty; // - if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); - var mail_bcc = string.Empty; - if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); - var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); - //mail_body = mail_body.Replace("{사번}", userinfo.id); - - //메일본문을 생성해서 진행해야함 - var mail_content = mail_body.Replace("{data}", body.ToString()); - - //메일데이터를 생성한다. - //mail_to = "chikyun.kim@amkor.co.kr"; - //mail_bcc = string.Empty; - //mail_cc = string.Empty; - - mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); - if (string.IsNullOrEmpty(mail_to) == false) + if (MailJD != null) { - db = new EEEntities(); - db.MailData.Add(new MailData + var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); + var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); + var mail_cc = string.Empty; // + if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); + var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); + //mail_body = mail_body.Replace("{사번}", userinfo.id); + + //메일본문을 생성해서 진행해야함 + var mail_content = mail_body.Replace("{data}", body.ToString()); + + //메일데이터를 생성한다. + //mail_to = "chikyun.kim@amkor.co.kr"; + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + + mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) { - gcode = Pub.vGcode, - cate = "SJ", - subject = mail_subject, - fromlist = "eetgw@amkor.co.kr", - tolist = Pub.MailSort(mail_to, MailJD.exceptmail), - bcc = mail_bcc, - cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), - pdate = DateTime.Now.ToShortDateString(), - body = mail_content, - wuid = "395552", - wdate = DateTime.Now, - }); - db.SaveChanges(); - addmsg($"메일 전송 완료(스케쥴day)"); - System.Threading.Thread.Sleep(10000); - } - else - { - addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); + db = new EEEntities(); + db.MailData.Add(new MailData + { + gcode = vGcode, + cate = "SJ", + subject = mail_subject, + fromlist = "eetgw@amkor.co.kr", + tolist = Pub.MailSort(mail_to, MailJD.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_content, + wuid = "DEV", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"[{vGcode}] 메일 전송 완료(스케쥴day)"); + System.Threading.Thread.Sleep(10000); + } + else + { + addmsg($"[{vGcode}] 받는사람이 소거되어 메일을 생성하지 않습니다"); + } } + System.Threading.Thread.Sleep(500); } + + + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -230,16 +241,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } diff --git a/JobReportMailService/fScheduleDay.resx b/JobReportMailService/fScheduleDay.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fScheduleDay.resx +++ b/JobReportMailService/fScheduleDay.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fScheduleDayWeek.Designer.cs b/JobReportMailService/fScheduleDayWeek.Designer.cs index 11d0683..8ac2bca 100644 --- a/JobReportMailService/fScheduleDayWeek.Designer.cs +++ b/JobReportMailService/fScheduleDayWeek.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fScheduleDayWeek)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fScheduleDayWeek // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fScheduleDayWeek.cs b/JobReportMailService/fScheduleDayWeek.cs index 12834f2..f2f74c7 100644 --- a/JobReportMailService/fScheduleDayWeek.cs +++ b/JobReportMailService/fScheduleDayWeek.cs @@ -26,8 +26,8 @@ namespace JobReportMailService { if (taskwait) { - if(task != null) - task.Wait(1000); + if (task != null) + task.Wait(1000); continue; } @@ -75,6 +75,8 @@ namespace JobReportMailService }); timer1.Start(); + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() @@ -84,16 +86,6 @@ namespace JobReportMailService var db = new EEEntities(); - //메일양식이 지정되어있는지 체크 - var MailJD = db.MailForm.Where(t => t.gcode == Pub.vGcode & t.cate == "SP").FirstOrDefault(); - - if (MailJD == null) - { - //토,일요일에는 동작하지 않는다 - addmsg("메일 양식(SP)이 입력되지 않았습니다"); - return; - } - //기준일자는 오늘부터 -15일이다 var sd = DateTime.Now.AddDays(-15); var ed = DateTime.Now; @@ -101,121 +93,147 @@ namespace JobReportMailService var str_ed = ed.ToShortDateString(); var str_dt = DateTime.Now.ToShortDateString(); - //오늘날짜로 데이터가 등록되어있느지 확인한다. - db = new EEEntities(); - var Existweek = db.MailData.Where(t => t.gcode == Pub.vGcode && t.cate == "SP" && t.wuid == "395552" && t.pdate == str_dt).Any(); - if (Existweek) + + var gcodelist = db.MailForm.GroupBy(t => t.gcode).ToList(); + foreach (var gcodedata in gcodelist) { - addmsg($"스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); - return; - } + //메일양식이 지정되어있는지 체크 + var vGcode = gcodedata.Key; + if (string.IsNullOrEmpty(vGcode)) continue; - //대상 사용자 목록을 추출한다 - var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); - var users = new DataSet1.vMailingProjectScheduleDataTable(); - ta.Fill(users); - //var users = db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + //메일양식이 지정되어있는지 체크 + var MailJD = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "SP").FirstOrDefault(); - addmsg($"{users.Count} 명의 데이터가 확인 되었습니다"); - - //메일데이터 생성 - var body = new System.Text.StringBuilder(); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - - var gp = users.GroupBy(t => t.idx); - foreach (var row in gp) - { - var prc = row.Sum(t => t.progress) / row.Count(); - var dr = row.FirstOrDefault(); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine(""); - //여기에 스케쥴이 들어가야한다 - body.AppendLine($""); - } - body.AppendLine("
진행(%)ProjectChampion등록일스케쥴
{prc}[{dr.idx}] {dr.name}{dr.userManager}{dr.pdate}"); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - body.AppendLine(""); - var ll = row.OrderBy(t => t.seq).ToList(); - foreach (var srow in ll) + if (MailJD == null) { + //토,일요일에는 동작하지 않는다 + addmsg($"[{vGcode}] 메일 양식(SP)이 입력되지 않았습니다"); + continue; + } + + + + //오늘날짜로 데이터가 등록되어있느지 확인한다. + db = new EEEntities(); + var Existweek = db.MailData.Where(t => t.gcode == vGcode && t.cate == "SP" && t.pdate == str_dt).Any(); + if (Existweek) + { + addmsg($"[{vGcode}] 스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); + continue; + } + + //대상 사용자 목록을 추출한다 + var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); + var users = new DataSet1.vMailingProjectScheduleDataTable(); + ta.Fill(users,vGcode); + //var users = db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + + addmsg($"[{vGcode}] {users.Count} 명의 데이터가 확인 되었습니다"); + + //메일데이터 생성 + var body = new System.Text.StringBuilder(); + body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료% 
"); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + + var gp = users.GroupBy(t => t.idx); + foreach (var row in gp) + { + var prc = row.Sum(t => t.progress) / row.Count(); + var dr = row.FirstOrDefault(); body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); - body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine(""); + //여기에 스케쥴이 들어가야한다 body.AppendLine($""); } body.AppendLine("
진행(%)ProjectChampion등록일스케쥴
{srow.seq}{srow.title}{srow.sw}{srow.ew}{srow.swa}{srow.ewa}{srow.progress}{srow.memo}{prc}[{dr.idx}] {dr.name}{dr.userManager}{dr.pdate}"); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + var ll = row.OrderBy(t => t.seq).ToList(); + foreach (var srow in ll) + { + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + } + body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료% 
{srow.seq}{srow.title}{srow.sw}{srow.ew}{srow.swa}{srow.ewa}{srow.progress}{srow.memo}
"); + body.AppendLine("
"); - body.AppendLine("
"); - //일별경고(월요일제외) + //일별경고(월요일제외) - if (MailJD != null) - { - var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); - var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); - var mail_cc = string.Empty; // - if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); - var mail_bcc = string.Empty; - if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); - var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); - //mail_body = mail_body.Replace("{사번}", userinfo.id); - - //메일본문을 생성해서 진행해야함 - var mail_content = mail_body.Replace("{data}", body.ToString()); - - //메일데이터를 생성한다. - //mail_to = "chikyun.kim@amkor.co.kr"; - //mail_bcc = string.Empty; - //mail_cc = string.Empty; - - mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); - if (string.IsNullOrEmpty(mail_to) == false) + if (MailJD != null) { - db = new EEEntities(); - db.MailData.Add(new MailData + var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); + var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); + var mail_cc = string.Empty; // + if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); + var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); + //mail_body = mail_body.Replace("{사번}", userinfo.id); + + //메일본문을 생성해서 진행해야함 + var mail_content = mail_body.Replace("{data}", body.ToString()); + + //메일데이터를 생성한다. + //mail_to = "chikyun.kim@amkor.co.kr"; + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + + mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) { - gcode = Pub.vGcode, - cate = "SP", - subject = mail_subject, - fromlist = "eetgw@amkor.co.kr", - tolist = Pub.MailSort(mail_to, MailJD.exceptmail), - bcc = mail_bcc, - cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), - pdate = DateTime.Now.ToShortDateString(), - body = mail_content, - wuid = "395552", - wdate = DateTime.Now, - }); - db.SaveChanges(); - addmsg($"메일 전송 완료(스케쥴day)"); - System.Threading.Thread.Sleep(10000); - } - else - { - addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); + db = new EEEntities(); + db.MailData.Add(new MailData + { + gcode = vGcode, + cate = "SP", + subject = mail_subject, + fromlist = "eetgw@amkor.co.kr", + tolist = Pub.MailSort(mail_to, MailJD.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_content, + wuid = "DEV", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"[{vGcode}] 메일 전송 완료(스케쥴day)"); + System.Threading.Thread.Sleep(10000); + } + else + { + addmsg($"[{vGcode}] 받는사람이 소거되어 메일을 생성하지 않습니다"); + } } + + System.Threading.Thread.Sleep(500); + } + + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -227,16 +245,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } diff --git a/JobReportMailService/fScheduleDayWeek.resx b/JobReportMailService/fScheduleDayWeek.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fScheduleDayWeek.resx +++ b/JobReportMailService/fScheduleDayWeek.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fSendMail.Designer.cs b/JobReportMailService/fSendMail.Designer.cs index e9b4773..f7bab7b 100644 --- a/JobReportMailService/fSendMail.Designer.cs +++ b/JobReportMailService/fSendMail.Designer.cs @@ -31,7 +31,7 @@ namespace JobReportMailService { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSendMail)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btRun = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,21 +42,21 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.btRun}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 + // btRun // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(48, 22); - this.toolStripButton1.Text = "Run"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btRun.Image = ((System.Drawing.Image)(resources.GetObject("btRun.Image"))); + this.btRun.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRun.Name = "btRun"; + this.btRun.Size = new System.Drawing.Size(48, 22); + this.btRun.Text = "Run"; + this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // // fSendMail // @@ -78,6 +78,6 @@ namespace JobReportMailService #endregion private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btRun; } } \ No newline at end of file diff --git a/JobReportMailService/fSendMail.cs b/JobReportMailService/fSendMail.cs index f99249a..45dee3f 100644 --- a/JobReportMailService/fSendMail.cs +++ b/JobReportMailService/fSendMail.cs @@ -54,6 +54,8 @@ namespace JobReportMailService }); timer1.Start(); + if (Pub.setting.autoRunData) + btRun.PerformClick(); } void RunData() @@ -65,7 +67,7 @@ namespace JobReportMailService void SendMail() { - + //그룹무관하게 모든 자료를 전송처리한다 var ta = new DataSet1TableAdapters.MailDataTableAdapter(); var sendList = ta.GetData(); //발송되지않은 메일목록 @@ -79,6 +81,7 @@ namespace JobReportMailService var list_to = getMaillist(dr.tolist); var list_bcc = getMaillist(dr.bcc); var list_cc = getMaillist(dr.cc); + string sendMsg = ""; if (list_from == "") @@ -205,7 +208,7 @@ namespace JobReportMailService newdr.body = dr.body; newdr.aidx = dr.idx; newdr.atime = dr.stime; - newdr.wuid = "MANAGER"; + newdr.wuid = "DEV"; newdr.wdate = DateTime.Now; dtInsert.AddMailDataRow(newdr); try @@ -256,16 +259,16 @@ namespace JobReportMailService { if (task != null) { - if (task.IsCompleted) this.toolStripButton1.Text = "완료"; - else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; - else if (taskwait) this.toolStripButton1.Text = "대기상태"; - else this.toolStripButton1.Text = "가동중"; - this.toolStripButton1.Enabled = true; + if (task.IsCompleted) this.btRun.Text = "완료"; + else if (task.IsCanceled) this.btRun.Text = "취소"; + else if (taskwait) this.btRun.Text = "대기상태"; + else this.btRun.Text = "가동중"; + this.btRun.Enabled = true; } else { - this.toolStripButton1.Text = "사용불가"; - this.toolStripButton1.Enabled = false; + this.btRun.Text = "사용불가"; + this.btRun.Enabled = false; } } diff --git a/JobReportMailService/fSendMail.resx b/JobReportMailService/fSendMail.resx index 49cb4c2..df60ad6 100644 --- a/JobReportMailService/fSendMail.resx +++ b/JobReportMailService/fSendMail.resx @@ -124,7 +124,7 @@ 104, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG diff --git a/JobReportMailService/fSetup.Designer.cs b/JobReportMailService/fSetup.Designer.cs new file mode 100644 index 0000000..682c0c7 --- /dev/null +++ b/JobReportMailService/fSetup.Designer.cs @@ -0,0 +1,75 @@ + +namespace JobReportMailService +{ + partial class fSetup + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // propertyGrid1 + // + this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill; + this.propertyGrid1.Location = new System.Drawing.Point(0, 0); + this.propertyGrid1.Name = "propertyGrid1"; + this.propertyGrid1.Size = new System.Drawing.Size(457, 486); + this.propertyGrid1.TabIndex = 0; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(0, 486); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(457, 68); + this.button1.TabIndex = 1; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // fSetup + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(457, 554); + this.Controls.Add(this.propertyGrid1); + this.Controls.Add(this.button1); + this.Name = "fSetup"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "fSetup"; + this.Load += new System.EventHandler(this.fSetup_Load); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PropertyGrid propertyGrid1; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file diff --git a/JobReportMailService/fSetup.cs b/JobReportMailService/fSetup.cs new file mode 100644 index 0000000..e11d451 --- /dev/null +++ b/JobReportMailService/fSetup.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace JobReportMailService +{ + public partial class fSetup : Form + { + public fSetup() + { + InitializeComponent(); + this.propertyGrid1.SelectedObject = Pub.setting; + } + + private void button1_Click(object sender, EventArgs e) + { + this.Validate(); + Pub.setting.Save(); + DialogResult = DialogResult.OK; + } + + private void fSetup_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/JobReportMailService/fSetup.resx b/JobReportMailService/fSetup.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/JobReportMailService/fSetup.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Project/Dev/fDisableItem.Designer.cs b/Project/Dev/fDisableItem.Designer.cs new file mode 100644 index 0000000..1f2fb13 --- /dev/null +++ b/Project/Dev/fDisableItem.Designer.cs @@ -0,0 +1,89 @@ + +namespace Project.Dev +{ + partial class fDisableItem + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fDisableItem)); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.textBox1.Location = new System.Drawing.Point(0, 0); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; + this.textBox1.Size = new System.Drawing.Size(269, 405); + this.textBox1.TabIndex = 0; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // + // progressBar1 + // + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.progressBar1.Location = new System.Drawing.Point(0, 405); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(800, 45); + this.progressBar1.TabIndex = 1; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(295, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(178, 56); + this.button1.TabIndex = 2; + this.button1.Text = "disable"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // fDisableItem + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.progressBar1); + this.Name = "fDisableItem"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "fDisableItem"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ProgressBar progressBar1; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file diff --git a/Project/Dev/fDisableItem.cs b/Project/Dev/fDisableItem.cs new file mode 100644 index 0000000..b59a3bc --- /dev/null +++ b/Project/Dev/fDisableItem.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Project.Dev +{ + public partial class fDisableItem : Form + { + public fDisableItem() + { + InitializeComponent(); + } + + private void button1_Click(object sender, EventArgs e) + { + + + var lines = this.textBox1.Text.Replace("\r", "").Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); + + var dlg = Util.MsgQ($"{lines.Length} 건의 아이템 비활성화를 진행 할까요?"); + if (dlg != DialogResult.Yes) return; + + this.progressBar1.Minimum = 0; + this.progressBar1.Maximum = lines.Length; + this.progressBar1.Value = 0; + + var cn = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.gwcs); + var cmd = new System.Data.SqlClient.SqlCommand("", cn); + cn.Open(); + var cnt = 0; + foreach(var item in lines) + { + this.progressBar1.Value += 1; + if (item.StartsWith("10") == false) continue; + var sql = $"update items set [disable]= 1 where [sid] = '{item.Trim()}' and gcode = '{FCOMMON.info.Login.gcode}'"; + cmd.CommandText = sql; + cnt += cmd.ExecuteNonQuery(); + if (this.progressBar1.Value % 50 == 0) + { + this.Text = $"{cnt}/{progressBar1.Maximum}"; + Application.DoEvents(); + } + } + cmd.Dispose(); + cn.Close(); + Util.MsgI("ok = " + cnt.ToString()); + + } + } +} diff --git a/Project/Dev/fDisableItem.resx b/Project/Dev/fDisableItem.resx new file mode 100644 index 0000000..8c2676f --- /dev/null +++ b/Project/Dev/fDisableItem.resx @@ -0,0 +1,5358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SID +100753463 +100757219 +100757238 +100757423 +100757444 +100757494 +100072683 +100752683 +108754428 +108795151 +108813536 +108946575 +108953299 +108790214 +108819169 +108902254 +108921296 +108928461 +108929978 +108931717 +108932071 +108934122 +108934123 +108934125 +108934517 +108939009 +108942566 +108942567 +108945181 +108946865 +108948122 +108948123 +108949450 +108955019 +108955690 +108017934 +108018744 +108019716 +108019724 +108020102 +108124285 +108473093 +108484150 +108674480 +108756158 +108858221 +108868774 +108872216 +108879324 +108886021 +108894771 +108910687 +108918515 +108918588 +108922843 +108925641 +108933617 +108935655 +108938274 +108940858 +108940969 +108941104 +108941205 +108941228 +108941385 +108941692 +108941783 +108941784 +108941999 +108942122 +108942942 +108943136 +108943137 +108943266 +108943478 +108943618 +108943619 +108944034 +108944267 +108944268 +108944675 +108944868 +108944869 +108944885 +108945010 +108945028 +108945035 +108945178 +108945361 +108945673 +108945822 +108946645 +108946830 +108947020 +108947471 +108947582 +108947810 +108947856 +108948124 +108948125 +108948581 +108948582 +108949028 +108949154 +108949323 +108949324 +108949446 +108949463 +108949549 +108949587 +108949640 +108949735 +108949870 +108949871 +108950698 +108950767 +108950808 +108950910 +108950911 +108950966 +108950968 +108950969 +108950970 +108951005 +108951317 +108951770 +108951782 +108952418 +108952453 +108952502 +108952651 +108952652 +108952654 +108952794 +108952813 +108952814 +108952833 +108952876 +108953351 +108953655 +108954009 +108954266 +108954267 +108955176 +108014315 +108014331 +108014463 +108124226 +108589954 +108709593 +108780494 +108786327 +108787057 +108802613 +108809129 +108812513 +108822832 +108830513 +108843629 +108846209 +108876599 +108877369 +108880101 +108893478 +108893801 +108900451 +108914374 +108938357 +108941101 +108946501 +108955401 +108955414 +108023845 +108024787 +108025740 +108028472 +108028545 +108028553 +108029223 +108029487 +108138847 +108152793 +108152904 +108161903 +108170449 +108186370 +108186639 +108208462 +108223976 +108321854 +108321862 +108369350 +108425137 +108427091 +108444611 +108459163 +108486209 +108486675 +108513648 +108529544 +108529552 +108529560 +108535668 +108543300 +108566091 +108567632 +108584383 +108609386 +108609408 +108625845 +108693395 +108700456 +108747732 +108748026 +108748609 +108748862 +108752043 +108752305 +108755845 +108756514 +108756701 +108756745 +108759190 +108762162 +108766423 +108768271 +108784266 +108790339 +108799560 +108807212 +108808746 +108810277 +108810696 +108812433 +108823164 +108824701 +108826801 +108834777 +108839095 +108839496 +108839541 +108839977 +108840538 +108841383 +108841632 +108842166 +108843053 +108843288 +108843296 +108843362 +108846118 +108846423 +108846515 +108847081 +108847193 +108847691 +108849430 +108850540 +108850725 +108850876 +108851286 +108851513 +108853537 +108855710 +108856061 +108856684 +108857176 +108858394 +108859169 +108860959 +108861559 +108861561 +108863635 +108864621 +108866863 +108867464 +108868022 +108868139 +108868140 +108868185 +108868285 +108869033 +108869327 +108870737 +108872003 +108872004 +108873333 +108876084 +108876842 +108880721 +108882498 +108884391 +108884697 +108885083 +108888049 +108888050 +108888051 +108891415 +108891727 +108894925 +108895855 +108897629 +108898343 +108898365 +108898995 +108899275 +108900676 +108901166 +108903223 +108905004 +108905038 +108907917 +108909265 +108909987 +108910598 +108910601 +108911361 +108917231 +108917232 +108921179 +108922514 +108923408 +108924800 +108924841 +108926812 +108927328 +108930350 +108930906 +108933229 +108933981 +108933982 +108934650 +108934653 +108934669 +108934672 +108934674 +108934675 +108934678 +108936443 +108936573 +108937464 +108937515 +108937811 +108940612 +108940933 +108941023 +108941116 +108941221 +108941377 +108941420 +108941450 +108941451 +108941458 +108941459 +108941460 +108941461 +108941462 +108941578 +108941605 +108941606 +108941618 +108941675 +108941676 +108941686 +108941958 +108942073 +108942218 +108942219 +108942225 +108942226 +108942227 +108942272 +108942273 +108942708 +108942766 +108942943 +108942949 +108943021 +108943031 +108943032 +108943033 +108943034 +108943035 +108943036 +108943046 +108943047 +108943064 +108943065 +108943197 +108943336 +108943711 +108943720 +108943782 +108943783 +108943784 +108943786 +108943835 +108943836 +108943837 +108943844 +108943907 +108943912 +108943913 +108943943 +108944114 +108944117 +108944127 +108944128 +108944137 +108944313 +108944314 +108944419 +108944420 +108944446 +108944798 +108944859 +108944955 +108944957 +108945072 +108945356 +108945357 +108945582 +108945583 +108945589 +108945693 +108945758 +108945760 +108945762 +108945813 +108945907 +108945909 +108945955 +108945957 +108946341 +108946344 +108946392 +108946393 +108946394 +108946395 +108946495 +108946496 +108946547 +108946604 +108946605 +108946731 +108946802 +108946847 +108946871 +108946872 +108947103 +108947160 +108947384 +108947619 +108947771 +108947778 +108947868 +108947974 +108948033 +108948057 +108948058 +108948584 +108948585 +108948586 +108948894 +108949342 +108949351 +108949637 +108949641 +108949727 +108949935 +108949942 +108950036 +108950037 +108950079 +108950425 +108950702 +108951098 +108951099 +108951144 +108951315 +108951432 +108951535 +108951536 +108951537 +108951579 +108952354 +108952470 +108952873 +108952892 +108953165 +108953767 +108953768 +108953770 +108953899 +108954081 +108954082 +108954083 +108955571 +108955775 +108955782 +108039660 +108858392 +108880996 +108899160 +108907243 +108908126 +108941341 +108944713 +108945670 +108945687 +108946382 +108946729 +108946863 +108946864 +108947581 +108949636 +108082612 +108083007 +108752190 +108757608 +108816117 +108817644 +108838020 +108850868 +108881728 +108896882 +108921282 +108935275 +108938799 +108940556 +108940557 +108940558 +108940559 +108940560 +108940561 +108940562 +108940563 +108941249 +108941250 +108941302 +108944728 +108944729 +108944730 +108944731 +108944732 +108946614 +108946615 +108946616 +108946996 +108947422 +108947423 +108948035 +108948394 +108948395 +108948396 +108948407 +108949210 +108949211 +108949462 +108952045 +108952095 +108952620 +108954395 +108044320 +108046918 +108047108 +108134213 +108138626 +108169009 +108184687 +108226541 +108365851 +108427300 +108532049 +108706640 +108714112 +108750028 +108758398 +108766912 +108776435 +108777909 +108778198 +108778858 +108781274 +108788067 +108789277 +108792142 +108793985 +108795028 +108796098 +108801338 +108802153 +108803278 +108804768 +108806020 +108806434 +108810964 +108811420 +108813135 +108813177 +108813408 +108814689 +108815924 +108816257 +108816682 +108818575 +108819180 +108819883 +108822065 +108826704 +108828267 +108828978 +108829317 +108832411 +108835160 +108837228 +108841123 +108845346 +108846466 +108850974 +108855332 +108855717 +108856826 +108859273 +108861793 +108861802 +108862236 +108862415 +108862696 +108867340 +108867776 +108868114 +108868379 +108868995 +108869759 +108869885 +108870253 +108870638 +108872320 +108873764 +108876164 +108877233 +108877798 +108878188 +108880507 +108880705 +108880708 +108881599 +108882336 +108882912 +108884297 +108885753 +108886620 +108886694 +108886786 +108886974 +108887390 +108888199 +108888290 +108890558 +108891012 +108898178 +108898196 +108900664 +108902670 +108903136 +108903137 +108903590 +108903682 +108904158 +108906329 +108910934 +108911094 +108913419 +108914754 +108916287 +108916706 +108916707 +108917044 +108917769 +108918340 +108918744 +108920230 +108921700 +108921967 +108922060 +108922095 +108922388 +108922389 +108922390 +108922391 +108922392 +108922393 +108922395 +108922640 +108923915 +108927411 +108928208 +108928471 +108929649 +108930200 +108932300 +108933012 +108935438 +108935646 +108935714 +108936471 +108936472 +108936557 +108936855 +108937184 +108937476 +108937698 +108937861 +108937999 +108938386 +108938388 +108938898 +108939093 +108939542 +108939653 +108940766 +108940772 +108940788 +108940789 +108940790 +108940791 +108940793 +108940870 +108940900 +108940919 +108940937 +108940955 +108941000 +108941102 +108941183 +108941292 +108941342 +108941382 +108941383 +108941425 +108941426 +108941694 +108941758 +108941884 +108941959 +108941960 +108941971 +108941972 +108942142 +108942301 +108942550 +108942674 +108942699 +108942723 +108942724 +108942746 +108943099 +108943100 +108943165 +108943172 +108943192 +108943309 +108943502 +108943665 +108943744 +108943810 +108943894 +108943908 +108943936 +108943938 +108943946 +108944061 +108944084 +108944112 +108944297 +108944358 +108944384 +108944385 +108944507 +108944568 +108944727 +108944822 +108944856 +108944865 +108944953 +108944959 +108945005 +108945097 +108945098 +108945130 +108945144 +108945310 +108945327 +108945355 +108945434 +108945506 +108945622 +108945637 +108945729 +108945827 +108945828 +108945883 +108945884 +108946039 +108946041 +108946257 +108946258 +108946398 +108946452 +108946457 +108946458 +108946539 +108946548 +108946612 +108946613 +108946646 +108946708 +108946709 +108946734 +108946840 +108946889 +108946971 +108947019 +108947059 +108947296 +108947365 +108947366 +108947421 +108947633 +108947817 +108947857 +108948023 +108948032 +108948086 +108948173 +108948251 +108948254 +108948401 +108948449 +108948475 +108948476 +108948482 +108948500 +108948555 +108948659 +108948751 +108948752 +108948753 +108948754 +108948755 +108948813 +108948886 +108948934 +108948956 +108949004 +108949306 +108949432 +108949479 +108949480 +108949540 +108949838 +108949865 +108949878 +108950059 +108950126 +108950371 +108950428 +108950482 +108950540 +108950560 +108950561 +108950599 +108950627 +108950628 +108950652 +108950758 +108950761 +108950943 +108951072 +108951152 +108951153 +108951154 +108951320 +108951538 +108951581 +108951582 +108951811 +108951873 +108952046 +108952064 +108952154 +108952209 +108952343 +108952439 +108952440 +108952475 +108952535 +108952605 +108952774 +108952871 +108952923 +108952983 +108952984 +108952987 +108953018 +108953019 +108953192 +108953198 +108953225 +108953247 +108953248 +108953250 +108953323 +108953487 +108953543 +108953544 +108953637 +108954043 +108954188 +108954189 +108954399 +108954421 +108954458 +108954459 +108954466 +108954515 +108954542 +108954566 +108954599 +108954640 +108954663 +108954763 +108954764 +108954796 +108954807 +108954907 +108955013 +108955114 +108955121 +108955215 +108955216 +108955231 +108955253 +108955388 +108955534 +108955583 +108955605 +108955607 +108955608 +108955609 +108955610 +108955645 +108955694 +108960668 +108050265 +108051741 +108053663 +108153668 +108239074 +108245490 +108253239 +108282794 +108333283 +108397656 +108398881 +108428780 +108451103 +108472828 +108494317 +108496263 +108525972 +108528530 +108532693 +108535625 +108541668 +108556908 +108576313 +108579690 +108582038 +108601121 +108639684 +108657089 +108677772 +108680471 +108698460 +108717898 +108727877 +108749788 +108749789 +108749912 +108750228 +108751149 +108751412 +108752185 +108755566 +108758760 +108759620 +108763138 +108765614 +108767455 +108769153 +108774814 +108777284 +108777285 +108777288 +108777289 +108778173 +108785260 +108790153 +108790190 +108790376 +108791559 +108791590 +108792603 +108797712 +108798474 +108802046 +108802426 +108803499 +108803684 +108805276 +108805855 +108807392 +108807396 +108809843 +108810036 +108814388 +108816613 +108817837 +108819747 +108819748 +108819771 +108820473 +108820716 +108820743 +108821063 +108821339 +108821460 +108821642 +108822101 +108823566 +108825826 +108826233 +108828030 +108829692 +108830976 +108831166 +108831630 +108832122 +108832123 +108832877 +108833207 +108833921 +108834310 +108834311 +108835006 +108835967 +108836097 +108836110 +108836572 +108836573 +108837175 +108837724 +108837727 +108837728 +108837802 +108838098 +108838174 +108839024 +108839025 +108839029 +108839030 +108839037 +108839819 +108839820 +108839821 +108839829 +108840106 +108840268 +108840269 +108840270 +108840388 +108840892 +108840893 +108840894 +108841817 +108841899 +108842033 +108842125 +108842287 +108842320 +108842486 +108842905 +108843166 +108843223 +108843224 +108843394 +108843396 +108843758 +108843760 +108843884 +108844017 +108844814 +108845325 +108845336 +108845544 +108845558 +108845978 +108847137 +108847343 +108848081 +108848836 +108849245 +108849537 +108849539 +108849544 +108849836 +108850023 +108850025 +108850350 +108850351 +108850464 +108850990 +108851447 +108851633 +108851634 +108851907 +108852001 +108852002 +108852003 +108852156 +108852157 +108852158 +108852162 +108852163 +108852164 +108852303 +108852436 +108852837 +108852986 +108853159 +108853293 +108853925 +108854047 +108854313 +108854453 +108854625 +108854627 +108854630 +108854631 +108854702 +108856097 +108856344 +108856434 +108856508 +108856702 +108856820 +108856953 +108857093 +108857218 +108857219 +108857776 +108858377 +108858816 +108859184 +108859471 +108859528 +108859632 +108859947 +108860441 +108860442 +108860444 +108860762 +108861191 +108861477 +108862746 +108862919 +108862936 +108863151 +108864326 +108864327 +108864561 +108864562 +108864665 +108865756 +108865760 +108866300 +108866726 +108866727 +108866728 +108866729 +108866986 +108867110 +108867125 +108867536 +108867689 +108868830 +108868970 +108869471 +108869866 +108869898 +108870369 +108870519 +108870547 +108871341 +108871342 +108871558 +108871954 +108871955 +108871956 +108872484 +108872671 +108872685 +108872688 +108872882 +108873004 +108873025 +108873039 +108873174 +108873234 +108873787 +108874749 +108876272 +108876375 +108876518 +108877033 +108877394 +108877403 +108878199 +108878374 +108880114 +108880535 +108881310 +108881797 +108881906 +108882274 +108882406 +108883029 +108883329 +108884494 +108884557 +108884795 +108884815 +108885344 +108885345 +108885431 +108885531 +108885610 +108885775 +108886253 +108886487 +108886699 +108886711 +108887147 +108887148 +108887571 +108887605 +108887972 +108888632 +108888940 +108888969 +108889408 +108889490 +108889501 +108889632 +108890027 +108890844 +108892105 +108892240 +108892308 +108892502 +108892610 +108892668 +108893377 +108893511 +108893852 +108893911 +108894138 +108894898 +108894993 +108895114 +108895387 +108895530 +108896440 +108896642 +108897147 +108897205 +108897208 +108897764 +108898009 +108898140 +108898681 +108899186 +108899344 +108899953 +108899954 +108899956 +108900054 +108900156 +108900610 +108900763 +108901094 +108901098 +108901129 +108901252 +108901353 +108901559 +108901837 +108902408 +108902417 +108902568 +108902572 +108902664 +108902863 +108903110 +108903392 +108903500 +108903839 +108904042 +108904086 +108904768 +108904838 +108905172 +108905906 +108906098 +108906137 +108906143 +108906781 +108906896 +108906898 +108906899 +108907312 +108907486 +108907544 +108907674 +108907720 +108908153 +108908712 +108908740 +108908809 +108908901 +108909159 +108910418 +108910452 +108911865 +108912013 +108912338 +108912339 +108912861 +108912869 +108913394 +108913443 +108913951 +108913966 +108914034 +108914336 +108914785 +108915332 +108915628 +108915952 +108916017 +108916612 +108916665 +108916787 +108916809 +108916896 +108917079 +108917223 +108917309 +108917555 +108918184 +108918207 +108918604 +108918808 +108918880 +108919164 +108920182 +108920411 +108920412 +108920645 +108920729 +108920758 +108920827 +108920898 +108921374 +108921503 +108921698 +108921896 +108921932 +108922414 +108922512 +108922610 +108923051 +108923268 +108923383 +108923607 +108923820 +108924133 +108924198 +108924399 +108924429 +108925144 +108925615 +108925616 +108925617 +108925618 +108925619 +108925620 +108925653 +108925694 +108925699 +108925835 +108925836 +108925839 +108926636 +108926769 +108927025 +108927080 +108927234 +108927317 +108927318 +108927321 +108927322 +108927452 +108927878 +108927885 +108927886 +108928502 +108928837 +108928855 +108928898 +108928934 +108929240 +108929260 +108929261 +108929262 +108929295 +108929421 +108929766 +108929767 +108929805 +108929854 +108929979 +108929986 +108930063 +108930195 +108930196 +108930204 +108930359 +108931220 +108931296 +108931318 +108932281 +108932431 +108932838 +108932898 +108932954 +108933978 +108934874 +108934878 +108935101 +108935173 +108935290 +108935346 +108935621 +108935622 +108935624 +108935757 +108935917 +108936124 +108936334 +108936480 +108936622 +108936716 +108936917 +108937098 +108937099 +108937196 +108937207 +108937208 +108937319 +108937406 +108937534 +108937939 +108937940 +108938098 +108938242 +108938384 +108938387 +108938592 +108938729 +108938891 +108938892 +108938931 +108938997 +108939028 +108939155 +108939676 +108939760 +108939896 +108939948 +108940083 +108940391 +108940851 +108940852 +108940853 +108940917 +108940918 +108940922 +108940956 +108940979 +108940985 +108940990 +108940995 +108941005 +108941016 +108941054 +108941056 +108941057 +108941058 +108941096 +108941107 +108941117 +108941118 +108941119 +108941120 +108941121 +108941122 +108941124 +108941158 +108941195 +108941198 +108941206 +108941220 +108941296 +108941298 +108941299 +108941368 +108941391 +108941410 +108941413 +108941414 +108941415 +108941432 +108941433 +108941576 +108941583 +108941592 +108941593 +108941601 +108941608 +108941619 +108941757 +108941766 +108941781 +108941872 +108941908 +108941909 +108941915 +108941916 +108941962 +108941966 +108941977 +108941978 +108941979 +108941985 +108942000 +108942009 +108942017 +108942019 +108942020 +108942021 +108942022 +108942023 +108942024 +108942072 +108942079 +108942135 +108942166 +108942177 +108942200 +108942232 +108942233 +108942258 +108942259 +108942265 +108942266 +108942267 +108942274 +108942304 +108942400 +108942401 +108942404 +108942405 +108942459 +108942526 +108942527 +108942570 +108942701 +108942702 +108942703 +108942704 +108942719 +108942736 +108942737 +108942738 +108942743 +108942744 +108942745 +108942747 +108942748 +108942772 +108942773 +108942837 +108942873 +108942874 +108942926 +108942930 +108942931 +108942932 +108942947 +108942980 +108943023 +108943024 +108943027 +108943053 +108943054 +108943055 +108943058 +108943059 +108943068 +108943101 +108943103 +108943166 +108943204 +108943273 +108943274 +108943275 +108943276 +108943277 +108943278 +108943280 +108943282 +108943284 +108943285 +108943300 +108943374 +108943386 +108943387 +108943390 +108943414 +108943464 +108943497 +108943498 +108943499 +108943500 +108943501 +108943507 +108943525 +108943556 +108943623 +108943673 +108943697 +108943699 +108943716 +108943755 +108943756 +108943757 +108943758 +108943759 +108943760 +108943761 +108943762 +108943787 +108943788 +108943789 +108943790 +108943792 +108943839 +108943842 +108943883 +108943914 +108943937 +108943939 +108943944 +108943950 +108943953 +108943987 +108944099 +108944100 +108944101 +108944102 +108944116 +108944133 +108944140 +108944187 +108944193 +108944208 +108944246 +108944305 +108944306 +108944307 +108944308 +108944309 +108944319 +108944326 +108944359 +108944361 +108944363 +108944365 +108944366 +108944429 +108944430 +108944449 +108944450 +108944451 +108944452 +108944453 +108944470 +108944476 +108944498 +108944499 +108944500 +108944502 +108944506 +108944522 +108944547 +108944555 +108944674 +108944683 +108944692 +108944716 +108944765 +108944768 +108944791 +108944801 +108944804 +108944805 +108944823 +108944824 +108944835 +108944836 +108944837 +108944841 +108944860 +108944877 +108944883 +108944886 +108944903 +108944904 +108944946 +108944962 +108944964 +108945013 +108945017 +108945036 +108945037 +108945059 +108945064 +108945075 +108945106 +108945110 +108945175 +108945179 +108945182 +108945217 +108945288 +108945289 +108945294 +108945368 +108945429 +108945433 +108945507 +108945510 +108945514 +108945525 +108945588 +108945674 +108945713 +108945780 +108945785 +108945866 +108945867 +108945873 +108945874 +108945875 +108945899 +108945900 +108945901 +108945903 +108945904 +108945911 +108945962 +108945968 +108945979 +108945980 +108945981 +108945985 +108945989 +108945991 +108945992 +108945993 +108945994 +108946037 +108946093 +108946115 +108946116 +108946118 +108946119 +108946120 +108946131 +108946132 +108946134 +108946135 +108946137 +108946138 +108946149 +108946150 +108946151 +108946152 +108946155 +108946158 +108946166 +108946178 +108946179 +108946195 +108946203 +108946214 +108946221 +108946288 +108946318 +108946319 +108946324 +108946335 +108946379 +108946397 +108946454 +108946502 +108946527 +108946528 +108946529 +108946530 +108946531 +108946532 +108946533 +108946534 +108946574 +108946578 +108946609 +108946610 +108946611 +108946624 +108946625 +108946680 +108946681 +108946684 +108946685 +108946686 +108946689 +108946690 +108946691 +108946693 +108946694 +108946705 +108946711 +108946714 +108946717 +108946719 +108946720 +108946721 +108946728 +108946771 +108946781 +108946803 +108946804 +108946817 +108946820 +108946824 +108946825 +108946826 +108946867 +108946886 +108946887 +108946893 +108946905 +108946906 +108946915 +108946916 +108946918 +108946941 +108946942 +108946943 +108946949 +108946950 +108946969 +108946982 +108946987 +108946991 +108947009 +108947010 +108947046 +108947057 +108947171 +108947228 +108947229 +108947231 +108947261 +108947324 +108947339 +108947360 +108947369 +108947446 +108947474 +108947517 +108947518 +108947521 +108947604 +108947605 +108947610 +108947611 +108947612 +108947722 +108947724 +108947745 +108947746 +108947747 +108947753 +108947763 +108947764 +108947859 +108947884 +108947898 +108947899 +108947900 +108947912 +108947931 +108947956 +108947959 +108947960 +108947961 +108947962 +108947964 +108947965 +108947981 +108947982 +108947984 +108948034 +108948036 +108948037 +108948128 +108948174 +108948180 +108948183 +108948218 +108948219 +108948222 +108948289 +108948332 +108948333 +108948375 +108948378 +108948383 +108948385 +108948386 +108948387 +108948388 +108948390 +108948524 +108948525 +108948552 +108948553 +108948554 +108948557 +108948563 +108948564 +108948589 +108948590 +108948591 +108948592 +108948593 +108948614 +108948617 +108948622 +108948623 +108948624 +108948656 +108948671 +108948672 +108948673 +108948701 +108948704 +108948724 +108948740 +108948757 +108948766 +108948772 +108948773 +108948774 +108948777 +108948778 +108948779 +108948781 +108948782 +108948783 +108948784 +108948786 +108948789 +108948790 +108948791 +108948792 +108948800 +108948801 +108948808 +108948809 +108948812 +108948814 +108948836 +108948837 +108948899 +108948915 +108948929 +108948959 +108948967 +108949007 +108949010 +108949011 +108949015 +108949032 +108949045 +108949061 +108949062 +108949069 +108949071 +108949072 +108949073 +108949076 +108949077 +108949081 +108949083 +108949084 +108949096 +108949102 +108949107 +108949116 +108949117 +108949131 +108949132 +108949133 +108949136 +108949137 +108949138 +108949139 +108949140 +108949141 +108949153 +108949161 +108949162 +108949178 +108949222 +108949235 +108949236 +108949237 +108949239 +108949286 +108949294 +108949305 +108949312 +108949329 +108949334 +108949366 +108949375 +108949421 +108949458 +108949517 +108949534 +108949539 +108949541 +108949583 +108949614 +108949615 +108949623 +108949690 +108949691 +108949703 +108949718 +108949740 +108949747 +108949748 +108949785 +108949843 +108949861 +108949862 +108949863 +108949889 +108949890 +108949906 +108949941 +108949967 +108949969 +108949976 +108949977 +108949978 +108950038 +108950090 +108950149 +108950196 +108950199 +108950200 +108950210 +108950224 +108950264 +108950303 +108950383 +108950387 +108950388 +108950389 +108950390 +108950392 +108950395 +108950444 +108950470 +108950499 +108950500 +108950509 +108950513 +108950531 +108950538 +108950541 +108950548 +108950549 +108950558 +108950559 +108950562 +108950566 +108950567 +108950569 +108950576 +108950626 +108950637 +108950638 +108950677 +108950687 +108950753 +108950775 +108950778 +108950779 +108950780 +108950781 +108950782 +108950783 +108950784 +108950807 +108950817 +108950818 +108950819 +108950824 +108950835 +108950836 +108950837 +108950909 +108950915 +108950921 +108950923 +108950948 +108950950 +108950951 +108950958 +108950959 +108950960 +108950961 +108950962 +108950964 +108951008 +108951009 +108951011 +108951014 +108951047 +108951053 +108951060 +108951061 +108951065 +108951073 +108951074 +108951075 +108951107 +108951137 +108951140 +108951141 +108951179 +108951184 +108951252 +108951256 +108951285 +108951286 +108951287 +108951288 +108951296 +108951297 +108951298 +108951308 +108951323 +108951330 +108951341 +108951370 +108951374 +108951375 +108951376 +108951377 +108951379 +108951380 +108951381 +108951384 +108951400 +108951401 +108951402 +108951403 +108951404 +108951405 +108951406 +108951407 +108951426 +108951430 +108951431 +108951461 +108951462 +108951463 +108951464 +108951465 +108951466 +108951467 +108951468 +108951471 +108951508 +108951512 +108951514 +108951515 +108951516 +108951517 +108951519 +108951520 +108951523 +108951540 +108951566 +108951569 +108951570 +108951572 +108951573 +108951574 +108951578 +108951617 +108951619 +108951620 +108951648 +108951659 +108951660 +108951685 +108951688 +108951692 +108951709 +108951746 +108951749 +108951750 +108951751 +108951765 +108951824 +108951840 +108951841 +108951843 +108951846 +108951853 +108951854 +108951863 +108951980 +108951981 +108951991 +108952009 +108952010 +108952024 +108952035 +108952037 +108952040 +108952041 +108952042 +108952065 +108952069 +108952070 +108952071 +108952072 +108952073 +108952074 +108952075 +108952083 +108952103 +108952104 +108952105 +108952212 +108952213 +108952214 +108952221 +108952222 +108952223 +108952230 +108952231 +108952232 +108952233 +108952234 +108952235 +108952250 +108952251 +108952252 +108952254 +108952255 +108952256 +108952257 +108952259 +108952260 +108952261 +108952262 +108952268 +108952300 +108952345 +108952346 +108952347 +108952348 +108952350 +108952351 +108952352 +108952355 +108952358 +108952359 +108952360 +108952361 +108952363 +108952364 +108952381 +108952402 +108952403 +108952405 +108952415 +108952416 +108952417 +108952419 +108952420 +108952430 +108952450 +108952466 +108952473 +108952478 +108952479 +108952480 +108952481 +108952482 +108952483 +108952484 +108952485 +108952486 +108952487 +108952488 +108952493 +108952494 +108952498 +108952525 +108952526 +108952529 +108952530 +108952531 +108952532 +108952533 +108952538 +108952539 +108952581 +108952589 +108952596 +108952602 +108952616 +108952617 +108952625 +108952626 +108952627 +108952628 +108952629 +108952646 +108952655 +108952656 +108952657 +108952688 +108952691 +108952715 +108952716 +108952717 +108952718 +108952719 +108952720 +108952723 +108952724 +108952725 +108952726 +108952727 +108952767 +108952769 +108952811 +108952831 +108952840 +108952856 +108952857 +108952872 +108952942 +108952956 +108952958 +108952968 +108952969 +108952970 +108952971 +108952982 +108952988 +108952989 +108952990 +108952991 +108953001 +108953039 +108953040 +108953043 +108953044 +108953045 +108953046 +108953047 +108953048 +108953178 +108953183 +108953184 +108953219 +108953220 +108953221 +108953222 +108953223 +108953224 +108953229 +108953301 +108953322 +108953367 +108953368 +108953371 +108953376 +108953377 +108953378 +108953379 +108953384 +108953385 +108953389 +108953404 +108953443 +108953448 +108953449 +108953450 +108953455 +108953462 +108953463 +108953471 +108953477 +108953482 +108953489 +108953552 +108953553 +108953559 +108953562 +108953563 +108953566 +108953588 +108953624 +108953628 +108953630 +108953635 +108953636 +108953657 +108953676 +108953677 +108953698 +108953786 +108953789 +108953812 +108953826 +108953839 +108953853 +108953882 +108953898 +108953908 +108953931 +108953949 +108953958 +108953959 +108953960 +108953963 +108953964 +108953965 +108953971 +108953972 +108954021 +108954036 +108954044 +108954055 +108954056 +108954057 +108954058 +108954059 +108954079 +108954096 +108954097 +108954102 +108954105 +108954106 +108954108 +108954109 +108954110 +108954135 +108954136 +108954156 +108954162 +108954184 +108954185 +108954207 +108954289 +108954322 +108954346 +108954348 +108954349 +108954368 +108954369 +108954398 +108954436 +108954498 +108954558 +108954562 +108954592 +108954593 +108954595 +108954636 +108954659 +108954716 +108954719 +108954720 +108954721 +108954722 +108954724 +108954733 +108954734 +108954777 +108954778 +108954801 +108954804 +108954805 +108954806 +108954808 +108954812 +108954813 +108954875 +108954876 +108954877 +108954878 +108954879 +108954880 +108954881 +108954909 +108954910 +108954911 +108954912 +108954916 +108954930 +108954933 +108954954 +108954973 +108954980 +108954999 +108955014 +108955015 +108955101 +108955105 +108955115 +108955116 +108955117 +108955118 +108955129 +108955136 +108955137 +108955186 +108955218 +108955242 +108955303 +108955389 +108955402 +108955403 +108955406 +108955407 +108955408 +108955412 +108955436 +108955449 +108955490 +108955527 +108955528 +108955532 +108955581 +108955611 +108955621 +108955623 +108955624 +108955625 +108955629 +108955630 +108955631 +108955632 +108955633 +108955634 +108955658 +108955669 +108955705 +108955756 +108955757 +108955758 +108955759 +108955760 +108955761 +108955762 +108955763 +108957673 +108250400 +108064940 +108066170 +108070878 +108167014 +108194798 +108195433 +108229770 +108262327 +108262637 +108341502 +108387162 +108388126 +108388576 +108402331 +108415832 +108418629 +108419013 +108420798 +108420852 +108421468 +108424955 +108439677 +108446959 +108452070 +108462989 +108463071 +108467468 +108480650 +108501291 +108517236 +108518631 +108521110 +108525492 +108529021 +108529226 +108536060 +108541269 +108543431 +108545469 +108554565 +108555243 +108561227 +108562592 +108571540 +108591029 +108595652 +108600966 +108613642 +108622196 +108628038 +108631780 +108632345 +108632353 +108632361 +108643851 +108653776 +108653822 +108653830 +108653873 +108654608 +108659154 +108669826 +108673211 +108673220 +108673750 +108677810 +108678000 +108680161 +108690736 +108703870 +108703935 +108704109 +108715569 +108715577 +108728601 +108732722 +108734245 +108735128 +108735411 +108737490 +108737821 +108737856 +108742361 +108742647 +108743678 +108745111 +108745269 +108745285 +108747165 +108748835 +108749556 +108749557 +108750432 +108750998 +108751018 +108751336 +108753254 +108753356 +108755159 +108755329 +108755330 +108755337 +108755436 +108755590 +108755596 +108755597 +108755600 +108755601 +108755603 +108755946 +108757001 +108757436 +108759724 +108759778 +108760436 +108761601 +108761714 +108762259 +108762261 +108762951 +108763594 +108763698 +108764043 +108764044 +108764704 +108764792 +108765548 +108766135 +108766606 +108767077 +108767411 +108767590 +108768872 +108769752 +108770255 +108770256 +108770837 +108770838 +108770853 +108771241 +108771671 +108771851 +108773768 +108773822 +108774742 +108775251 +108775347 +108775656 +108776113 +108776711 +108777378 +108778573 +108778616 +108780002 +108780362 +108780363 +108780364 +108780967 +108781991 +108782817 +108783938 +108783984 +108784489 +108784616 +108785006 +108786520 +108786625 +108787237 +108788894 +108789235 +108790033 +108790879 +108792229 +108792385 +108792782 +108794290 +108794967 +108796278 +108796520 +108798097 +108798357 +108798784 +108798785 +108799599 +108800497 +108801495 +108802466 +108802694 +108802745 +108803202 +108804920 +108805583 +108805585 +108806389 +108806500 +108807862 +108808215 +108808482 +108808483 +108808993 +108808998 +108809183 +108809473 +108810641 +108810643 +108812035 +108812455 +108813033 +108813036 +108814397 +108815351 +108815664 +108815822 +108816314 +108817045 +108817147 +108817149 +108817154 +108818977 +108818978 +108819931 +108820444 +108822537 +108823035 +108823153 +108823348 +108823638 +108824167 +108824173 +108824266 +108824275 +108826049 +108826147 +108826188 +108826523 +108826561 +108826705 +108827133 +108827175 +108827619 +108827664 +108828047 +108828151 +108828189 +108828615 +108829714 +108829941 +108830111 +108830310 +108830561 +108830600 +108831118 +108831319 +108831396 +108831861 +108832365 +108832366 +108832453 +108833107 +108833442 +108833722 +108834325 +108834326 +108834594 +108835114 +108836379 +108837005 +108837371 +108837953 +108838547 +108838568 +108838873 +108839640 +108840583 +108841134 +108841136 +108841137 +108841138 +108841141 +108841142 +108841312 +108841313 +108841323 +108841325 +108841425 +108841426 +108841550 +108841594 +108841652 +108842032 +108842056 +108842189 +108842664 +108842677 +108842678 +108842680 +108842778 +108842881 +108843682 +108844358 +108844392 +108844501 +108844554 +108844618 +108844942 +108845548 +108845718 +108846845 +108847560 +108847752 +108847962 +108848553 +108848838 +108849390 +108849392 +108849397 +108850126 +108851043 +108851171 +108851197 +108851198 +108851201 +108851786 +108852259 +108852307 +108852356 +108852378 +108852408 +108852716 +108852718 +108852825 +108853092 +108853266 +108853629 +108853641 +108854407 +108854441 +108854446 +108854452 +108854949 +108855137 +108855507 +108855508 +108855566 +108856595 +108857066 +108858052 +108859304 +108860856 +108861107 +108861111 +108861428 +108862638 +108862855 +108862856 +108862937 +108864380 +108864382 +108864466 +108864806 +108864872 +108866058 +108866073 +108866908 +108867174 +108867520 +108867736 +108868454 +108868488 +108868737 +108869114 +108869116 +108869511 +108869587 +108869986 +108870605 +108870903 +108870904 +108870905 +108870906 +108871615 +108872082 +108872090 +108872282 +108873257 +108873713 +108873714 +108874069 +108874138 +108874172 +108874173 +108874174 +108874454 +108875263 +108876069 +108876326 +108876507 +108876510 +108876841 +108877308 +108877343 +108877537 +108878195 +108878301 +108878302 +108878328 +108878333 +108878488 +108879714 +108879825 +108880274 +108880318 +108880361 +108880671 +108880805 +108880944 +108881005 +108881144 +108881145 +108881179 +108882300 +108883326 +108883374 +108883724 +108884091 +108884130 +108884848 +108885688 +108886547 +108886554 +108887838 +108887839 +108888090 +108888208 +108889456 +108889723 +108889784 +108889785 +108889822 +108890113 +108890612 +108890715 +108891279 +108891448 +108892251 +108892252 +108892253 +108892255 +108892256 +108892265 +108892851 +108892982 +108893422 +108893700 +108893830 +108893857 +108893994 +108894979 +108895606 +108895665 +108895668 +108895678 +108895682 +108896067 +108896520 +108896872 +108897138 +108897277 +108897552 +108897775 +108897914 +108898378 +108898531 +108900545 +108901692 +108901698 +108901702 +108901777 +108901781 +108901782 +108901930 +108901931 +108901932 +108901933 +108902151 +108902183 +108903400 +108903693 +108903856 +108904510 +108905048 +108905540 +108905703 +108906113 +108906226 +108906937 +108907307 +108907611 +108907735 +108908125 +108908718 +108908869 +108908881 +108908883 +108909573 +108910035 +108910340 +108910402 +108910916 +108910971 +108910974 +108911284 +108911299 +108911961 +108912370 +108912698 +108912700 +108912822 +108912873 +108912874 +108912965 +108912968 +108912969 +108912970 +108912971 +108912972 +108913227 +108913470 +108913471 +108913518 +108913519 +108913688 +108913689 +108913690 +108913852 +108913990 +108914133 +108914239 +108914896 +108914972 +108915003 +108915009 +108915696 +108916346 +108916347 +108916711 +108917055 +108917093 +108917284 +108917285 +108917870 +108918366 +108918609 +108918610 +108919169 +108919296 +108919507 +108919885 +108920190 +108920512 +108921363 +108921477 +108921638 +108921843 +108922205 +108922255 +108922345 +108922925 +108922926 +108923593 +108923594 +108923595 +108923596 +108923597 +108923598 +108923599 +108923601 +108923602 +108923603 +108923604 +108923605 +108923677 +108923684 +108923921 +108923947 +108924190 +108924226 +108924320 +108924463 +108924799 +108924801 +108924879 +108924890 +108924925 +108925209 +108925310 +108925849 +108925902 +108926116 +108926496 +108926517 +108926748 +108926773 +108927444 +108927527 +108927552 +108927639 +108927834 +108928265 +108928341 +108928488 +108928529 +108928729 +108928824 +108929054 +108929130 +108929190 +108929593 +108929594 +108929720 +108930513 +108930546 +108930569 +108930714 +108931099 +108931872 +108931905 +108931946 +108931951 +108931960 +108931961 +108931965 +108932284 +108932288 +108932756 +108932761 +108933661 +108934032 +108934072 +108934301 +108934347 +108934349 +108934601 +108934713 +108934880 +108934912 +108935083 +108935093 +108935255 +108935286 +108935485 +108935640 +108935805 +108935830 +108935863 +108935936 +108935999 +108936038 +108936192 +108936203 +108936204 +108936323 +108936707 +108936709 +108936805 +108936825 +108937217 +108937488 +108937561 +108937567 +108937884 +108937932 +108937933 +108938015 +108938116 +108938733 +108938734 +108938752 +108938825 +108938840 +108938841 +108939004 +108939396 +108939443 +108939444 +108939543 +108939876 +108939911 +108940096 +108940097 +108940098 +108940099 +108940146 +108940272 +108940273 +108940302 +108940321 +108940360 +108940529 +108940564 +108940678 +108940679 +108940689 +108940724 +108940735 +108940802 +108940806 +108940807 +108940809 +108940813 +108940833 +108940850 +108940859 +108940869 +108940913 +108940921 +108940925 +108940932 +108940958 +108940959 +108940964 +108940965 +108940975 +108940980 +108940998 +108941042 +108941047 +108941052 +108941085 +108941098 +108941105 +108941155 +108941182 +108941184 +108941213 +108941243 +108941277 +108941280 +108941282 +108941300 +108941348 +108941353 +108941360 +108941361 +108941362 +108941363 +108941364 +108941384 +108941455 +108941457 +108941471 +108941472 +108941473 +108941500 +108941502 +108941505 +108941563 +108941585 +108941594 +108941595 +108941638 +108941642 +108941643 +108941644 +108941677 +108941678 +108941679 +108941680 +108941681 +108941682 +108941683 +108941695 +108941698 +108941760 +108941831 +108941832 +108941833 +108941834 +108941873 +108941874 +108941897 +108941898 +108941906 +108941907 +108941910 +108941937 +108941955 +108941964 +108941967 +108941973 +108942016 +108942070 +108942071 +108942084 +108942085 +108942086 +108942088 +108942089 +108942090 +108942091 +108942092 +108942093 +108942094 +108942095 +108942096 +108942110 +108942117 +108942118 +108942119 +108942141 +108942145 +108942170 +108942173 +108942178 +108942179 +108942180 +108942181 +108942192 +108942198 +108942217 +108942238 +108942240 +108942242 +108942243 +108942260 +108942285 +108942286 +108942287 +108942288 +108942289 +108942290 +108942291 +108942292 +108942293 +108942294 +108942308 +108942310 +108942312 +108942313 +108942314 +108942317 +108942319 +108942321 +108942322 +108942323 +108942324 +108942325 +108942326 +108942327 +108942328 +108942329 +108942330 +108942331 +108942332 +108942334 +108942335 +108942336 +108942337 +108942338 +108942339 +108942340 +108942341 +108942342 +108942343 +108942344 +108942345 +108942346 +108942347 +108942348 +108942349 +108942350 +108942351 +108942355 +108942356 +108942357 +108942359 +108942360 +108942361 +108942362 +108942363 +108942364 +108942533 +108942534 +108942535 +108942536 +108942537 +108942538 +108942552 +108942561 +108942574 +108942635 +108942684 +108942685 +108942690 +108942691 +108942692 +108942694 +108942695 +108942705 +108942706 +108942707 +108942725 +108942739 +108942740 +108942806 +108942807 +108942849 +108942850 +108942851 +108942852 +108942853 +108942854 +108942855 +108942856 +108942857 +108942858 +108942860 +108942861 +108942862 +108942863 +108942865 +108942866 +108942867 +108942868 +108942869 +108942872 +108942909 +108942910 +108942991 +108942992 +108943015 +108943016 +108943019 +108943025 +108943028 +108943049 +108943050 +108943061 +108943062 +108943070 +108943071 +108943072 +108943073 +108943074 +108943075 +108943076 +108943078 +108943079 +108943104 +108943153 +108943193 +108943208 +108943209 +108943210 +108943211 +108943213 +108943221 +108943222 +108943223 +108943235 +108943236 +108943237 +108943238 +108943239 +108943240 +108943241 +108943242 +108943243 +108943245 +108943246 +108943247 +108943248 +108943249 +108943250 +108943251 +108943252 +108943253 +108943254 +108943255 +108943256 +108943258 +108943259 +108943260 +108943261 +108943262 +108943263 +108943264 +108943265 +108943267 +108943268 +108943269 +108943270 +108943271 +108943272 +108943287 +108943342 +108943349 +108943388 +108943396 +108943397 +108943445 +108943446 +108943471 +108943509 +108943517 +108943518 +108943520 +108943529 +108943538 +108943563 +108943627 +108943657 +108943668 +108943672 +108943678 +108943679 +108943681 +108943682 +108943683 +108943685 +108943712 +108943724 +108943725 +108943764 +108943800 +108943875 +108943926 +108943940 +108944054 +108944055 +108944056 +108944070 +108944071 +108944103 +108944109 +108944124 +108944126 +108944176 +108944182 +108944236 +108944237 +108944238 +108944239 +108944240 +108944241 +108944248 +108944250 +108944251 +108944252 +108944253 +108944274 +108944304 +108944350 +108944351 +108944352 +108944353 +108944354 +108944355 +108944356 +108944357 +108944381 +108944390 +108944391 +108944392 +108944393 +108944394 +108944395 +108944396 +108944397 +108944398 +108944399 +108944404 +108944493 +108944504 +108944505 +108944558 +108944560 +108944561 +108944562 +108944563 +108944607 +108944608 +108944609 +108944709 +108944710 +108944711 +108944755 +108944762 +108944763 +108944844 +108944874 +108944875 +108944876 +108944878 +108944915 +108945002 +108945003 +108945004 +108945020 +108945026 +108945027 +108945030 +108945044 +108945058 +108945111 +108945112 +108945114 +108945118 +108945163 +108945164 +108945169 +108945172 +108945184 +108945214 +108945241 +108945247 +108945369 +108945370 +108945373 +108945385 +108945432 +108945435 +108945610 +108945645 +108945678 +108945686 +108945688 +108945719 +108945739 +108945754 +108945776 +108945777 +108945778 +108945830 +108945845 +108945863 +108945865 +108946024 +108946038 +108946042 +108946059 +108946084 +108946121 +108946122 +108946123 +108946124 +108946125 +108946126 +108946156 +108946157 +108946163 +108946164 +108946184 +108946196 +108946198 +108946199 +108946222 +108946289 +108946292 +108946293 +108946294 +108946295 +108946304 +108946328 +108946378 +108946381 +108946386 +108946415 +108946416 +108946417 +108946418 +108946419 +108946420 +108946475 +108946538 +108946565 +108946566 +108946567 +108946617 +108946632 +108946640 +108946715 +108946722 +108946727 +108946769 +108946775 +108946815 +108946823 +108946828 +108946832 +108946888 +108946900 +108946901 +108946902 +108946965 +108946983 +108947017 +108947045 +108947047 +108947061 +108947062 +108947063 +108947064 +108947071 +108947072 +108947092 +108947095 +108947101 +108947102 +108947109 +108947110 +108947113 +108947114 +108947115 +108947162 +108947164 +108947213 +108947270 +108947398 +108947417 +108947418 +108947419 +108947420 +108947442 +108947511 +108947512 +108947513 +108947520 +108947579 +108947614 +108947618 +108947625 +108947635 +108947717 +108947718 +108947783 +108947784 +108947795 +108947796 +108947798 +108947799 +108947800 +108947801 +108947802 +108947803 +108947804 +108947805 +108947806 +108947807 +108947819 +108947841 +108947844 +108947845 +108947846 +108947847 +108947848 +108947849 +108947850 +108947851 +108947852 +108947888 +108947895 +108947897 +108947902 +108947904 +108947906 +108947908 +108947909 +108947910 +108947911 +108947927 +108947955 +108947972 +108947973 +108948090 +108948102 +108948103 +108948143 +108948175 +108948176 +108948177 +108948182 +108948214 +108948216 +108948285 +108948293 +108948294 +108948342 +108948344 +108948368 +108948389 +108948632 +108948657 +108948658 +108948674 +108948685 +108948702 +108948703 +108948706 +108948710 +108948711 +108948725 +108948726 +108948727 +108948728 +108948739 +108948745 +108948796 +108948797 +108948799 +108948802 +108948803 +108948804 +108948805 +108948806 +108948807 +108948810 +108948811 +108948816 +108948817 +108948818 +108948819 +108948820 +108948821 +108948822 +108948823 +108948824 +108948825 +108948827 +108948828 +108948829 +108948831 +108948832 +108948833 +108948834 +108948835 +108948852 +108948853 +108948854 +108948913 +108948968 +108949027 +108949064 +108949065 +108949066 +108949067 +108949068 +108949085 +108949086 +108949087 +108949088 +108949089 +108949090 +108949101 +108949180 +108949221 +108949224 +108949240 +108949266 +108949285 +108949309 +108949310 +108949311 +108949315 +108949327 +108949328 +108949330 +108949331 +108949359 +108949410 +108949413 +108949415 +108949418 +108949422 +108949436 +108949451 +108949465 +108949511 +108949515 +108949565 +108949608 +108949617 +108949645 +108949651 +108949728 +108949729 +108949731 +108949733 +108949734 +108949773 +108949840 +108949841 +108949842 +108949844 +108949845 +108949846 +108949847 +108949848 +108949849 +108949850 +108949857 +108949858 +108949860 +108949923 +108949924 +108949925 +108949926 +108949927 +108949928 +108949929 +108949930 +108949931 +108949932 +108949934 +108949936 +108949937 +108949938 +108949939 +108949940 +108949943 +108949945 +108949946 +108949947 +108949959 +108949960 +108949961 +108949962 +108949963 +108949964 +108949965 +108949968 +108949971 +108949972 +108949973 +108949980 +108950002 +108950026 +108950058 +108950092 +108950093 +108950094 +108950095 +108950132 +108950230 +108950231 +108950232 +108950255 +108950385 +108950463 +108950467 +108950468 +108950469 +108950484 +108950517 +108950524 +108950591 +108950620 +108950660 +108950690 +108950691 +108950692 +108950693 +108950694 +108950695 +108950742 +108950752 +108950768 +108950786 +108950800 +108950802 +108950841 +108950896 +108950897 +108950898 +108950899 +108950900 +108950901 +108950902 +108950903 +108950904 +108950996 +108950997 +108950998 +108951001 +108951002 +108951052 +108951089 +108951095 +108951096 +108951108 +108951139 +108951143 +108951151 +108951181 +108951208 +108951223 +108951226 +108951253 +108951254 +108951255 +108951257 +108951258 +108951260 +108951267 +108951291 +108951294 +108951295 +108951299 +108951300 +108951301 +108951302 +108951303 +108951312 +108951313 +108951314 +108951324 +108951331 +108951365 +108951367 +108951368 +108951369 +108951382 +108951428 +108951469 +108951488 +108951489 +108951490 +108951522 +108951575 +108951583 +108951616 +108951628 +108951657 +108951658 +108951665 +108951666 +108951667 +108951668 +108951669 +108951670 +108951671 +108951672 +108951673 +108951675 +108951676 +108951677 +108951691 +108951756 +108951757 +108951758 +108951759 +108951760 +108951762 +108951763 +108951764 +108951766 +108951768 +108951785 +108951805 +108951844 +108951953 +108951960 +108951978 +108951983 +108951984 +108951985 +108951986 +108951987 +108951999 +108952000 +108952020 +108952060 +108952097 +108952158 +108952181 +108952206 +108952267 +108952269 +108952376 +108952377 +108952378 +108952379 +108952404 +108952467 +108952472 +108952499 +108952512 +108952513 +108952516 +108952517 +108952518 +108952647 +108952648 +108952671 +108952687 +108952698 +108952788 +108952791 +108952843 +108952844 +108952858 +108952859 +108952861 +108952889 +108952901 +108952935 +108952957 +108952972 +108952973 +108952975 +108952977 +108952979 +108952980 +108952981 +108952985 +108952997 +108952998 +108952999 +108953000 +108953002 +108953003 +108953005 +108953041 +108953049 +108953050 +108953051 +108953052 +108953053 +108953054 +108953055 +108953056 +108953057 +108953058 +108953059 +108953060 +108953063 +108953066 +108953067 +108953068 +108953069 +108953074 +108953075 +108953076 +108953077 +108953138 +108953142 +108953172 +108953174 +108953176 +108953181 +108953188 +108953193 +108953194 +108953202 +108953216 +108953227 +108953258 +108953305 +108953335 +108953336 +108953337 +108953338 +108953339 +108953353 +108953388 +108953422 +108953432 +108953434 +108953435 +108953436 +108953437 +108953444 +108953456 +108953472 +108953473 +108953474 +108953475 +108953476 +108953492 +108953497 +108953498 +108953517 +108953586 +108953587 +108953593 +108953594 +108953634 +108953641 +108953644 +108953649 +108953666 +108953673 +108953678 +108953679 +108953680 +108953681 +108953682 +108953683 +108953684 +108953685 +108953686 +108953687 +108953689 +108953752 +108953761 +108953762 +108953764 +108953765 +108953814 +108953842 +108953843 +108953844 +108953883 +108953901 +108953909 +108953915 +108953955 +108953956 +108953978 +108953979 +108953980 +108954060 +108954063 +108954065 +108954147 +108954194 +108954197 +108954198 +108954199 +108954287 +108954347 +108954353 +108954423 +108954440 +108954467 +108954475 +108954497 +108954565 +108954705 +108954707 +108954717 +108954760 +108954775 +108954800 +108954847 +108954848 +108954851 +108954854 +108954870 +108954885 +108954905 +108954917 +108954918 +108954919 +108954920 +108954921 +108954927 +108954928 +108954929 +108954975 +108954986 +108954987 +108954988 +108954989 +108954990 +108954991 +108954992 +108954993 +108955005 +108955058 +108955059 +108955060 +108955062 +108955082 +108955100 +108955131 +108955132 +108955133 +108955293 +108955376 +108955377 +108955378 +108955470 +108955510 +108955536 +108955553 +108955557 +108955559 +108955563 +108955564 +108955566 +108955620 +108955628 +108955647 +108955660 +108955670 +108955688 +108955724 +108955735 +108955898 +108001493 +108002651 +108002660 +108002864 +108002988 +108003070 +108003135 +108003534 +108003607 +108003887 +108003895 +108004654 +108005480 +108005731 +108005960 +108006215 +108006355 +108006428 +108006436 +108006550 +108006592 +108007866 +108008781 +108009028 +108009338 +108009532 +108010158 +108010174 +108128310 +108157388 +108168045 +108170163 +108175416 +108190555 +108190563 +108223712 +108438573 +108442015 +108444913 +108452525 +108462091 +108475584 +108478915 +108479377 +108483820 +108493736 +108495038 +108502212 +108508440 +108510061 +108513486 +108523660 +108528181 +108529579 +108548786 +108558340 +108567250 +108568760 +108584642 +108588192 +108589881 +108590642 +108603280 +108603779 +108608487 +108608584 +108608614 +108612581 +108615882 +108635506 +108644009 +108655965 +108698435 +108728946 +108748199 +108749343 +108749426 +108749646 +108750122 +108753838 +108754384 +108758406 +108760865 +108761264 +108762641 +108762693 +108763712 +108766615 +108766947 +108768824 +108769352 +108769353 +108772061 +108773072 +108774648 +108774651 +108775224 +108775870 +108780733 +108784439 +108786101 +108786664 +108788363 +108788951 +108788953 +108789664 +108790644 +108790715 +108790719 +108792503 +108792619 +108793559 +108794238 +108796364 +108796787 +108797025 +108797248 +108797259 +108798027 +108798030 +108798982 +108799140 +108799141 +108799742 +108800299 +108800898 +108801056 +108801279 +108801781 +108802294 +108804913 +108806402 +108807440 +108808316 +108808629 +108809144 +108809855 +108810618 +108811282 +108811639 +108811884 +108812718 +108813848 +108814839 +108815604 +108815844 +108816223 +108816625 +108817244 +108817245 +108818105 +108818254 +108818802 +108820671 +108820853 +108820954 +108821662 +108822422 +108823285 +108823389 +108824112 +108824326 +108827517 +108827862 +108828160 +108828344 +108828669 +108830858 +108831142 +108831219 +108833986 +108834239 +108834515 +108834995 +108835164 +108835383 +108835393 +108836271 +108836421 +108836568 +108836569 +108836571 +108837348 +108837350 +108837573 +108837791 +108837792 +108839089 +108840361 +108840365 +108840368 +108840372 +108841672 +108842226 +108844012 +108845330 +108845416 +108845454 +108845639 +108846841 +108847763 +108849237 +108849400 +108850497 +108851728 +108851791 +108852170 +108853070 +108853538 +108853563 +108854178 +108854258 +108854345 +108855359 +108855412 +108855594 +108855779 +108855916 +108855919 +108855920 +108855993 +108856040 +108856042 +108856226 +108856380 +108856904 +108856905 +108856906 +108856907 +108856940 +108857916 +108857917 +108857918 +108857919 +108857920 +108857962 +108858288 +108858334 +108858482 +108858485 +108858652 +108858790 +108860711 +108860712 +108860758 +108861710 +108862068 +108862331 +108862365 +108862380 +108862731 +108863190 +108863227 +108863229 +108863465 +108863777 +108863917 +108864260 +108864290 +108864446 +108864448 +108865060 +108865766 +108866366 +108866600 +108866844 +108866871 +108866872 +108866873 +108866874 +108867407 +108867551 +108868388 +108868389 +108869039 +108869061 +108869504 +108869734 +108869831 +108869891 +108869927 +108870107 +108870678 +108871109 +108871494 +108871639 +108871750 +108871751 +108871752 +108871753 +108871903 +108871976 +108872006 +108872007 +108872979 +108872988 +108873328 +108873942 +108875524 +108876273 +108876720 +108878096 +108878235 +108878354 +108879314 +108879635 +108880245 +108880246 +108880247 +108880346 +108882012 +108882865 +108883679 +108883861 +108883864 +108883975 +108883981 +108883982 +108883983 +108883984 +108884109 +108884530 +108884531 +108884771 +108884943 +108885128 +108885238 +108885725 +108885798 +108887363 +108887685 +108889263 +108889553 +108890003 +108890024 +108890091 +108890223 +108890246 +108891531 +108892783 +108893862 +108893864 +108893865 +108893867 +108893869 +108893870 +108893999 +108894113 +108894208 +108894229 +108895271 +108896098 +108896238 +108896498 +108896860 +108896894 +108896973 +108897580 +108897974 +108897975 +108898073 +108898075 +108898193 +108898749 +108899264 +108900475 +108902290 +108902422 +108902945 +108903297 +108903421 +108903483 +108903484 +108903485 +108903667 +108903668 +108903669 +108905009 +108905844 +108905869 +108905871 +108906310 +108906490 +108906502 +108906531 +108906581 +108906984 +108907060 +108907166 +108907288 +108907289 +108907638 +108907662 +108908339 +108909130 +108909299 +108909753 +108910646 +108910927 +108912224 +108912401 +108912402 +108912617 +108912627 +108912774 +108912801 +108914834 +108914866 +108914895 +108914989 +108915188 +108915193 +108915726 +108916518 +108917028 +108917758 +108917970 +108918073 +108918493 +108918496 +108919440 +108919547 +108920424 +108921626 +108921733 +108922183 +108922283 +108922284 +108922917 +108923236 +108923237 +108924351 +108924445 +108926287 +108927393 +108930360 +108930529 +108930693 +108931243 +108932172 +108932976 +108933055 +108935231 +108935873 +108936006 +108936747 +108937741 +108938127 +108938593 +108938594 +108938804 +108939540 +108939741 +108940845 +108940848 +108940849 +108940856 +108940863 +108940864 +108940934 +108940935 +108940936 +108940972 +108940973 +108941050 +108941060 +108941089 +108941154 +108941349 +108941386 +108941387 +108941388 +108941389 +108941419 +108941474 +108941688 +108941928 +108941956 +108941957 +108941965 +108942025 +108942060 +108942081 +108942082 +108942151 +108942199 +108942438 +108942439 +108942573 +108942714 +108942715 +108942716 +108942718 +108942752 +108942965 +108942986 +108942987 +108942988 +108942989 +108942990 +108942998 +108942999 +108943000 +108943001 +108943002 +108943081 +108943082 +108943083 +108943504 +108943566 +108943569 +108943573 +108943597 +108943814 +108943905 +108943929 +108943930 +108943931 +108943947 +108943949 +108944113 +108944125 +108944146 +108944254 +108944255 +108944256 +108944257 +108944258 +108944315 +108944316 +108944320 +108944321 +108944322 +108944360 +108944417 +108944418 +108944421 +108944422 +108944445 +108944497 +108944684 +108944689 +108944960 +108944972 +108945079 +108945080 +108945081 +108945121 +108945183 +108945185 +108945215 +108945290 +108945351 +108945367 +108945650 +108945779 +108945864 +108946105 +108946110 +108946111 +108946200 +108946286 +108946287 +108946322 +108946541 +108946542 +108946563 +108946576 +108946606 +108946618 +108946628 +108946651 +108946652 +108946862 +108946869 +108946935 +108947007 +108947155 +108947169 +108947173 +108947182 +108947183 +108947184 +108947326 +108947340 +108947385 +108947437 +108947584 +108947766 +108947767 +108947815 +108947816 +108947949 +108947950 +108947951 +108947952 +108947953 +108948283 +108948284 +108948295 +108948355 +108948356 +108948358 +108948359 +108948360 +108948361 +108948362 +108948364 +108948365 +108948366 +108948391 +108948519 +108948520 +108948521 +108948663 +108948687 +108948758 +108948944 +108948955 +108948988 +108949057 +108949058 +108949075 +108949148 +108949149 +108949151 +108949155 +108949212 +108949218 +108949219 +108949220 +108949262 +108949464 +108949489 +108949749 +108949868 +108949869 +108949894 +108949966 +108949970 +108949981 +108950051 +108950061 +108950062 +108950218 +108950219 +108950329 +108950330 +108950333 +108950377 +108950378 +108950397 +108950457 +108950489 +108950582 +108950657 +108950787 +108950788 +108950870 +108950912 +108950913 +108950944 +108950946 +108950947 +108950963 +108951004 +108951006 +108951007 +108951010 +108951026 +108951224 +108951225 +108951248 +108951249 +108951311 +108951366 +108951393 +108951394 +108951409 +108951429 +108951445 +108951446 +108951447 +108951448 +108951449 +108951513 +108951618 +108951636 +108951637 +108951638 +108951639 +108951640 +108951641 +108951642 +108951643 +108951644 +108951681 +108951710 +108951777 +108951778 +108951780 +108951781 +108951995 +108952192 +108952329 +108952437 +108952438 +108952468 +108952469 +108952477 +108952489 +108952490 +108952491 +108952492 +108952495 +108952496 +108952497 +108952500 +108952504 +108952505 +108952506 +108952507 +108952508 +108952509 +108952510 +108952578 +108952579 +108952580 +108952586 +108952587 +108952621 +108952630 +108952631 +108952632 +108952633 +108952634 +108952635 +108952636 +108952637 +108952638 +108952639 +108952640 +108952641 +108952642 +108952643 +108952644 +108952645 +108952649 +108952661 +108952884 +108952941 +108953116 +108953173 +108953179 +108953195 +108953196 +108953203 +108953308 +108953321 +108953397 +108953426 +108953568 +108953608 +108953609 +108953616 +108953617 +108953626 +108953629 +108953656 +108953690 +108953691 +108953692 +108953693 +108953694 +108953732 +108953733 +108953785 +108953967 +108953968 +108953969 +108954103 +108954104 +108954180 +108954181 +108954182 +108954183 +108954238 +108954393 +108954435 +108954452 +108954460 +108954461 +108954462 +108954502 +108954563 +108954564 +108954687 +108954689 +108954690 +108954759 +108954799 +108954871 +108954872 +108954873 +108954978 +108955232 +108955391 +108955392 +108955779 + + \ No newline at end of file diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 964e440..c0d47d3 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -277,6 +277,12 @@ DataSet1.xsd + + Form + + + fDisableItem.cs + Form @@ -572,6 +578,9 @@ Form + + fDisableItem.cs + AccessDB.cs diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index f84aa3d..9df91e2 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -126,6 +126,8 @@ this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); + this.아이템비활성화하기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -247,14 +249,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -265,7 +267,7 @@ this.myAccouserToolStripMenuItem, this.권한설정ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem @@ -292,14 +294,14 @@ // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(180, 24); + this.mn_kuntae.Size = new System.Drawing.Size(153, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -307,7 +309,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -386,21 +388,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // // 양식ToolStripMenuItem // this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; - this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // @@ -603,39 +605,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(146, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -644,7 +646,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -653,7 +655,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -661,7 +663,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -669,7 +671,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -678,7 +680,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -725,7 +727,9 @@ this.pMP데이터베이스업데이트ToolStripMenuItem, this.mailBackupToolStripMenuItem, this.accessDBToolStripMenuItem, - this.메일자동발신테스트ToolStripMenuItem}); + this.메일자동발신테스트ToolStripMenuItem, + this.toolStripMenuItem5, + this.아이템비활성화하기ToolStripMenuItem}); this.btDev.ForeColor = System.Drawing.Color.Blue; this.btDev.Image = ((System.Drawing.Image)(resources.GetObject("btDev.Image"))); this.btDev.Name = "btDev"; @@ -946,6 +950,18 @@ this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(275, 6); + // + // 아이템비활성화하기ToolStripMenuItem + // + this.아이템비활성화하기ToolStripMenuItem.Name = "아이템비활성화하기ToolStripMenuItem"; + this.아이템비활성화하기ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.아이템비활성화하기ToolStripMenuItem.Text = "아이템 비활성화하기"; + this.아이템비활성화하기ToolStripMenuItem.Click += new System.EventHandler(this.아이템비활성화하기ToolStripMenuItem_Click); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1074,6 +1090,8 @@ private System.Windows.Forms.ToolStripMenuItem 출근부출력ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 휴가신청ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem10; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; + private System.Windows.Forms.ToolStripMenuItem 아이템비활성화하기ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b68378d..bea6d1e 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1081,5 +1081,11 @@ namespace Project if (!ShowForm(formkey)) AddForm(formkey, new FPJ0000.fHolyRequest()); } + + private void 아이템비활성화하기ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new Dev.fDisableItem(); + f.ShowDialog(); + } } } diff --git a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs index 005cbfc..4c50457 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs @@ -31,9 +31,9 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WorkTable)); System.Globalization.CultureInfo cultureInfo = new System.Globalization.CultureInfo("ko-KR", false); - FarPoint.Win.ComplexBorder complexBorder1 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.ComplexBorder complexBorder2 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -62,6 +62,9 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -94,14 +97,14 @@ this.sbJan, this.toolStripButton2, this.toolStripButton3}); - this.bn.Location = new System.Drawing.Point(0, 545); + this.bn.Location = new System.Drawing.Point(0, 653); 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(926, 27); + this.bn.Size = new System.Drawing.Size(1137, 27); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -243,12 +246,15 @@ this.tbSD, this.toolStripLabel2, this.tbED, + this.toolStripButton4, + this.toolStripButton5, + this.toolStripSeparator1, this.toolStripLabel3, this.tbGrp, this.toolStripButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(926, 31); + this.toolStrip1.Size = new System.Drawing.Size(1137, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -314,7 +320,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(926, 514); + this.fpSpread1.Size = new System.Drawing.Size(1137, 622); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.SetViewportLeftColumn(0, 0, 4); @@ -329,26 +335,26 @@ this.fpSpread1_Sheet1.ColumnCount = 50; this.fpSpread1_Sheet1.RowCount = 1; this.fpSpread1_Sheet1.AllowNoteEdit = false; - this.fpSpread1_Sheet1.Cells.Get(0, 0).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 1).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 2).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 3).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 4).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 0).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 1).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 3).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 4).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 5).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 5).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 6).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 6).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 7).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 7).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 8).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 8).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 9).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 9).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -357,7 +363,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 9).Value = 6; this.fpSpread1_Sheet1.Cells.Get(0, 9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 10).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 10).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -366,7 +372,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 10).Value = 7; this.fpSpread1_Sheet1.Cells.Get(0, 10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 11).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 11).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -375,7 +381,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 11).Value = 8; this.fpSpread1_Sheet1.Cells.Get(0, 11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 12).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 12).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -384,7 +390,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 12).Value = 9; this.fpSpread1_Sheet1.Cells.Get(0, 12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 13).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 13).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -393,7 +399,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 13).Value = 10; this.fpSpread1_Sheet1.Cells.Get(0, 13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 14).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 14).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -402,7 +408,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 14).Value = 11; this.fpSpread1_Sheet1.Cells.Get(0, 14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 15).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 15).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -411,7 +417,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 15).Value = 12; this.fpSpread1_Sheet1.Cells.Get(0, 15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 16).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 16).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -420,55 +426,55 @@ this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 16).Value = 13; this.fpSpread1_Sheet1.Cells.Get(0, 16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 17).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 17).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 18).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 18).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 19).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 19).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 20).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 20).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 21).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 21).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 22).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 22).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 23).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 23).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 24).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 24).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 25).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 25).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 26).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 26).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 27).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 27).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 28).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 28).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 29).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 29).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 30).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 30).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 31).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 31).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 32).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 32).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 33).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 33).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -477,7 +483,7 @@ this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatString = "n"; this.fpSpread1_Sheet1.Cells.Get(0, 33).Value = 30; this.fpSpread1_Sheet1.Cells.Get(0, 33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 34).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 34).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(0, 34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo)).NumberDecimalDigits = 0; @@ -487,39 +493,39 @@ this.fpSpread1_Sheet1.Cells.Get(0, 34).Value = 31; this.fpSpread1_Sheet1.Cells.Get(0, 34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 35).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 35).Border = complexBorder1; - numberCellType1.DecimalPlaces = 0; - numberCellType1.MaximumValue = 10000000D; - numberCellType1.MinimumValue = -10000000D; - numberCellType1.NegativeRed = true; - this.fpSpread1_Sheet1.Cells.Get(0, 35).CellType = numberCellType1; + this.fpSpread1_Sheet1.Cells.Get(0, 35).Border = complexBorder2; + numberCellType2.DecimalPlaces = 0; + numberCellType2.MaximumValue = 10000000D; + numberCellType2.MinimumValue = -10000000D; + numberCellType2.NegativeRed = true; + this.fpSpread1_Sheet1.Cells.Get(0, 35).CellType = numberCellType2; this.fpSpread1_Sheet1.Cells.Get(0, 35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 35).Value = "발생연차"; this.fpSpread1_Sheet1.Cells.Get(0, 35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 36).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 36).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 36).CellType = numberCellType1; + this.fpSpread1_Sheet1.Cells.Get(0, 36).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 36).CellType = numberCellType2; this.fpSpread1_Sheet1.Cells.Get(0, 36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 36).Value = "사용휴가"; this.fpSpread1_Sheet1.Cells.Get(0, 36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 37).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Cells.Get(0, 37).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 37).CellType = numberCellType1; + this.fpSpread1_Sheet1.Cells.Get(0, 37).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 37).CellType = numberCellType2; this.fpSpread1_Sheet1.Cells.Get(0, 37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(0, 37).Value = "잔여휴가"; this.fpSpread1_Sheet1.Cells.Get(0, 37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Cells.Get(0, 38).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 39).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 40).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 41).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 42).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 43).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 44).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 45).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 46).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder1; - this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(0, 38).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 39).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 40).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 41).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 42).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 43).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 44).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 45).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 46).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder2; 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 = "직급"; @@ -534,25 +540,25 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder1; + this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder2; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "분류"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).Border = complexBorder1; + this.fpSpread1_Sheet1.Columns.Get(1).Border = complexBorder2; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "사번"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(2).Border = complexBorder1; + this.fpSpread1_Sheet1.Columns.Get(2).Border = complexBorder2; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "직급"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).Border = complexBorder1; + this.fpSpread1_Sheet1.Columns.Get(3).Border = complexBorder2; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -704,11 +710,11 @@ this.fpSpread1_Sheet1.PrintInfo.Margin.Left = 25; this.fpSpread1_Sheet1.PrintInfo.Margin.Right = 25; this.fpSpread1_Sheet1.PrintInfo.Margin.Top = 75; - noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo1.HardMarginX = 0F; - noPrinterPrintInfo1.HardMarginY = 0F; - noPrinterPrintInfo1.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; + noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo2.HardMarginX = 0F; + noPrinterPrintInfo2.HardMarginY = 0F; + noPrinterPrintInfo2.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; this.fpSpread1_Sheet1.PrintInfo.Orientation = FarPoint.Win.Spread.PrintOrientation.Landscape; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.PrintInfo.Printer = ""; @@ -720,11 +726,36 @@ this.fpSpread1_Sheet1.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(28, 28); + this.toolStripButton4.Text = "이전달"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // toolStripButton5 + // + this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(28, 28); + this.toolStripButton5.Text = "다음달"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // WorkTable // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(926, 572); + this.ClientSize = new System.Drawing.Size(1137, 680); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); @@ -772,5 +803,8 @@ private System.Windows.Forms.ToolStripLabel lbStt; private System.Windows.Forms.ToolStripButton toolStripButton3; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index 74ab949..e5c246f 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -342,5 +342,24 @@ namespace FBS0000 newTask.Attachments.Add(FileName); newTask.Display(); } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + + var sd = DateTime.Parse(tbSD.Text); + sd = sd.AddMonths(-1); + var ed = sd.AddMonths(1); + tbSD.Text = sd.ToShortDateString(); + tbED.Text = ed.ToShortDateString(); + } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + var sd = DateTime.Parse(tbSD.Text); + sd = sd.AddMonths(1); + var ed = sd.AddMonths(1); + tbSD.Text = sd.ToShortDateString(); + tbED.Text = ed.ToShortDateString(); + } } } diff --git a/SubProject/FBS0000/Holiday/WorkTable.resx b/SubProject/FBS0000/Holiday/WorkTable.resx index 4d73c23..f9d5cc2 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.resx +++ b/SubProject/FBS0000/Holiday/WorkTable.resx @@ -194,6 +194,33 @@ 83, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFMSURBVDhPhZI7SwNBFIX3T9jY2KQQxE4LIY2ghaBCGgUx + 2GhjJUSwSqWVBKwsbbTRTrAREQsfhQYikhRBDD4KQRAR/QFXv2HOMpt13QMHkpn7nbk5JMqSdckf58vP + 2+T+YOyx7X5/mhPEgKDH77bzw1fT2p+3LkRBfjwpwQJPXw9s66lsm505O3zesebHtTXeL6y4XkiHhDBD + gILxxv2MVVslO3rZtau3Yxuq9CVDwgDBGAleu5uylfpEOoAPwPxW1tarUggv34xbrVVxcwMLve7eBVAO + RfEaztLi5aiVz4t/B1ASr+EsAc+ejbguEgE0S3l7nVq8rsTaehl4tT7vAgrTPe4+7oEQCgIQhAAFl06G + 0zDiC80SwBZ6UaBgCuQ/kQpACqEgXG0sOQizNmAmLHFBOZhVcQj+C0tu4lcCQhD5sXz5+Vj+uEtR9AOl + bDfO85KcaQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFNSURBVDhPhZKvSwRRFIXnn7BYLBsE2aZB2GAQDcqCBkVw + MYhJLK7BokWTLJiMFi3aBIuIGPwRloXVRVE2rKhBEEQE/4Cr3+Xdx5sZxzlwYOfO/c68d9goS5KQG+fL + 7cv4QdF7eKfXTXOCWDDo6fvRu/11qyEW5NbjMtigs7dD2X6uyFZnRo5eduXusy7Nj0spbRTSISHMEqDB + eLM9Jautshy/7sn1+4n0V3viIWGAwRaAgPFSYzQdwA9g7smx7av2ZdNifURdu6/qXt9ct841gHIIAAih + pOavhqRyUfo7gJLWHybVWQKePh/ULmIBNEt5+52aLN+MeXNnk8ErjVkNKJS7dO57IISCgOy+HBkZPHE6 + kIYRDzRLAKewuxpoMAXyn0gFIAuhILzWXFAIc2zATNjEC8rBHBWH4L+wSTd+ZUAIIreWL7fv5cYJRdEP + Fas4M5JsXd4AAAAASUVORK5CYII= + + + + 189, 17 + 189, 17 diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs index 9f30a0b..a700d7b 100644 --- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.panel1 = new System.Windows.Forms.Panel(); + this.btSave = new System.Windows.Forms.Button(); this.cmbUser = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -40,7 +41,8 @@ this.btRefresh = new System.Windows.Forms.Button(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.btSave = new System.Windows.Forms.Button(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); @@ -49,6 +51,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.linkLabel2); + this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.btSave); this.panel1.Controls.Add(this.cmbUser); this.panel1.Controls.Add(this.label4); @@ -63,9 +67,20 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(888, 58); + this.panel1.Size = new System.Drawing.Size(1102, 58); this.panel1.TabIndex = 1; // + // btSave + // + this.btSave.Dock = System.Windows.Forms.DockStyle.Right; + this.btSave.Location = new System.Drawing.Point(947, 5); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(75, 48); + this.btSave.TabIndex = 13; + this.btSave.Text = "파일저장"; + this.btSave.UseVisualStyleBackColor = true; + this.btSave.Click += new System.EventHandler(this.btSave_Click); + // // cmbUser // this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -138,7 +153,7 @@ // btRefresh // this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; - this.btRefresh.Location = new System.Drawing.Point(808, 5); + this.btRefresh.Location = new System.Drawing.Point(1022, 5); this.btRefresh.Name = "btRefresh"; this.btRefresh.Size = new System.Drawing.Size(75, 48); this.btRefresh.TabIndex = 2; @@ -154,49 +169,41 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(888, 638); + this.fpSpread1.Size = new System.Drawing.Size(1102, 592); this.fpSpread1.TabIndex = 4; // // fpSpread1_Sheet1 // 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.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // btSave + // linkLabel1 // - this.btSave.Dock = System.Windows.Forms.DockStyle.Right; - this.btSave.Location = new System.Drawing.Point(733, 5); - this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(75, 48); - this.btSave.TabIndex = 13; - this.btSave.Text = "파일저장"; - this.btSave.UseVisualStyleBackColor = true; - this.btSave.Click += new System.EventHandler(this.btSave_Click); + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(522, 12); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(41, 12); + this.linkLabel1.TabIndex = 14; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "다음달"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Location = new System.Drawing.Point(475, 12); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(41, 12); + this.linkLabel2.TabIndex = 15; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "이전달"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); // // fJobChartMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(888, 696); + this.ClientSize = new System.Drawing.Size(1102, 650); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.panel1); this.Name = "fJobChartMenu"; @@ -227,5 +234,7 @@ private FarPoint.Win.Spread.FpSpread fpSpread1; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.Button btSave; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs index 3c5ecb6..c580c18 100644 --- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs +++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs @@ -360,5 +360,23 @@ namespace FPJ0000.JobReport_ FCOMMON.Util.MsgE("파일저장완료\n" + sd.FileName); } } + + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //이전달 + var sd = dts.Value.AddMonths(-1); + var ed = sd.AddMonths(1); + dts.Value = sd; + dte.Value = ed; + } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //다음달 + var sd = dts.Value.AddMonths(1); + var ed = sd.AddMonths(1); + dts.Value = sd; + dte.Value = ed; + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index bf9c96d..b1de614 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -593,7 +593,7 @@ namespace FPJ0000 FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다."); return; } - if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0) + if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0 && FCOMMON.info.Login.level < 5) { FCOMMON.Util.MsgE("연장/휴일 근무 시간이 승인된 자료이므로 삭제할 수 없습니다"); return; diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index b346893..b904a10 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -544,9 +544,9 @@ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4; - this.HolyDays.HeaderText = "일"; + this.HolyDays.HeaderText = "사용일"; this.HolyDays.Name = "HolyDays"; - this.HolyDays.Width = 52; + this.HolyDays.Width = 76; // // HolyTimes // diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index 61e0524..ccc3af0 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -32,7 +32,6 @@ namespace FPJ0000.OtConfirm this.components = new System.ComponentModel.Container(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); this.tbCate = new System.Windows.Forms.ComboBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSKuntae = new FPJ0000.DSKuntae(); @@ -57,6 +56,7 @@ namespace FPJ0000.OtConfirm this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.grpAdmin = new System.Windows.Forms.GroupBox(); + this.chkSendMail = new System.Windows.Forms.CheckBox(); this.cmbPreset = new System.Windows.Forms.ComboBox(); this.rad2 = new System.Windows.Forms.RadioButton(); this.rad1 = new System.Windows.Forms.RadioButton(); @@ -64,7 +64,8 @@ namespace FPJ0000.OtConfirm this.tbResponse = new System.Windows.Forms.RichTextBox(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); - this.chkSendMail = new System.Windows.Forms.CheckBox(); + this.radTime = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); this.grpUser.SuspendLayout(); @@ -89,26 +90,17 @@ namespace FPJ0000.OtConfirm this.label2.TabIndex = 2; this.label2.Text = "종료일"; // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(62, 136); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(66, 27); - this.label3.TabIndex = 4; - this.label3.Text = "구분"; - // // tbCate // this.tbCate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.tbCate.FormattingEnabled = true; this.tbCate.Items.AddRange(new object[] { - "연차", + "년차", "하기", "대체"}); this.tbCate.Location = new System.Drawing.Point(140, 133); this.tbCate.Name = "tbCate"; - this.tbCate.Size = new System.Drawing.Size(358, 35); + this.tbCate.Size = new System.Drawing.Size(153, 35); this.tbCate.TabIndex = 5; // // bs @@ -141,6 +133,7 @@ namespace FPJ0000.OtConfirm // tbRemark // this.tbRemark.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Remark", true)); + this.tbRemark.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbRemark.Location = new System.Drawing.Point(140, 297); this.tbRemark.Name = "tbRemark"; this.tbRemark.Size = new System.Drawing.Size(358, 169); @@ -149,6 +142,8 @@ namespace FPJ0000.OtConfirm // // grpUser // + this.grpUser.Controls.Add(this.radioButton2); + this.grpUser.Controls.Add(this.radTime); this.grpUser.Controls.Add(this.tbTimes); this.grpUser.Controls.Add(this.tbDays); this.grpUser.Controls.Add(this.label11); @@ -170,7 +165,6 @@ namespace FPJ0000.OtConfirm this.grpUser.Controls.Add(this.label2); this.grpUser.Controls.Add(this.tbSD); this.grpUser.Controls.Add(this.label4); - this.grpUser.Controls.Add(this.label3); this.grpUser.Controls.Add(this.tbCate); this.grpUser.Location = new System.Drawing.Point(12, 12); this.grpUser.Name = "grpUser"; @@ -220,7 +214,7 @@ namespace FPJ0000.OtConfirm this.tbBackup.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.tbBackup.FormattingEnabled = true; this.tbBackup.Items.AddRange(new object[] { - "연차", + "년차", "하기", "대체"}); this.tbBackup.Location = new System.Drawing.Point(140, 256); @@ -242,7 +236,7 @@ namespace FPJ0000.OtConfirm this.tbLocation.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.tbLocation.FormattingEnabled = true; this.tbLocation.Items.AddRange(new object[] { - "연차", + "년차", "하기", "대체"}); this.tbLocation.Location = new System.Drawing.Point(140, 215); @@ -264,7 +258,7 @@ namespace FPJ0000.OtConfirm this.tbReason.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.tbReason.FormattingEnabled = true; this.tbReason.Items.AddRange(new object[] { - "연차", + "년차", "하기", "대체"}); this.tbReason.Location = new System.Drawing.Point(140, 174); @@ -340,20 +334,30 @@ namespace FPJ0000.OtConfirm this.grpAdmin.Controls.Add(this.rad1); this.grpAdmin.Controls.Add(this.rad0); this.grpAdmin.Controls.Add(this.tbResponse); - this.grpAdmin.Location = new System.Drawing.Point(12, 520); + this.grpAdmin.Location = new System.Drawing.Point(12, 503); this.grpAdmin.Name = "grpAdmin"; - this.grpAdmin.Size = new System.Drawing.Size(788, 242); + this.grpAdmin.Size = new System.Drawing.Size(788, 179); this.grpAdmin.TabIndex = 1; this.grpAdmin.TabStop = false; this.grpAdmin.Text = "관리자"; // + // chkSendMail + // + this.chkSendMail.AutoSize = true; + this.chkSendMail.Location = new System.Drawing.Point(631, 37); + this.chkSendMail.Name = "chkSendMail"; + this.chkSendMail.Size = new System.Drawing.Size(139, 31); + this.chkSendMail.TabIndex = 7; + this.chkSendMail.Text = "메일전송"; + this.chkSendMail.UseVisualStyleBackColor = true; + // // cmbPreset // this.cmbPreset.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); this.cmbPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPreset.FormattingEnabled = true; this.cmbPreset.Items.AddRange(new object[] { - "연차", + "년차", "하기", "대체"}); this.cmbPreset.Location = new System.Drawing.Point(26, 74); @@ -401,15 +405,15 @@ namespace FPJ0000.OtConfirm this.tbResponse.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Response", true)); this.tbResponse.Location = new System.Drawing.Point(26, 115); this.tbResponse.Name = "tbResponse"; - this.tbResponse.Size = new System.Drawing.Size(744, 113); + this.tbResponse.Size = new System.Drawing.Size(744, 57); this.tbResponse.TabIndex = 3; this.tbResponse.Text = ""; // // button1 // - this.button1.Location = new System.Drawing.Point(12, 768); + this.button1.Location = new System.Drawing.Point(12, 688); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(788, 72); + this.button1.Size = new System.Drawing.Size(788, 50); this.button1.TabIndex = 2; this.button1.Text = "확인"; this.button1.UseVisualStyleBackColor = true; @@ -419,20 +423,35 @@ namespace FPJ0000.OtConfirm // this.ta.ClearBeforeFill = true; // - // chkSendMail + // radTime // - this.chkSendMail.AutoSize = true; - this.chkSendMail.Location = new System.Drawing.Point(631, 37); - this.chkSendMail.Name = "chkSendMail"; - this.chkSendMail.Size = new System.Drawing.Size(139, 31); - this.chkSendMail.TabIndex = 7; - this.chkSendMail.Text = "메일전송"; - this.chkSendMail.UseVisualStyleBackColor = true; + this.radTime.AutoSize = true; + this.radTime.Location = new System.Drawing.Point(306, 134); + this.radTime.Name = "radTime"; + this.radTime.Size = new System.Drawing.Size(192, 31); + this.radTime.TabIndex = 24; + this.radTime.TabStop = true; + this.radTime.Text = "대체시간사용"; + this.radTime.UseVisualStyleBackColor = true; + this.radTime.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Checked = true; + this.radioButton2.Location = new System.Drawing.Point(50, 133); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(84, 31); + this.radioButton2.TabIndex = 25; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "일반"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // fHolyRequestAdd // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(812, 851); + this.ClientSize = new System.Drawing.Size(812, 746); this.Controls.Add(this.button1); this.Controls.Add(this.grpAdmin); this.Controls.Add(this.grpUser); @@ -457,7 +476,6 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox tbCate; private System.Windows.Forms.DateTimePicker tbSD; private System.Windows.Forms.DateTimePicker tbED; @@ -490,5 +508,7 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.Label label11; private System.Windows.Forms.ComboBox cmbPreset; private System.Windows.Forms.CheckBox chkSendMail; + private System.Windows.Forms.RadioButton radTime; + private System.Windows.Forms.RadioButton radioButton2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 0de8dee..a5dc517 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -64,6 +64,21 @@ namespace FPJ0000.OtConfirm tbDays.Text = dr.HolyDays.ToString(); //211224 tbTimes.Text = dr.HolyTimes.ToString(); + if(dr.cate == "대체") + { + tbTimes.Enabled = true; + tbDays.Enabled = false; + tbCate.Enabled = false; + radTime.Checked = true; + } + else + { + tbCate.Enabled = true; + tbTimes.Enabled = false; + tbDays.Enabled = true; + radioButton2.Checked = true; + } + } int curLevel = 0; private void fHolyRequestAdd_Load(object sender, EventArgs e) @@ -75,6 +90,7 @@ namespace FPJ0000.OtConfirm if (dr.RowState == DataRowState.Detached) { grpAdmin.Enabled = false; + UpdateStatus(); } else { @@ -91,11 +107,13 @@ namespace FPJ0000.OtConfirm private void button1_Click(object sender, EventArgs e) { var cate = tbCate.Text.Trim(); + if (radTime.Checked) cate = "대체"; + var remark = tbRemark.Text.Trim(); var response = tbResponse.Text.Trim(); if (string.IsNullOrEmpty(cate)) { - FCOMMON.Util.MsgE("구분을 입력하세요 (연차/하기휴가/연장근무)"); + FCOMMON.Util.MsgE("구분을 입력하세요"); tbCate.Focus(); return; } @@ -108,6 +126,9 @@ namespace FPJ0000.OtConfirm var vDay = 0; var vTime = 0f; + if (tbDays.Enabled == false) tbDays.Text = string.Empty; + if (tbTimes.Enabled == false) tbTimes.Text = string.Empty; + if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim()); if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim()); @@ -123,6 +144,16 @@ namespace FPJ0000.OtConfirm FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요"); return; } + + //하나도 입력안했다면 경고한다 + if(tbReason.Text.isEmpty() && tbLocation.Text.isEmpty() && tbBackup.Text.isEmpty() && tbRemark.Text.isEmpty()) + { + FCOMMON.Util.MsgE("비고를 입력해주세요"); + tbRemark.Focus(); + return; + } + + if (dr.RowState == DataRowState.Detached) { var dlg = FCOMMON.Util.MsgQ("입력을 완료하시겠습니까?\r\n관리자에게 메일로 알림이 발생 합니다"); @@ -144,7 +175,7 @@ namespace FPJ0000.OtConfirm dr.HolyReason = tbReason.Text.Trim(); dr.HolyLocation = tbLocation.Text.Trim(); dr.HolyBackup = tbBackup.Text.Trim(); - dr.cate = tbCate.Text.Trim(); + dr.cate = cate;// tbCate.Text.Trim(); dr.Remark = tbRemark.Text.Trim(); dr.Response = tbResponse.Text.Trim(); dr.sdate = tbSD.Value.ToShortDateString(); @@ -175,14 +206,64 @@ namespace FPJ0000.OtConfirm } private void tbED_ValueChanged(object sender, EventArgs e) + { + UpdateStatus(); + + } + + void UpdateStatus() { //해당 값이 오늘보다 이전이라면 메일전송을 자동 해제하낟. var v = tbED.Value.ToShortDateString(); + var s = tbSD.Value.ToShortDateString(); + var c = DateTime.Now.ToShortDateString(); if (v.CompareTo(c) < 0) chkSendMail.Checked = false; else chkSendMail.Checked = true; + + //일수계산 + var term = tbED.Value - tbSD.Value; + var days = term.Days + 1; + if (radTime.Checked == false) + { + //if(tbDays.Text.isEmpty() || tbDays.Text=="0") + { + tbDays.Text = (days).ToString(); + } + + } + else + { + //여기는 시간 + //if (tbTimes.Text.isEmpty() || tbTimes.Text == "0") + { + tbTimes.Text = (days * 8).ToString(); + } + } + } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) + { + if (radTime.Checked) + { + tbCate.Enabled = false; + tbDays.Enabled = false; + tbTimes.Enabled = true; + tbDays.BackColor = Color.DimGray; + tbTimes.BackColor = Color.Gold; + } + else + { + tbCate.Enabled = true; + tbDays.Enabled = true; + tbTimes.Enabled = false; + tbTimes.BackColor = Color.DimGray; + tbDays.BackColor = Color.Gold; + } + + UpdateStatus(); } } }