....

2022-02-09 09:55:22 +09:00
parent 5617db1780
commit fdda87b48b
20 changed files with 260 additions and 20 deletions
--- a/JobReportMailService/fJobReportDay.Designer.cs
+++ b/JobReportMailService/fJobReportDay.Designer.cs
@@ -32,6 +32,7 @@ namespace JobReportMailService
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReportDay));
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
            this.btRun = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
            this.toolStrip1.SuspendLayout();
            this.SuspendLayout();
            // 
@@ -42,7 +43,8 @@ namespace JobReportMailService
            // toolStrip1
            // 
            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btRun});
+            this.btRun,
+            this.toolStripButton1});
            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
            this.toolStrip1.Name = "toolStrip1";
            this.toolStrip1.Size = new System.Drawing.Size(473, 25);
@@ -58,6 +60,15 @@ namespace JobReportMailService
            this.btRun.Text = "Run";
            this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click);
            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(67, 22);
+            this.toolStripButton1.Text = "manual";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
+            // 
            // fJobReportDay
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -79,5 +90,6 @@ namespace JobReportMailService

        private System.Windows.Forms.ToolStrip toolStrip1;
        private System.Windows.Forms.ToolStripButton btRun;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
    }
 }
--- a/JobReportMailService/fJobReportDay.cs
+++ b/JobReportMailService/fJobReportDay.cs
@@ -102,6 +102,8 @@ namespace JobReportMailService
                var vGcode = gcodedata.Key;
                if (string.IsNullOrEmpty(vGcode)) continue;

+                //if (vGcode.Contains("K5") == false) continue;
+
                var MailJD = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault();
                if (MailJD == null)
                {
@@ -314,5 +316,10 @@ namespace JobReportMailService
            }
            
        }
+
+        private void toolStripButton1_Click_1(object sender, EventArgs e)
+        {
+            RunData();
+        }
    }
 }
--- a/JobReportMailService/fJobReportDay.resx
+++ b/JobReportMailService/fJobReportDay.resx
@@ -137,6 +137,21 @@
        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton1.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>
 </root>
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.02.08.1130")]
-[assembly: AssemblyFileVersion("22.02.08.1130")]
+[assembly: AssemblyVersion("22.02.09.0950")]
+[assembly: AssemblyFileVersion("22.02.09.0950")]
--- a/SubProject/FBS0000/FBS0000.csproj
+++ b/SubProject/FBS0000/FBS0000.csproj
@@ -126,6 +126,9 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>dsMSSQL.xsd</DependentUpon>
    </Compile>
+    <Compile Include="dsReport.cs">
+      <DependentUpon>dsReport.xsd</DependentUpon>
+    </Compile>
    <Compile Include="dsReport.Designer.cs">
      <DependentUpon>dsReport.xsd</DependentUpon>
      <AutoGen>True</AutoGen>
--- a/SubProject/FBS0000/Holiday/fHolyDayData.cs
+++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs
@@ -62,12 +62,12 @@ namespace FBS0000
            var uid = GetUIDValue();
            if (cmbType.SelectedIndex == 0)
            {
-                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortTimeString());
+                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                //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());
+                taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                dsReport.Holydata_Day.Clear();
                dsReport.Holydata_Day.Merge(dsReport.Holydata_Time);
                dsReport.Holydata_Day.AcceptChanges();
--- a/SubProject/FBS0000/dsReport.cs
+++ b/SubProject/FBS0000/dsReport.cs
@@ -0,0 +1,15 @@
+namespace FBS0000
+{
+
+
+    partial class dsReport
+    {
+    }
+}
+
+namespace FBS0000.dsReportTableAdapters {
+    
+    
+    public partial class holydataTableAdapter {
+    }
+}
--- a/SubProject/FPJ0000/Auth.cs
+++ b/SubProject/FPJ0000/Auth.cs
@@ -25,5 +25,9 @@ namespace FPJ0000
        public Nullable<int> scheapp { get; set; }
        public Nullable<int> equipment { get; set; }
        public Nullable<int> kusul { get; set; }
+        public Nullable<int> otconfirm { get; set; }
+        public Nullable<int> kuntae { get; set; }
+        public Nullable<int> holyreq { get; set; }
+        public Nullable<int> account { get; set; }
    }
 }
--- a/SubProject/FPJ0000/EETGW_HolydayRequest.cs
+++ b/SubProject/FPJ0000/EETGW_HolydayRequest.cs
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     이 코드는 템플릿에서 생성되었습니다.
+//
+//     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
+//     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FPJ0000
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class EETGW_HolydayRequest
+    {
+        public int idx { get; set; }
+        public string gcode { get; set; }
+        public string uid { get; set; }
+        public string cate { get; set; }
+        public string sdate { get; set; }
+        public string edate { get; set; }
+        public Nullable<int> conf { get; set; }
+        public string Remark { get; set; }
+        public string Response { get; set; }
+        public string HolyReason { get; set; }
+        public string HolyBackup { get; set; }
+        public string HolyLocation { get; set; }
+        public Nullable<int> HolyDays { get; set; }
+        public Nullable<double> HolyTimes { get; set; }
+        public Nullable<bool> sendmail { get; set; }
+        public string wuid { get; set; }
+        public System.DateTime wdate { get; set; }
+    }
+}
--- a/SubProject/FPJ0000/FPJ0000.csproj
+++ b/SubProject/FPJ0000/FPJ0000.csproj
@@ -181,6 +181,9 @@
    <Compile Include="EETGW_DocuForm.cs">
      <DependentUpon>Model1.tt</DependentUpon>
    </Compile>
+    <Compile Include="EETGW_HolydayRequest.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
    <Compile Include="EETGW_JobReport_EBoard.cs">
      <DependentUpon>Model1.tt</DependentUpon>
    </Compile>
--- a/SubProject/FPJ0000/JobReport.cs
+++ b/SubProject/FPJ0000/JobReport.cs
@@ -40,5 +40,7 @@ namespace FPJ0000
        public string kisullv { get; set; }
        public string kisuldiv { get; set; }
        public Nullable<decimal> kisulamt { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public string otReason { get; set; }
    }
 }
--- a/SubProject/FPJ0000/JobReport_/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs
@@ -569,7 +569,7 @@ namespace FPJ0000
            newdr.EndEdit();

            //var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
-            JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr);
+            JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr,true);
            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
            {
                this.dsMSSQL.JobReport.AddJobReportRow(newdr);
--- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
@@ -267,7 +267,7 @@ namespace FPJ0000.JobReport_
            }

            //신규데이터라면 양식을 처리한다.
-            if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
+            if (copyMOde==false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
            {
                //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
                var db = new EEEntities();
--- a/SubProject/FPJ0000/Model1.Context.cs
+++ b/SubProject/FPJ0000/Model1.Context.cs
@@ -46,5 +46,6 @@ namespace FPJ0000
        public virtual DbSet<EETGW_Project_Layout> EETGW_Project_Layout { get; set; }
        public virtual DbSet<EETGW_DocuForm> EETGW_DocuForm { get; set; }
        public virtual DbSet<EETGW_ProjectsSchedule> EETGW_ProjectsSchedule { get; set; }
+        public virtual DbSet<EETGW_HolydayRequest> EETGW_HolydayRequest { get; set; }
    }
 }
--- a/SubProject/FPJ0000/Model1.edmx
+++ b/SubProject/FPJ0000/Model1.edmx
@@ -20,6 +20,10 @@
          <Property Name="scheapp" Type="int" />
          <Property Name="equipment" Type="int" />
          <Property Name="kusul" Type="int" />
+          <Property Name="otconfirm" Type="int" />
+          <Property Name="kuntae" Type="int" />
+          <Property Name="holyreq" Type="int" />
+          <Property Name="account" Type="int" />
        </EntityType>
        <EntityType Name="Common">
          <Key>
@@ -48,6 +52,28 @@
          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
        </EntityType>
+        <EntityType Name="EETGW_HolydayRequest">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
+          <Property Name="uid" Type="varchar" MaxLength="20" />
+          <Property Name="cate" Type="varchar" MaxLength="20" />
+          <Property Name="sdate" Type="varchar" MaxLength="10" />
+          <Property Name="edate" Type="varchar" MaxLength="10" />
+          <Property Name="conf" Type="int" />
+          <Property Name="Remark" Type="varchar" MaxLength="255" />
+          <Property Name="Response" Type="varchar" MaxLength="255" />
+          <Property Name="HolyReason" Type="varchar" MaxLength="100" />
+          <Property Name="HolyBackup" Type="varchar" MaxLength="100" />
+          <Property Name="HolyLocation" Type="varchar" MaxLength="100" />
+          <Property Name="HolyDays" Type="int" />
+          <Property Name="HolyTimes" Type="float" />
+          <Property Name="sendmail" Type="bit" />
+          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
+        </EntityType>
        <EntityType Name="EETGW_JobReport_EBoard">
          <Key>
            <PropertyRef Name="idx" />
@@ -222,6 +248,8 @@
          <Property Name="kisullv" Type="varchar" MaxLength="10" />
          <Property Name="kisuldiv" Type="varchar" MaxLength="100" />
          <Property Name="kisulamt" Type="decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="otReason" Type="varchar" MaxLength="255" />
        </EntityType>
        <EntityType Name="MailData">
          <Key>
@@ -311,6 +339,7 @@
          <Property Name="CMP_Description" Type="nvarchar(max)" />
          <Property Name="CMP_Before" Type="nvarchar(max)" />
          <Property Name="CMP_After" Type="nvarchar(max)" />
+          <Property Name="CMP_After2" Type="nvarchar(max)" />
          <Property Name="bCost" Type="bit" />
          <Property Name="bFanOut" Type="bit" />
          <Property Name="div" Type="varchar" MaxLength="2" />
@@ -427,6 +456,7 @@
        <EntityType Name="vGroupUser">
          <Key>
            <PropertyRef Name="gcode" />
+            
          </Key>
          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
          <Property Name="dept" Type="varchar" MaxLength="100" />
@@ -444,7 +474,7 @@
          <Property Name="ads_title" Type="nvarchar" MaxLength="100" />
          <Property Name="ads_created" Type="varchar" MaxLength="50" />
          <Property Name="memo" Type="nvarchar" MaxLength="255" />
-          <Property Name="processs" Type="varchar" MaxLength="50" />
+          <Property Name="processs" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="id" Type="varchar" MaxLength="20" />
          <Property Name="state" Type="varchar" MaxLength="20" />
          <Property Name="useJobReport" Type="bit" />
@@ -476,19 +506,22 @@
          <Key>
            <PropertyRef Name="idx" />
            <PropertyRef Name="gcode" />
+            
+            
+            
          </Key>
          <Property Name="idx" Type="int" Nullable="false" />
          <Property Name="pdate" Type="varchar" MaxLength="10" />
          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
          <Property Name="id" Type="varchar" MaxLength="20" />
          <Property Name="name" Type="nvarchar" MaxLength="100" />
-          <Property Name="process" Type="varchar" MaxLength="50" />
+          <Property Name="process" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="type" Type="varchar" MaxLength="50" />
          <Property Name="svalue" Type="varchar" MaxLength="255" />
          <Property Name="hrs" Type="float" />
          <Property Name="ot" Type="float" />
-          <Property Name="requestpart" Type="varchar" MaxLength="50" />
-          <Property Name="package" Type="varchar" MaxLength="50" />
+          <Property Name="requestpart" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="package" Type="varchar" MaxLength="50" Nullable="false" />
          <Property Name="userProcess" Type="varchar" MaxLength="50" />
          <Property Name="status" Type="varchar" MaxLength="20" />
          <Property Name="projectName" Type="nvarchar" MaxLength="255" />
@@ -496,6 +529,11 @@
          <Property Name="ww" Type="varchar" MaxLength="6" />
          <Property Name="otStart" Type="datetime" />
          <Property Name="otEnd" Type="datetime" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="otReason" Type="varchar" MaxLength="255" />
+          <Property Name="grade" Type="varchar" MaxLength="10" />
+          <Property Name="indate" Type="varchar" MaxLength="20" />
+          <Property Name="outdate" Type="varchar" MaxLength="20" />
        </EntityType>
        <!--생성 중 오류 발생:
 경고 6002: 테이블/뷰 'EE.dbo.vUserWorkTimeList'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
@@ -512,11 +550,14 @@
          <Property Name="ot" Type="float" />
          <Property Name="UserProcess" Type="varchar" MaxLength="50" />
          <Property Name="holyot" Type="float" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="holyot2" Type="float" />
        </EntityType>
        <EntityContainer Name="EEModelStoreContainer">
          <EntitySet Name="Auth" EntityType="Self.Auth" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="Common" EntityType="Self.Common" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_DocuForm" EntityType="Self.EETGW_DocuForm" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="EETGW_HolydayRequest" EntityType="Self.EETGW_HolydayRequest" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_JobReport_EBoard" EntityType="Self.EETGW_JobReport_EBoard" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_Note" EntityType="Self.EETGW_Note" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="EETGW_Project_Layout" EntityType="Self.EETGW_Project_Layout" Schema="dbo" store:Type="Tables" />
@@ -603,7 +644,12 @@
    [vJobReportForUser].[description] AS [description], 
    [vJobReportForUser].[ww] AS [ww], 
    [vJobReportForUser].[otStart] AS [otStart], 
-    [vJobReportForUser].[otEnd] AS [otEnd]
+    [vJobReportForUser].[otEnd] AS [otEnd], 
+    [vJobReportForUser].[ot2] AS [ot2], 
+    [vJobReportForUser].[otReason] AS [otReason], 
+    [vJobReportForUser].[grade] AS [grade], 
+    [vJobReportForUser].[indate] AS [indate], 
+    [vJobReportForUser].[outdate] AS [outdate]
    FROM [dbo].[vJobReportForUser] AS [vJobReportForUser]</DefiningQuery>
          </EntitySet>
          <EntitySet Name="vUserWorkTimeList" EntityType="Self.vUserWorkTimeList" store:Type="Views" store:Schema="dbo">
@@ -616,7 +662,9 @@
    [vUserWorkTimeList].[hrs] AS [hrs], 
    [vUserWorkTimeList].[ot] AS [ot], 
    [vUserWorkTimeList].[UserProcess] AS [UserProcess], 
-    [vUserWorkTimeList].[holyot] AS [holyot]
+    [vUserWorkTimeList].[holyot] AS [holyot], 
+    [vUserWorkTimeList].[ot2] AS [ot2], 
+    [vUserWorkTimeList].[holyot2] AS [holyot2]
    FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList]</DefiningQuery>
          </EntitySet>
        </EntityContainer>
@@ -707,6 +755,8 @@
          <Property Name="ot" Type="Double" />
          <Property Name="UserProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="holyot" Type="Double" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="holyot2" Type="Double" />
        </EntityType>
        <EntityContainer Name="EEEntities" annotation:LazyLoadingEnabled="true">
          <EntitySet Name="Common" EntityType="Self.Common" />
@@ -730,6 +780,7 @@
          <EntitySet Name="EETGW_Project_Layout" EntityType="EEModel.EETGW_Project_Layout" />
          <EntitySet Name="EETGW_DocuForm" EntityType="EEModel.EETGW_DocuForm" />
          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="EEModel.EETGW_ProjectsSchedule" />
+          <EntitySet Name="EETGW_HolydayRequest" EntityType="EEModel.EETGW_HolydayRequest" />
        </EntityContainer>
        <EntityType Name="HolidayLIst">
          <Key>
@@ -950,6 +1001,8 @@
          <Property Name="kisullv" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
          <Property Name="kisuldiv" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
          <Property Name="kisulamt" Type="Decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="otReason" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
        </EntityType>
        <EntityType Name="vGroupUser">
          <Key>
@@ -971,7 +1024,7 @@
          <Property Name="ads_title" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
          <Property Name="ads_created" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="state" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="useJobReport" Type="Boolean" />
@@ -987,13 +1040,13 @@
          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
          <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="name" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
          <Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
          <Property Name="hrs" Type="Double" />
          <Property Name="ot" Type="Double" />
-          <Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
+          <Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
          <Property Name="userProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
@@ -1001,6 +1054,11 @@
          <Property Name="ww" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
          <Property Name="otStart" Type="DateTime" Precision="3" />
          <Property Name="otEnd" Type="DateTime" Precision="3" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="otReason" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="grade" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="indate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="outdate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
        </EntityType>
        <EntityType Name="Auth">
          <Key>
@@ -1017,6 +1075,10 @@
          <Property Name="scheapp" Type="Int32" />
          <Property Name="equipment" Type="Int32" />
          <Property Name="kusul" Type="Int32" />
+          <Property Name="otconfirm" Type="Int32" />
+          <Property Name="kuntae" Type="Int32" />
+          <Property Name="holyreq" Type="Int32" />
+          <Property Name="account" Type="Int32" />
        </EntityType>
        <EntityType Name="Projects">
          <Key>
@@ -1076,6 +1138,7 @@
          <Property Name="bAlert" Type="Boolean" />
          <Property Name="model" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          <Property Name="serial" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="CMP_After2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
        </EntityType>
        <EntityType Name="vEETGW_Project_LayoutList">
          <Key>
@@ -1145,6 +1208,28 @@
          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
        </EntityType>
+        <EntityType Name="EETGW_HolydayRequest">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="uid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="cate" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="sdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="edate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="conf" Type="Int32" />
+          <Property Name="Remark" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="Response" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="HolyReason" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="HolyBackup" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="HolyLocation" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="HolyDays" Type="Int32" />
+          <Property Name="HolyTimes" Type="Double" />
+          <Property Name="sendmail" Type="Boolean" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+        </EntityType>
      </Schema>
    </edmx:ConceptualModels>
    <!-- C-S mapping content -->
@@ -1224,6 +1309,8 @@
          <EntitySetMapping Name="vUserWorkTimeList">
            <EntityTypeMapping TypeName="EEModel.vUserWorkTimeList">
              <MappingFragment StoreEntitySet="vUserWorkTimeList">
+                <ScalarProperty Name="holyot2" ColumnName="holyot2" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
                <ScalarProperty Name="holyot" ColumnName="holyot" />
                <ScalarProperty Name="UserProcess" ColumnName="UserProcess" />
                <ScalarProperty Name="gcode" ColumnName="gcode" />
@@ -1435,6 +1522,8 @@
          <EntitySetMapping Name="JobReport">
            <EntityTypeMapping TypeName="EEModel.JobReport">
              <MappingFragment StoreEntitySet="JobReport">
+                <ScalarProperty Name="otReason" ColumnName="otReason" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
                <ScalarProperty Name="kisulamt" ColumnName="kisulamt" />
                <ScalarProperty Name="kisuldiv" ColumnName="kisuldiv" />
                <ScalarProperty Name="kisullv" ColumnName="kisullv" />
@@ -1494,6 +1583,11 @@
          <EntitySetMapping Name="vJobReportForUser">
            <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
              <MappingFragment StoreEntitySet="vJobReportForUser">
+                <ScalarProperty Name="outdate" ColumnName="outdate" />
+                <ScalarProperty Name="indate" ColumnName="indate" />
+                <ScalarProperty Name="grade" ColumnName="grade" />
+                <ScalarProperty Name="otReason" ColumnName="otReason" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
                <ScalarProperty Name="otEnd" ColumnName="otEnd" />
                <ScalarProperty Name="otStart" ColumnName="otStart" />
                <ScalarProperty Name="ww" ColumnName="ww" />
@@ -1519,6 +1613,10 @@
          <EntitySetMapping Name="Auth">
            <EntityTypeMapping TypeName="EEModel.Auth">
              <MappingFragment StoreEntitySet="Auth">
+                <ScalarProperty Name="account" ColumnName="account" />
+                <ScalarProperty Name="holyreq" ColumnName="holyreq" />
+                <ScalarProperty Name="kuntae" ColumnName="kuntae" />
+                <ScalarProperty Name="otconfirm" ColumnName="otconfirm" />
                <ScalarProperty Name="kusul" ColumnName="kusul" />
                <ScalarProperty Name="equipment" ColumnName="equipment" />
                <ScalarProperty Name="scheapp" ColumnName="scheapp" />
@@ -1536,6 +1634,7 @@
          <EntitySetMapping Name="Projects">
            <EntityTypeMapping TypeName="EEModel.Projects">
              <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="CMP_After2" ColumnName="CMP_After2" />
                <ScalarProperty Name="serial" ColumnName="serial" />
                <ScalarProperty Name="model" ColumnName="model" />
                <ScalarProperty Name="bAlert" ColumnName="bAlert" />
@@ -1664,6 +1763,29 @@
              </MappingFragment>
            </EntityTypeMapping>
          </EntitySetMapping>
+          <EntitySetMapping Name="EETGW_HolydayRequest">
+            <EntityTypeMapping TypeName="EEModel.EETGW_HolydayRequest">
+              <MappingFragment StoreEntitySet="EETGW_HolydayRequest">
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="sendmail" ColumnName="sendmail" />
+                <ScalarProperty Name="HolyTimes" ColumnName="HolyTimes" />
+                <ScalarProperty Name="HolyDays" ColumnName="HolyDays" />
+                <ScalarProperty Name="HolyLocation" ColumnName="HolyLocation" />
+                <ScalarProperty Name="HolyBackup" ColumnName="HolyBackup" />
+                <ScalarProperty Name="HolyReason" ColumnName="HolyReason" />
+                <ScalarProperty Name="Response" ColumnName="Response" />
+                <ScalarProperty Name="Remark" ColumnName="Remark" />
+                <ScalarProperty Name="conf" ColumnName="conf" />
+                <ScalarProperty Name="edate" ColumnName="edate" />
+                <ScalarProperty Name="sdate" ColumnName="sdate" />
+                <ScalarProperty Name="cate" ColumnName="cate" />
+                <ScalarProperty Name="uid" ColumnName="uid" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
        </EntityContainerMapping>
      </Mapping>
    </edmx:Mappings>
--- a/SubProject/FPJ0000/Model1.edmx.diagram
+++ b/SubProject/FPJ0000/Model1.edmx.diagram
@@ -26,6 +26,7 @@
        <EntityTypeShape EntityType="EEModel.EETGW_Project_Layout" Width="1.5" PointX="5.375" PointY="13.75" />
        <EntityTypeShape EntityType="EEModel.EETGW_DocuForm" Width="1.5" PointX="15.375" PointY="12.75" />
        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="16.375" PointY="4.75" />
+        <EntityTypeShape EntityType="EEModel.EETGW_HolydayRequest" Width="1.5" PointX="7.375" PointY="16.75" />
      </Diagram>
    </edmx:Diagrams>
  </edmx:Designer>
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -182,12 +182,24 @@ namespace FPJ0000.OtConfirm
                return;
            }

-            if(tbRemark.Text.StartsWith("테스트") && chkSendMail.Checked)
+            if (tbRemark.Text.StartsWith("테스트") && chkSendMail.Checked)
            {
                FCOMMON.Util.MsgI("테스트라 메일 체크를 끕니다");
                chkSendMail.Checked = false;
            }

+            //동일날짜에 등록된 자료가있다면 오류로 처리한다.
+            var db = new EEEntities();
+            string chkdt = tbSD.Value.ToShortDateString();
+            var existdb = db.EETGW_HolydayRequest.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == uid.ToString() && t.sdate == chkdt).Any();
+            if(existdb)
+            {
+                FCOMMON.Util.MsgE("동일 날짜에 등록된 자료가 있습니다");
+                return ;
+            }
+
+
+
            if (dr.RowState == DataRowState.Detached)
            {
                var dlg = FCOMMON.Util.MsgQ("입력을 완료하시겠습니까?\r\n관리자에게 메일로 알림이 발생 합니다");
@@ -347,14 +359,14 @@ namespace FPJ0000.OtConfirm
                    var perc = 0f;
                    if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]);
                    if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc*100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc * 100:N1}%사용)");
                }
                else if (val[5] != "0")
                {
                    var perc = 0f;
                    if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]);
                    if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc*100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc * 100:N1}%사용)");
                }

            }
--- a/SubProject/FPJ0000/Projects.cs
+++ b/SubProject/FPJ0000/Projects.cs
@@ -68,5 +68,6 @@ namespace FPJ0000
        public Nullable<bool> bAlert { get; set; }
        public string model { get; set; }
        public string serial { get; set; }
+        public string CMP_After2 { get; set; }
    }
 }
--- a/SubProject/FPJ0000/vJobReportForUser.cs
+++ b/SubProject/FPJ0000/vJobReportForUser.cs
@@ -33,5 +33,10 @@ namespace FPJ0000
        public string ww { get; set; }
        public Nullable<System.DateTime> otStart { get; set; }
        public Nullable<System.DateTime> otEnd { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public string otReason { get; set; }
+        public string grade { get; set; }
+        public string indate { get; set; }
+        public string outdate { get; set; }
    }
 }
--- a/SubProject/FPJ0000/vUserWorkTimeList.cs
+++ b/SubProject/FPJ0000/vUserWorkTimeList.cs
@@ -23,5 +23,7 @@ namespace FPJ0000
        public Nullable<double> ot { get; set; }
        public string UserProcess { get; set; }
        public Nullable<double> holyot { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public Nullable<double> holyot2 { get; set; }
    }
 }