diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 3c778b8..bbe0d01 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -126,8 +126,8 @@ False ..\DLL\ArSetting.Net4.dll - - ..\packages\CsvHelper.27.0.4\lib\net45\CsvHelper.dll + + ..\packages\CsvHelper.30.0.1\lib\net45\CsvHelper.dll ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll @@ -140,8 +140,8 @@ - - ..\packages\HtmlAgilityPack.CssSelectors.1.0.2\lib\net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.11.49\lib\Net45\HtmlAgilityPack.dll ..\packages\HtmlAgilityPack.CssSelectors.1.0.2\lib\net45\HtmlAgilityPack.CssSelectors.dll @@ -149,17 +149,17 @@ ..\DLL\libxl.net.dll - - ..\packages\Microsoft.Owin.4.2.0\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Cors.4.2.0\lib\net45\Microsoft.Owin.Cors.dll + + ..\packages\Microsoft.Owin.Cors.4.2.2\lib\net45\Microsoft.Owin.Cors.dll - - ..\packages\Microsoft.Owin.FileSystems.4.2.0\lib\net45\Microsoft.Owin.FileSystems.dll + + ..\packages\Microsoft.Owin.FileSystems.4.2.2\lib\net45\Microsoft.Owin.FileSystems.dll - - ..\packages\Microsoft.Owin.Host.HttpListener.4.1.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + ..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll ..\packages\Microsoft.Owin.Hosting.4.1.1\lib\net45\Microsoft.Owin.Hosting.dll @@ -170,8 +170,8 @@ ..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -188,16 +188,16 @@ - - ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll + + ..\packages\System.Memory.4.5.5\lib\netstandard1.1\System.Memory.dll - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll @@ -206,14 +206,14 @@ ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll - - ..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll + + ..\packages\Microsoft.AspNet.Cors.5.2.9\lib\net45\System.Web.Cors.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll + + ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.9\lib\net45\System.Web.Http.Owin.dll @@ -828,10 +828,6 @@ {c2e0627d-0623-4b68-a558-37cbce6bdca6} FEQ0000 - - {8d593b42-1eae-4d5a-a2c1-0361e2c43a80} - FOW0000 - {74836a5f-cb5b-449f-9210-99c9d1a23b97} FPJ0000 @@ -854,11 +850,4 @@ - - - - 이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다. - - - \ No newline at end of file diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index e8c6da7..fcf0183 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.06.26.1430")] -[assembly: AssemblyFileVersion("23.06.26.1430")] +[assembly: AssemblyVersion("23.07.12.1700")] +[assembly: AssemblyFileVersion("23.07.12.1700")] diff --git a/Project/SqlServerTypes/Loader.cs b/Project/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/Project/SqlServerTypes/Loader.cs +++ b/Project/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file diff --git a/Project/StateMachine/_MailService.cs b/Project/StateMachine/_MailService.cs index 8f61333..ed82795 100644 --- a/Project/StateMachine/_MailService.cs +++ b/Project/StateMachine/_MailService.cs @@ -1092,7 +1092,7 @@ namespace Project var ucnt = cmd.ExecuteNonQuery(); } } - catch (Exception eX) + catch { //sendMsg = eX.Message; //msgupdate = true; @@ -1106,7 +1106,7 @@ namespace Project cmd.Dispose(); cn.Close(); } - catch (Exception ex) + catch { } @@ -1203,7 +1203,7 @@ namespace Project } } } - catch (Exception ex) + catch { } diff --git a/Project/Util.cs b/Project/Util.cs index 35aa623..0a65ced 100644 --- a/Project/Util.cs +++ b/Project/Util.cs @@ -133,7 +133,7 @@ namespace Project cn.Dispose(); return retval; } - catch (Exception ex) + catch { return false; } diff --git a/Project/app.config b/Project/app.config index 3a053a2..73b67fc 100644 --- a/Project/app.config +++ b/Project/app.config @@ -2,24 +2,15 @@ - - - - - - - - - + + + + + + + + + @@ -34,11 +25,11 @@ - + - + @@ -54,7 +45,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Project/packages.config b/Project/packages.config index 4ba495f..4ffd783 100644 --- a/Project/packages.config +++ b/Project/packages.config @@ -1,30 +1,29 @@  - + - + - - - - - - + + + + + - - - - - + + + + + - + - - + + \ No newline at end of file diff --git a/Sub/AmkorRestfulService b/Sub/AmkorRestfulService index 9b981a8..8478403 160000 --- a/Sub/AmkorRestfulService +++ b/Sub/AmkorRestfulService @@ -1 +1 @@ -Subproject commit 9b981a81fe57032ffe577bb7c783ed2669c2de77 +Subproject commit 847840385fb239e6bb758347672bcef3d6495583 diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index 68e28b5..5a2be00 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -210,13 +210,13 @@ namespace FBS0000 //현재인원값 var bIndate = DateTime.TryParse(item.indate, out DateTime dtIn); var bOutdate = DateTime.TryParse(item.outdate, out DateTime dtOut); - Boolean usePerson = true; + // Boolean usePerson = true; // - if (bIndate == true && curDate.ToShortDateString().CompareTo(dtIn.ToShortDateString()) < 0) - usePerson = false; - if (bOutdate == true && curDate.ToShortDateString().CompareTo(dtOut.ToShortDateString()) > 0) - usePerson = false; + //if (bIndate == true && curDate.ToShortDateString().CompareTo(dtIn.ToShortDateString()) < 0) + // usePerson = false; + //if (bOutdate == true && curDate.ToShortDateString().CompareTo(dtOut.ToShortDateString()) > 0) + // usePerson = false; ps[3] = bholy ? 1 : 0; ps[2] += 1; diff --git a/SubProject/FBS0000/SqlServerTypes/Loader.cs b/SubProject/FBS0000/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/SubProject/FBS0000/SqlServerTypes/Loader.cs +++ b/SubProject/FBS0000/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file diff --git a/SubProject/FCM0000/SqlServerTypes/Loader.cs b/SubProject/FCM0000/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/SubProject/FCM0000/SqlServerTypes/Loader.cs +++ b/SubProject/FCM0000/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index a766fab..6c31d40 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -280,7 +280,7 @@ namespace FCOMMON " where prgmName = 'Amkor K4-EET GroupWare'"; return ExecuteScalar(sql); } - catch (Exception ex) + catch { return string.Empty; } @@ -1043,7 +1043,7 @@ namespace FCOMMON { return ExecuteScalar(slq); } - catch (Exception ex) + catch { return string.Empty; } @@ -1057,7 +1057,7 @@ namespace FCOMMON try { return ExecuteScalar(slq); - }catch ( Exception ex) + }catch { return string.Empty; } diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 1b110cf..3b175db 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -274,6 +274,12 @@ rPurchaseCR.cs + + Form + + + fSIDListSelect.cs + Form @@ -356,6 +362,9 @@ fPurchaseNR.cs + + fSIDListSelect.cs + @@ -430,6 +439,10 @@ + + {58cfc90c-5068-46a2-a8de-0e92ee9e0990} + AmkorRestfulService + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index dea7d1a..7f5b905 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -86,6 +86,7 @@ this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.tbInQty = new System.Windows.Forms.TextBox(); this.button7 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); @@ -99,7 +100,8 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.tbInQty = new System.Windows.Forms.TextBox(); + this.btSIDChk = new System.Windows.Forms.Button(); + this.timer1 = new System.Windows.Forms.Timer(this.components); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -162,7 +164,7 @@ // sidLabel // sidLabel.AutoSize = true; - sidLabel.Location = new System.Drawing.Point(288, 251); + sidLabel.Location = new System.Drawing.Point(54, 252); sidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sidLabel.Name = "sidLabel"; sidLabel.Size = new System.Drawing.Size(32, 20); @@ -172,7 +174,7 @@ // pumscaleLabel // pumscaleLabel.AutoSize = true; - pumscaleLabel.Location = new System.Drawing.Point(10, 142); + pumscaleLabel.Location = new System.Drawing.Point(10, 124); pumscaleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumscaleLabel.Name = "pumscaleLabel"; pumscaleLabel.Size = new System.Drawing.Size(75, 20); @@ -182,7 +184,7 @@ // pumqtyLabel // pumqtyLabel.AutoSize = true; - pumqtyLabel.Location = new System.Drawing.Point(47, 179); + pumqtyLabel.Location = new System.Drawing.Point(47, 154); pumqtyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumqtyLabel.Name = "pumqtyLabel"; pumqtyLabel.Size = new System.Drawing.Size(39, 20); @@ -192,7 +194,7 @@ // pumpriceLabel // pumpriceLabel.AutoSize = true; - pumpriceLabel.Location = new System.Drawing.Point(280, 179); + pumpriceLabel.Location = new System.Drawing.Point(280, 154); pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumpriceLabel.Name = "pumpriceLabel"; pumpriceLabel.Size = new System.Drawing.Size(39, 20); @@ -202,7 +204,7 @@ // pumamtLabel // pumamtLabel.AutoSize = true; - pumamtLabel.Location = new System.Drawing.Point(47, 251); + pumamtLabel.Location = new System.Drawing.Point(47, 215); pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumamtLabel.Name = "pumamtLabel"; pumamtLabel.Size = new System.Drawing.Size(39, 20); @@ -283,7 +285,7 @@ // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(46, 69); + label3.Location = new System.Drawing.Point(46, 62); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(39, 20); @@ -293,7 +295,7 @@ // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(280, 69); + label6.Location = new System.Drawing.Point(280, 62); label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label6.Name = "label6"; label6.Size = new System.Drawing.Size(39, 20); @@ -316,7 +318,7 @@ // label8.AutoSize = true; label8.ForeColor = System.Drawing.Color.Blue; - label8.Location = new System.Drawing.Point(29, 214); + label8.Location = new System.Drawing.Point(29, 182); label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label8.Name = "label8"; label8.Size = new System.Drawing.Size(57, 20); @@ -328,7 +330,7 @@ label9.AutoSize = true; label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); label9.ForeColor = System.Drawing.Color.Blue; - label9.Location = new System.Drawing.Point(285, 218); + label9.Location = new System.Drawing.Point(285, 186); label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label9.Name = "label9"; label9.Size = new System.Drawing.Size(163, 15); @@ -338,13 +340,23 @@ // label10 // label10.AutoSize = true; - label10.Location = new System.Drawing.Point(287, 286); + label10.Location = new System.Drawing.Point(287, 215); label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label10.Name = "label10"; label10.Size = new System.Drawing.Size(75, 20); label10.TabIndex = 38; label10.Text = "STORAGE"; // + // label11 + // + label11.AutoSize = true; + label11.Location = new System.Drawing.Point(27, 129); + label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(69, 20); + label11.TabIndex = 37; + label11.Text = "입고수량"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 191); @@ -356,17 +368,18 @@ // tbSID // this.tbSID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.tbSID.Location = new System.Drawing.Point(327, 248); + this.tbSID.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSID.Location = new System.Drawing.Point(93, 249); this.tbSID.Margin = new System.Windows.Forms.Padding(4); this.tbSID.Name = "tbSID"; - this.tbSID.Size = new System.Drawing.Size(148, 27); + this.tbSID.Size = new System.Drawing.Size(179, 34); this.tbSID.TabIndex = 20; // // tbPumName // this.tbPumName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.tbPumName.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPumName.Location = new System.Drawing.Point(93, 102); + this.tbPumName.Location = new System.Drawing.Point(93, 91); this.tbPumName.Margin = new System.Windows.Forms.Padding(4); this.tbPumName.Name = "tbPumName"; this.tbPumName.Size = new System.Drawing.Size(311, 27); @@ -378,7 +391,7 @@ // this.tbPumModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.tbPumModel.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbPumModel.Location = new System.Drawing.Point(93, 139); + this.tbPumModel.Location = new System.Drawing.Point(93, 121); this.tbPumModel.Margin = new System.Windows.Forms.Padding(4); this.tbPumModel.Name = "tbPumModel"; this.tbPumModel.Size = new System.Drawing.Size(311, 27); @@ -387,7 +400,7 @@ // tbPumUnit // this.tbPumUnit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.tbPumUnit.Location = new System.Drawing.Point(410, 139); + this.tbPumUnit.Location = new System.Drawing.Point(410, 121); this.tbPumUnit.Margin = new System.Windows.Forms.Padding(4); this.tbPumUnit.Name = "tbPumUnit"; this.tbPumUnit.Size = new System.Drawing.Size(64, 27); @@ -399,7 +412,7 @@ // tbPumQty // this.tbPumQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPumQty.Location = new System.Drawing.Point(94, 175); + this.tbPumQty.Location = new System.Drawing.Point(94, 150); this.tbPumQty.Margin = new System.Windows.Forms.Padding(4); this.tbPumQty.Name = "tbPumQty"; this.tbPumQty.Size = new System.Drawing.Size(111, 27); @@ -409,7 +422,7 @@ // // tbPumPrice // - this.tbPumPrice.Location = new System.Drawing.Point(326, 175); + this.tbPumPrice.Location = new System.Drawing.Point(326, 150); this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4); this.tbPumPrice.Name = "tbPumPrice"; this.tbPumPrice.Size = new System.Drawing.Size(148, 27); @@ -419,7 +432,7 @@ // // tbPumAmt // - this.tbPumAmt.Location = new System.Drawing.Point(93, 248); + this.tbPumAmt.Location = new System.Drawing.Point(93, 212); this.tbPumAmt.Margin = new System.Windows.Forms.Padding(4); this.tbPumAmt.Name = "tbPumAmt"; this.tbPumAmt.ReadOnly = true; @@ -431,15 +444,15 @@ // tbSupply // this.tbSupply.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSupply.Location = new System.Drawing.Point(93, 283); + this.tbSupply.Location = new System.Drawing.Point(93, 288); this.tbSupply.Margin = new System.Windows.Forms.Padding(4); this.tbSupply.Name = "tbSupply"; - this.tbSupply.Size = new System.Drawing.Size(112, 27); + this.tbSupply.Size = new System.Drawing.Size(311, 27); this.tbSupply.TabIndex = 22; // // tbSupplyIndex // - this.tbSupplyIndex.Location = new System.Drawing.Point(208, 283); + this.tbSupplyIndex.Location = new System.Drawing.Point(411, 288); this.tbSupplyIndex.Margin = new System.Windows.Forms.Padding(4); this.tbSupplyIndex.Name = "tbSupplyIndex"; this.tbSupplyIndex.ReadOnly = true; @@ -516,7 +529,7 @@ // this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.cmbState.FormattingEnabled = true; - this.cmbState.Location = new System.Drawing.Point(327, 66); + this.cmbState.Location = new System.Drawing.Point(327, 59); this.cmbState.Margin = new System.Windows.Forms.Padding(4); this.cmbState.Name = "cmbState"; this.cmbState.Size = new System.Drawing.Size(148, 28); @@ -543,7 +556,7 @@ this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbRequest.FormattingEnabled = true; this.cmbRequest.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbRequest.Location = new System.Drawing.Point(93, 66); + this.cmbRequest.Location = new System.Drawing.Point(93, 59); this.cmbRequest.Margin = new System.Windows.Forms.Padding(4); this.cmbRequest.Name = "cmbRequest"; this.cmbRequest.Size = new System.Drawing.Size(179, 28); @@ -564,7 +577,7 @@ // // tbPumIDX // - this.tbPumIDX.Location = new System.Drawing.Point(410, 102); + this.tbPumIDX.Location = new System.Drawing.Point(410, 91); this.tbPumIDX.Margin = new System.Windows.Forms.Padding(4); this.tbPumIDX.Name = "tbPumIDX"; this.tbPumIDX.ReadOnly = true; @@ -576,7 +589,7 @@ // // tbPumStock // - this.tbPumStock.Location = new System.Drawing.Point(208, 175); + this.tbPumStock.Location = new System.Drawing.Point(208, 150); this.tbPumStock.Margin = new System.Windows.Forms.Padding(4); this.tbPumStock.Name = "tbPumStock"; this.tbPumStock.ReadOnly = true; @@ -643,6 +656,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.btSIDChk); this.groupBox1.Controls.Add(this.tbStorage); this.groupBox1.Controls.Add(label10); this.groupBox1.Controls.Add(label9); @@ -689,7 +703,7 @@ // tbStorage // this.tbStorage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.tbStorage.Location = new System.Drawing.Point(370, 283); + this.tbStorage.Location = new System.Drawing.Point(370, 212); this.tbStorage.Margin = new System.Windows.Forms.Padding(4); this.tbStorage.Name = "tbStorage"; this.tbStorage.Size = new System.Drawing.Size(104, 27); @@ -698,7 +712,7 @@ // tbPumPriceD // this.tbPumPriceD.ForeColor = System.Drawing.Color.Blue; - this.tbPumPriceD.Location = new System.Drawing.Point(94, 211); + this.tbPumPriceD.Location = new System.Drawing.Point(94, 179); this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); this.tbPumPriceD.Name = "tbPumPriceD"; this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); @@ -719,7 +733,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(9, 283); + this.button2.Location = new System.Drawing.Point(9, 288); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(80, 27); this.button2.TabIndex = 33; @@ -729,7 +743,7 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(9, 102); + this.button1.Location = new System.Drawing.Point(9, 91); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(80, 27); this.button1.TabIndex = 32; @@ -776,6 +790,15 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; // + // tbInQty + // + this.tbInQty.Location = new System.Drawing.Point(104, 125); + this.tbInQty.Margin = new System.Windows.Forms.Padding(4); + this.tbInQty.Name = "tbInQty"; + this.tbInQty.Size = new System.Drawing.Size(286, 27); + this.tbInQty.TabIndex = 38; + this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // button7 // this.button7.Location = new System.Drawing.Point(6, 489); @@ -890,24 +913,21 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // tbInQty + // btSIDChk // - this.tbInQty.Location = new System.Drawing.Point(104, 125); - this.tbInQty.Margin = new System.Windows.Forms.Padding(4); - this.tbInQty.Name = "tbInQty"; - this.tbInQty.Size = new System.Drawing.Size(286, 27); - this.tbInQty.TabIndex = 38; - this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.btSIDChk.BackColor = System.Drawing.Color.Gray; + this.btSIDChk.Location = new System.Drawing.Point(279, 249); + this.btSIDChk.Name = "btSIDChk"; + this.btSIDChk.Size = new System.Drawing.Size(196, 34); + this.btSIDChk.TabIndex = 40; + this.btSIDChk.Text = "SID 검사(SPR/NR)"; + this.btSIDChk.UseVisualStyleBackColor = false; + this.btSIDChk.Click += new System.EventHandler(this.button8_Click); // - // label11 + // timer1 // - label11.AutoSize = true; - label11.Location = new System.Drawing.Point(27, 129); - label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label11.Name = "label11"; - label11.Size = new System.Drawing.Size(69, 20); - label11.TabIndex = 37; - label11.Text = "입고수량"; + this.timer1.Interval = 250; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // // fPurchase_Add // @@ -988,5 +1008,7 @@ private System.Windows.Forms.TextBox tbPumPriceD; private System.Windows.Forms.TextBox tbStorage; private System.Windows.Forms.TextBox tbInQty; + private System.Windows.Forms.Button btSIDChk; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 4cdef39..dec3bf0 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -1,4 +1,6 @@ -using System; +using FCOMMON; +using FEQ0000.Purchase; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -16,6 +18,8 @@ namespace FEQ0000 dsPurchase.PurchaseRow dr; public Boolean repeatAdd = false; Boolean binit = false; + string sidchk = string.Empty; + public fPurchase_Add(dsPurchase.PurchaseRow dr_) { InitializeComponent(); @@ -277,7 +281,12 @@ namespace FEQ0000 } binit = true; + if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + sidchk = string.Empty; + else + sidchk = tbSID.Text.Trim(); + timer1.Start(); } @@ -433,6 +442,24 @@ namespace FEQ0000 tbSID.Text = sidTrim(tbSID.Text); + + + if(string.IsNullOrWhiteSpace(this.sidchk)) + { + FCOMMON.Util.MsgE("SID검사가 필요합니다.\n상단의 검사 버튼을 눌러 SPR/NR 재고 여부를 확인 하세요"); + btSIDChk.Focus(); + return false; + } + + //시드검사한 자료와 현재 입력된 시드가 다르면 검사를 다시 하게 한다 + if (this.tbSID.Text.Trim().Equals(this.sidchk) == false) + { + Util.MsgE("SID검사 자료가 변경되었습니다. 다시 검사 하세요"); + sidchk = string.Empty; + return false; + } + + //if (cbProcess.Text.Trim() == "") //{ // FCOMMON.Util.MsgE("추가정보내의 [공정]을 선택하세요."); @@ -1010,5 +1037,58 @@ namespace FEQ0000 } else tbPumPrice.Text = "0"; } + + private void button8_Click(object sender, EventArgs e) + { + var sid = tbSID.Text.Trim(); + if (sid.Length != 9) + { + FCOMMON.Util.MsgE("검색 할 SID를 입력하세요"); + tbSID.Focus(); + tbSID.SelectAll(); + return; + } + + var dt = Amkor.RestfulService.SPMSIDSearch(sid); + if (dt.Complete) + { + var f = new fSIDListSelect(sid,dt.Result); + if (f.ShowDialog() == DialogResult.OK) + this.sidchk = sid; + else + { + FCOMMON.Util.MsgE("목록표시 창에서 '확인' 버튼을 눌러야 SID검색이 완료됩니다."); + } + } + else + { + FCOMMON.Util.MsgI("SPM/NR 에서 검색된 정보가 없습니다\n저장이 가능 합니다"); + this.sidchk = sid; + } + + } + + private void timer1_Tick(object sender, EventArgs e) + { + if (tbSID.TextLength != 9) + { + if (btSIDChk.BackColor == Color.Gray) + btSIDChk.BackColor = Color.Tomato; + else + btSIDChk.BackColor = Color.Gray; + } + else + { + if (string.IsNullOrWhiteSpace(sidchk)) + { + if (btSIDChk.BackColor == Color.Lime) + btSIDChk.BackColor = Color.White; + else + btSIDChk.BackColor = Color.Lime; + } + else btSIDChk.BackColor = SystemColors.Control; + } + + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index e2c8ac2..4f8df88 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -199,6 +199,9 @@ False + + False + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) @@ -206,9 +209,6 @@ * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - - False - 17, 17 @@ -218,6 +218,9 @@ 313, 17 + + 587, 17 + 58 diff --git a/SubProject/FEQ0000/Purchase/fSIDListSelect.Designer.cs b/SubProject/FEQ0000/Purchase/fSIDListSelect.Designer.cs new file mode 100644 index 0000000..0cf2c44 --- /dev/null +++ b/SubProject/FEQ0000/Purchase/fSIDListSelect.Designer.cs @@ -0,0 +1,222 @@ +namespace FEQ0000.Purchase +{ + partial class fSIDListSelect + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSIDListSelect)); + this.dv1 = new System.Windows.Forms.DataGridView(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + this.SuspendLayout(); + // + // dv1 + // + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle1; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowTemplate.Height = 23; + this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dv1.Size = new System.Drawing.Size(884, 378); + this.dv1.TabIndex = 0; + this.dv1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(32, 32); + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.toolStripButton1}); + this.bn.Location = new System.Drawing.Point(0, 378); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(884, 39); + this.bn.TabIndex = 1; + this.bn.Text = "bindingNavigator1"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(36, 36); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(36, 36); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(36, 36); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(36, 36); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 39); + // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(95, 36); + this.toolStripButton1.Text = "확인 완료"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // fSIDListSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(884, 417); + this.Controls.Add(this.dv1); + this.Controls.Add(this.bn); + this.Name = "fSIDListSelect"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "SPM 검색 결과"; + this.Load += new System.EventHandler(this.fSIDListSelect_Load); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dv1; + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStripButton toolStripButton1; + } +} \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fSIDListSelect.cs b/SubProject/FEQ0000/Purchase/fSIDListSelect.cs new file mode 100644 index 0000000..4f14ca4 --- /dev/null +++ b/SubProject/FEQ0000/Purchase/fSIDListSelect.cs @@ -0,0 +1,41 @@ +using FCOMMON; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FEQ0000.Purchase +{ + public partial class fSIDListSelect : Form + { + public fSIDListSelect(string sid,DataTable dt) + { + InitializeComponent(); + this.bs.DataSource = dt; + this.dv1.DataSource = this.bs; + this.bs.Sort = "quantity desc"; + this.Text = $"SPM/NR 검색 결과 SID:{sid}"; + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + DBM.InsertLog("SIDCHK", this.Text); + DialogResult = DialogResult.OK; + } + + private void dataGridView1_DoubleClick(object sender, EventArgs e) + { + + } + + private void fSIDListSelect_Load(object sender, EventArgs e) + { + this.dv1.AutoResizeColumns(); + } + } +} diff --git a/SubProject/FOW0000/fHappyNarae.resx b/SubProject/FEQ0000/Purchase/fSIDListSelect.resx similarity index 68% rename from SubProject/FOW0000/fHappyNarae.resx rename to SubProject/FEQ0000/Purchase/fSIDListSelect.resx index c40c5e3..36daea1 100644 --- a/SubProject/FOW0000/fHappyNarae.resx +++ b/SubProject/FEQ0000/Purchase/fSIDListSelect.resx @@ -117,10 +117,53 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 + + 81, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -136,22 +179,4 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - 123, 17 - \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index f28a0d5..3ae9b22 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -1238,8 +1238,8 @@ namespace FEQ0000 //if (fi.Directory.Exists == false) fi.Directory.Create(); - var xlsrow = 0; - var xlscol = 0; + // var xlsrow = 0; + // var xlscol = 0; var sb = new System.Text.StringBuilder(); Dictionary userlist = new Dictionary(); foreach (var idx in selidx) @@ -1249,7 +1249,7 @@ namespace FEQ0000 if (row == null || row.RowState == DataRowState.Deleted) continue; //데이터를 찾았다 var sid = row.sid; - var deliver = 20; + //var deliver = 20; var requestname = row.requestName; var rquestid = row.request; var tel = FCOMMON.DBM.GetUserTel(FCOMMON.info.Login.gcode, rquestid); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs index 95e5379..badc464 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs @@ -88,6 +88,8 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.btSIDChk = new System.Windows.Forms.Button(); + this.timer1 = new System.Windows.Forms.Timer(this.components); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -135,7 +137,7 @@ // sidLabel // sidLabel.AutoSize = true; - sidLabel.Location = new System.Drawing.Point(288, 251); + sidLabel.Location = new System.Drawing.Point(54, 245); sidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sidLabel.Name = "sidLabel"; sidLabel.Size = new System.Drawing.Size(32, 20); @@ -145,7 +147,7 @@ // pumscaleLabel // pumscaleLabel.AutoSize = true; - pumscaleLabel.Location = new System.Drawing.Point(10, 142); + pumscaleLabel.Location = new System.Drawing.Point(10, 121); pumscaleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumscaleLabel.Name = "pumscaleLabel"; pumscaleLabel.Size = new System.Drawing.Size(75, 20); @@ -155,7 +157,7 @@ // pumqtyLabel // pumqtyLabel.AutoSize = true; - pumqtyLabel.Location = new System.Drawing.Point(47, 179); + pumqtyLabel.Location = new System.Drawing.Point(47, 151); pumqtyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumqtyLabel.Name = "pumqtyLabel"; pumqtyLabel.Size = new System.Drawing.Size(39, 20); @@ -165,7 +167,7 @@ // pumpriceLabel // pumpriceLabel.AutoSize = true; - pumpriceLabel.Location = new System.Drawing.Point(280, 179); + pumpriceLabel.Location = new System.Drawing.Point(280, 151); pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumpriceLabel.Name = "pumpriceLabel"; pumpriceLabel.Size = new System.Drawing.Size(39, 20); @@ -175,7 +177,7 @@ // pumamtLabel // pumamtLabel.AutoSize = true; - pumamtLabel.Location = new System.Drawing.Point(47, 251); + pumamtLabel.Location = new System.Drawing.Point(47, 209); pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumamtLabel.Name = "pumamtLabel"; pumamtLabel.Size = new System.Drawing.Size(39, 20); @@ -226,7 +228,7 @@ // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(46, 69); + label3.Location = new System.Drawing.Point(46, 62); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(39, 20); @@ -236,7 +238,7 @@ // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(280, 69); + label6.Location = new System.Drawing.Point(280, 62); label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label6.Name = "label6"; label6.Size = new System.Drawing.Size(39, 20); @@ -247,7 +249,7 @@ // label8.AutoSize = true; label8.ForeColor = System.Drawing.Color.Blue; - label8.Location = new System.Drawing.Point(29, 214); + label8.Location = new System.Drawing.Point(29, 179); label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label8.Name = "label8"; label8.Size = new System.Drawing.Size(57, 20); @@ -259,7 +261,7 @@ label9.AutoSize = true; label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); label9.ForeColor = System.Drawing.Color.Blue; - label9.Location = new System.Drawing.Point(285, 218); + label9.Location = new System.Drawing.Point(285, 183); label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label9.Name = "label9"; label9.Size = new System.Drawing.Size(163, 15); @@ -269,7 +271,7 @@ // label10 // label10.AutoSize = true; - label10.Location = new System.Drawing.Point(287, 286); + label10.Location = new System.Drawing.Point(287, 209); label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label10.Name = "label10"; label10.Size = new System.Drawing.Size(75, 20); @@ -307,17 +309,18 @@ // tbSID // this.tbSID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.tbSID.Location = new System.Drawing.Point(327, 248); + this.tbSID.Font = new System.Drawing.Font("맑은 고딕", 15F); + this.tbSID.Location = new System.Drawing.Point(93, 242); this.tbSID.Margin = new System.Windows.Forms.Padding(4); this.tbSID.Name = "tbSID"; - this.tbSID.Size = new System.Drawing.Size(148, 27); + this.tbSID.Size = new System.Drawing.Size(179, 34); this.tbSID.TabIndex = 20; // // tbPumName // this.tbPumName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.tbPumName.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPumName.Location = new System.Drawing.Point(93, 102); + this.tbPumName.Location = new System.Drawing.Point(93, 88); this.tbPumName.Margin = new System.Windows.Forms.Padding(4); this.tbPumName.Name = "tbPumName"; this.tbPumName.Size = new System.Drawing.Size(311, 27); @@ -329,7 +332,7 @@ // this.tbPumModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.tbPumModel.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbPumModel.Location = new System.Drawing.Point(93, 139); + this.tbPumModel.Location = new System.Drawing.Point(93, 118); this.tbPumModel.Margin = new System.Windows.Forms.Padding(4); this.tbPumModel.Name = "tbPumModel"; this.tbPumModel.Size = new System.Drawing.Size(311, 27); @@ -338,7 +341,7 @@ // tbPumUnit // this.tbPumUnit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.tbPumUnit.Location = new System.Drawing.Point(410, 139); + this.tbPumUnit.Location = new System.Drawing.Point(410, 118); this.tbPumUnit.Margin = new System.Windows.Forms.Padding(4); this.tbPumUnit.Name = "tbPumUnit"; this.tbPumUnit.Size = new System.Drawing.Size(64, 27); @@ -350,7 +353,7 @@ // tbPumQty // this.tbPumQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPumQty.Location = new System.Drawing.Point(94, 175); + this.tbPumQty.Location = new System.Drawing.Point(94, 147); this.tbPumQty.Margin = new System.Windows.Forms.Padding(4); this.tbPumQty.Name = "tbPumQty"; this.tbPumQty.Size = new System.Drawing.Size(111, 27); @@ -360,7 +363,7 @@ // // tbPumPrice // - this.tbPumPrice.Location = new System.Drawing.Point(326, 175); + this.tbPumPrice.Location = new System.Drawing.Point(326, 147); this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4); this.tbPumPrice.Name = "tbPumPrice"; this.tbPumPrice.Size = new System.Drawing.Size(148, 27); @@ -370,7 +373,7 @@ // // tbPumAmt // - this.tbPumAmt.Location = new System.Drawing.Point(93, 248); + this.tbPumAmt.Location = new System.Drawing.Point(93, 206); this.tbPumAmt.Margin = new System.Windows.Forms.Padding(4); this.tbPumAmt.Name = "tbPumAmt"; this.tbPumAmt.ReadOnly = true; @@ -385,12 +388,12 @@ this.tbSupply.Location = new System.Drawing.Point(93, 283); this.tbSupply.Margin = new System.Windows.Forms.Padding(4); this.tbSupply.Name = "tbSupply"; - this.tbSupply.Size = new System.Drawing.Size(112, 27); + this.tbSupply.Size = new System.Drawing.Size(311, 27); this.tbSupply.TabIndex = 22; // // tbSupplyIndex // - this.tbSupplyIndex.Location = new System.Drawing.Point(208, 283); + this.tbSupplyIndex.Location = new System.Drawing.Point(410, 283); this.tbSupplyIndex.Margin = new System.Windows.Forms.Padding(4); this.tbSupplyIndex.Name = "tbSupplyIndex"; this.tbSupplyIndex.ReadOnly = true; @@ -468,7 +471,7 @@ // this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.cmbState.FormattingEnabled = true; - this.cmbState.Location = new System.Drawing.Point(327, 66); + this.cmbState.Location = new System.Drawing.Point(327, 59); this.cmbState.Margin = new System.Windows.Forms.Padding(4); this.cmbState.Name = "cmbState"; this.cmbState.Size = new System.Drawing.Size(148, 28); @@ -482,7 +485,7 @@ this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbRequest.FormattingEnabled = true; this.cmbRequest.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbRequest.Location = new System.Drawing.Point(93, 66); + this.cmbRequest.Location = new System.Drawing.Point(93, 59); this.cmbRequest.Margin = new System.Windows.Forms.Padding(4); this.cmbRequest.Name = "cmbRequest"; this.cmbRequest.Size = new System.Drawing.Size(179, 28); @@ -503,7 +506,7 @@ // // tbPumIDX // - this.tbPumIDX.Location = new System.Drawing.Point(410, 102); + this.tbPumIDX.Location = new System.Drawing.Point(410, 88); this.tbPumIDX.Margin = new System.Windows.Forms.Padding(4); this.tbPumIDX.Name = "tbPumIDX"; this.tbPumIDX.ReadOnly = true; @@ -515,7 +518,7 @@ // // tbPumStock // - this.tbPumStock.Location = new System.Drawing.Point(208, 175); + this.tbPumStock.Location = new System.Drawing.Point(208, 147); this.tbPumStock.Margin = new System.Windows.Forms.Padding(4); this.tbPumStock.Name = "tbPumStock"; this.tbPumStock.ReadOnly = true; @@ -583,6 +586,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.btSIDChk); this.groupBox1.Controls.Add(this.tbStorage); this.groupBox1.Controls.Add(label10); this.groupBox1.Controls.Add(label9); @@ -627,7 +631,7 @@ // tbStorage // this.tbStorage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.tbStorage.Location = new System.Drawing.Point(370, 283); + this.tbStorage.Location = new System.Drawing.Point(370, 206); this.tbStorage.Margin = new System.Windows.Forms.Padding(4); this.tbStorage.Name = "tbStorage"; this.tbStorage.Size = new System.Drawing.Size(104, 27); @@ -636,7 +640,7 @@ // tbPumPriceD // this.tbPumPriceD.ForeColor = System.Drawing.Color.Blue; - this.tbPumPriceD.Location = new System.Drawing.Point(94, 211); + this.tbPumPriceD.Location = new System.Drawing.Point(94, 176); this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); this.tbPumPriceD.Name = "tbPumPriceD"; this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); @@ -667,7 +671,7 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(9, 102); + this.button1.Location = new System.Drawing.Point(9, 88); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(80, 27); this.button1.TabIndex = 32; @@ -744,6 +748,22 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // + // btSIDChk + // + this.btSIDChk.BackColor = System.Drawing.Color.Gray; + this.btSIDChk.Location = new System.Drawing.Point(279, 242); + this.btSIDChk.Name = "btSIDChk"; + this.btSIDChk.Size = new System.Drawing.Size(196, 34); + this.btSIDChk.TabIndex = 41; + this.btSIDChk.Text = "SID 검사(SPR/NR)"; + this.btSIDChk.UseVisualStyleBackColor = false; + this.btSIDChk.Click += new System.EventHandler(this.btSIDChk_Click); + // + // timer1 + // + this.timer1.Interval = 250; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // // fPurchaseCR_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -817,5 +837,7 @@ private System.Windows.Forms.TextBox tbStorage; private System.Windows.Forms.TextBox tbInQty; private System.Windows.Forms.TextBox tbInRemar; + private System.Windows.Forms.Button btSIDChk; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 2dc35e8..13257eb 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -1,4 +1,6 @@ -using System; +using FCOMMON; +using FEQ0000.Purchase; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -16,6 +18,8 @@ namespace FEQ0000 dsPurchase.EETGW_PurchaseCRRow dr; public Boolean repeatAdd = false; Boolean binit = false; + string sidchk = string.Empty; + public fPurchaseCR_Add(dsPurchase.EETGW_PurchaseCRRow dr_) { InitializeComponent(); @@ -278,6 +282,12 @@ namespace FEQ0000 //} binit = true; + if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + sidchk = string.Empty; + else + sidchk = tbSID.Text; + + timer1.Start(); } @@ -443,6 +453,21 @@ namespace FEQ0000 return false; } + if (string.IsNullOrWhiteSpace(this.sidchk)) + { + FCOMMON.Util.MsgE("SID검사가 필요합니다.\n상단의 검사 버튼을 눌러 SPR/NR 재고 여부를 확인 하세요"); + btSIDChk.Focus(); + return false; + } + + //시드검사한 자료와 현재 입력된 시드가 다르면 검사를 다시 하게 한다 + if (this.tbSID.Text.Trim().Equals(this.sidchk) == false) + { + Util.MsgE("SID검사 자료가 변경되었습니다. 다시 검사 하세요"); + sidchk = string.Empty; + return false; + } + //if (cbProcess.Text.Trim() == "") //{ // FCOMMON.Util.MsgE("추가정보내의 [공정]을 선택하세요."); @@ -914,5 +939,56 @@ namespace FEQ0000 { } + + private void timer1_Tick(object sender, EventArgs e) + { + if (tbSID.TextLength != 9) + { + if (btSIDChk.BackColor == Color.Gray) + btSIDChk.BackColor = Color.Tomato; + else + btSIDChk.BackColor = Color.Gray; + } + else + { + if (string.IsNullOrWhiteSpace(sidchk)) + { + if (btSIDChk.BackColor == Color.Lime) + btSIDChk.BackColor = Color.White; + else + btSIDChk.BackColor = Color.Lime; + } + else btSIDChk.BackColor = SystemColors.Control; + } + } + + private void btSIDChk_Click(object sender, EventArgs e) + { + var sid = tbSID.Text.Trim(); + if (sid.Length != 9) + { + FCOMMON.Util.MsgE("검색 할 SID를 입력하세요"); + tbSID.Focus(); + tbSID.SelectAll(); + return; + } + + var dt = Amkor.RestfulService.SPMSIDSearch(sid); + if (dt.Complete) + { + var f = new fSIDListSelect(sid, dt.Result); + if (f.ShowDialog() == DialogResult.OK) + this.sidchk = sid; + else + { + FCOMMON.Util.MsgE("목록표시 창에서 '확인' 버튼을 눌러야 SID검색이 완료됩니다."); + } + } + else + { + FCOMMON.Util.MsgI("SPM/NR 에서 검색된 정보가 없습니다\n저장이 가능 합니다"); + this.sidchk = sid; + } + } } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx index 0183111..98f9eaf 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx @@ -197,6 +197,9 @@ 313, 17 + + 674, 17 + 58 diff --git a/SubProject/FEQ0000/SqlServerTypes/Loader.cs b/SubProject/FEQ0000/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/SubProject/FEQ0000/SqlServerTypes/Loader.cs +++ b/SubProject/FEQ0000/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index 243f464..f13757a 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/SubProject/FEQ0000/fItemin.cs @@ -88,7 +88,7 @@ namespace FEQ0000 bs.Filter = filter; tbFind.BackColor = Color.Lime; } - catch (Exception ex) + catch { tbFind.BackColor = Color.Tomato; } @@ -129,7 +129,7 @@ namespace FEQ0000 bs2.Filter = filter; tbFind2.BackColor = Color.Lime; } - catch (Exception ex) + catch { tbFind2.BackColor = Color.Tomato; } diff --git a/SubProject/FOW0000/FOW0000.csproj b/SubProject/FOW0000/FOW0000.csproj index 60917d1..8312093 100644 --- a/SubProject/FOW0000/FOW0000.csproj +++ b/SubProject/FOW0000/FOW0000.csproj @@ -112,18 +112,9 @@ - - Form - - - fHappyNarae.cs - - - fHappyNarae.cs - ResXFileCodeGenerator Resources.Designer.cs diff --git a/SubProject/FOW0000/fHappyNarae.Designer.cs b/SubProject/FOW0000/fHappyNarae.Designer.cs deleted file mode 100644 index e67327d..0000000 --- a/SubProject/FOW0000/fHappyNarae.Designer.cs +++ /dev/null @@ -1,138 +0,0 @@ - -namespace FOW0000 -{ - partial class fHappyNarae - { - /// - /// 필수 디자이너 변수입니다. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 사용 중인 모든 리소스를 정리합니다. - /// - /// 관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form 디자이너에서 생성한 코드 - - /// - /// 디자이너 지원에 필요한 메서드입니다. - /// 이 메서드의 내용을 코드 편집기로 수정하지 마세요. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHappyNarae)); - this.wb1 = new CefSharp.WinForms.ChromiumWebBrowser(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.sburl = new System.Windows.Forms.ToolStripStatusLabel(); - this.sbstat = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStrip1.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // wb1 - // - this.wb1.ActivateBrowserOnCreation = false; - this.wb1.Dock = System.Windows.Forms.DockStyle.Fill; - this.wb1.Location = new System.Drawing.Point(0, 25); - this.wb1.Name = "wb1"; - this.wb1.Size = new System.Drawing.Size(925, 621); - this.wb1.TabIndex = 0; - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1, - this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(925, 25); - this.toolStrip1.TabIndex = 1; - this.toolStrip1.Text = "toolStrip1"; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.sburl, - this.sbstat}); - this.statusStrip1.Location = new System.Drawing.Point(0, 646); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(925, 22); - this.statusStrip1.TabIndex = 2; - this.statusStrip1.Text = "statusStrip1"; - // - // toolStripButton1 - // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(66, 22); - this.toolStripButton1.Text = "Refresh"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // toolStripButton2 - // - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(123, 22); - this.toolStripButton2.Text = "신규품목신청현황"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // sburl - // - this.sburl.Name = "sburl"; - this.sburl.Size = new System.Drawing.Size(121, 17); - this.sburl.Text = "toolStripStatusLabel1"; - // - // sbstat - // - this.sbstat.Name = "sbstat"; - this.sbstat.Size = new System.Drawing.Size(121, 17); - this.sbstat.Text = "toolStripStatusLabel1"; - // - // fHappyNarae - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(925, 668); - this.Controls.Add(this.wb1); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.toolStrip1); - this.Name = "fHappyNarae"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "행복나래 A-BSJUNG / Amkor1973 "; - this.WindowState = System.Windows.Forms.FormWindowState.Maximized; - this.Load += new System.EventHandler(this.fHappyNarae_Load); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private CefSharp.WinForms.ChromiumWebBrowser wb1; - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton2; - private System.Windows.Forms.ToolStripStatusLabel sburl; - private System.Windows.Forms.ToolStripStatusLabel sbstat; - } -} - diff --git a/SubProject/FOW0000/fHappyNarae.cs b/SubProject/FOW0000/fHappyNarae.cs deleted file mode 100644 index 5c3112e..0000000 --- a/SubProject/FOW0000/fHappyNarae.cs +++ /dev/null @@ -1,91 +0,0 @@ -using CefSharp; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace FOW0000 -{ - public partial class fHappyNarae : Form - { - public fHappyNarae() - { - InitializeComponent(); - this.wb1.FrameLoadEnd += Wb1_FrameLoadEnd; - this.wb1.AddressChanged += Wb1_AddressChanged; - this.wb1.StatusMessage += Wb1_StatusMessage; - } - - private void Wb1_StatusMessage(object sender, StatusMessageEventArgs e) - { - sbstat.Text = e.Value; - } - - private void Wb1_AddressChanged(object sender, AddressChangedEventArgs e) - { - sburl.Text = e.Address; - } - - - private void Wb1_FrameLoadEnd(object sender, FrameLoadEndEventArgs e) - { - Console.WriteLine("Frame End : " + e.Url); ; - //if (e.Url.Contains("logfail.jsp?LoginDNS=null")) - //{ - // var frame = this.wb1.GetMainFrame(); - // var visitor = new SourceVisitor((text) => - // { - // BeginInvoke(new Action(() => - // { - // MessageBox.Show(text.Substring(0, 100)); - // })); - // }); - - // frame.GetSource(visitor); - //} - } - //public class SourceVisitor : IStringVisitor - //{ - // private readonly Action _callback; - - // public SourceVisitor(Action callback) - // { - // _callback = callback; - // } - - // public override void Visit(string value) - // { - // _callback(value); - // } - // public override Dispose() - // { - - // } - //} - - - private void fHappyNarae_Load(object sender, EventArgs e) - { - wb1.Load("https://www.happynarae.com/fullsize/frist_web/logfail.jsp?LoginDNS=null"); - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - wb1.Load("https://www.happynarae.com/fullsize/frist_web/logfail.jsp?LoginDNS=null"); - } - - private void toolStripButton2_Click(object sender, EventArgs e) - { - var script = "f_sub_menu_click("/havis/havis_custom/202auth/order/cust_order_05.jsp","/havis/fullsize/help_desk/202auth/main/cust_order_05.html","3");"; - script = script.Replace(""", "\""); - var command = string.Format(script); - this.wb1.GetMainFrame().ExecuteJavaScriptAsync(command); - } - } -} diff --git a/SubProject/FPJ0000/EBoard/fEboardData.cs b/SubProject/FPJ0000/EBoard/fEboardData.cs index c991757..005a6ca 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.cs @@ -119,7 +119,7 @@ namespace FPJ0000 { this.richTextBoxEx1.Rtf = dr.원인2; } - catch (Exception ex) + catch { this.richTextBoxEx1.Text = dr.원인; } @@ -136,7 +136,7 @@ namespace FPJ0000 { this.richTextBoxEx2.Rtf = dr.결과2; } - catch (Exception ex) + catch { this.richTextBoxEx2.Text = dr.결과; } diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs index e57aeb6..1cc0117 100644 --- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs +++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs @@ -68,7 +68,7 @@ namespace FPJ0000.JobReport_ //일반사용자 목록 가져온다 - IQueryable> userlist; + //IQueryable> userlist; //공정구분없이 전체사용자를 가져온다 foreach (System.Data.DataRow item in userList.Rows) diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs index 3979bc7..7f8e1c8 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs @@ -257,7 +257,7 @@ namespace FPJ0000.JobReport_ var processName = grp.Max(t => t.userprocess); //string[] columns = new string[dv1.ColumnCount]; - var row = 0; + //var row = 0; //columns[row++] = grp.Max(t => t.idx).ToString(); //columns[row++] = prjname; //columns[row++] = sdate; @@ -379,7 +379,7 @@ namespace FPJ0000.JobReport_ var status = prc.Max(t => t.status); //string[] columns = new string[dv1.ColumnCount]; - var row = 0; + //var row = 0; //columns[row++] = grp.Max(t => t.idx).ToString(); //columns[row++] = prjname; //columns[row++] = sdate; diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs index 3ee490a..7dc0cc3 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs @@ -13,7 +13,7 @@ namespace FPJ0000.OtConfirm public partial class fOTConfirmOK : Form { dsPRJ.JobReportRow[] dr; - Boolean binit = false; + //Boolean binit = false; public fOTConfirmOK(dsPRJ.JobReportRow[] dr_) { @@ -28,7 +28,7 @@ namespace FPJ0000.OtConfirm { curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); button1.Enabled = curLevel >= 5; - binit = true; + //binit = true; } private void button1_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index b63d5ba..950a996 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -205,7 +205,7 @@ namespace FPJ0000 var PO대기 = 0; //PR이 체크되어있으나 PO가 체크안된데이터 var 구매진행 = 0; // PO가 체크되어있으나 입고수량이 구매수량보다 적은 경우 var 구매완료 = 0; // 입고수량 >= 구매수량 - var 입력오류 = 0; + //var 입력오류 = 0; var project = int.Parse(tbIdx.Text); @@ -217,8 +217,8 @@ namespace FPJ0000 { var v_supply = string.Empty; var v_sid = string.Empty; - Boolean bPR = false; - Boolean bPO = false; + //Boolean bPR = false; + //Boolean bPO = false; var row = this.fpSpread1.ActiveSheet.Rows[i]; // var value_buy = this.fpSpread1.ActiveSheet.GetValue(i, col_buy); diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index c392633..c5bb475 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -288,11 +288,11 @@ namespace FPJ0000 this.dr.CMP_Description = rtDesc.Rtf; this.dr.CMP_Background = rtBack.Rtf; - var s = "dbo.getUserName2(championid,usermanager) as name_champion," + - "dbo.getUserName2(designid,usermain) as name_design," + - "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + - "dbo.getUserName2(epanelid,userhw2) as name_epanel," + - "dbo.getUserName2(softwareid,usersub) as name_software"; + // var s = "dbo.getUserName2(championid,usermanager) as name_champion," + + //"dbo.getUserName2(designid,usermain) as name_design," + + //"dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + + //"dbo.getUserName2(epanelid,userhw2) as name_epanel," + + //"dbo.getUserName2(softwareid,usersub) as name_software"; //if (cmbChampion.SelectedIndex < 1) //{ diff --git a/SubProject/FPJ0000/SqlServerTypes/Loader.cs b/SubProject/FPJ0000/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/SubProject/FPJ0000/SqlServerTypes/Loader.cs +++ b/SubProject/FPJ0000/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file diff --git a/SubProject/FPM0000/SqlServerTypes/Loader.cs b/SubProject/FPM0000/SqlServerTypes/Loader.cs index 92f9384..b11d98d 100644 --- a/SubProject/FPM0000/SqlServerTypes/Loader.cs +++ b/SubProject/FPM0000/SqlServerTypes/Loader.cs @@ -1,45 +1,45 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; +//using System; +//using System.IO; +//using System.Runtime.InteropServices; -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - public class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); +//namespace SqlServerTypes +//{ +// /// +// /// Utility methods related to CLR Types for SQL Server +// /// +// public class Utilities +// { +// [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] +// private static extern IntPtr LoadLibrary(string libname); - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - public static void LoadNativeAssemblies(string rootApplicationPath) - { - var nativeBinaryPath = IntPtr.Size > 4 - ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") - : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); +// /// +// /// Loads the required native assemblies for the current architecture (x86 or x64) +// /// +// /// +// /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications +// /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. +// /// +// public static void LoadNativeAssemblies(string rootApplicationPath) +// { +// var nativeBinaryPath = IntPtr.Size > 4 +// ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") +// : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); - LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); - LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); - } +// LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); +// LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); +// } - private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) - { - var path = Path.Combine(nativeBinaryPath, assemblyName); - var ptr = LoadLibrary(path); - if (ptr == IntPtr.Zero) - { - throw new Exception(string.Format( - "Error loading {0} (ErrorCode: {1})", - assemblyName, - Marshal.GetLastWin32Error())); - } - } - } -} \ No newline at end of file +// private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) +// { +// var path = Path.Combine(nativeBinaryPath, assemblyName); +// var ptr = LoadLibrary(path); +// if (ptr == IntPtr.Zero) +// { +// throw new Exception(string.Format( +// "Error loading {0} (ErrorCode: {1})", +// assemblyName, +// Marshal.GetLastWin32Error())); +// } +// } +// } +//} \ No newline at end of file