구매입력시 엔터키, 기본 일자 조회범위를 90일로 변경.

Project/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace Project.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));
@@ -38,7 +38,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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string CS {
             get {
                 return ((string)(this["CS"]));

Project/Properties/Settings.settings

@@ -4,18 +4,19 @@
   <Settings>
     <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;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&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;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&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=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
     <Setting Name="CS" 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;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&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;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&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=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
   </Settings>
 </SettingsFile>

Project/app.config

@@ -2,16 +2,26 @@
 <configuration>
   <configSections></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=Amkor123!" providerName="System.Data.SqlClient" />
+    <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!;Encrypt=False;TrustServerCertificate=True"
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+      providerName="System.Data.SqlClient" />
-    <add name="EEEntities1" connectionString="metadata=res://*/ModelMain.csdl|res://*/ModelMain.ssdl|res://*/ModelMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;user id=eeuser;password=Amkor123!;connect timeout=30;encrypt=False;trustservercertificate=False;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-    <add name="EEEntitiesMain" connectionString="metadata=res://*/AdoNetEFMain.csdl|res://*/AdoNetEFMain.ssdl|res://*/AdoNetEFMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;user id=eeuser;password=Amkor123!;connect timeout=30;encrypt=False;trustservercertificate=False;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+      providerName="System.Data.EntityClient" />
-    <add name="S1ACCESS300Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.141.18.50;initial catalog=S1ACCESS300;persist security info=True;user id=amkoruser;password=AmkorUser!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="EEEntities1" connectionString="metadata=res://*/ModelMain.csdl|res://*/ModelMain.ssdl|res://*/ModelMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;user id=eeuser;password=Amkor123!;connect timeout=30;encrypt=False;trustservercertificate=False;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-    <add name="EEEntitiesPurchase" connectionString="metadata=res://*/ModelPurchase.csdl|res://*/ModelPurchase.ssdl|res://*/ModelPurchase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+      providerName="System.Data.EntityClient" />
-    <add name="EEEntitiesCommon" connectionString="metadata=res://*/ModelCommon.csdl|res://*/ModelCommon.ssdl|res://*/ModelCommon.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesMain" connectionString="metadata=res://*/AdoNetEFMain.csdl|res://*/AdoNetEFMain.ssdl|res://*/AdoNetEFMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;user id=eeuser;password=Amkor123!;connect timeout=30;encrypt=False;trustservercertificate=False;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-    <add name="EEEntitiesJobreport" connectionString="metadata=res://*/ModelJobreport.csdl|res://*/ModelJobreport.ssdl|res://*/ModelJobreport.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+      providerName="System.Data.EntityClient" />
-    <add name="EEEntitiesProject" connectionString="metadata=res://*/ModelProject.csdl|res://*/ModelProject.ssdl|res://*/ModelProject.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="S1ACCESS300Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.141.18.50;initial catalog=S1ACCESS300;persist security info=True;user id=amkoruser;password=AmkorUser!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-    <add name="Project.Properties.Settings.CS" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" />
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesPurchase" connectionString="metadata=res://*/ModelPurchase.csdl|res://*/ModelPurchase.ssdl|res://*/ModelPurchase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesCommon" connectionString="metadata=res://*/ModelCommon.csdl|res://*/ModelCommon.ssdl|res://*/ModelCommon.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesJobreport" connectionString="metadata=res://*/ModelJobreport.csdl|res://*/ModelJobreport.ssdl|res://*/ModelJobreport.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesProject" connectionString="metadata=res://*/ModelProject.csdl|res://*/ModelProject.ssdl|res://*/ModelProject.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="Project.Properties.Settings.CS" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

SubProject/FBS0000/Holiday/rHolidaySummary.cs

@@ -110,7 +110,8 @@ namespace FBS0000
                     else if (catename.StartsWith("이월")) newdr.orderno = 0;
                     else newdr.orderno = 2;
 
-                    this.dsReport.holydatasum.AddholydatasumRow(newdr);
+                    if (newdr.dr == 0 && newdr.drday == 0 && newdr.cr == 0 && newdr.crday == 0) newdr.Delete();
+                    else this.dsReport.holydatasum.AddholydatasumRow(newdr);
                 }
             }
             this.dsReport.holydatasum.AcceptChanges();
@@ -173,7 +174,7 @@ namespace FBS0000
 
 
             //최종합계추가
-            this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계(대체/외출 제외)";
             var grpstart2 = headercol;
             foreach (var colname in subcols)
             {
@@ -194,9 +195,9 @@ namespace FBS0000
                     var col = 0;
                     var druser = dr.First();
 
-                    if(row % 2 == 0)
+                    if (row % 2 == 0)
                     {
-                        fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80,Color.LightSkyBlue);
+                        fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80, Color.LightSkyBlue);
                     }
                     else fpSpread1_Sheet1.Rows[row].BackColor = Color.White;
 
@@ -261,12 +262,15 @@ namespace FBS0000
                         else cateColumn++;
 
 
-
+                        if (cateName.StartsWith("대체") == false && cateName.StartsWith("외출") == false)
+                        {
                             sum_이월 += 이월;
                             sum_발생 += 발생;
                             sum_사용 += 사용;
                             sum_잔여 += 잔여;
                             sum_초과 += 초과;
+                        }
+
                         if (cateColumn > lastcol) lastcol = cateColumn;
                     }
 
@@ -303,8 +307,8 @@ namespace FBS0000
             fpSpread1_Sheet1.SetFormula(row, 3, $"SUM(R1C4:R{row}C4)");
 
             //0번컬럼은 색상을 초기화
-            for(int i = 0; i < fpSpread1_Sheet1.RowCount;i++)
+            for (int i = 0; i < fpSpread1_Sheet1.RowCount; i++)
-            fpSpread1_Sheet1.Cells[i,0].BackColor = Color.White;
+                fpSpread1_Sheet1.Cells[i, 0].BackColor = Color.White;
 
 
 
@@ -346,7 +350,7 @@ namespace FBS0000
                     title = fpSpread1_Sheet1.ColumnHeader.Cells[0, i].Text;
                 }
                 var title2 = fpSpread1_Sheet1.ColumnHeader.Cells[1, i].Text;
-                if(title != "년차" && title != "합계"  && title2 == "초과")
+                if (title != "년차" && title != "합계" && title2 == "초과")
                 {
                     fpSpread1_Sheet1.Columns[i].Visible = false;
                 }

SubProject/FEQ0000/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace FEQ0000.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=True;TrustServerCertificate=True")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));
@@ -38,7 +38,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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string EEEntities {
             get {
                 return ((string)(this["EEEntities"]));

SubProject/FEQ0000/Properties/Settings.settings

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

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs

@@ -166,8 +166,6 @@ namespace FEQ0000
             }
             else cmbReceive.Text = dr.receive;
 
-
-
             tbSID.Text = dr.sid;
             tbSID.Tag = tbSID.Text;
             tbStorage.Text = dr.place;
@@ -373,6 +371,9 @@ namespace FEQ0000
                     case "tbsupply":
                         Lov_Supply(search, false);
                         break;
+                    case "tbbigo":
+                        e.Handled = true;
+                        break;
                     default:
                         SendKeys.Send("{TAB}");
                         break;

SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs

@@ -40,27 +40,28 @@
             FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
@@ -145,9 +146,9 @@
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.btViewDel = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -882,7 +883,30 @@
             this.fpSpread1.TabIndex = 4;
             this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
             this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
-            this.fpSpread1.SetViewportLeftColumn(0, 0, 1);
+            // 
+            // label1
+            // 
+            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.label1.Location = new System.Drawing.Point(0, 644);
+            this.label1.Name = "label1";
+            this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
+            this.label1.Size = new System.Drawing.Size(1334, 23);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "--";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.label2.Location = new System.Drawing.Point(0, 621);
+            this.label2.Name = "label2";
+            this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
+            this.label2.Size = new System.Drawing.Size(1334, 23);
+            this.label2.TabIndex = 7;
+            this.label2.Text = "--";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // fpSpread1_Sheet1
             // 
@@ -890,7 +914,7 @@
             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 = 33;
+            this.fpSpread1_Sheet1.ColumnCount = 34;
             this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
             this.fpSpread1_Sheet1.ActiveRowIndex = -1;
             this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -898,31 +922,31 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE";
             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, 5).Value = "SC#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SC#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SCR/CF";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "SCR/CF";
-            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, 8).Value = "SID#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "SID#";
-            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, 10).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "규격";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "규격";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "수량\r\n(요청)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량\r\n(요청)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량\r\n(구매)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "수량\r\n(구매)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단위";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단위";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단가\r\n(해외)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "단가\r\n(해외)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "통화";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "통화";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "단가";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "합계금액";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "합계금액";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "공급업체";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "공급업체";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고(구매사유)\r\n(요청자)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "입고예정";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고(구매사유)\r\n(요청자)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고예정";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고수량";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "PO#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고수량";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "PO#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "삭제됨";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
@@ -960,100 +984,106 @@
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 100F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "oversea";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청";
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName";
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 70F;
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestName";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "요청";
-            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc";
+            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "requestName";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF";
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "SC#";
-            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf";
+            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "sc";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "orderno";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "SCR/CF";
-            this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName";
+            this.fpSpread1_Sheet1.Columns.Get(7).Tag = "crcf";
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
             this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "receiveName";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "수령";
-            this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid";
+            this.fpSpread1_Sheet1.Columns.Get(8).Tag = "receiveName";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoSort = true;
             this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sid";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "SID#";
-            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname";
+            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "sid";
+            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(9).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumname";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "품명";
+            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumname";
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(11).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(10).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumidx";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
-            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).Tag = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumscale";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "규격";
+            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumscale";
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F;
             numberCellType2.DecimalPlaces = 0;
             numberCellType2.NegativeRed = true;
             numberCellType2.NullDisplay = "--";
             numberCellType2.Separator = ",";
             numberCellType2.ShowSeparator = true;
             numberCellType2.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqtyReq";
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqtyReq";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량\r\n(요청)";
-            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumqty";
-            this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F;
-            numberCellType3.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(구매)";
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(요청)";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
+            numberCellType3.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit";
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위";
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량\r\n(구매)";
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 119F;
-            numberCellType4.DecimalPlaces = 2;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumunit";
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumpriceD";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "단위";
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가\r\n(해외)";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            numberCellType4.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "currency";
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumpriceD";
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "통화";
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "단가\r\n(해외)";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "currency";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "통화";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F;
             numberCellType5.DecimalPlaces = 0;
             numberCellType5.MaximumValue = 9999999999999.99D;
             numberCellType5.MinimumValue = -9999999999999.99D;
@@ -1062,12 +1092,12 @@
             numberCellType5.Separator = ",";
             numberCellType5.ShowSeparator = true;
             numberCellType5.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice";
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가";
+            this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가";
-            this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice";
+            this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice";
-            this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F;
             numberCellType6.DecimalPlaces = 0;
             numberCellType6.MaximumValue = 9999999999999.99D;
             numberCellType6.MinimumValue = -9999999999999.99D;
@@ -1076,118 +1106,118 @@
             numberCellType6.Separator = ",";
             numberCellType6.ShowSeparator = true;
             numberCellType6.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt";
+            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt";
-            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액";
+            this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액";
-            this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt";
+            this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt";
-            this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply";
-            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체";
-            this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체";
+            this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             numberCellType7.DecimalPlaces = 0;
             numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
             numberCellType7.MaximumValue = 2147483647D;
             numberCellType7.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx";
+            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx";
-            this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(21).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(20).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(21).Visible = false;
-            this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             numberCellType8.DecimalPlaces = 0;
             numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
             numberCellType8.MaximumValue = 2147483647D;
             numberCellType8.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "projectidx";
+            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx";
-            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(21).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(22).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(21).Tag = "projectidx";
+            this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx";
-            this.fpSpread1_Sheet1.Columns.Get(21).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(22).Visible = false;
-            this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F;
-            textCellType15.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
-            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고(구매사유)\r\n(요청자)";
-            this.fpSpread1_Sheet1.Columns.Get(22).Tag = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 119F;
+            textCellType16.WordWrap = true;
             this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고예정";
+            this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고(구매사유)\r\n(요청자)";
+            this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일";
+            this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정";
-            this.fpSpread1_Sheet1.Columns.Get(24).Tag = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일";
+            this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F;
             numberCellType9.DecimalPlaces = 0;
             numberCellType9.NegativeRed = true;
             numberCellType9.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty";
+            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty";
-            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고수량";
-            this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty";
-            this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(26).Label = "PO#";
+            this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량";
-            this.fpSpread1_Sheet1.Columns.Get(26).Tag = "po";
+            this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty";
+            this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F;
-            textCellType19.WordWrap = true;
             this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "chkremark";
+            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po";
-            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(27).Label = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#";
-            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po";
             this.fpSpread1_Sheet1.Columns.Get(27).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType1;
+            textCellType20.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨";
+            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "chkremark";
-            this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(28).Label = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel";
-            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨";
-            this.fpSpread1_Sheet1.Columns.Get(29).ForeColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel";
-            this.fpSpread1_Sheet1.Columns.Get(29).Tag = "idx";
-            this.fpSpread1_Sheet1.Columns.Get(29).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(29).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(30).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "conf_status";
+            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(30).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(30).Tag = "conf_status";
+            this.fpSpread1_Sheet1.Columns.Get(30).Tag = "idx";
             this.fpSpread1_Sheet1.Columns.Get(30).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(31).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_request";
+            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(31).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_request";
+            this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(31).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(31).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(32).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_reponse";
+            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(32).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_reponse";
+            this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(32).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(32).Width = 119F;
+            this.fpSpread1_Sheet1.Columns.Get(33).BackColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "conf_reponse";
+            this.fpSpread1_Sheet1.Columns.Get(33).ForeColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(33).Tag = "conf_reponse";
+            this.fpSpread1_Sheet1.Columns.Get(33).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(33).Width = 119F;
             this.fpSpread1_Sheet1.DataAutoCellTypes = false;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -1195,30 +1225,6 @@
             this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
-            // label1
-            // 
-            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.label1.Location = new System.Drawing.Point(0, 644);
-            this.label1.Name = "label1";
-            this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
-            this.label1.Size = new System.Drawing.Size(1334, 23);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "--";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.label2.Location = new System.Drawing.Point(0, 621);
-            this.label2.Name = "label2";
-            this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
-            this.label2.Size = new System.Drawing.Size(1334, 23);
-            this.label2.TabIndex = 7;
-            this.label2.Text = "--";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // fPurchaseEB
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1329,7 +1335,6 @@
         private System.Windows.Forms.ToolStripButton toolStripButton8;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
         private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem;
@@ -1337,5 +1342,6 @@
         private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem btMakeItemsData;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx

@@ -427,7 +427,7 @@
 </value>
   </data>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>577, 17</value>
+    <value>579, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>65</value>

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs

@@ -49,6 +49,7 @@
             System.Windows.Forms.Label label15;
             System.Windows.Forms.Label label18;
             System.Windows.Forms.Label label2;
+            System.Windows.Forms.Label label4;
             this.tbSC = new System.Windows.Forms.TextBox();
             this.tbSID = new System.Windows.Forms.TextBox();
             this.tbPumName = new System.Windows.Forms.TextBox();
@@ -71,6 +72,7 @@
             this.chkInDate = new System.Windows.Forms.CheckBox();
             this.btSaveAdd = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lbcurrentwon = new System.Windows.Forms.Label();
             this.cmbDept = new System.Windows.Forms.ComboBox();
             this.cmbSite = new System.Windows.Forms.ComboBox();
             this.cmbRemark = new System.Windows.Forms.ComboBox();
@@ -94,7 +96,7 @@
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
-            this.lbcurrentwon = new System.Windows.Forms.Label();
+            this.cmbOverSeas = new System.Windows.Forms.ComboBox();
             receiveLabel = new System.Windows.Forms.Label();
             scLabel = new System.Windows.Forms.Label();
             sidLabel = new System.Windows.Forms.Label();
@@ -114,6 +116,7 @@
             label15 = new System.Windows.Forms.Label();
             label18 = new System.Windows.Forms.Label();
             label2 = new System.Windows.Forms.Label();
+            label4 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -591,6 +594,18 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "필수입력";
             // 
+            // lbcurrentwon
+            // 
+            this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue;
+            this.lbcurrentwon.Location = new System.Drawing.Point(312, 202);
+            this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbcurrentwon.Name = "lbcurrentwon";
+            this.lbcurrentwon.Size = new System.Drawing.Size(161, 28);
+            this.lbcurrentwon.TabIndex = 55;
+            this.lbcurrentwon.Text = "통화기호를 선택하세요";
+            this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // cmbDept
             // 
             this.cmbDept.FormattingEnabled = true;
@@ -700,6 +715,8 @@
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.Gainsboro;
+            this.groupBox2.Controls.Add(this.cmbOverSeas);
+            this.groupBox2.Controls.Add(label4);
             this.groupBox2.Controls.Add(this.dtExpDate);
             this.groupBox2.Controls.Add(this.chkExp);
             this.groupBox2.Controls.Add(this.cmbReceive);
@@ -826,17 +843,29 @@
             // 
             this.purchaseTableAdapter.ClearBeforeFill = true;
             // 
-            // lbcurrentwon
+            // cmbOverSeas
             // 
-            this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.cmbOverSeas.FormattingEnabled = true;
-            this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue;
+            this.cmbOverSeas.ImeMode = System.Windows.Forms.ImeMode.Alpha;
-            this.lbcurrentwon.Location = new System.Drawing.Point(312, 202);
+            this.cmbOverSeas.Items.AddRange(new object[] {
-            this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            "NR",
-            this.lbcurrentwon.Name = "lbcurrentwon";
+            "SPR",
-            this.lbcurrentwon.Size = new System.Drawing.Size(161, 28);
+            "전자실"});
-            this.lbcurrentwon.TabIndex = 55;
+            this.cmbOverSeas.Location = new System.Drawing.Point(136, 346);
-            this.lbcurrentwon.Text = "통화기호를 선택하세요";
+            this.cmbOverSeas.Margin = new System.Windows.Forms.Padding(4);
-            this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cmbOverSeas.Name = "cmbOverSeas";
+            this.cmbOverSeas.Size = new System.Drawing.Size(265, 28);
+            this.cmbOverSeas.TabIndex = 54;
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new System.Drawing.Point(5, 350);
+            label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label4.Name = "label4";
+            label4.Size = new System.Drawing.Size(123, 20);
+            label4.TabIndex = 53;
+            label4.Text = "Overseas Budget";
             // 
             // fPurchaseEB_Add
             // 
@@ -916,5 +945,6 @@
         private System.Windows.Forms.CheckBox chkExp;
         private System.Windows.Forms.ComboBox cmbDept;
         private System.Windows.Forms.Label lbcurrentwon;
+        private System.Windows.Forms.ComboBox cmbOverSeas;
     }
 }

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs

@@ -117,6 +117,12 @@ namespace FEQ0000
             this.cmbCurrency.ValueMember = "Value";
             this.cmbCurrency.DataSource = LstCur;
 
+            //oversea
+            var LstOverSea = FCOMMON.DBM.getCodeTable("30");
+            this.cmbOverSeas.DisplayMember = "Value";
+            this.cmbOverSeas.ValueMember = "Value";
+            this.cmbOverSeas.DataSource = LstOverSea;
+
 
             //구매자비고
             var LstRemark = FCOMMON.DBM.getCodeList("70");
@@ -233,6 +239,8 @@ namespace FEQ0000
             cmbState.Text = dr.state;
             cmbSite.Text = dr.site;
             cmbDept.Text = dr.dept;
+            cmbOverSeas.Text = dr.oversea;
+
             tbSC.Text = dr.sc;
             tbPO.Text = dr.po;
       
@@ -353,6 +361,9 @@ namespace FEQ0000
                     case "tbsupply":
                         Lov_Supply(search, false);
                         break;
+                    case "tbbigo":
+                        e.Handled = true;
+                        break;
                     default:
                         SendKeys.Send("{TAB}");
                         break;
@@ -589,6 +600,7 @@ namespace FEQ0000
             dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text);
             dr.currency = cmbCurrency.Text.Trim();
             dr.place = "전자실";
+            dr.oversea = cmbOverSeas.Text.Trim();
 
             if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced))
             {

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx

@@ -205,6 +205,9 @@
 * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
 * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
   </data>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>587, 17</value>
   </metadata>

SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs

@@ -115,7 +115,7 @@ namespace FEQ0000
             this.cmDate.SelectedIndex = 0;
             this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
             this.cmbSort.SelectedIndex = 0;
-            this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
+            this.dtSD.Text = DateTime.Now.AddDays(-90).ToShortDateString();
             this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
 
 

SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs

@@ -430,6 +430,9 @@ namespace FEQ0000
                     case "tbsupply":
                         Lov_Supply(search, false);
                         break;
+                    case "tbbigo":
+                        e.Handled = true; 
+                        break;
                     default:
                         SendKeys.Send("{TAB}");
                         break;

SubProject/FEQ0000/app.config

@@ -5,9 +5,12 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </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=Amkor123!" providerName="System.Data.SqlClient" />
+    <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!;Encrypt=True;TrustServerCertificate=True"
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+      providerName="System.Data.SqlClient" />
-    <add name="FEQ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" />
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="FEQ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />

SubProject/FEQ0000/dsPurchase.xss

@@ -4,11 +4,15 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="138" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Purchase" ZOrder="3" X="148" Y="70" Height="596" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="433" />
+    <Shape ID="DesignTable:Purchase" ZOrder="7" X="148" Y="70" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_PurchaseCR" ZOrder="2" X="452" Y="74" Height="592" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="448" />
+    <Shape ID="DesignTable:EETGW_PurchaseCR" ZOrder="6" X="452" Y="74" Height="381" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Ipkolist" ZOrder="1" X="827" Y="132" Height="324" Width="302" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Ipkolist" ZOrder="5" X="827" Y="132" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Purchase_Managerlist" ZOrder="4" X="0" Y="18" Height="97" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:EETGW_PurchaseEB" ZOrder="1" X="753" Y="108" Height="381" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PurchaseCheck" ZOrder="3" X="0" Y="18" Height="239" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="2" X="0" Y="18" Height="68" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="16" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/JobReport_/rJobReportPrj.cs

@@ -145,6 +145,12 @@ namespace FPJ0000.JobReport_
                     row.Add("--");
                     row.Add("비 프로젝트 업무");
                 }
+                else if (dr.Key == "미팅")
+                {
+                    row.Add("--");
+                    row.Add("미팅");
+                    addholy = true;
+                }
                 else if (dr.Key == "휴가")
                 {
                     row.Add("--");
@@ -186,7 +192,7 @@ namespace FPJ0000.JobReport_
 
                 row.Add(tperc);
 
-                if (string.IsNullOrEmpty(dr.Key))
+                if (string.IsNullOrEmpty(dr.Key) || dr.Key == "휴가" || dr.Key == "미팅")
                     dv1.Rows.Insert(0, row.ToArray());
                 else
                     dv1.Rows.Add(row.ToArray());
@@ -226,26 +232,43 @@ namespace FPJ0000.JobReport_
             }
 
             //첫줄은 색상을 변경해준다.
-            if (dv1.RowCount > 0)
+            //if (dv1.RowCount > 0)
+            //{
+            //    var dvrow = dv1.Rows[0];
+            //    for (int i = 0; i < this.dv1.ColumnCount; i++)
+            //    {
+            //        var c = dvrow.Cells[i];
+            //        c.Style.BackColor = Color.LightGray;
+            //    }
+
+            //}
+            for(int r = 0; r < dv1.RowCount;r++)
+            {
+                var dvrow = dv1.Rows[r];
+                var idxvlaue = dvrow.Cells[0].Value.ToString();
+                if (idxvlaue == "-1")
                 {
-                var dvrow = dv1.Rows[0];
                     for (int i = 0; i < this.dv1.ColumnCount; i++)
                     {
                         var c = dvrow.Cells[i];
                         c.Style.BackColor = Color.LightGray;
                     }
+                }
+                else break;
                 
             }
-            if (addholy && dv1.RowCount > 1)
-            {
-                var dvrow = dv1.Rows[1];
-                for (int i = 0; i < this.dv1.ColumnCount; i++)
-                {
-                    var c = dvrow.Cells[i];
-                    c.Style.BackColor = Color.LightGray;
-                }
 
-            }
+
+            //if (addholy && dv1.RowCount > 1)
+            //{
+            //    var dvrow = dv1.Rows[1];
+            //    for (int i = 0; i < this.dv1.ColumnCount; i++)
+            //    {
+            //        var c = dvrow.Cells[i];
+            //        c.Style.BackColor = Color.LightGray;
+            //    }
+
+            //}
 
 
             this.dv1.AutoResizeColumns();

SubProject/FPJ0000/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace FPJ0000.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));
@@ -38,7 +38,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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string EEEntities {
             get {
                 return ((string)(this["EEEntities"]));
@@ -49,7 +49,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=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string EEEntitiesLayout {
             get {
                 return ((string)(this["EEEntitiesLayout"]));

SubProject/FPJ0000/Properties/Settings.settings

@@ -4,26 +4,26 @@
   <Settings>
     <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;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&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;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&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=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
     <Setting Name="EEEntities" 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;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&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;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&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=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
     <Setting Name="EEEntitiesLayout" 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;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&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;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&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=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FPJ0000/app.config

@@ -5,12 +5,17 @@
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <connectionStrings>
-    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
+    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
-    <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"/>
+      providerName="System.Data.SqlClient" />
-    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;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=Amkor123!;Encrypt=False;TrustServerCertificate=True"
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+      providerName="System.Data.SqlClient" />
-    <add name="EEEntitiesLayout" connectionString="metadata=res://*/ModelLayout.csdl|res://*/ModelLayout.ssdl|res://*/ModelLayout.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
-    <add name="FPJ0000.Properties.Settings.EEEntitiesLayout" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"/>
+      providerName="System.Data.SqlClient" />
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntitiesLayout" connectionString="metadata=res://*/ModelLayout.csdl|res://*/ModelLayout.ssdl|res://*/ModelLayout.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="FPJ0000.Properties.Settings.EEEntitiesLayout" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>

SubProject/FPJ0000/dsReport.Designer.cs

@@ -9040,12 +9040,13 @@ ORDER BY pdate";
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, 
-               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
+               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)) 
+               AS PrjName
 FROM     JobReport WITH (nolock) LEFT OUTER JOIN
                Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
 WHERE  (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
-GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), 
+GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, 
-               Projects.status
+               (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status
 ORDER BY title, ww";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FPJ0000/dsReport.xsd

@@ -300,12 +300,13 @@ ORDER BY pdate</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, 
-               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
+               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)) 
+               AS PrjName
 FROM     JobReport WITH (nolock) LEFT OUTER JOIN
                Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
 WHERE  (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) &gt; 0)
-GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), 
+GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, 
-               Projects.status
+               (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status
 ORDER BY title, ww</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />

SubProject/FPJ0000/dsReport.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:jobReport" ZOrder="4" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
     <Shape ID="DesignTable:JobReportDay" ZOrder="1" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />