191024 chi 프로젝트 공유폴더 눌렀을떄 \\ 가 연속으로 붙는현상 수정

191018	chi	열저장방식 변경(필드명으로 저장)

Project/History.txt

@@ -1,6 +1,6 @@
 * 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인\
-
+191024	chi 프로젝트 공유폴더 눌렀을떄 \\ 가 연속으로 붙는현상 수정
-1910108	chi	열저장방식 변경(필드명으로 저장)
+191018	chi	열저장방식 변경(필드명으로 저장)
 			파트리스트 열 순서를 기존 사용 엑셀과 동일하게 정렬
 			파트리스트 적용부위 납기일 항목 추가 
 			파트리스트 가져오기 메뉴에 적용부위, 납기일 항목 추가

Project/Properties/AssemblyInfo.cs

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

Project/Properties/Settings.Designer.cs

@@ -27,7 +27,7 @@ namespace Project.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

Project/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
     <Setting Name="nilliila" Type="System.String" Scope="User">
       <Value Profile="(Default)">using System; 

Project/app.config

@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <connectionStrings>
-        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
+        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <userSettings>

SubProject/FBS0000/Properties/Settings.Designer.cs

@@ -27,7 +27,7 @@ namespace FBS0000.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

SubProject/FBS0000/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FBS0000/app.config

@@ -5,7 +5,7 @@
     <connectionStrings>
         <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
-        <add name="FBS0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
+        <add name="FBS0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
 </configuration>

SubProject/FCM0000/Properties/Settings.Designer.cs

@@ -27,7 +27,7 @@ namespace FCM0000.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

SubProject/FCM0000/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FCM0000/app.config

@@ -5,7 +5,7 @@
     <connectionStrings>
         <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
-        <add name="FCM0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
+        <add name="FCM0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
 </configuration>

SubProject/FCOMMON/DataBaseManager.cs

@@ -652,6 +652,37 @@ namespace FCOMMON
             else return null;
         }
 
+
+        public static System.Data.DataTable getUserProjectList(string userName)
+        {
+
+            System.Data.DataTable retval = new System.Data.DataTable();
+            retval.Columns.Add("Code");
+            retval.Columns.Add("Value");
+
+            var cn = getCn();
+            cn.Open();
+            var sql = "select idx,isnull(name,''),pdate  from Projects" +                
+                " where gcode='{0}'" +
+                " and  isnull(userManager,'') like '%{1}%'" +
+                " or  isnull(userMain,'') like '%{1}%'" +
+                " or  isnull(usersub,'') like '%{1}%'" +
+                " order by pdate desc,name";
+            sql = string.Format(sql, FCOMMON.info.Login.gcode, userName);
+            var cmd = new SqlCommand(sql, cn);
+            var rdr = cmd.ExecuteReader();
+            while (rdr.Read())
+            {
+                retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString() });
+            }
+            rdr.Close();
+            cmd.Dispose();
+            cn.Close();
+            cn.Dispose();
+            return retval;
+        }
+
+
         public static System.Data.DataTable getCodeTable(string GroupCode = "99")
         {
 

SubProject/FEQ0000/Properties/Settings.Designer.cs

@@ -27,7 +27,7 @@ namespace FEQ0000.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

SubProject/FEQ0000/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FEQ0000/Purchase/fPurchase_AddS.cs

@@ -132,7 +132,9 @@ namespace FEQ0000
             Application.DoEvents();
             tbPumName.Focus();
 
+
             //이미지를 불러온다.
+            pictureBox1.Tag = "";
             if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Deleted && dr.RowState != DataRowState.Added)
             {
                 if (dr.IspumidxNull() == false && dr.pumidx != -1)

SubProject/FEQ0000/app.config

@@ -3,7 +3,7 @@
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
+        <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

SubProject/FPJ0000/JobReport/fJobReport.Designer.cs

@@ -30,18 +30,18 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -84,7 +84,6 @@
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
             this.dtSD = new System.Windows.Forms.ToolStripTextBox();
@@ -96,14 +95,15 @@
             this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -474,101 +474,6 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 12;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청부서";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "패키지";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "상태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "업무형태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "시간";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "초과";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
-            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "requestpart";
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청부서";
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "package";
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "패키지";
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 86F;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태";
-            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType15;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "type";
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "업무형태";
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F;
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무분류";
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 80F;
-            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "projectName";
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 158F;
-            this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pidx";
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 39F;
-            numberCellType5.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "hrs";
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "시간";
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 52F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ot";
-            this.fpSpread1_Sheet1.Columns.Get(10).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "초과";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "description";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -667,6 +572,104 @@
             this.toolStripButton2.Text = "닫기";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 12;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청부서";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "패키지";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "업무형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "프로젝트(아이템)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "시간";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "초과";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
+            this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
+            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "requestpart";
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청부서";
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "package";
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "패키지";
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 86F;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태";
+            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "type";
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "업무형태";
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F;
+            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무분류";
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 80F;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "projectName";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "프로젝트(아이템)";
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 158F;
+            this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 39F;
+            numberCellType2.MaximumValue = 999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "hrs";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "시간";
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 52F;
+            numberCellType3.MaximumValue = 999999999999999D;
+            numberCellType3.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ot";
+            this.fpSpread1_Sheet1.Columns.Get(10).ForeColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "초과";
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "description";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // fJobReport
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -686,9 +689,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -740,7 +743,6 @@
         private System.Windows.Forms.ToolStripButton btFind;
         private System.Windows.Forms.ToolStripComboBox cmbUser;
         private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripButton btReport;
         private System.Windows.Forms.ToolStripLabel lbTime;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
@@ -750,5 +752,6 @@
         private System.Windows.Forms.ToolStripButton btReportDay;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/JobReport/fJobReport.cs

@@ -183,8 +183,31 @@ namespace FPJ0000
             this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request,FCOMMON.info.Login.gcode);
             RefreshTime();
             FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+            FormattingData();
         }
+        void FormattingData()
+        {
+            //삭제컬럼인덱스
+            this.fpSpread1.SuspendLayout();
+            var delindex = this.fpSpread1.ActiveSheet.Columns["pidx"].Index;
+            for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
+            {
+                var state = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
+                string stateStr = string.Empty;
+                if (state != null) stateStr = state.ToString();
 
+                switch (stateStr.ToLower())
+                {
+                    case "-1":
+                        this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Gold;
+                        break;
+                    default:
+                        this.fpSpread1.ActiveSheet.Rows[i].BackColor = SystemColors.Window;
+                        break;
+                }
+            }
+            this.fpSpread1.ResumeLayout();
+        }
         void funcSave()
         {
             this.Validate();
@@ -192,6 +215,7 @@ namespace FPJ0000
             try
             {
                 this.tam.UpdateAll(this.dsMSSQL);
+                FormattingData();
             }
             catch (Exception ex)
             {
@@ -286,6 +310,7 @@ namespace FPJ0000
                 this.dsMSSQL.JobReport.AddJobReportRow(newdr);
                 int cnt = this.ta.Update(newdr);
                 newdr.AcceptChanges();
+                FormattingData();
                 if (cnt != 1)
                     FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
             }
@@ -355,6 +380,7 @@ namespace FPJ0000
                 {
                     int cnt = this.ta.Update(dr);
                     dr.AcceptChanges();
+                    FormattingData();
                 }
             }
             else dr.RejectChanges();

SubProject/FPJ0000/JobReport/fJobReport.resx

@@ -246,9 +246,6 @@
         GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>325, 17</value>
   </metadata>

SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs

@@ -49,7 +49,6 @@
             this.tbDescription = new System.Windows.Forms.TextBox();
             this.dtPdate = new System.Windows.Forms.DateTimePicker();
             this.cmbUser = new System.Windows.Forms.ComboBox();
-            this.tbProject = new System.Windows.Forms.TextBox();
             this.tbProjectIndex = new System.Windows.Forms.TextBox();
             this.tbOt = new System.Windows.Forms.TextBox();
             this.tbWW = new System.Windows.Forms.TextBox();
@@ -60,6 +59,7 @@
             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.chkAutoAdd = new System.Windows.Forms.CheckBox();
+            this.tbProject = new System.Windows.Forms.ComboBox();
             hrsLabel = new System.Windows.Forms.Label();
             typeLabel = new System.Windows.Forms.Label();
             label1 = new System.Windows.Forms.Label();
@@ -112,7 +112,7 @@
             // projectLabel
             // 
             projectLabel.AutoSize = true;
-            projectLabel.Location = new System.Drawing.Point(30, 74);
+            projectLabel.Location = new System.Drawing.Point(30, 73);
             projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             projectLabel.Name = "projectLabel";
             projectLabel.Size = new System.Drawing.Size(103, 12);
@@ -257,16 +257,6 @@
             this.cmbUser.TabIndex = 6;
             this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
             // 
-            // tbProject
-            // 
-            this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.tbProject.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbProject.Location = new System.Drawing.Point(141, 69);
-            this.tbProject.Margin = new System.Windows.Forms.Padding(4);
-            this.tbProject.Name = "tbProject";
-            this.tbProject.Size = new System.Drawing.Size(311, 21);
-            this.tbProject.TabIndex = 8;
-            // 
             // tbProjectIndex
             // 
             this.tbProjectIndex.Location = new System.Drawing.Point(458, 69);
@@ -363,11 +353,23 @@
             this.chkAutoAdd.Text = "프로젝트 주간내역으로 등록";
             this.chkAutoAdd.UseVisualStyleBackColor = true;
             // 
+            // tbProject
+            // 
+            this.tbProject.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.tbProject.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbProject.FormattingEnabled = true;
+            this.tbProject.Location = new System.Drawing.Point(140, 69);
+            this.tbProject.Name = "tbProject";
+            this.tbProject.Size = new System.Drawing.Size(311, 20);
+            this.tbProject.TabIndex = 55;
+            // 
             // fJobReport_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(538, 465);
+            this.Controls.Add(this.tbProject);
             this.Controls.Add(this.chkAutoAdd);
             this.Controls.Add(label5);
             this.Controls.Add(this.lbSummary);
@@ -380,7 +382,6 @@
             this.Controls.Add(label4);
             this.Controls.Add(this.tbOt);
             this.Controls.Add(projectLabel);
-            this.Controls.Add(this.tbProject);
             this.Controls.Add(this.tbProjectIndex);
             this.Controls.Add(this.cmbUser);
             this.Controls.Add(this.dtPdate);
@@ -423,7 +424,6 @@
         private System.Windows.Forms.TextBox tbDescription;
         private System.Windows.Forms.DateTimePicker dtPdate;
         private System.Windows.Forms.ComboBox cmbUser;
-        private System.Windows.Forms.TextBox tbProject;
         private System.Windows.Forms.TextBox tbProjectIndex;
         private System.Windows.Forms.TextBox tbOt;
         private System.Windows.Forms.TextBox tbWW;
@@ -433,5 +433,6 @@
         private System.Windows.Forms.ComboBox cmbRequest;
         private System.Windows.Forms.Label lbSummary;
         private System.Windows.Forms.CheckBox chkAutoAdd;
+        private System.Windows.Forms.ComboBox tbProject;
     }
 }

SubProject/FPJ0000/JobReport/fJobReport_Add.cs

@@ -13,6 +13,7 @@ namespace FPJ0000.JobReport
     {
         dsPRJ.JobReportRow dr;
         Boolean copyMOde = false;
+        Boolean bInit = false;
         public fJobReport_Add(dsPRJ.JobReportRow dr_,Boolean copy=false)
         {
             InitializeComponent();
@@ -32,6 +33,30 @@ namespace FPJ0000.JobReport
                 }
             }
             copyMOde = copy;
+            this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged;
+        }
+
+        void tbProject_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (bInit==false || this.tbProject.SelectedIndex < 0) return;
+            var data = this.tbProject.SelectedValue;
+            if (data == null) return;
+            if(data.GetType() == typeof(DataRowView))
+            {
+                var drv = data as DataRowView;
+                var idx = int.Parse(drv["Code"].ToString());
+                tbProjectIndex.Text = idx.ToString();
+                tbProject.Tag = tbProject.Text;
+                Console.WriteLine(string.Format("Project Select #1 {0}:{1}",idx,tbProject.Text));
+            }
+            else
+            {
+                var idx = int.Parse(data.ToString());
+                tbProjectIndex.Text = idx.ToString();
+                tbProject.Tag = tbProject.Text;
+                Console.WriteLine(string.Format("Project Select #2 {0}:{1}", idx, tbProject.Text));
+            }
+
         }
 
         private void fJobReport_Add_Load(object sender, EventArgs e)
@@ -39,6 +64,12 @@ namespace FPJ0000.JobReport
             //사용자목록
             this.bs.DataSource = dr;
 
+            //해당 사용자에 걸린 프로젝트 목록 가져오기
+            var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK);
+            this.tbProject.DataSource = userProject;
+            this.tbProject.ValueMember = "Code";
+            this.tbProject.DisplayMember = "Value";
+
             //상태
             var stateList = FCOMMON.DBM.getCodeTable("12");
             this.cmbState.DisplayMember = "Value";
@@ -119,8 +150,10 @@ namespace FPJ0000.JobReport
                 tbProject.Focus();
                 tbProject.SelectAll();
             }
-
+            tbProject.Tag = tbProject.Text;
+            bInit = true;
         }
+
         void ctl_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -194,7 +227,7 @@ namespace FPJ0000.JobReport
                         else
                         {
                             FCOMMON.Util.MsgE("프로젝트 혹은 아이템이름은 반드시 입력되어야 합니다.");
-                            var tb = sender as TextBox;
+                            var tb = sender as ComboBox;
                             tb.SelectAll();
                             tb.Focus();
                         }
@@ -256,6 +289,15 @@ namespace FPJ0000.JobReport
                 return;
             }
 
+            if(tbProject.Tag.ToString() != tbProject.Text && tbProjectIndex.Text != "" && tbProjectIndex.Text != "-1")
+            {
+                FCOMMON.Util.MsgE("프로젝트가 선택되었으나 이름이 임의 수정되어 프로젝트 연결을 해제 합니다\n\n" +
+                    "잘못된 프로젝트명은 프로젝트 관리화면에서 변경하시기 바랍니다.\n\n"+
+                    "원본 : " + tbProject.Tag.ToString() + "\n" + 
+                    "현재 : " + tbProject.Text);
+                tbProjectIndex.Text = "-1";
+            }
+
             ///휴일체크
             var taQ = new dsQueryTableAdapters.QueriesTableAdapter();
             var freeday = taQ.CheckHoliday(dtPdate.Value.ToShortDateString());

SubProject/FPJ0000/JobReport/rJobReport.rdlc

@@ -78,7 +78,7 @@
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                                 <Color>=iif(Fields!hrs.Value &gt; Fields!total.Value,
 "Blue",
 iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
@@ -120,7 +120,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                                 <Color>=iif(Sum(Fields!ot.Value, "DataSet1")=0,"White","Black")</Color>
                               </Style>
                             </TextRun>
@@ -159,7 +159,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -201,7 +201,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                                 <Color>=iif(Sum(Fields!ot.Value, "DataSet1")=0,"White","Black")</Color>
                               </Style>
                             </TextRun>
@@ -249,7 +249,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -291,7 +291,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                                 <Color>=iif(Sum(Fields!ot.Value, "DataSet1")=0,"White","Black")</Color>
                               </Style>
                             </TextRun>
@@ -334,7 +334,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -376,7 +376,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Format>N0</Format>
+                                <Format>N1</Format>
                                 <Color>=iif(Sum(Fields!ot.Value, "DataSet1")=0,"White","Black")</Color>
                               </Style>
                             </TextRun>
@@ -784,7 +784,7 @@ iif(Fields!hrs.Value &lt; Fields!total.Value,"Red","Black")
         </TablixRowHierarchy>
         <DataSetName>DataSet1</DataSetName>
         <Height>2.4cm</Height>
-        <Width>6.33521cm</Width>
+        <Width>6.33522cm</Width>
         <Style>
           <Border>
             <Style>None</Style>

SubProject/FPJ0000/JobReport/rJobReportDay.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsReport = new FPJ0000.dsReport();
             this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
@@ -56,9 +56,9 @@
             // reportViewer1
             // 
             this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource2.Name = "DataSet1";
+            reportDataSource1.Name = "DataSet1";
-            reportDataSource2.Value = this.bs;
+            reportDataSource1.Value = this.bs;
-            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
+            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
             this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport.rJobReportDay.rdlc";
             this.reportViewer1.Location = new System.Drawing.Point(0, 42);
             this.reportViewer1.Name = "reportViewer1";
@@ -119,7 +119,7 @@
             this.Controls.Add(this.reportViewer1);
             this.Controls.Add(this.panel1);
             this.Name = "rJobReportDay";
-            this.Text = "일/개인별 근무시간 집계";
+            this.Text = "일/개인별 근무시간 집계(+OT 포함)";
             this.Load += new System.EventHandler(this.rJobReport_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();

SubProject/FPJ0000/JobReport/rJobReportDay.rdlc

@@ -68,11 +68,12 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!hrs.Value)</Value>
+                              <Value>=Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
-                                <Color>=iif(Sum(Fields!hrs.Value)&lt;8,"Red",iif(Sum(Fields!hrs.Value)&gt;8,"Blue","Black"))</Color>
+                                <Format>N1</Format>
+                                <Color>=iif(Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)&lt;8,"Red",iif(Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)&gt;8,"Blue","Black"))</Color>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -106,10 +107,11 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!hrs.Value)</Value>
+                              <Value>=Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -147,10 +149,11 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!hrs.Value)</Value>
+                              <Value>=Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -186,10 +189,11 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!hrs.Value)</Value>
+                              <Value>=Sum(Fields!hrs.Value)+Sum(Fields!ot.Value)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
+                                <Format>N1</Format>
                               </Style>
                             </TextRun>
                           </TextRuns>

SubProject/FPJ0000/JobReport/rJobReportDay.resx

@@ -123,9 +123,6 @@
   <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="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>245, 17</value>
   </metadata>

SubProject/FPJ0000/Project/fProjectData.Designer.cs

@@ -182,7 +182,7 @@
             // reqstaffLabel
             // 
             reqstaffLabel.AutoSize = true;
-            reqstaffLabel.Location = new System.Drawing.Point(378, 37);
+            reqstaffLabel.Location = new System.Drawing.Point(378, 36);
             reqstaffLabel.Name = "reqstaffLabel";
             reqstaffLabel.Size = new System.Drawing.Size(41, 12);
             reqstaffLabel.TabIndex = 8;
@@ -263,7 +263,7 @@
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(205, 37);
+            label1.Location = new System.Drawing.Point(205, 36);
             label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label1.Name = "label1";
             label1.Size = new System.Drawing.Size(29, 12);
@@ -302,7 +302,7 @@
             // label6
             // 
             label6.AutoSize = true;
-            label6.Location = new System.Drawing.Point(56, 37);
+            label6.Location = new System.Drawing.Point(56, 36);
             label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label6.Name = "label6";
             label6.Size = new System.Drawing.Size(29, 12);
@@ -371,7 +371,7 @@
             // 
             this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true));
             this.reqstaffTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.reqstaffTextBox.Location = new System.Drawing.Point(425, 34);
+            this.reqstaffTextBox.Location = new System.Drawing.Point(425, 32);
             this.reqstaffTextBox.Name = "reqstaffTextBox";
             this.reqstaffTextBox.Size = new System.Drawing.Size(113, 21);
             this.reqstaffTextBox.TabIndex = 9;

SubProject/FPJ0000/Project/fProjectData.cs

@@ -196,7 +196,6 @@ namespace FPJ0000
             {
                 System.Windows.Forms.MessageBox.Show(ex.Message);
             }
-
         }
 
         private void btwEdit_Click(object sender, EventArgs e)
@@ -220,13 +219,41 @@ namespace FPJ0000
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             if (tbPath.Text == "") tbPath.Text = "/" + tbIdx.Text;
-            var f = new FCOMMON.fFTPExplorer(nameTextBox.Text, tbPath.Text,
+
-                FCOMMON.info.ftp_ip,
+            if(tbPath.Text.StartsWith("\\")==false)
-                FCOMMON.info.ftp_id,
+            {
-                FCOMMON.info.ftp_pw,
+                if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\");
-                FCOMMON.info.ftp_port,
+                else tbPath.Text = "\\" + tbPath.Text;
-                FCOMMON.info.ftp_passive);
+            }
-            f.ShowDialog();
+            
+            var serverpath = @"\\10.131.36.57\Data\Project";
+            if (System.IO.Directory.Exists(serverpath) == false)
+            {
+                FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
+                    serverpath);
+                return;
+            }
+
+            var path = serverpath + tbPath.Text;
+            if (System.IO.Directory.Exists(path) == false)
+            {
+                try
+                {
+                    System.IO.Directory.CreateDirectory(path);
+
+                    string[] subdir = new string[] { "Source", "Document", "Draw","Estimate" };
+                    foreach (var dir in subdir)
+                        System.IO.Directory.CreateDirectory(path + "\\" + dir);
+
+                }
+                catch (Exception eX)
+                {
+                    FCOMMON.Util.MsgE("프로젝트 저장소 생성실패\n" + eX.Message);
+                    return;
+                }
+            }
+
+            FCOMMON.Util.RunExplorer(path);
         }
         void SelectDate(TextBox ctl)
         {

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -95,6 +95,8 @@
             this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
             this.cmbYearE = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbCate = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.chk검토 = new System.Windows.Forms.ToolStripButton();
             this.chk대기 = new System.Windows.Forms.ToolStripButton();
@@ -139,8 +141,6 @@
             this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.panel3 = new System.Windows.Forms.Panel();
-            this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
-            this.cmbCate = new System.Windows.Forms.ToolStripComboBox();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -572,6 +572,28 @@
             this.cmbYearE.Name = "cmbYearE";
             this.cmbYearE.Size = new System.Drawing.Size(75, 27);
             // 
+            // toolStripLabel6
+            // 
+            this.toolStripLabel6.Name = "toolStripLabel6";
+            this.toolStripLabel6.Size = new System.Drawing.Size(31, 24);
+            this.toolStripLabel6.Text = "분류";
+            // 
+            // cmbCate
+            // 
+            this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbCate.Items.AddRange(new object[] {
+            "---",
+            "Origin Cost",
+            "Input Cost",
+            "Effect Cost",
+            "Asset No",
+            "Project",
+            "Champion",
+            "Requestor",
+            "Process"});
+            this.cmbCate.Name = "cmbCate";
+            this.cmbCate.Size = new System.Drawing.Size(100, 27);
+            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -1062,28 +1084,6 @@
             this.panel3.Size = new System.Drawing.Size(1384, 218);
             this.panel3.TabIndex = 7;
             // 
-            // toolStripLabel6
-            // 
-            this.toolStripLabel6.Name = "toolStripLabel6";
-            this.toolStripLabel6.Size = new System.Drawing.Size(31, 24);
-            this.toolStripLabel6.Text = "분류";
-            // 
-            // cmbCate
-            // 
-            this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbCate.Items.AddRange(new object[] {
-            "---",
-            "Origin Cost",
-            "Input Cost",
-            "Effect Cost",
-            "Asset No",
-            "Project",
-            "Champion",
-            "Requestor",
-            "Process"});
-            this.cmbCate.Name = "cmbCate";
-            this.cmbCate.Size = new System.Drawing.Size(100, 27);
-            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
@@ -1155,7 +1155,7 @@
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part";

SubProject/FPJ0000/Project/fProjectList.resx

@@ -257,7 +257,7 @@
     <value>248, 17</value>
   </metadata>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>828, 17</value>
   </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>455, 17</value>

SubProject/FPJ0000/Properties/Settings.Designer.cs

@@ -27,7 +27,7 @@ namespace FPJ0000.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

SubProject/FPJ0000/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FPJ0000/app.config

@@ -5,7 +5,7 @@
     <connectionStrings>
         <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
-        <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
+        <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
 </configuration>