..

2022-05-18 16:05:58 +09:00
parent 8d83d4a768
commit 5e67caad39
14 changed files with 830 additions and 78 deletions
--- a/JobReportMailService/DataSet1.Designer.cs
+++ b/JobReportMailService/DataSet1.Designer.cs
@@ -32,6 +32,8 @@ namespace JobReportMailService {
        
        private vMailingProjectScheduleDataTable tablevMailingProjectSchedule;
        
+        private vJobReportForUserDataTable tablevJobReportForUser;
+        
        private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
        
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -72,6 +74,9 @@ namespace JobReportMailService {
                if ((ds.Tables["vMailingProjectSchedule"] != null)) {
                    base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"]));
                }
+                if ((ds.Tables["vJobReportForUser"] != null)) {
+                    base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"]));
+                }
                this.DataSetName = ds.DataSetName;
                this.Prefix = ds.Prefix;
                this.Namespace = ds.Namespace;
@@ -130,6 +135,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 vJobReportForUserDataTable vJobReportForUser {
+            get {
+                return this.tablevJobReportForUser;
+            }
+        }
+        
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
        [global::System.ComponentModel.BrowsableAttribute(true)]
@@ -209,6 +224,9 @@ namespace JobReportMailService {
                if ((ds.Tables["vMailingProjectSchedule"] != null)) {
                    base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"]));
                }
+                if ((ds.Tables["vJobReportForUser"] != null)) {
+                    base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"]));
+                }
                this.DataSetName = ds.DataSetName;
                this.Prefix = ds.Prefix;
                this.Namespace = ds.Namespace;
@@ -266,6 +284,12 @@ namespace JobReportMailService {
                    this.tablevMailingProjectSchedule.InitVars();
                }
            }
+            this.tablevJobReportForUser = ((vJobReportForUserDataTable)(base.Tables["vJobReportForUser"]));
+            if ((initTable == true)) {
+                if ((this.tablevJobReportForUser != null)) {
+                    this.tablevJobReportForUser.InitVars();
+                }
+            }
        }
        
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -284,6 +308,8 @@ namespace JobReportMailService {
            base.Tables.Add(this.tableMailForm);
            this.tablevMailingProjectSchedule = new vMailingProjectScheduleDataTable();
            base.Tables.Add(this.tablevMailingProjectSchedule);
+            this.tablevJobReportForUser = new vJobReportForUserDataTable();
+            base.Tables.Add(this.tablevJobReportForUser);
        }
        
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -310,6 +336,12 @@ namespace JobReportMailService {
            return false;
        }
        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        private bool ShouldSerializevJobReportForUser() {
+            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) {
@@ -377,6 +409,9 @@ namespace JobReportMailService {
        [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 vJobReportForUserRowChangeEventHandler(object sender, vJobReportForUserRowChangeEvent e);
+        
        /// <summary>
        ///Represents the strongly named DataTable class.
        ///</summary>
@@ -2363,6 +2398,280 @@ namespace JobReportMailService {
            }
        }
        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class vJobReportForUserDataTable : global::System.Data.TypedTableBase<vJobReportForUserRow> {
+            
+            private global::System.Data.DataColumn columnid;
+            
+            private global::System.Data.DataColumn columnname;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public vJobReportForUserDataTable() {
+                this.TableName = "vJobReportForUser";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal vJobReportForUserDataTable(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 vJobReportForUserDataTable(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 idColumn {
+                get {
+                    return this.columnid;
+                }
+            }
+            
+            [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")]
+            [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 vJobReportForUserRow this[int index] {
+                get {
+                    return ((vJobReportForUserRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void AddvJobReportForUserRow(vJobReportForUserRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public vJobReportForUserRow AddvJobReportForUserRow(string id, string name) {
+                vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        id,
+                        name};
+                rowvJobReportForUserRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowvJobReportForUserRow);
+                return rowvJobReportForUserRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public vJobReportForUserRow FindByid(string id) {
+                return ((vJobReportForUserRow)(this.Rows.Find(new object[] {
+                            id})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                vJobReportForUserDataTable cln = ((vJobReportForUserDataTable)(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 vJobReportForUserDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal void InitVars() {
+                this.columnid = base.Columns["id"];
+                this.columnname = base.Columns["name"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            private void InitClass() {
+                this.columnid = new global::System.Data.DataColumn("id", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnid);
+                this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnname);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnid}, true));
+                this.columnid.AllowDBNull = false;
+                this.columnid.Unique = true;
+                this.columnid.MaxLength = 20;
+                this.columnname.MaxLength = 100;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public vJobReportForUserRow NewvJobReportForUserRow() {
+                return ((vJobReportForUserRow)(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 vJobReportForUserRow(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(vJobReportForUserRow);
+            }
+            
+            [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.vJobReportForUserRowChanged != null)) {
+                    this.vJobReportForUserRowChanged(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(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.vJobReportForUserRowChanging != null)) {
+                    this.vJobReportForUserRowChanging(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(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.vJobReportForUserRowDeleted != null)) {
+                    this.vJobReportForUserRowDeleted(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(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.vJobReportForUserRowDeleting != null)) {
+                    this.vJobReportForUserRowDeleting(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void RemovevJobReportForUserRow(vJobReportForUserRow 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 = "vJobReportForUserDataTable";
+                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;
+            }
+        }
+        
        /// <summary>
        ///Represents strongly named DataRow class.
        ///</summary>
@@ -3943,6 +4252,60 @@ namespace JobReportMailService {
            }
        }
        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class vJobReportForUserRow : global::System.Data.DataRow {
+            
+            private vJobReportForUserDataTable tablevJobReportForUser;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            internal vJobReportForUserRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tablevJobReportForUser = ((vJobReportForUserDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string id {
+                get {
+                    return ((string)(this[this.tablevJobReportForUser.idColumn]));
+                }
+                set {
+                    this[this.tablevJobReportForUser.idColumn] = 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.tablevJobReportForUser.nameColumn]));
+                    }
+                }
+                set {
+                    this[this.tablevJobReportForUser.nameColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsnameNull() {
+                return this.IsNull(this.tablevJobReportForUser.nameColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetnameNull() {
+                this[this.tablevJobReportForUser.nameColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
        /// <summary>
        ///Row event argument class
        ///</summary>
@@ -4078,6 +4441,40 @@ namespace JobReportMailService {
                }
            }
        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        public class vJobReportForUserRowChangeEvent : global::System.EventArgs {
+            
+            private vJobReportForUserRow 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 vJobReportForUserRowChangeEvent(vJobReportForUserRow 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 vJobReportForUserRow 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 {
@@ -6575,6 +6972,188 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se
        }
    }
    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [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 vJobReportForUserTableAdapter : 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 vJobReportForUserTableAdapter() {
+            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 = "vJobReportForUser";
+            tableMapping.ColumnMappings.Add("id", "id");
+            tableMapping.ColumnMappings.Add("name", "name");
+            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  id, MAX(name) AS name\r\nFROM     vJobReportForUser\r\nWHERE  (gcode = @gcode" +
+                ")\r\nGROUP BY id\r\nORDER BY name";
+            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.vJobReportForUserDataTable 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.vJobReportForUserDataTable 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.vJobReportForUserDataTable dataTable = new DataSet1.vJobReportForUserDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
    /// <summary>
    ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
    ///</summary>
--- a/JobReportMailService/DataSet1.cs
+++ b/JobReportMailService/DataSet1.cs
@@ -2,6 +2,14 @@
 {
 }

+namespace JobReportMailService
+{
+}
+
+namespace JobReportMailService
+{
+}
+
 namespace JobReportMailService
 {
 }
--- a/JobReportMailService/DataSet1.xsd
+++ b/JobReportMailService/DataSet1.xsd
@@ -458,6 +458,29 @@ ORDER BY pdate, idx, seq</CommandText>
            </Mappings>
            <Sources />
          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vJobReportForUserTableAdapter" GeneratorDataComponentClassName="vJobReportForUserTableAdapter" Name="vJobReportForUser" UserDataComponentName="vJobReportForUserTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="CS (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  id, MAX(name) AS name
+FROM     vJobReportForUser
+WHERE  (gcode = @gcode)
+GROUP BY id
+ORDER BY name</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="id" DataSetColumn="id" />
+              <Mapping SourceColumn="name" DataSetColumn="name" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
        </Tables>
        <Sources />
      </DataSource>
@@ -818,6 +841,26 @@ ORDER BY pdate, idx, seq</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
+        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:choice>
    </xs:complexType>
    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -837,5 +880,9 @@ ORDER BY pdate, idx, seq</CommandText>
      <xs:field xpath="mstns:idx" />
      <xs:field xpath="mstns:sidx" />
    </xs:unique>
+    <xs:unique name="vJobReportForUser_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:vJobReportForUser" />
+      <xs:field xpath="mstns:id" />
+    </xs:unique>
  </xs:element>
 </xs:schema>
--- a/JobReportMailService/DataSet1.xss
+++ b/JobReportMailService/DataSet1.xss
@@ -6,10 +6,11 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
-    <Shape ID="DesignTable:MailAuto" ZOrder="3" X="652" Y="137" Height="324" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:MailData" ZOrder="2" X="917" Y="151" Height="362" Width="361" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:MailForm" ZOrder="4" X="1355" Y="161" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vMailingProjectSchedule" ZOrder="1" X="275" Y="205" Height="305" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:MailAuto" ZOrder="4" X="652" Y="137" Height="324" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:MailData" ZOrder="3" X="917" Y="151" Height="362" Width="361" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:MailForm" ZOrder="5" X="1355" Y="161" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vMailingProjectSchedule" ZOrder="2" X="275" Y="205" Height="305" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="663" Y="606" Height="153" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
  </Shapes>
  <Connectors />
 </DiagramLayout>
--- a/JobReportMailService/EETGW_ProjectToDo.cs
+++ b/JobReportMailService/EETGW_ProjectToDo.cs
@@ -29,5 +29,7 @@ namespace JobReportMailService
        public string remark2 { get; set; }
        public string wuid { get; set; }
        public System.DateTime wdate { get; set; }
+        public string gcode { get; set; }
+        public Nullable<int> no { get; set; }
    }
 }
--- a/JobReportMailService/EETGW_ProjectsSchedule.cs
+++ b/JobReportMailService/EETGW_ProjectsSchedule.cs
@@ -20,10 +20,11 @@ namespace JobReportMailService
        public Nullable<int> no { get; set; }
        public Nullable<int> seq { get; set; }
        public string title { get; set; }
-        public Nullable<int> sw { get; set; }
-        public Nullable<int> ew { get; set; }
-        public Nullable<int> swa { get; set; }
-        public Nullable<int> ewa { get; set; }
+        public string cate { get; set; }
+        public string sw { get; set; }
+        public string ew { get; set; }
+        public string swa { get; set; }
+        public string ewa { get; set; }
        public string uid { get; set; }
        public string memo { get; set; }
        public Nullable<int> appoval { get; set; }
--- a/JobReportMailService/JobReport.cs
+++ b/JobReportMailService/JobReport.cs
@@ -35,5 +35,14 @@ namespace JobReportMailService
        public string description2 { get; set; }
        public string tag { get; set; }
        public Nullable<bool> autoinput { get; set; }
+        public Nullable<System.DateTime> otStart { get; set; }
+        public Nullable<System.DateTime> otEnd { get; set; }
+        public string kisullv { get; set; }
+        public string kisuldiv { get; set; }
+        public Nullable<decimal> kisulamt { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public string otReason { get; set; }
+        public string otwuid { get; set; }
+        public Nullable<System.DateTime> ottime { get; set; }
    }
 }
--- a/JobReportMailService/Model1.Context.cs
+++ b/JobReportMailService/Model1.Context.cs
@@ -28,11 +28,11 @@ namespace JobReportMailService
        public virtual DbSet<JobReport> JobReport { get; set; }
        public virtual DbSet<MailData> MailData { get; set; }
        public virtual DbSet<vGroupUser> vGroupUser { get; set; }
-        public virtual DbSet<vJobReportForUser> vJobReportForUser { get; set; }
        public virtual DbSet<HolidayLIst> HolidayLIst { get; set; }
        public virtual DbSet<MailForm> MailForm { get; set; }
        public virtual DbSet<EETGW_ProjectToDo> EETGW_ProjectToDo { get; set; }
        public virtual DbSet<Projects> Projects { get; set; }
        public virtual DbSet<EETGW_ProjectsSchedule> EETGW_ProjectsSchedule { get; set; }
+        public virtual DbSet<vJobReportForUser> vJobReportForUser { get; set; }
    }
 }
--- a/JobReportMailService/Model1.edmx
+++ b/JobReportMailService/Model1.edmx
@@ -15,10 +15,11 @@
          <Property Name="no" Type="int" />
          <Property Name="seq" Type="int" />
          <Property Name="title" Type="varchar" MaxLength="100" />
-          <Property Name="sw" Type="int" />
-          <Property Name="ew" Type="int" />
-          <Property Name="swa" Type="int" />
-          <Property Name="ewa" Type="int" />
+          <Property Name="cate" Type="varchar" MaxLength="20" />
+          <Property Name="sw" Type="varchar" MaxLength="10" />
+          <Property Name="ew" Type="varchar" MaxLength="10" />
+          <Property Name="swa" Type="varchar" MaxLength="10" />
+          <Property Name="ewa" Type="varchar" MaxLength="10" />
          <Property Name="uid" Type="varchar" MaxLength="50" />
          <Property Name="memo" Type="varchar(max)" />
          <Property Name="appoval" Type="int" />
@@ -31,8 +32,10 @@
            <PropertyRef Name="idx" />
          </Key>
          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="gcode" Type="varchar" MaxLength="10" />
          <Property Name="pidx" Type="int" Nullable="false" />
          <Property Name="pseq" Type="int" />
+          <Property Name="no" Type="int" />
          <Property Name="sw" Type="int" />
          <Property Name="ww" Type="int" />
          <Property Name="sort" Type="varchar" MaxLength="2" />
@@ -76,12 +79,21 @@
          <Property Name="remark" Type="nvarchar" MaxLength="255" />
          <Property Name="hrs" Type="float" />
          <Property Name="ot" Type="float" />
+          <Property Name="otStart" Type="datetime" />
+          <Property Name="otEnd" Type="datetime" />
          <Property Name="import" Type="bit" />
          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
          <Property Name="description2" Type="nvarchar(max)" />
          <Property Name="tag" Type="varchar" MaxLength="255" />
          <Property Name="autoinput" Type="bit" />
+          <Property Name="kisullv" Type="varchar" MaxLength="10" />
+          <Property Name="kisuldiv" Type="varchar" MaxLength="100" />
+          <Property Name="kisulamt" Type="decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="otReason" Type="varchar" MaxLength="255" />
+          <Property Name="otwuid" Type="varchar" MaxLength="20" />
+          <Property Name="ottime" Type="datetime" />
        </EntityType>
        <EntityType Name="MailData">
          <Key>
@@ -171,9 +183,12 @@
          <Property Name="CMP_Description" Type="nvarchar(max)" />
          <Property Name="CMP_Before" Type="nvarchar(max)" />
          <Property Name="CMP_After" Type="nvarchar(max)" />
+          <Property Name="CMP_After2" Type="nvarchar(max)" />
          <Property Name="bCost" Type="bit" />
          <Property Name="bFanOut" Type="bit" />
          <Property Name="div" Type="varchar" MaxLength="2" />
+          <Property Name="model" Type="varchar" MaxLength="50" />
+          <Property Name="serial" Type="varchar" MaxLength="50" />
          <Property Name="EB_Site" Type="varchar" MaxLength="20" />
          <Property Name="EB_Line" Type="varchar" MaxLength="10" />
          <Property Name="EB_Team" Type="varchar" MaxLength="10" />
@@ -182,12 +197,14 @@
          <Property Name="EB_RepairTime" Type="float" />
          <Property Name="EB_ConstNew" Type="float" />
          <Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
+          <Property Name="bAlert" Type="bit" />
        </EntityType>
        <!--생성 중 오류 발생:
 경고 6002: 테이블/뷰 'EE.dbo.vGroupUser'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
        <EntityType Name="vGroupUser">
          <Key>
            <PropertyRef Name="gcode" />
+            
          </Key>
          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
          <Property Name="dept" Type="varchar" MaxLength="100" />
@@ -205,11 +222,12 @@
          <Property Name="ads_title" Type="nvarchar" MaxLength="100" />
          <Property Name="ads_created" Type="varchar" MaxLength="50" />
          <Property Name="memo" Type="nvarchar" MaxLength="255" />
-          <Property Name="processs" Type="varchar" MaxLength="50" />
+          <Property Name="processs" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="id" Type="varchar" MaxLength="20" />
          <Property Name="state" Type="varchar" MaxLength="20" />
          <Property Name="useJobReport" Type="bit" />
          <Property Name="useUserState" Type="bit" />
+          <Property Name="password" Type="varchar" MaxLength="50" />
        </EntityType>
        <!--생성 중 오류 발생:
 경고 6002: 테이블/뷰 'EE.dbo.vJobReportForUser'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
@@ -217,24 +235,34 @@
          <Key>
            <PropertyRef Name="idx" />
            <PropertyRef Name="gcode" />
+            <PropertyRef Name="process" />
+            <PropertyRef Name="requestpart" />
+            <PropertyRef Name="package" />
          </Key>
          <Property Name="idx" Type="int" Nullable="false" />
          <Property Name="pdate" Type="varchar" MaxLength="10" />
          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
          <Property Name="id" Type="varchar" MaxLength="20" />
          <Property Name="name" Type="nvarchar" MaxLength="100" />
-          <Property Name="process" Type="varchar" MaxLength="50" />
+          <Property Name="process" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="type" Type="varchar" MaxLength="50" />
          <Property Name="svalue" Type="varchar" MaxLength="255" />
          <Property Name="hrs" Type="float" />
          <Property Name="ot" Type="float" />
-          <Property Name="requestpart" Type="varchar" MaxLength="50" />
-          <Property Name="package" Type="varchar" MaxLength="50" />
+          <Property Name="requestpart" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="package" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="userProcess" Type="varchar" MaxLength="50" />
          <Property Name="status" Type="varchar" MaxLength="20" />
          <Property Name="projectName" Type="nvarchar" MaxLength="255" />
          <Property Name="description" Type="nvarchar(max)" />
          <Property Name="ww" Type="varchar" MaxLength="6" />
+          <Property Name="otStart" Type="datetime" />
+          <Property Name="otEnd" Type="datetime" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="otReason" Type="varchar" MaxLength="255" />
+          <Property Name="grade" Type="varchar" MaxLength="10" />
+          <Property Name="indate" Type="varchar" MaxLength="20" />
+          <Property Name="outdate" Type="varchar" MaxLength="20" />
        </EntityType>
        <EntityContainer Name="EEModelStoreContainer">
          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="Self.EETGW_ProjectsSchedule" Schema="dbo" store:Type="Tables" />
@@ -266,7 +294,8 @@
    [vGroupUser].[id] AS [id], 
    [vGroupUser].[state] AS [state], 
    [vGroupUser].[useJobReport] AS [useJobReport], 
-    [vGroupUser].[useUserState] AS [useUserState]
+    [vGroupUser].[useUserState] AS [useUserState], 
+    [vGroupUser].[password] AS [password]
    FROM [dbo].[vGroupUser] AS [vGroupUser]</DefiningQuery>
          </EntitySet>
          <EntitySet Name="vJobReportForUser" EntityType="Self.vJobReportForUser" store:Type="Views" store:Schema="dbo">
@@ -287,7 +316,14 @@
    [vJobReportForUser].[status] AS [status], 
    [vJobReportForUser].[projectName] AS [projectName], 
    [vJobReportForUser].[description] AS [description], 
-    [vJobReportForUser].[ww] AS [ww]
+    [vJobReportForUser].[ww] AS [ww], 
+    [vJobReportForUser].[otStart] AS [otStart], 
+    [vJobReportForUser].[otEnd] AS [otEnd], 
+    [vJobReportForUser].[ot2] AS [ot2], 
+    [vJobReportForUser].[otReason] AS [otReason], 
+    [vJobReportForUser].[grade] AS [grade], 
+    [vJobReportForUser].[indate] AS [indate], 
+    [vJobReportForUser].[outdate] AS [outdate]
    FROM [dbo].[vJobReportForUser] AS [vJobReportForUser]</DefiningQuery>
          </EntitySet>
        </EntityContainer>
@@ -320,6 +356,15 @@
          <Property Name="description2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
          <Property Name="tag" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
          <Property Name="autoinput" Type="Boolean" />
+          <Property Name="otStart" Type="DateTime" Precision="3" />
+          <Property Name="otEnd" Type="DateTime" Precision="3" />
+          <Property Name="kisullv" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="kisuldiv" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="kisulamt" Type="Decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="otReason" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="otwuid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="ottime" Type="DateTime" Precision="3" />
        </EntityType>
        <EntityType Name="MailData">
          <Key>
@@ -363,45 +408,23 @@
          <Property Name="ads_title" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
          <Property Name="ads_created" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="state" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="useJobReport" Type="Boolean" />
          <Property Name="useUserState" Type="Boolean" />
-        </EntityType>
-        <EntityType Name="vJobReportForUser">
-          <Key>
-            <PropertyRef Name="idx" />
-            <PropertyRef Name="gcode" />
-          </Key>
-          <Property Name="idx" Type="Int32" Nullable="false" />
-          <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
-          <Property Name="gcode" Type="String" MaxLength="10" FixedLength="false" Unicode="false" Nullable="false" />
-          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
-          <Property Name="name" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
-          <Property Name="hrs" Type="Double" />
-          <Property Name="ot" Type="Double" />
-          <Property Name="userProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
-          <Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="ww" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="password" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
        </EntityType>
        <EntityContainer Name="EEEntities" annotation:LazyLoadingEnabled="true">
          <EntitySet Name="JobReport" EntityType="Self.JobReport" />
          <EntitySet Name="MailData" EntityType="Self.MailData" />
          <EntitySet Name="vGroupUser" EntityType="Self.vGroupUser" />
-          <EntitySet Name="vJobReportForUser" EntityType="Self.vJobReportForUser" />
          <EntitySet Name="HolidayLIst" EntityType="EEModel.HolidayLIst" />
          <EntitySet Name="MailForm" EntityType="EEModel.MailForm" />
          <EntitySet Name="EETGW_ProjectToDo" EntityType="EEModel.EETGW_ProjectToDo" />
          <EntitySet Name="Projects" EntityType="EEModel.Projects" />
          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="EEModel.EETGW_ProjectsSchedule" />
+          <EntitySet Name="vJobReportForUser" EntityType="EEModel.vJobReportForUser" />
        </EntityContainer>
        <EntityType Name="HolidayLIst">
          <Key>
@@ -455,6 +478,8 @@
          <Property Name="remark2" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+          <Property Name="gcode" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="no" Type="Int32" />
        </EntityType>
        <EntityType Name="Projects">
          <Key>
@@ -511,6 +536,10 @@
          <Property Name="EB_RepairTime" Type="Double" />
          <Property Name="EB_ConstNew" Type="Double" />
          <Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="CMP_After2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="model" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="serial" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="bAlert" Type="Boolean" />
        </EntityType>
        <EntityType Name="EETGW_ProjectsSchedule">
          <Key>
@@ -522,10 +551,11 @@
          <Property Name="no" Type="Int32" />
          <Property Name="seq" Type="Int32" />
          <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="sw" Type="Int32" />
-          <Property Name="ew" Type="Int32" />
-          <Property Name="swa" Type="Int32" />
-          <Property Name="ewa" Type="Int32" />
+          <Property Name="cate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="sw" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="ew" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="swa" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="ewa" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
          <Property Name="uid" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="memo" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
          <Property Name="appoval" Type="Int32" />
@@ -533,6 +563,39 @@
          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
        </EntityType>
+        <EntityType Name="vJobReportForUser">
+          <Key>
+            <PropertyRef Name="idx" />
+            <PropertyRef Name="gcode" />
+            <PropertyRef Name="process" />
+            <PropertyRef Name="requestpart" />
+            <PropertyRef Name="package" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" />
+          <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="name" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="process" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="hrs" Type="Double" />
+          <Property Name="ot" Type="Double" />
+          <Property Name="requestpart" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="package" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="userProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="ww" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="otStart" Type="DateTime" Precision="3" />
+          <Property Name="otEnd" Type="DateTime" Precision="3" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="otReason" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="grade" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="indate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="outdate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+        </EntityType>
      </Schema>
    </edmx:ConceptualModels>
    <!-- C-S mapping content -->
@@ -542,6 +605,15 @@
          <EntitySetMapping Name="JobReport">
            <EntityTypeMapping TypeName="EEModel.JobReport">
              <MappingFragment StoreEntitySet="JobReport">
+                <ScalarProperty Name="ottime" ColumnName="ottime" />
+                <ScalarProperty Name="otwuid" ColumnName="otwuid" />
+                <ScalarProperty Name="otReason" ColumnName="otReason" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
+                <ScalarProperty Name="kisulamt" ColumnName="kisulamt" />
+                <ScalarProperty Name="kisuldiv" ColumnName="kisuldiv" />
+                <ScalarProperty Name="kisullv" ColumnName="kisullv" />
+                <ScalarProperty Name="otEnd" ColumnName="otEnd" />
+                <ScalarProperty Name="otStart" ColumnName="otStart" />
                <ScalarProperty Name="autoinput" ColumnName="autoinput" />
                <ScalarProperty Name="idx" ColumnName="idx" />
                <ScalarProperty Name="gcode" ColumnName="gcode" />
@@ -592,6 +664,7 @@
          <EntitySetMapping Name="vGroupUser">
            <EntityTypeMapping TypeName="EEModel.vGroupUser">
              <MappingFragment StoreEntitySet="vGroupUser">
+                <ScalarProperty Name="password" ColumnName="password" />
                <ScalarProperty Name="useUserState" ColumnName="useUserState" />
                <ScalarProperty Name="useJobReport" ColumnName="useJobReport" />
                <ScalarProperty Name="state" ColumnName="state" />
@@ -616,29 +689,6 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
-          <EntitySetMapping Name="vJobReportForUser">
-            <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
-              <MappingFragment StoreEntitySet="vJobReportForUser">
-                <ScalarProperty Name="ww" ColumnName="ww" />
-                <ScalarProperty Name="description" ColumnName="description" />
-                <ScalarProperty Name="projectName" ColumnName="projectName" />
-                <ScalarProperty Name="status" ColumnName="status" />
-                <ScalarProperty Name="idx" ColumnName="idx" />
-                <ScalarProperty Name="pdate" ColumnName="pdate" />
-                <ScalarProperty Name="gcode" ColumnName="gcode" />
-                <ScalarProperty Name="id" ColumnName="id" />
-                <ScalarProperty Name="name" ColumnName="name" />
-                <ScalarProperty Name="process" ColumnName="process" />
-                <ScalarProperty Name="type" ColumnName="type" />
-                <ScalarProperty Name="svalue" ColumnName="svalue" />
-                <ScalarProperty Name="hrs" ColumnName="hrs" />
-                <ScalarProperty Name="ot" ColumnName="ot" />
-                <ScalarProperty Name="userProcess" ColumnName="userProcess" />
-                <ScalarProperty Name="requestpart" ColumnName="requestpart" />
-                <ScalarProperty Name="package" ColumnName="package" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
          <EntitySetMapping Name="HolidayLIst">
            <EntityTypeMapping TypeName="EEModel.HolidayLIst">
              <MappingFragment StoreEntitySet="HolidayLIst">
@@ -677,6 +727,8 @@
          <EntitySetMapping Name="EETGW_ProjectToDo">
            <EntityTypeMapping TypeName="EEModel.EETGW_ProjectToDo">
              <MappingFragment StoreEntitySet="EETGW_ProjectToDo">
+                <ScalarProperty Name="no" ColumnName="no" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
                <ScalarProperty Name="wdate" ColumnName="wdate" />
                <ScalarProperty Name="wuid" ColumnName="wuid" />
                <ScalarProperty Name="remark2" ColumnName="remark2" />
@@ -698,6 +750,10 @@
          <EntitySetMapping Name="Projects">
            <EntityTypeMapping TypeName="EEModel.Projects">
              <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="bAlert" ColumnName="bAlert" />
+                <ScalarProperty Name="serial" ColumnName="serial" />
+                <ScalarProperty Name="model" ColumnName="model" />
+                <ScalarProperty Name="CMP_After2" ColumnName="CMP_After2" />
                <ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
                <ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
                <ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
@@ -765,6 +821,7 @@
                <ScalarProperty Name="swa" ColumnName="swa" />
                <ScalarProperty Name="ew" ColumnName="ew" />
                <ScalarProperty Name="sw" ColumnName="sw" />
+                <ScalarProperty Name="cate" ColumnName="cate" />
                <ScalarProperty Name="title" ColumnName="title" />
                <ScalarProperty Name="seq" ColumnName="seq" />
                <ScalarProperty Name="no" ColumnName="no" />
@@ -774,6 +831,36 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
+          <EntitySetMapping Name="vJobReportForUser">
+            <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
+              <MappingFragment StoreEntitySet="vJobReportForUser">
+                <ScalarProperty Name="outdate" ColumnName="outdate" />
+                <ScalarProperty Name="indate" ColumnName="indate" />
+                <ScalarProperty Name="grade" ColumnName="grade" />
+                <ScalarProperty Name="otReason" ColumnName="otReason" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
+                <ScalarProperty Name="otEnd" ColumnName="otEnd" />
+                <ScalarProperty Name="otStart" ColumnName="otStart" />
+                <ScalarProperty Name="ww" ColumnName="ww" />
+                <ScalarProperty Name="description" ColumnName="description" />
+                <ScalarProperty Name="projectName" ColumnName="projectName" />
+                <ScalarProperty Name="status" ColumnName="status" />
+                <ScalarProperty Name="userProcess" ColumnName="userProcess" />
+                <ScalarProperty Name="package" ColumnName="package" />
+                <ScalarProperty Name="requestpart" ColumnName="requestpart" />
+                <ScalarProperty Name="ot" ColumnName="ot" />
+                <ScalarProperty Name="hrs" ColumnName="hrs" />
+                <ScalarProperty Name="svalue" ColumnName="svalue" />
+                <ScalarProperty Name="type" ColumnName="type" />
+                <ScalarProperty Name="process" ColumnName="process" />
+                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="id" ColumnName="id" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="pdate" ColumnName="pdate" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
        </EntityContainerMapping>
      </Mapping>
    </edmx:Mappings>
--- a/JobReportMailService/Model1.edmx.diagram
+++ b/JobReportMailService/Model1.edmx.diagram
@@ -8,12 +8,12 @@
        <EntityTypeShape EntityType="EEModel.JobReport" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
        <EntityTypeShape EntityType="EEModel.MailData" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
        <EntityTypeShape EntityType="EEModel.vGroupUser" Width="1.5" PointX="4.75" PointY="5.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="EEModel.vJobReportForUser" Width="1.5" PointX="6.75" PointY="0.75" IsExpanded="true" />
        <EntityTypeShape EntityType="EEModel.HolidayLIst" Width="1.5" PointX="0.75" PointY="6.75" />
        <EntityTypeShape EntityType="EEModel.MailForm" Width="1.5" PointX="7.375" PointY="5.75" />
        <EntityTypeShape EntityType="EEModel.EETGW_ProjectToDo" Width="2.875" PointX="10.125" PointY="5.75" />
        <EntityTypeShape EntityType="EEModel.Projects" Width="1.5" PointX="9.75" PointY="10.75" />
-        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="9.375" PointY="0.75" />
+        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="3.375" PointY="11.75" />
+        <EntityTypeShape EntityType="EEModel.vJobReportForUser" Width="1.75" PointX="0.75" PointY="9.75" />
      </Diagram>
    </edmx:Diagrams>
  </edmx:Designer>
--- a/JobReportMailService/Projects.cs
+++ b/JobReportMailService/Projects.cs
@@ -65,5 +65,9 @@ namespace JobReportMailService
        public Nullable<double> EB_RepairTime { get; set; }
        public Nullable<double> EB_ConstNew { get; set; }
        public string EB_BoardName { get; set; }
+        public string CMP_After2 { get; set; }
+        public string model { get; set; }
+        public string serial { get; set; }
+        public Nullable<bool> bAlert { get; set; }
    }
 }
--- a/JobReportMailService/fJobReportDay.cs
+++ b/JobReportMailService/fJobReportDay.cs
@@ -127,12 +127,18 @@ namespace JobReportMailService

                //대상 사용자 목록을 추출한다
                db = new EEEntities();
-                var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id);
+                //                db.Database.CommandTimeout = 10000;
+                var taUser = new DataSet1TableAdapters.vJobReportForUserTableAdapter();
+                var users = taUser.GetData(vGcode);
+                taUser.Dispose();
+
+                //var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id);
+                
                Dictionary<string, string> uids = new Dictionary<string, string>();
-                foreach (var user in users)
+                foreach (var userinfo in users)
                {
                    //해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다
-                    var userinfo = user.FirstOrDefault();
+                    //var userinfo = user.FirstOrDefault();
                    if (userinfo == null || string.IsNullOrEmpty(userinfo.id) == true) continue;

                    //퇴사자 확인
@@ -186,7 +192,7 @@ namespace JobReportMailService

                    //이사용자의 날짜별 근무시간을 확인한다.
                    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();
+                    var UserDatas = db.JobReport.Where(t => t.gcode == vGcode && t.uid == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList();

                    Dictionary<DateTime, double?> WarnList = new Dictionary<DateTime, double?>();
                    foreach (var dt in days.OrderBy(t => t))
--- a/JobReportMailService/vGroupUser.cs
+++ b/JobReportMailService/vGroupUser.cs
@@ -35,5 +35,6 @@ namespace JobReportMailService
        public string state { get; set; }
        public Nullable<bool> useJobReport { get; set; }
        public Nullable<bool> useUserState { get; set; }
+        public string password { get; set; }
    }
 }
--- a/JobReportMailService/vJobReportForUser.cs
+++ b/JobReportMailService/vJobReportForUser.cs
@@ -24,12 +24,19 @@ namespace JobReportMailService
        public string svalue { get; set; }
        public Nullable<double> hrs { get; set; }
        public Nullable<double> ot { get; set; }
-        public string userProcess { get; set; }
        public string requestpart { get; set; }
        public string package { get; set; }
+        public string userProcess { get; set; }
        public string status { get; set; }
        public string projectName { get; set; }
        public string description { get; set; }
        public string ww { get; set; }
+        public Nullable<System.DateTime> otStart { get; set; }
+        public Nullable<System.DateTime> otEnd { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public string otReason { get; set; }
+        public string grade { get; set; }
+        public string indate { get; set; }
+        public string outdate { get; set; }
    }
 }