..

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.11.21.2000")]
-[assembly: AssemblyFileVersion("23.11.21.2000")]
+[assembly: AssemblyVersion("23.11.23.1006")]
+[assembly: AssemblyFileVersion("23.11.23.1006")]

SubProject/FBS0000/Holiday/rHolidaySummary.Designer.cs

@@ -31,7 +31,6 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rHolidaySummary));
             Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
-            this.dsReport = new FBS0000.dsReport();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
@@ -41,17 +40,15 @@
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dsReport = new FBS0000.dsReport();
+            this.bs2 = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FBS0000.dsReportTableAdapters.holydataTableAdapter();
-            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit();
             this.SuspendLayout();
             // 
-            // dsReport
-            // 
-            this.dsReport.DataSetName = "dsReport";
-            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -125,8 +122,8 @@
             // reportViewer1
             // 
             this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet1";
-            reportDataSource1.Value = this.bs;
+            reportDataSource1.Name = "DataSet2";
+            reportDataSource1.Value = this.bs2;
             this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
             this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolidaySummary.rdlc";
             this.reportViewer1.Location = new System.Drawing.Point(0, 37);
@@ -141,6 +138,16 @@
             this.bs.DataMember = "holydata";
             this.bs.DataSource = this.dsReport;
             // 
+            // dsReport
+            // 
+            this.dsReport.DataSetName = "dsReport";
+            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // bs2
+            // 
+            this.bs2.DataMember = "holydatasum";
+            this.bs2.DataSource = this.dsReport;
+            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -156,10 +163,11 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "휴가이력 현황";
             this.Load += new System.EventHandler(this.rJobReport_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -177,5 +185,6 @@
         private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
         private System.Windows.Forms.BindingSource bs;
         private dsReportTableAdapters.holydataTableAdapter ta;
+        private System.Windows.Forms.BindingSource bs2;
     }
 }

SubProject/FBS0000/Holiday/rHolidaySummary.cs

@@ -1,4 +1,6 @@
-using System;
+using FarPoint.Excel;
+using FarPoint.Win.Spread.CellType.BarCode;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -44,6 +46,64 @@ namespace FBS0000
             var dt = DateTime.Parse(this.tbMon.Text);
             ta.Fill(this.dsReport.holydata, FCOMMON.info.Login.gcode, dt.Year.ToString("0000") + "-01-01", dt.ToShortDateString());
 
+            //데이터를 재 집계한다.
+            this.dsReport.holydatasum.Clear();
+            var grp_user = dsReport.holydata.GroupBy(t => t.uid);
+            foreach (var grp in grp_user)
+            {
+                //cate group
+                var first_user = grp.First();
+                var grp_cate = grp.GroupBy(t => t.cate);
+                foreach (var cate in grp_cate)
+                {
+                    var newdr = this.dsReport.holydatasum.NewholydatasumRow();
+                    var catename = cate.Key;
+                    newdr.uid = grp.Key;
+                    newdr.uname = first_user.name;
+                    newdr.process = first_user.Process;
+                    newdr.cate = cate.Key;
+                    if (catename.StartsWith("대체"))
+                    {
+                        newdr.dr = cate.Sum(t => t.DrTime);
+                        newdr.cr = cate.Sum(t => t.CrTime);
+                        newdr.jan = newdr.dr - newdr.cr;
+                        //newdr.add = 0;
+                        if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr)*100f;
+                        else newdr.rate = 0;
+                    }
+                    else if (catename.StartsWith("외출"))
+                    {
+                        //newdr.dr = 0;
+                        //newdr.cr = 0;
+                        //newdr.jan = 0;
+                        //newdr.add = 0;
+                        //newdr.rate = 0;
+                    }
+                    else
+                    {
+                        newdr.dr = cate.Sum(t => t.DrDay);
+                        newdr.cr = cate.Sum(t => t.CrDay);
+                        newdr.jan = newdr.dr - newdr.cr;
+                        if (newdr.jan < 0)  //초과사용자는 0으로 처리
+                        {
+                            newdr.add = newdr.jan;
+                            newdr.cr = newdr.dr;
+                            newdr.jan = 0;
+                        }
+                        if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr) * 100f;
+                        else newdr.rate = 0;
+                        newdr.drday = newdr.dr;
+                        newdr.crday = newdr.cr;
+                        newdr.janday = newdr.jan;
+                        newdr.rateday = newdr.rate;
+                        newdr.addday = newdr.add;
+                    }
+
+                    this.dsReport.holydatasum.AddholydatasumRow(newdr);
+                }
+            }
+            this.dsReport.holydatasum.AcceptChanges();
+
 
             //this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc";
             this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);

SubProject/FBS0000/Holiday/rHolidaySummary.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>119, 17</value>
   </metadata>
@@ -175,6 +172,12 @@
         dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="bs2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>351, 17</value>
+  </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>225, 17</value>
   </metadata>

SubProject/FBS0000/dsReport.Designer.cs

@@ -30,6 +30,8 @@ namespace FBS0000 {
         
         private Holydata_TimeDataTable tableHolydata_Time;
         
+        private holydatasumDataTable tableholydatasum;
+        
         private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -71,6 +73,9 @@ namespace FBS0000 {
                 if ((ds.Tables["Holydata_Time"] != null)) {
                     base.Tables.Add(new Holydata_TimeDataTable(ds.Tables["Holydata_Time"]));
                 }
+                if ((ds.Tables["holydatasum"] != null)) {
+                    base.Tables.Add(new holydatasumDataTable(ds.Tables["holydatasum"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -120,6 +125,16 @@ namespace FBS0000 {
             }
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public holydatasumDataTable holydatasum {
+            get {
+                return this.tableholydatasum;
+            }
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.BrowsableAttribute(true)]
@@ -197,6 +212,9 @@ namespace FBS0000 {
                 if ((ds.Tables["Holydata_Time"] != null)) {
                     base.Tables.Add(new Holydata_TimeDataTable(ds.Tables["Holydata_Time"]));
                 }
+                if ((ds.Tables["holydatasum"] != null)) {
+                    base.Tables.Add(new holydatasumDataTable(ds.Tables["holydatasum"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -248,6 +266,12 @@ namespace FBS0000 {
                     this.tableHolydata_Time.InitVars();
                 }
             }
+            this.tableholydatasum = ((holydatasumDataTable)(base.Tables["holydatasum"]));
+            if ((initTable == true)) {
+                if ((this.tableholydatasum != null)) {
+                    this.tableholydatasum.InitVars();
+                }
+            }
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -264,6 +288,8 @@ namespace FBS0000 {
             base.Tables.Add(this.tableHolydata_Day);
             this.tableHolydata_Time = new Holydata_TimeDataTable();
             base.Tables.Add(this.tableHolydata_Time);
+            this.tableholydatasum = new holydatasumDataTable();
+            base.Tables.Add(this.tableholydatasum);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -284,6 +310,12 @@ namespace FBS0000 {
             return false;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private bool ShouldSerializeholydatasum() {
+            return false;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
@@ -354,6 +386,9 @@ namespace FBS0000 {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         public delegate void Holydata_TimeRowChangeEventHandler(object sender, Holydata_TimeRowChangeEvent e);
         
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public delegate void holydatasumRowChangeEventHandler(object sender, holydatasumRowChangeEvent e);
+        
         /// <summary>
         ///Represents the strongly named DataTable class.
         ///</summary>
@@ -1591,6 +1626,448 @@ namespace FBS0000 {
             }
         }
         
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class holydatasumDataTable : global::System.Data.TypedTableBase<holydatasumRow> {
+            
+            private global::System.Data.DataColumn columnuid;
+            
+            private global::System.Data.DataColumn columnuname;
+            
+            private global::System.Data.DataColumn columnprocess;
+            
+            private global::System.Data.DataColumn columncate;
+            
+            private global::System.Data.DataColumn columndr;
+            
+            private global::System.Data.DataColumn columncr;
+            
+            private global::System.Data.DataColumn columnjan;
+            
+            private global::System.Data.DataColumn columnadd;
+            
+            private global::System.Data.DataColumn columnrate;
+            
+            private global::System.Data.DataColumn columndrday;
+            
+            private global::System.Data.DataColumn columncrday;
+            
+            private global::System.Data.DataColumn columnjanday;
+            
+            private global::System.Data.DataColumn columnrateday;
+            
+            private global::System.Data.DataColumn columnaddday;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public holydatasumDataTable() {
+                this.TableName = "holydatasum";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal holydatasumDataTable(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", "17.0.0.0")]
+            protected holydatasumDataTable(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", "17.0.0.0")]
+            public global::System.Data.DataColumn uidColumn {
+                get {
+                    return this.columnuid;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn unameColumn {
+                get {
+                    return this.columnuname;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn processColumn {
+                get {
+                    return this.columnprocess;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn cateColumn {
+                get {
+                    return this.columncate;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn drColumn {
+                get {
+                    return this.columndr;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn crColumn {
+                get {
+                    return this.columncr;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn janColumn {
+                get {
+                    return this.columnjan;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn addColumn {
+                get {
+                    return this.columnadd;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn rateColumn {
+                get {
+                    return this.columnrate;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn drdayColumn {
+                get {
+                    return this.columndrday;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn crdayColumn {
+                get {
+                    return this.columncrday;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn jandayColumn {
+                get {
+                    return this.columnjanday;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ratedayColumn {
+                get {
+                    return this.columnrateday;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn adddayColumn {
+                get {
+                    return this.columnaddday;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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", "17.0.0.0")]
+            public holydatasumRow this[int index] {
+                get {
+                    return ((holydatasumRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event holydatasumRowChangeEventHandler holydatasumRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event holydatasumRowChangeEventHandler holydatasumRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event holydatasumRowChangeEventHandler holydatasumRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event holydatasumRowChangeEventHandler holydatasumRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void AddholydatasumRow(holydatasumRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public holydatasumRow AddholydatasumRow(string uid, string uname, string process, string cate, double dr, double cr, double jan, double add, double rate, double drday, double crday, double janday, double rateday, double addday) {
+                holydatasumRow rowholydatasumRow = ((holydatasumRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        uid,
+                        uname,
+                        process,
+                        cate,
+                        dr,
+                        cr,
+                        jan,
+                        add,
+                        rate,
+                        drday,
+                        crday,
+                        janday,
+                        rateday,
+                        addday};
+                rowholydatasumRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowholydatasumRow);
+                return rowholydatasumRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public holydatasumRow FindByuidcate(string uid, string cate) {
+                return ((holydatasumRow)(this.Rows.Find(new object[] {
+                            uid,
+                            cate})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                holydatasumDataTable cln = ((holydatasumDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new holydatasumDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal void InitVars() {
+                this.columnuid = base.Columns["uid"];
+                this.columnuname = base.Columns["uname"];
+                this.columnprocess = base.Columns["process"];
+                this.columncate = base.Columns["cate"];
+                this.columndr = base.Columns["dr"];
+                this.columncr = base.Columns["cr"];
+                this.columnjan = base.Columns["jan"];
+                this.columnadd = base.Columns["add"];
+                this.columnrate = base.Columns["rate"];
+                this.columndrday = base.Columns["drday"];
+                this.columncrday = base.Columns["crday"];
+                this.columnjanday = base.Columns["janday"];
+                this.columnrateday = base.Columns["rateday"];
+                this.columnaddday = base.Columns["addday"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            private void InitClass() {
+                this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnuid);
+                this.columnuname = new global::System.Data.DataColumn("uname", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnuname);
+                this.columnprocess = new global::System.Data.DataColumn("process", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnprocess);
+                this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columncate);
+                this.columndr = new global::System.Data.DataColumn("dr", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columndr);
+                this.columncr = new global::System.Data.DataColumn("cr", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columncr);
+                this.columnjan = new global::System.Data.DataColumn("jan", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnjan);
+                this.columnadd = new global::System.Data.DataColumn("add", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnadd);
+                this.columnrate = new global::System.Data.DataColumn("rate", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnrate);
+                this.columndrday = new global::System.Data.DataColumn("drday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columndrday);
+                this.columncrday = new global::System.Data.DataColumn("crday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columncrday);
+                this.columnjanday = new global::System.Data.DataColumn("janday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnjanday);
+                this.columnrateday = new global::System.Data.DataColumn("rateday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnrateday);
+                this.columnaddday = new global::System.Data.DataColumn("addday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnaddday);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnuid,
+                                this.columncate}, true));
+                this.columnuid.AllowDBNull = false;
+                this.columncate.AllowDBNull = false;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public holydatasumRow NewholydatasumRow() {
+                return ((holydatasumRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new holydatasumRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(holydatasumRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.holydatasumRowChanged != null)) {
+                    this.holydatasumRowChanged(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.holydatasumRowChanging != null)) {
+                    this.holydatasumRowChanging(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.holydatasumRowDeleted != null)) {
+                    this.holydatasumRowDeleted(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.holydatasumRowDeleting != null)) {
+                    this.holydatasumRowDeleting(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void RemoveholydatasumRow(holydatasumRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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();
+                dsReport ds = new dsReport();
+                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 = "holydatasumDataTable";
+                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>
@@ -2447,6 +2924,379 @@ namespace FBS0000 {
             }
         }
         
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class holydatasumRow : global::System.Data.DataRow {
+            
+            private holydatasumDataTable tableholydatasum;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal holydatasumRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableholydatasum = ((holydatasumDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string uid {
+                get {
+                    return ((string)(this[this.tableholydatasum.uidColumn]));
+                }
+                set {
+                    this[this.tableholydatasum.uidColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string uname {
+                get {
+                    if (this.IsunameNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableholydatasum.unameColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.unameColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string process {
+                get {
+                    if (this.IsprocessNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableholydatasum.processColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.processColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string cate {
+                get {
+                    return ((string)(this[this.tableholydatasum.cateColumn]));
+                }
+                set {
+                    this[this.tableholydatasum.cateColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double dr {
+                get {
+                    if (this.IsdrNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.drColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.drColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double cr {
+                get {
+                    if (this.IscrNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.crColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.crColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double jan {
+                get {
+                    if (this.IsjanNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.janColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.janColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double add {
+                get {
+                    if (this.IsaddNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.addColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.addColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double rate {
+                get {
+                    if (this.IsrateNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.rateColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.rateColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double drday {
+                get {
+                    if (this.IsdrdayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.drdayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.drdayColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double crday {
+                get {
+                    if (this.IscrdayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.crdayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.crdayColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double janday {
+                get {
+                    if (this.IsjandayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.jandayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.jandayColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double rateday {
+                get {
+                    if (this.IsratedayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.ratedayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.ratedayColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double addday {
+                get {
+                    if (this.IsadddayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.adddayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.adddayColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsunameNull() {
+                return this.IsNull(this.tableholydatasum.unameColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetunameNull() {
+                this[this.tableholydatasum.unameColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsprocessNull() {
+                return this.IsNull(this.tableholydatasum.processColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetprocessNull() {
+                this[this.tableholydatasum.processColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsdrNull() {
+                return this.IsNull(this.tableholydatasum.drColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetdrNull() {
+                this[this.tableholydatasum.drColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IscrNull() {
+                return this.IsNull(this.tableholydatasum.crColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetcrNull() {
+                this[this.tableholydatasum.crColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsjanNull() {
+                return this.IsNull(this.tableholydatasum.janColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetjanNull() {
+                this[this.tableholydatasum.janColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsaddNull() {
+                return this.IsNull(this.tableholydatasum.addColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetaddNull() {
+                this[this.tableholydatasum.addColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsrateNull() {
+                return this.IsNull(this.tableholydatasum.rateColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetrateNull() {
+                this[this.tableholydatasum.rateColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsdrdayNull() {
+                return this.IsNull(this.tableholydatasum.drdayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetdrdayNull() {
+                this[this.tableholydatasum.drdayColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IscrdayNull() {
+                return this.IsNull(this.tableholydatasum.crdayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetcrdayNull() {
+                this[this.tableholydatasum.crdayColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsjandayNull() {
+                return this.IsNull(this.tableholydatasum.jandayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetjandayNull() {
+                this[this.tableholydatasum.jandayColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsratedayNull() {
+                return this.IsNull(this.tableholydatasum.ratedayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetratedayNull() {
+                this[this.tableholydatasum.ratedayColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsadddayNull() {
+                return this.IsNull(this.tableholydatasum.adddayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetadddayNull() {
+                this[this.tableholydatasum.adddayColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
         /// <summary>
         ///Row event argument class
         ///</summary>
@@ -2548,6 +3398,40 @@ namespace FBS0000 {
                 }
             }
         }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public class holydatasumRowChangeEvent : global::System.EventArgs {
+            
+            private holydatasumRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public holydatasumRowChangeEvent(holydatasumRow 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", "17.0.0.0")]
+            public holydatasumRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
     }
 }
 namespace FBS0000.dsReportTableAdapters {

SubProject/FBS0000/dsReport.xsd

@@ -164,152 +164,152 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
+  <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dsReport" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_UserTableName="holydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_RowEvArgName="holydataRowChangeEvent" msprop:Generator_RowClassName="holydataRow">
+        <xs:element name="holydata" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowEvArgName="holydataRowChangeEvent" msprop:Generator_TablePropName="holydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_UserTableName="holydata" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowClassName="holydataRow" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate" minOccurs="0">
+              <xs:element name="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DrTime" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DrTime" msprop:Generator_ColumnVarNameInTable="columnDrTime" msprop:Generator_ColumnPropNameInTable="DrTimeColumn" msprop:Generator_UserColumnName="DrTime" type="xs:double" minOccurs="0" />
-              <xs:element name="CrTime" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CrTime" msprop:Generator_ColumnVarNameInTable="columnCrTime" msprop:Generator_ColumnPropNameInTable="CrTimeColumn" msprop:Generator_UserColumnName="CrTime" type="xs:double" minOccurs="0" />
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="DrTime" msprop:Generator_ColumnPropNameInTable="DrTimeColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DrTime" msprop:Generator_UserColumnName="DrTime" msprop:Generator_ColumnVarNameInTable="columnDrTime" type="xs:double" minOccurs="0" />
+              <xs:element name="CrTime" msprop:Generator_ColumnPropNameInTable="CrTimeColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CrTime" msprop:Generator_UserColumnName="CrTime" msprop:Generator_ColumnVarNameInTable="columnCrTime" type="xs:double" minOccurs="0" />
+              <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_UserColumnName="Process" minOccurs="0">
+              <xs:element name="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CrDay" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CrDay" msprop:Generator_ColumnVarNameInTable="columnCrDay" msprop:Generator_ColumnPropNameInTable="CrDayColumn" msprop:Generator_UserColumnName="CrDay" type="xs:double" minOccurs="0" />
-              <xs:element name="DrDay" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DrDay" msprop:Generator_ColumnVarNameInTable="columnDrDay" msprop:Generator_ColumnPropNameInTable="DrDayColumn" msprop:Generator_UserColumnName="DrDay" type="xs:double" minOccurs="0" />
+              <xs:element name="CrDay" msprop:Generator_ColumnPropNameInTable="CrDayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CrDay" msprop:Generator_UserColumnName="CrDay" msprop:Generator_ColumnVarNameInTable="columnCrDay" type="xs:double" minOccurs="0" />
+              <xs:element name="DrDay" msprop:Generator_ColumnPropNameInTable="DrDayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DrDay" msprop:Generator_UserColumnName="DrDay" msprop:Generator_ColumnVarNameInTable="columnDrDay" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_RowClassName="Holydata_DayRow" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent">
+        <xs:element name="Holydata_Day" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowClassName="Holydata_DayRow" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
-              <xs:element name="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_UserColumnName="sdate" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate" minOccurs="0">
+              <xs:element name="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="jun" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_ColumnVarNameInTable="columnjun" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_UserColumnName="jun" type="xs:double" minOccurs="0" />
-              <xs:element name="Dr" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_UserColumnName="Dr" type="xs:double" minOccurs="0" />
-              <xs:element name="Cr" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_UserColumnName="Cr" type="xs:double" minOccurs="0" />
-              <xs:element name="contents" msprop:Generator_ColumnVarNameInTable="columncontents" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_UserColumnName="contents" minOccurs="0">
+              <xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_UserColumnName="jun" msprop:Generator_ColumnVarNameInTable="columnjun" type="xs:double" minOccurs="0" />
+              <xs:element name="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_UserColumnName="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" type="xs:double" minOccurs="0" />
+              <xs:element name="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_UserColumnName="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" type="xs:double" minOccurs="0" />
+              <xs:element name="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_UserColumnName="contents" msprop:Generator_ColumnVarNameInTable="columncontents" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_UserColumnName="Process" minOccurs="0">
+              <xs:element name="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="jan" msdata:ReadOnly="true" msdata:Expression="jun+dr-cr" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_ColumnVarNameInTable="columnjan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:Generator_UserColumnName="jan" type="xs:double" minOccurs="0" />
+              <xs:element name="jan" msdata:ReadOnly="true" msdata:Expression="jun+dr-cr" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_RowClassName="Holydata_TimeRow" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent">
+        <xs:element name="Holydata_Time" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowClassName="Holydata_TimeRow" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
-              <xs:element name="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_UserColumnName="sdate" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate" minOccurs="0">
+              <xs:element name="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnjun" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_UserColumnName="jun" type="xs:double" minOccurs="0" />
-              <xs:element name="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_UserColumnName="Dr" type="xs:double" minOccurs="0" />
-              <xs:element name="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_UserColumnName="Cr" type="xs:double" minOccurs="0" />
-              <xs:element name="contents" msprop:Generator_ColumnVarNameInTable="columncontents" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_UserColumnName="contents" minOccurs="0">
+              <xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_UserColumnName="jun" msprop:Generator_ColumnVarNameInTable="columnjun" type="xs:double" minOccurs="0" />
+              <xs:element name="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_UserColumnName="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" type="xs:double" minOccurs="0" />
+              <xs:element name="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_UserColumnName="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" type="xs:double" minOccurs="0" />
+              <xs:element name="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_UserColumnName="contents" msprop:Generator_ColumnVarNameInTable="columncontents" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_UserColumnName="Process" minOccurs="0">
+              <xs:element name="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -319,6 +319,26 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="holydatasum" msprop:Generator_RowEvHandlerName="holydatasumRowChangeEventHandler" msprop:Generator_RowDeletedName="holydatasumRowDeleted" msprop:Generator_RowDeletingName="holydatasumRowDeleting" msprop:Generator_RowEvArgName="holydatasumRowChangeEvent" msprop:Generator_TablePropName="holydatasum" msprop:Generator_RowChangedName="holydatasumRowChanged" msprop:Generator_UserTableName="holydatasum" msprop:Generator_RowChangingName="holydatasumRowChanging" msprop:Generator_RowClassName="holydatasumRow" msprop:Generator_TableClassName="holydatasumDataTable" msprop:Generator_TableVarName="tableholydatasum">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" type="xs:string" />
+              <xs:element name="uname" msprop:Generator_ColumnPropNameInTable="unameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="uname" msprop:Generator_UserColumnName="uname" msprop:Generator_ColumnVarNameInTable="columnuname" type="xs:string" minOccurs="0" />
+              <xs:element name="process" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_UserColumnName="process" msprop:Generator_ColumnVarNameInTable="columnprocess" type="xs:string" minOccurs="0" />
+              <xs:element name="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnVarNameInTable="columncate" type="xs:string" />
+              <xs:element name="dr" msprop:Generator_ColumnPropNameInTable="drColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="dr" msprop:Generator_UserColumnName="dr" msprop:Generator_ColumnVarNameInTable="columndr" type="xs:double" minOccurs="0" />
+              <xs:element name="cr" msprop:Generator_ColumnPropNameInTable="crColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="cr" msprop:Generator_UserColumnName="cr" msprop:Generator_ColumnVarNameInTable="columncr" type="xs:double" minOccurs="0" />
+              <xs:element name="jan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
+              <xs:element name="add" msprop:Generator_ColumnPropNameInTable="addColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="add" msprop:Generator_UserColumnName="add" msprop:Generator_ColumnVarNameInTable="columnadd" type="xs:double" minOccurs="0" />
+              <xs:element name="rate" msprop:Generator_ColumnPropNameInTable="rateColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rate" msprop:Generator_UserColumnName="rate" msprop:Generator_ColumnVarNameInTable="columnrate" type="xs:double" minOccurs="0" />
+              <xs:element name="drday" msprop:Generator_ColumnPropNameInTable="drdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="drday" msprop:Generator_UserColumnName="drday" msprop:Generator_ColumnVarNameInTable="columndrday" type="xs:double" minOccurs="0" />
+              <xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
+              <xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
+              <xs:element name="rateday" msprop:Generator_ColumnPropNameInTable="ratedayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rateday" msprop:Generator_UserColumnName="rateday" msprop:Generator_ColumnVarNameInTable="columnrateday" type="xs:double" minOccurs="0" />
+              <xs:element name="addday" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="adddayColumn" msprop:Generator_ColumnVarNameInTable="columnaddday" msprop:Generator_UserColumnName="addday" msprop:Generator_ColumnPropNameInRow="addday" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -329,5 +349,10 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
       <xs:selector xpath=".//mstns:Holydata_Time" />
       <xs:field xpath="mstns:idx" />
     </xs:unique>
+    <xs:unique name="holydatasum_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:holydatasum" />
+      <xs:field xpath="mstns:uid" />
+      <xs:field xpath="mstns:cate" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs

@@ -260,7 +260,7 @@ namespace FEQ0000
             this.dtInDate.Enabled = chkInDate.Checked;
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
-            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase));
+            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchaseEB));
             if (curLevel < 5)
             {
                 if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)