원장추가

Project/Properties/AssemblyInfo.cs

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

Project/fMain.Designer.cs

@@ -81,6 +81,7 @@
             this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
             this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가신청ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.개인별근태원장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
             this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -510,6 +511,7 @@
             this.toolStripMenuItem9,
             this.근태입력ToolStripMenuItem,
             this.휴가신청ToolStripMenuItem,
+            this.개인별근태원장ToolStripMenuItem,
             this.toolStripMenuItem10,
             this.출근부출력ToolStripMenuItem,
             this.휴가사용현황ToolStripMenuItem,
@@ -555,6 +557,13 @@
             this.휴가신청ToolStripMenuItem.Text = "휴가 신청";
             this.휴가신청ToolStripMenuItem.Click += new System.EventHandler(this.휴가신청ToolStripMenuItem_Click);
             // 
+            // 개인별근태원장ToolStripMenuItem
+            // 
+            this.개인별근태원장ToolStripMenuItem.Name = "개인별근태원장ToolStripMenuItem";
+            this.개인별근태원장ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
+            this.개인별근태원장ToolStripMenuItem.Text = "개인별 근태 원장";
+            this.개인별근태원장ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태원장ToolStripMenuItem_Click);
+            // 
             // toolStripMenuItem10
             // 
             this.toolStripMenuItem10.Name = "toolStripMenuItem10";
@@ -580,6 +589,7 @@
             this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem";
             this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
             this.근로명부ToolStripMenuItem.Text = "근로자명부";
+            this.근로명부ToolStripMenuItem.Visible = false;
             this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click);
             // 
             // personalInventoryToolStripMenuItem
@@ -1102,6 +1112,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5;
         private System.Windows.Forms.ToolStripMenuItem 아이템비활성화하기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 휴가사용현황ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 개인별근태원장ToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -120,7 +120,7 @@ namespace Project
 
             Func_Login();
 
-            if(Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
+            if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
             {
                 FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
                 Pub.setting.SharedDataPath = FCOMMON.info.datapath;
@@ -1082,5 +1082,12 @@ namespace Project
             var f = new FBS0000.rHolidaySummary();
             f.Show();
         }
+
+        private void 개인별근태원장ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
+            var f = new FBS0000.fHolyDayData(DateTime.Now.ToShortDateString(), uid);
+            f.Show();
+        }
     }
 }

SubProject/FBS0000/FBS0000.csproj

@@ -139,6 +139,12 @@
     <Compile Include="Holiday\fWorkTableUser.Designer.cs">
       <DependentUpon>fWorkTableUser.cs</DependentUpon>
     </Compile>
+    <Compile Include="Holiday\fHolyDayData.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Holiday\fHolyDayData.Designer.cs">
+      <DependentUpon>fHolyDayData.cs</DependentUpon>
+    </Compile>
     <Compile Include="Holiday\WorkTable.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -177,10 +183,10 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="rHolidaySummary.cs">
+    <Compile Include="Holiday\rHolidaySummary.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="rHolidaySummary.Designer.cs">
+    <Compile Include="Holiday\rHolidaySummary.Designer.cs">
       <DependentUpon>rHolidaySummary.cs</DependentUpon>
     </Compile>
     <Compile Include="SqlServerTypes\Loader.cs" />
@@ -193,6 +199,10 @@
     <EmbeddedResource Include="Holiday\fWorkTableUser.resx">
       <DependentUpon>fWorkTableUser.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Holiday\fHolyDayData.resx">
+      <DependentUpon>fHolyDayData.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Holiday\rHolyData.rdlc" />
     <EmbeddedResource Include="Holiday\WorkTable.resx">
       <DependentUpon>WorkTable.cs</DependentUpon>
     </EmbeddedResource>
@@ -222,8 +232,8 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="rHolidaySummary.rdlc" />
+    <EmbeddedResource Include="Holiday\rHolidaySummary.rdlc" />
-    <EmbeddedResource Include="rHolidaySummary.resx">
+    <EmbeddedResource Include="Holiday\rHolidaySummary.resx">
       <DependentUpon>rHolidaySummary.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />

SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs

@@ -0,0 +1,243 @@
+namespace FBS0000
+{
+    partial class fHolyDayData
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayData));
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.bsDay = new System.Windows.Forms.BindingSource(this.components);
+            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();
+            this.tbMon = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.btSearch = new System.Windows.Forms.ToolStripButton();
+            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbType = new System.Windows.Forms.ToolStripComboBox();
+            this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.taDay = new FBS0000.dsReportTableAdapters.Holydata_DayTableAdapter();
+            this.bsTime = new System.Windows.Forms.BindingSource(this.components);
+            this.taTime = new FBS0000.dsReportTableAdapters.Holydata_timee_adapter();
+            ((System.ComponentModel.ISupportInitialize)(this.bsDay)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
+            this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsTime)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // bsDay
+            // 
+            this.bsDay.DataMember = "Holydata_Day";
+            this.bsDay.DataSource = this.dsReport;
+            // 
+            // dsReport
+            // 
+            this.dsReport.DataSetName = "dsReport";
+            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton8,
+            this.lbStt,
+            this.tbMon,
+            this.toolStripButton7,
+            this.toolStripSeparator2,
+            this.btSearch,
+            this.toolStripLabel3,
+            this.cmbUser,
+            this.toolStripSeparator1,
+            this.toolStripLabel1,
+            this.cmbType});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(1059, 37);
+            this.toolStrip1.TabIndex = 6;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // toolStripButton8
+            // 
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
+            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton8.Name = "toolStripButton8";
+            this.toolStripButton8.Size = new System.Drawing.Size(34, 34);
+            this.toolStripButton8.Text = "toolStripButton7";
+            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
+            // 
+            // lbStt
+            // 
+            this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.lbStt.ForeColor = System.Drawing.Color.Black;
+            this.lbStt.LinkColor = System.Drawing.Color.Black;
+            this.lbStt.Name = "lbStt";
+            this.lbStt.Size = new System.Drawing.Size(47, 34);
+            this.lbStt.Text = "기준 일";
+            // 
+            // tbMon
+            // 
+            this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.tbMon.Name = "tbMon";
+            this.tbMon.Size = new System.Drawing.Size(90, 37);
+            this.tbMon.Text = "1982";
+            this.tbMon.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // toolStripButton7
+            // 
+            this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
+            this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton7.Name = "toolStripButton7";
+            this.toolStripButton7.Size = new System.Drawing.Size(34, 34);
+            this.toolStripButton7.Text = "toolStripButton7";
+            this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
+            // 
+            // btSearch
+            // 
+            this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
+            this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btSearch.Name = "btSearch";
+            this.btSearch.Size = new System.Drawing.Size(80, 34);
+            this.btSearch.Text = "조회(&R)";
+            this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
+            // 
+            // toolStripLabel3
+            // 
+            this.toolStripLabel3.Name = "toolStripLabel3";
+            this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
+            this.toolStripLabel3.Text = "담당자";
+            // 
+            // cmbUser
+            // 
+            this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbUser.Name = "cmbUser";
+            this.cmbUser.Size = new System.Drawing.Size(150, 37);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 37);
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(55, 34);
+            this.toolStripLabel1.Text = "출력형태";
+            // 
+            // cmbType
+            // 
+            this.cmbType.Items.AddRange(new object[] {
+            "일반 원장",
+            "대체 원장"});
+            this.cmbType.Name = "cmbType";
+            this.cmbType.Size = new System.Drawing.Size(150, 37);
+            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
+            this.cmbType.Click += new System.EventHandler(this.cmbType_Click);
+            // 
+            // reportViewer1
+            // 
+            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            reportDataSource2.Name = "DataSet1";
+            reportDataSource2.Value = this.bsDay;
+            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
+            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyData.rdlc";
+            this.reportViewer1.Location = new System.Drawing.Point(0, 37);
+            this.reportViewer1.Name = "reportViewer1";
+            this.reportViewer1.ServerReport.BearerToken = null;
+            this.reportViewer1.Size = new System.Drawing.Size(1059, 543);
+            this.reportViewer1.TabIndex = 7;
+            this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
+            // 
+            // taDay
+            // 
+            this.taDay.ClearBeforeFill = true;
+            // 
+            // bsTime
+            // 
+            this.bsTime.DataMember = "Holydata_Time";
+            this.bsTime.DataSource = this.dsReport;
+            // 
+            // taTime
+            // 
+            this.taTime.ClearBeforeFill = true;
+            // 
+            // fHolyDayData
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1059, 580);
+            this.Controls.Add(this.reportViewer1);
+            this.Controls.Add(this.toolStrip1);
+            this.Name = "fHolyDayData";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "근태 원장";
+            this.Load += new System.EventHandler(this.rJobReport_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsTime)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private dsReport dsReport;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton toolStripButton8;
+        private System.Windows.Forms.ToolStripLabel lbStt;
+        private System.Windows.Forms.ToolStripTextBox tbMon;
+        private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripButton btSearch;
+        private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
+        private System.Windows.Forms.BindingSource bsDay;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel3;
+        private System.Windows.Forms.ToolStripComboBox cmbUser;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+        private System.Windows.Forms.ToolStripComboBox cmbType;
+        private dsReportTableAdapters.Holydata_DayTableAdapter taDay;
+        private System.Windows.Forms.BindingSource bsTime;
+        private dsReportTableAdapters.Holydata_timee_adapter taTime;
+    }
+}

SubProject/FBS0000/Holiday/fHolyDayData.cs

@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FBS0000
+{
+    public partial class fHolyDayData : Form
+    {
+        bool binit = false;
+        public fHolyDayData(string sdate, string uid)
+        {
+            InitializeComponent();
+            this.WindowState = FormWindowState.Maximized;
+
+            var dtUser = FCOMMON.DBM.getUserTable();
+            this.cmbUser.Items.Clear();
+            this.cmbUser.Items.Add("-- ALL --");
+            foreach (DataRow dr in dtUser.Rows)
+            {
+                this.cmbUser.Items.Add(dr["dispname"].ToString());
+            }
+            cmbUser.Text = uid;
+
+            if (cmbUser.SelectedIndex < 0)
+                cmbUser.SelectedIndex = 0;
+
+            this.tbMon.Text = DateTime.Now.ToShortDateString();
+            cmbType.SelectedIndex = 0; //일기준으로한다
+
+        }
+
+        private void rJobReport_Load(object sender, EventArgs e)
+        {            
+            refreshData();
+            binit = true;
+
+        }
+        string GetUIDValue()
+        {
+            string uid = "%";
+            if (cmbUser.SelectedIndex > 0)
+            {
+                var si = cmbUser.Text.IndexOf("(");
+                var ei = cmbUser.Text.LastIndexOf(")");
+                uid = cmbUser.Text.Substring(si + 1, ei - si - 1);
+            }
+            return uid;
+        }
+
+        void refreshData()
+        {
+
+            var ed = DateTime.Parse(this.tbMon.Text);
+            var sd = DateTime.Parse(ed.ToString("yyyy") + "-01-01");
+
+            //this.reportViewer1.LocalReport.DataSources.Clear();
+            var uid = GetUIDValue();
+            if (cmbType.SelectedIndex == 0)
+            {
+                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortTimeString());
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
+            }
+            else
+            {
+                taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortTimeString());
+                dsReport.Holydata_Day.Clear();
+                dsReport.Holydata_Day.Merge(dsReport.Holydata_Time);
+                dsReport.Holydata_Day.AcceptChanges();
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
+            }
+
+
+            
+            
+            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
+            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
+            this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
+            this.reportViewer1.RefreshReport();
+
+
+
+        }
+
+        private void btRefresh_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+
+        }
+
+        private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // if (tbProcess.SelectedIndex >= 0) refrehData();
+        }
+
+        private void toolStripButton6_Click(object sender, EventArgs e)
+        {
+            // dataGridView1.ExportData(string.Empty);
+        }
+
+        private void btSearch_Click(object sender, EventArgs e)
+        {
+            refreshData();
+        }
+
+        private void toolStripButton8_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(this.tbMon.Text);
+            var sd = sdo.AddMonths(-1);
+            tbMon.Text = sd.ToShortDateString();
+        }
+
+        private void toolStripButton7_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(this.tbMon.Text);
+            var sd = sdo.AddMonths(1);
+            tbMon.Text = sd.ToShortDateString();
+        }
+
+        private void reportViewer1_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void lbStt_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbType_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(binit)
+            refreshData();
+        }
+    }
+}

SubProject/FBS0000/Holiday/fHolyDayData.resx

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="bsDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>225, 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="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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX
+        wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY
+        TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ
+        fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j
+        p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS
+        qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3
+        ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG
+        3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8
+        UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv
+        UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb
+        mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4
+        6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo
+        JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA
+        BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
+        8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
+        c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+        VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
+        /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
+        A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
+        CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK
+        ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP
+        uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi
+        8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF
+        UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40
+        3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
+        613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
+        t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
+        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei
+        QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG
+        A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF
+        GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG
+        cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E
+        dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="taDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>311, 17</value>
+  </metadata>
+  <metadata name="bsTime.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>395, 17</value>
+  </metadata>
+  <metadata name="taTime.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>486, 17</value>
+  </metadata>
+</root>

SubProject/FBS0000/Holiday/fHolyday.Designer.cs

@@ -94,6 +94,7 @@
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
             this.textBox1 = new System.Windows.Forms.TextBox();
+            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
@@ -134,7 +135,8 @@
             this.sbJan,
             this.toolStripButton4,
             this.toolStripButton5,
-            this.toolStripButton3});
+            this.toolStripButton3,
+            this.toolStripButton7});
             this.bn.Location = new System.Drawing.Point(0, 822);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -180,6 +182,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -363,6 +366,7 @@
             // tbSD
             // 
             this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbSD.Name = "tbSD";
             this.tbSD.Size = new System.Drawing.Size(100, 31);
             this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -377,6 +381,7 @@
             // tbED
             // 
             this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbED.Name = "tbED";
             this.tbED.Size = new System.Drawing.Size(100, 31);
             this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -544,7 +549,7 @@
             dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
             dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2022, 1, 26, 10, 35, 4, 37);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2022, 2, 2, 13, 41, 42, 241);
             this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일";
@@ -693,6 +698,16 @@
             this.textBox1.TabIndex = 5;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
+            // toolStripButton7
+            // 
+            this.toolStripButton7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
+            this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton7.Name = "toolStripButton7";
+            this.toolStripButton7.Size = new System.Drawing.Size(79, 24);
+            this.toolStripButton7.Text = "원장출력";
+            this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
+            // 
             // fHolyday
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -772,5 +787,6 @@
         private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripButton toolStripButton3;
+        private System.Windows.Forms.ToolStripButton toolStripButton7;
     }
 }

SubProject/FBS0000/Holiday/fHolyday.cs

@@ -630,5 +630,12 @@ namespace FBS0000
             var f = new FBS0000.Holiday.fImpKunTae();
             f.ShowDialog();
         }
+
+        private void toolStripButton7_Click(object sender, EventArgs e)
+        {
+            seluid = GetUIDValue();
+            var f = new fHolyDayData(tbED.Text, seluid != "%" ? cmbUser.Text : string.Empty );
+            f.Show();
+        }
     }
 }

SubProject/FBS0000/Holiday/fHolyday.resx

@@ -212,23 +212,6 @@
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi
-        CwURXcSp9BQ1MctoZA9BPQQSlVNkbUmWpszbLjG32S54OdEu2HJHt6WuOdeE7Zx2Nje+/c9ZHhvuwT98
-        OPwP/L7/z/mec3bwi6KoyonnMoy3VMFYexDk1vFtsp8fPmy325kppw2U0wr9jQpks9ltIYQoFIqdWq32
-        puFpI+zKRuivVyCVShXAsiwYhhFJJBJYX1/PBxQaWKC7Kt0SsBGyQTKZRCaTKTTQPWmEraMBuitScBwn
-        8KAnhBZNCPcIzeogmlVBNBF4CzFANHDkDUYvS5FOpwX4YY0lCjXhrTkK1XgUd7oDQgBvVWAw2taAL6/q
-        MXKpXEjn+f9UORm820XjdictdOD3+3NFDYYulAsF8QEcl4LVHUK/Yw4qcwjvbcsYoxax9nsF8XicIQFH
-        Nw0U9Zh4KcPQ+bJ/wxzUJj9GqBX4f7EIxDhMzieg/7YKw9QCYrFYkQ4cFmjPlgoBfAcfHWHMLiUxFfwD
-        xwILO8ET5tA7EYTL5UJJSckJ0WD4oQzW9joMVpeKJXabgqCjHBzzDGw0A5MvCeonh3fWJUQika0GM8Rg
-        oOqAWGIveebZZRbWufwwz8wiB+XYj61f4vD9Ophf1GLgzGaAxRXGJJ3AVzLkDKYwTU4fdiXRoRnCIqUr
-        btB/WoJcLie8idU1Fs7vUfSRLj7Yw+gyBvBaMwaPvgvTygY01+xrFQzkcrmkp/oQBq8dQ98pCWiahs/n
-        g9frhdvtFgrzeDzC1frpDSY7b2HB0I7BtsoUsciv2rJdJx8d2fO4TrpbRrbFfl2Rppq9rZ8VFznjs3P4
-        Cw64yAw4SoDAAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
@@ -243,6 +226,23 @@
         cYPe0xLkcjnhTSyvsvB8j6OHdPHBFYXGMofXumH4TRpMtCnRULOvSTBQqVSSrupD6L92DD2nJKBpGsFg
         EIFAAD6fTyjM7/cLV8enNxhrv4VZcwv6myvTxCK/ZGW7Tj46suexXLpbQbbFfl2R+pq9TZ/VFznLs3P4
         CwfIyAm42h5cAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ7SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
+        Dwoi+hCno6uoybKURnYR1EUgUTmHmEuyNGV+bNPQ7ax94MeJtoltepxb6tK5JmzntDN1PL3nLI+N7cIX
+        fhzeA//n/Z3nnLNLWDRNl9peKDBaV4bhysMgt07ukIPC8FGHw8GOu+ygXRTMt0qwubm5I8QQjUaz22Aw
+        3B56poRDq4T5ZgmSyWQWHMeBZVmJeDyOjY2NTEC2gRWm6/KcgK2QLRKJBNbX17MNTE+VsDfXwHRNDp7n
+        RR51hFCnD+EBQd0ehLotiFqCYCEFSAbOjMHgVTlSqZSIMKy3RtBOeGeJoG00gnut82KAYJVlMNhYg6+v
+        qzFwpVhMF/j/VBUZvK9jcLeFETvw+/3pvAZ9l4rFgoQAnk+C8oTQ7ZxBmyWED/YlGOkFrP1eQSwWY0nA
+        8W0DTTVsrxTou1j0b5hH+8gsBugVzP7iMB/lMTYXh/n7KobGA4hGo3k6cFphOF8oBggdfHKGMb2YwHjw
+        D5wBDg6CN8yj0xaE2+1GQUHBKcmgv0EBqqkKveWFUomtI0EwER7OORZ2hsWILwH6J4/31CKWl5dzDSaJ
+        QU/ZIanETvLM00scqJnMsMDkAg+t0Z/7JfY/rILlZSV6zm0HWN1hjDFxfCNDrmASE+T0fncCzfo+LNCm
+        /AbdZ2VIp9Pim1hd4+D6EUEX6eKjIwzd8Dze6I3wmnWY0NZAXXGgXjRQqVSyjvIj6L1xAl1nZGAYBj6f
+        D1NTU/B4PGJhXq9XvFKf32Ks5Q4CQ03obSxNEovMqizac/rxsX1PquR7FWSb79eVqK3YX/9Fc5kffn4B
+        fwEA2MgGIGjT1AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -258,6 +258,21 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsReport = new FBS0000.dsReport();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
@@ -41,17 +40,13 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FBS0000.dsReportTableAdapters.holydataTableAdapter();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             this.SuspendLayout();
             // 
-            // bs
-            // 
-            this.bs.DataMember = "holydata";
-            this.bs.DataSource = this.dsReport;
-            // 
             // dsReport
             // 
             this.dsReport.DataSetName = "dsReport";
@@ -69,7 +64,7 @@
             this.btSearch});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1003, 37);
+            this.toolStrip1.Size = new System.Drawing.Size(1059, 37);
             this.toolStrip1.TabIndex = 6;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -133,14 +128,19 @@
             reportDataSource1.Name = "DataSet1";
             reportDataSource1.Value = this.bs;
             this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
-            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.rHolidaySummary.rdlc";
+            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolidaySummary.rdlc";
             this.reportViewer1.Location = new System.Drawing.Point(0, 37);
             this.reportViewer1.Name = "reportViewer1";
             this.reportViewer1.ServerReport.BearerToken = null;
-            this.reportViewer1.Size = new System.Drawing.Size(1003, 539);
+            this.reportViewer1.Size = new System.Drawing.Size(1059, 543);
             this.reportViewer1.TabIndex = 7;
             this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
             // 
+            // bs
+            // 
+            this.bs.DataMember = "holydata";
+            this.bs.DataSource = this.dsReport;
+            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -149,24 +149,23 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1003, 576);
+            this.ClientSize = new System.Drawing.Size(1059, 580);
             this.Controls.Add(this.reportViewer1);
             this.Controls.Add(this.toolStrip1);
             this.Name = "rHolidaySummary";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "휴가이력 현황";
             this.Load += new System.EventHandler(this.rJobReport_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-        private System.Windows.Forms.BindingSource bs;
         private dsReport dsReport;
         private System.Windows.Forms.ToolStrip toolStrip1;
         private System.Windows.Forms.ToolStripButton toolStripButton8;
@@ -176,6 +175,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton btSearch;
         private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
+        private System.Windows.Forms.BindingSource bs;
         private dsReportTableAdapters.holydataTableAdapter ta;
     }
 }

SubProject/FBS0000/Holiday/rHolidaySummary.cs

@@ -19,6 +19,8 @@ namespace FBS0000
 
         private void rJobReport_Load(object sender, EventArgs e)
         {
+            // TODO: 이 코드는 데이터를 'dsReport.holydata' 테이블에 로드합니다. 필요 시 이 코드를 이동하거나 제거할 수 있습니다.
+            //this.ta.Fill(this.dsReport.holydata);
             //this.tbProcess.Items.Clear();
             //tbProcess.Items.Add("전체");
             //var taProcess = new dsReportTableAdapters.holydataTableAdapter();

SubProject/FBS0000/Holiday/rHolidaySummary.resx

@@ -117,14 +117,11 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>119, 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="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>183, 17</value>
+    <value>119, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -152,7 +149,7 @@
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
         8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
-        c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+        c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
         VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
         /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
         A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
@@ -164,7 +161,7 @@
         3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
         613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
         t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
-        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
+        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -178,6 +175,9 @@
         dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>225, 17</value>
+  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>289, 17</value>
   </metadata>

SubProject/FBS0000/dsReport.xsd

@@ -40,6 +40,124 @@ ORDER BY Holyday.uid, CrDay</CommandText>
             </Mappings>
             <Sources />
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Holydata_DayTableAdapter" GeneratorDataComponentClassName="Holydata_DayTableAdapter" Name="Holydata_Day" UserDataComponentName="Holydata_DayTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_Dr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_Dr)) AND ((@IsNull_Cr = 1 AND [term] IS NULL) OR ([term] = @Original_Cr)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Dr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Dr" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_Dr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Dr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Cr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cr" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_Cr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Cr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Day(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.termDr AS Dr, 
+               Holyday.term AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+FROM     Holyday LEFT OUTER JOIN
+               EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
+               Users ON Holyday.uid = Users.id
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.termDr, 0) + ISNULL(Holyday.term, 0) &lt;&gt; 0)
+ORDER BY Holyday.sdate, Holyday.idx</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [Holyday] SET [sdate] = @sdate, [uid] = @uid, [cate] = @cate, [termDr] = @Dr, [term] = @Cr, [contents] = @contents WHERE (([idx] = @Original_idx) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_Dr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_Dr)) AND ((@IsNull_Cr = 1 AND [term] IS NULL) OR ([term] = @Original_Cr)));
+SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) AS jun, termDr AS Dr, term AS Cr, contents FROM Holyday WHERE (idx = @idx) ORDER BY sdate, idx</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Dr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Dr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Cr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Cr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Dr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Dr" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_Dr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Dr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Cr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cr" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_Cr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="Cr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="sdate" DataSetColumn="sdate" />
+              <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="cate" DataSetColumn="cate" />
+              <Mapping SourceColumn="jun" DataSetColumn="jun" />
+              <Mapping SourceColumn="Dr" DataSetColumn="Dr" />
+              <Mapping SourceColumn="Cr" DataSetColumn="Cr" />
+              <Mapping SourceColumn="contents" DataSetColumn="contents" />
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
+              <Mapping SourceColumn="name" DataSetColumn="name" />
+              <Mapping SourceColumn="Process" DataSetColumn="Process" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Holydata_timee_adapter" GeneratorDataComponentClassName="Holydata_timee_adapter" Name="Holydata_Time" UserDataComponentName="Holydata_timee_adapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" 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  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Time(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.DrTime AS Dr, 
+               Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+FROM     Holyday LEFT OUTER JOIN
+               EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
+               Users ON Holyday.uid = Users.id
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) &lt;&gt; 0)
+ORDER BY Holyday.sdate, Holyday.idx</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
+              <Mapping SourceColumn="name" DataSetColumn="name" />
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="sdate" DataSetColumn="sdate" />
+              <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="cate" DataSetColumn="cate" />
+              <Mapping SourceColumn="jun" DataSetColumn="jun" />
+              <Mapping SourceColumn="Dr" DataSetColumn="Dr" />
+              <Mapping SourceColumn="Cr" DataSetColumn="Cr" />
+              <Mapping SourceColumn="contents" DataSetColumn="contents" />
+              <Mapping SourceColumn="Process" DataSetColumn="Process" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -48,7 +166,7 @@ ORDER BY Holyday.uid, CrDay</CommandText>
   <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="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_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_RowClassName="holydataRow" msprop:Generator_UserTableName="holydata" msprop:Generator_RowEvArgName="holydataRowChangeEvent">
           <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">
@@ -88,12 +206,127 @@ ORDER BY Holyday.uid, CrDay</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CrDay" msprop:Generator_ColumnVarNameInTable="columnCrDay" msprop:Generator_ColumnPropNameInRow="CrDay" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="CrDayColumn" msprop:Generator_UserColumnName="CrDay" type="xs:double" minOccurs="0" />
+              <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:Generator_ColumnVarNameInTable="columnDrDay" msprop:Generator_ColumnPropNameInRow="DrDay" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="DrDayColumn" msprop:Generator_UserColumnName="DrDay" 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:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" 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_UserTableName="Holydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent" msprop:Generator_RowClassName="Holydata_DayRow">
+          <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: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: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: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: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: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: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:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" 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_UserTableName="Holydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent" msprop:Generator_RowClassName="Holydata_TimeRow">
+          <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: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: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: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: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: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:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
       </xs:choice>
     </xs:complexType>
+    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:Holydata_Day" />
+      <xs:field xpath="mstns:idx" />
+    </xs:unique>
+    <xs:unique name="Holydata_Time_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:Holydata_Time" />
+      <xs:field xpath="mstns:idx" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FBS0000/dsReport.xss

@@ -4,9 +4,11 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="175" ViewPortY="186" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="331" ViewPortY="186" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:holydata" ZOrder="1" X="426" Y="219" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:holydata" ZOrder="3" X="443" Y="240" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:Holydata_Day" ZOrder="2" X="788" Y="288" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
+    <Shape ID="DesignTable:Holydata_Time" ZOrder="1" X="1102" Y="298" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
   </Shapes>
   <Connectors />
 </DiagramLayout>