..

SubProject/FPJ0000/Auth.cs

@@ -23,5 +23,6 @@ namespace FPJ0000
         public Nullable<int> jobreport { get; set; }
         public Nullable<int> savecost { get; set; }
         public Nullable<int> scheapp { get; set; }
+        public Nullable<int> equipment { get; set; }
     }
 }

SubProject/FPJ0000/EETGW_DocuForm.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     이 코드는 템플릿에서 생성되었습니다.
+//
+//     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
+//     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FPJ0000
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class EETGW_DocuForm
+    {
+        public int idx { get; set; }
+        public string gcode { get; set; }
+        public string cate { get; set; }
+        public string title { get; set; }
+        public string body { get; set; }
+        public string wuid { get; set; }
+        public System.DateTime wdate { get; set; }
+    }
+}

SubProject/FPJ0000/EETGW_JobReport_EBoard.cs

@@ -47,5 +47,6 @@ namespace FPJ0000
         public System.DateTime wdate { get; set; }
         public string 원인2 { get; set; }
         public string 결과2 { get; set; }
+        public Nullable<bool> refdata { get; set; }
     }
 }

SubProject/FPJ0000/EETGW_SaveCost.cs

@@ -46,5 +46,7 @@ namespace FPJ0000
         public Nullable<bool> fanout { get; set; }
         public Nullable<bool> weekly { get; set; }
         public Nullable<bool> Highlight { get; set; }
+        public Nullable<double> bef_time { get; set; }
+        public Nullable<double> aft_time { get; set; }
     }
 }

SubProject/FPJ0000/FPJ0000.csproj

@@ -216,6 +216,9 @@
     <Compile Include="EBoard\fEBoardReport.Designer.cs">
       <DependentUpon>fEBoardReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="EETGW_DocuForm.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
     <Compile Include="EETGW_JobReport_EBoard.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>

SubProject/FPJ0000/JobReport_/fJobReport.cs

@@ -393,6 +393,7 @@ namespace FPJ0000
         private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
         {
             var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
+            newdr.status = "진행 중";
             newdr.pdate = DateTime.Now.ToShortDateString();
             if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday ||
                 DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0;

SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs

@@ -323,6 +323,7 @@
             this.cmbState.Name = "cmbState";
             this.cmbState.Size = new System.Drawing.Size(160, 20);
             this.cmbState.TabIndex = 4;
+            this.cmbState.SelectedIndexChanged += new System.EventHandler(this.chkform_indexchan);
             // 
             // cmbPackage
             // 
@@ -349,9 +350,12 @@
             // tam
             // 
             this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.EETGW_JobReport_AutoInputTableAdapter = null;
             this.tam.EETGW_JobReport_EBoardTableAdapter = null;
             this.tam.EETGW_NoteTableAdapter = null;
             this.tam.EETGW_ProjecthistoryDTableAdapter = null;
+            this.tam.EETGW_ProjectResonTableAdapter = null;
+            this.tam.EETGW_ProjectsScheduleTableAdapter = null;
             this.tam.EETGW_ProjectToDoTableAdapter = null;
             this.tam.EETGW_SaveCostTableAdapter = null;
             this.tam.JobReportTableAdapter = this.ta;
@@ -399,7 +403,7 @@
             this.richTextBoxEx1.Location = new System.Drawing.Point(0, 129);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
-    "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+    "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
     "Ex1\\par\r\n}\r\n";
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -160,7 +160,7 @@ namespace FPJ0000.JobReport_
 
             if (this.richTextBoxEx1.Text.Trim() != "")
             {
-                this.richTextBoxEx1.Focus();                
+                this.richTextBoxEx1.Focus();
             }
             else
             {
@@ -168,7 +168,7 @@ namespace FPJ0000.JobReport_
                 tbProject.SelectAll();
             }
             tbProject.Tag = tbProject.Text;
-            
+
             //  if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
 
             //editor
@@ -179,12 +179,12 @@ namespace FPJ0000.JobReport_
 
             //ed.DisplayEditForm(this.panel1);
             //ed.AllowRtf = true;
-            
+
 
 
             bInit = true;
         }
-    //    editform.editor ed;
+        //    editform.editor ed;
         void ctl_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -287,7 +287,7 @@ namespace FPJ0000.JobReport_
                 tbProject.Focus();
                 return;
             }
-            if (cmbType.Text != "휴가" && string.IsNullOrEmpty( this.richTextBoxEx1.Text )==true)
+            if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
             {
                 FCOMMON.Util.MsgE("진행 내용이 없습니다.");
                 this.richTextBoxEx1.Focus();
@@ -364,7 +364,7 @@ namespace FPJ0000.JobReport_
             }
 
             double hrs2 = 0.0;
-            if(double.TryParse(tbHrs.Text,out hrs2) ==false)
+            if (double.TryParse(tbHrs.Text, out hrs2) == false)
             {
                 FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요");
                 tbHrs.Focus();
@@ -421,6 +421,49 @@ namespace FPJ0000.JobReport_
                     if (predr["process"] != DBNull.Value)
                         cmbProcess.Text = predr["process"].ToString(); //190506
                 }
+
+            }
+            chkform_indexchan(sender, e);
+
+        }
+
+        void chkform_indexchan(object sender, EventArgs e)
+        {
+            if (cmbType.Text.Trim() != "" &&
+           cmbType.SelectedIndex >= 0 && cmbState.Text.Trim().isEmpty() == false)
+            {
+
+
+                //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
+                var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim();
+                var db = new EEEntities();
+                var dr = db.EETGW_DocuForm.Where(t => t.cate == "J1" && t.title == formname).FirstOrDefault();
+                if (dr != null)
+                {
+
+
+                    //신규상태이다
+                    if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached)
+                    {
+                        if (this.richTextBoxEx1.Text.isEmpty())
+                        {
+                            this.richTextBoxEx1.Rtf = dr.body;
+                        }
+                        else
+                        {
+                            //뭔가 자료가 있는가?
+                            if (this.richTextBoxEx1.Text.Length < 10)
+                            {
+                                if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes)
+                                {
+                                    this.richTextBoxEx1.Rtf = dr.body + this.richTextBoxEx1.Rtf;
+
+                                }
+                            }
+                        }
+                    }
+                }
+
             }
         }
 

SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc

@@ -210,7 +210,7 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>1.12417cm</Width>
+                  <Width>1.46813cm</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
@@ -465,7 +465,7 @@
             </TablixRowHierarchy>
             <DataSetName>DataSet1</DataSetName>
             <Height>2.17042cm</Height>
-            <Width>7.26188cm</Width>
+            <Width>7.60584cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>

SubProject/FPJ0000/Model1.Context.cs

@@ -45,5 +45,6 @@ namespace FPJ0000
         public virtual DbSet<Projects> Projects { get; set; }
         public virtual DbSet<vEETGW_Project_LayoutList> vEETGW_Project_LayoutList { get; set; }
         public virtual DbSet<EETGW_Project_Layout> EETGW_Project_Layout { get; set; }
+        public virtual DbSet<EETGW_DocuForm> EETGW_DocuForm { get; set; }
     }
 }

SubProject/FPJ0000/Model1.edmx

@@ -18,6 +18,7 @@
           <Property Name="jobreport" Type="int" />
           <Property Name="savecost" Type="int" />
           <Property Name="scheapp" Type="int" />
+          <Property Name="equipment" Type="int" />
         </EntityType>
         <EntityType Name="Common">
           <Key>
@@ -34,6 +35,18 @@
           <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
           <Property Name="wdate" Type="smalldatetime" Nullable="false" />
         </EntityType>
+        <EntityType Name="EETGW_DocuForm">
+          <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="cate" Type="varchar" MaxLength="2" />
+          <Property Name="title" Type="varchar" MaxLength="100" />
+          <Property Name="body" Type="varchar(max)" />
+          <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" />
@@ -71,6 +84,7 @@
           <Property Name="wdate" Type="smalldatetime" Nullable="false" />
           <Property Name="원인2" Type="nvarchar(max)" />
           <Property Name="결과2" Type="nvarchar(max)" />
+          <Property Name="refdata" Type="bit" />
         </EntityType>
         <EntityType Name="EETGW_Note">
           <Key>
@@ -148,6 +162,8 @@
           <Property Name="cnt" Type="int" />
           <Property Name="remark_req" Type="varchar(max)" />
           <Property Name="remark_ans" Type="varchar(max)" />
+          <Property Name="bef_time" Type="float" />
+          <Property Name="aft_time" Type="float" />
           <Property Name="edate" Type="varchar" MaxLength="50" />
           <Property Name="progress" Type="int" />
           <Property Name="memo" Type="nvarchar" MaxLength="255" />
@@ -299,6 +315,7 @@
           <Property Name="EB_RepairTime" Type="float" />
           <Property Name="EB_ConstNew" Type="float" />
           <Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
+          <Property Name="bAlert" Type="bit" />
         </EntityType>
         <EntityType Name="Purchase">
           <Key>
@@ -319,6 +336,7 @@
           <Property Name="pumunit" Type="varchar" MaxLength="50" />
           <Property Name="pumqty" Type="int" />
           <Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
+          <Property Name="pumpriceD" Type="decimal" Precision="18" Scale="2" />
           <Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
           <Property Name="supply" Type="varchar" MaxLength="200" />
           <Property Name="supplyidx" Type="int" />
@@ -481,10 +499,12 @@
           <Property Name="hrs" Type="float" />
           <Property Name="ot" Type="float" />
           <Property Name="UserProcess" Type="varchar" MaxLength="50" />
+          <Property Name="holyot" 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_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" />
@@ -581,7 +601,8 @@
     [vUserWorkTimeList].[uname] AS [uname], 
     [vUserWorkTimeList].[hrs] AS [hrs], 
     [vUserWorkTimeList].[ot] AS [ot], 
-    [vUserWorkTimeList].[UserProcess] AS [UserProcess]
+    [vUserWorkTimeList].[UserProcess] AS [UserProcess], 
+    [vUserWorkTimeList].[holyot] AS [holyot]
     FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList]</DefiningQuery>
           </EntitySet>
         </EntityContainer>
@@ -670,6 +691,7 @@
           <Property Name="hrs" Type="Double" />
           <Property Name="ot" Type="Double" />
           <Property Name="UserProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="holyot" Type="Double" />
         </EntityType>
         <EntityContainer Name="EEEntities" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="Common" EntityType="Self.Common" />
@@ -692,6 +714,7 @@
           <EntitySet Name="Projects" EntityType="EEModel.Projects" />
           <EntitySet Name="vEETGW_Project_LayoutList" EntityType="EEModel.vEETGW_Project_LayoutList" />
           <EntitySet Name="EETGW_Project_Layout" EntityType="EEModel.EETGW_Project_Layout" />
+          <EntitySet Name="EETGW_DocuForm" EntityType="EEModel.EETGW_DocuForm" />
         </EntityContainer>
         <EntityType Name="HolidayLIst">
           <Key>
@@ -741,6 +764,7 @@
           <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
           <Property Name="원인2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="결과2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="refdata" Type="Boolean" />
         </EntityType>
         <EntityType Name="EETGW_SaveCost">
           <Key>
@@ -778,6 +802,8 @@
           <Property Name="fanout" Type="Boolean" />
           <Property Name="weekly" Type="Boolean" />
           <Property Name="Highlight" Type="Boolean" />
+          <Property Name="bef_time" Type="Double" />
+          <Property Name="aft_time" Type="Double" />
         </EntityType>
         <EntityType Name="MailData">
           <Key>
@@ -861,6 +887,7 @@
           <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
           <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
           <Property Name="inqty" Type="Int32" />
+          <Property Name="pumpriceD" Type="Decimal" Precision="18" Scale="2" />
         </EntityType>
         <EntityType Name="EETGW_Note">
           <Key>
@@ -987,6 +1014,7 @@
           <Property Name="jobreport" Type="Int32" />
           <Property Name="savecost" Type="Int32" />
           <Property Name="scheapp" Type="Int32" />
+          <Property Name="equipment" Type="Int32" />
         </EntityType>
         <EntityType Name="Projects">
           <Key>
@@ -1043,6 +1071,7 @@
           <Property Name="EB_RepairTime" Type="Double" />
           <Property Name="EB_ConstNew" Type="Double" />
           <Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="bAlert" Type="Boolean" />
         </EntityType>
         <EntityType Name="vEETGW_Project_LayoutList">
           <Key>
@@ -1078,6 +1107,18 @@
           <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_DocuForm">
+          <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="cate" Type="String" MaxLength="2" FixedLength="false" Unicode="false" />
+          <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="body" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+        </EntityType>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -1156,6 +1197,7 @@
           <EntitySetMapping Name="vUserWorkTimeList">
             <EntityTypeMapping TypeName="EEModel.vUserWorkTimeList">
               <MappingFragment StoreEntitySet="vUserWorkTimeList">
+                <ScalarProperty Name="holyot" ColumnName="holyot" />
                 <ScalarProperty Name="UserProcess" ColumnName="UserProcess" />
                 <ScalarProperty Name="gcode" ColumnName="gcode" />
                 <ScalarProperty Name="yymm" ColumnName="yymm" />
@@ -1182,6 +1224,7 @@
           <EntitySetMapping Name="EETGW_JobReport_EBoard">
             <EntityTypeMapping TypeName="EEModel.EETGW_JobReport_EBoard">
               <MappingFragment StoreEntitySet="EETGW_JobReport_EBoard">
+                <ScalarProperty Name="refdata" ColumnName="refdata" />
                 <ScalarProperty Name="결과2" ColumnName="결과2" />
                 <ScalarProperty Name="원인2" ColumnName="원인2" />
                 <ScalarProperty Name="wdate" ColumnName="wdate" />
@@ -1221,6 +1264,8 @@
           <EntitySetMapping Name="EETGW_SaveCost">
             <EntityTypeMapping TypeName="EEModel.EETGW_SaveCost">
               <MappingFragment StoreEntitySet="EETGW_SaveCost">
+                <ScalarProperty Name="aft_time" ColumnName="aft_time" />
+                <ScalarProperty Name="bef_time" ColumnName="bef_time" />
                 <ScalarProperty Name="Highlight" ColumnName="Highlight" />
                 <ScalarProperty Name="weekly" ColumnName="weekly" />
                 <ScalarProperty Name="fanout" ColumnName="fanout" />
@@ -1305,6 +1350,7 @@
           <EntitySetMapping Name="Purchase">
             <EntityTypeMapping TypeName="EEModel.Purchase">
               <MappingFragment StoreEntitySet="Purchase">
+                <ScalarProperty Name="pumpriceD" ColumnName="pumpriceD" />
                 <ScalarProperty Name="inqty" ColumnName="inqty" />
                 <ScalarProperty Name="wdate" ColumnName="wdate" />
                 <ScalarProperty Name="wuid" ColumnName="wuid" />
@@ -1461,6 +1507,7 @@
           <EntitySetMapping Name="Auth">
             <EntityTypeMapping TypeName="EEModel.Auth">
               <MappingFragment StoreEntitySet="Auth">
+                <ScalarProperty Name="equipment" ColumnName="equipment" />
                 <ScalarProperty Name="scheapp" ColumnName="scheapp" />
                 <ScalarProperty Name="savecost" ColumnName="savecost" />
                 <ScalarProperty Name="jobreport" ColumnName="jobreport" />
@@ -1476,6 +1523,7 @@
           <EntitySetMapping Name="Projects">
             <EntityTypeMapping TypeName="EEModel.Projects">
               <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="bAlert" ColumnName="bAlert" />
                 <ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
                 <ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
                 <ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
@@ -1565,6 +1613,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="EETGW_DocuForm">
+            <EntityTypeMapping TypeName="EEModel.EETGW_DocuForm">
+              <MappingFragment StoreEntitySet="EETGW_DocuForm">
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="body" ColumnName="body" />
+                <ScalarProperty Name="title" ColumnName="title" />
+                <ScalarProperty Name="cate" ColumnName="cate" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

SubProject/FPJ0000/Model1.edmx.diagram

@@ -25,6 +25,7 @@
         <EntityTypeShape EntityType="EEModel.Projects" Width="1.5" PointX="13.375" PointY="12.75" />
         <EntityTypeShape EntityType="EEModel.vEETGW_Project_LayoutList" Width="1.5" PointX="15.375" PointY="0.75" />
         <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" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

SubProject/FPJ0000/Project/fProjectLayout.cs

@@ -95,7 +95,7 @@ namespace FPJ0000
                         data.champion = string.Empty;
                         data.duedate = "미 할당";
                         data.project = -1;
-                        data.reserve = string.Empty;
+                        data.reserve = dr.reserve; // string.Empty; 예약자는 그대로 한다.
                     }
                     else
                     {
@@ -381,6 +381,17 @@ namespace FPJ0000
 
         private void 편집ToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            var currentime = this.ctlLayout1.items[this.no - 1];
+            if (currentime.project == -1 && currentime.reserve.isEmpty() == false)
+            {
+                //프로젝트가 할당된 상태가 아니다.
+                if (currentime.reserve != FCOMMON.info.Login.nameK)
+                {
+                    FCOMMON.Util.MsgE($"다음 예약자 {currentime.reserve} 가 아닙니다.\r\n해당 예약자가 취소해야 등록 가능 합니다");
+                    return;
+                }
+            }
+
             var f = new FCM0000.fLovProject(string.Empty, "진행");
             if (f.ShowDialog() == DialogResult.OK)
             {
@@ -399,7 +410,7 @@ namespace FPJ0000
                     newdr.col = 1;
                     newdr.rowspan = 1;
                     newdr.colspan = 1;
-                    newdr.wdate = DateTime.Now;                    
+                    newdr.wdate = DateTime.Now;
                     newdr.wuid = FCOMMON.info.Login.no;
                     db.EETGW_Project_Layout.Add(newdr);
                     db.SaveChanges();
@@ -587,18 +598,18 @@ namespace FPJ0000
 
         private void 프로젝트해제ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if(this.project < 1)
+            if (this.project < 1)
             {
                 FCOMMON.Util.MsgE("선택된 프로젝트가 없습니다");
                 return;
             }
             var dlg = FCOMMON.Util.MsgQ("슬롯 " + this.no.ToString() + "의 프로젝트를 해제 할까요?\n" +
                 "해당 슬롯은 '미사용'이 됩니다");
-            if(dlg == DialogResult.Yes)
+            if (dlg == DialogResult.Yes)
             {
                 var db = new EEEntities();
-                var dr= db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault();
-                if(dr != null)
+                var dr = db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault();
+                if (dr != null)
                 {
                     dr.project = -1;
                     db.SaveChanges();

SubProject/FPJ0000/Projects.cs

@@ -65,5 +65,6 @@ namespace FPJ0000
         public Nullable<double> EB_RepairTime { get; set; }
         public Nullable<double> EB_ConstNew { get; set; }
         public string EB_BoardName { get; set; }
+        public Nullable<bool> bAlert { get; set; }
     }
 }

SubProject/FPJ0000/Purchase.cs

@@ -48,5 +48,6 @@ namespace FPJ0000
         public string wuid { get; set; }
         public System.DateTime wdate { get; set; }
         public Nullable<int> inqty { get; set; }
+        public Nullable<decimal> pumpriceD { get; set; }
     }
 }

SubProject/FPJ0000/vUserWorkTimeList.cs

@@ -22,5 +22,6 @@ namespace FPJ0000
         public Nullable<double> hrs { get; set; }
         public Nullable<double> ot { get; set; }
         public string UserProcess { get; set; }
+        public Nullable<double> holyot { get; set; }
     }
 }