diff --git a/EETGW.sln b/EETGW.sln index b7fcd1b..5a26a9a 100644 --- a/EETGW.sln +++ b/EETGW.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sub", "Sub", "{28105E67-9D3 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaffLayoutCtl", "Sub\StaffLayoutCtl\StaffLayoutCtl.csproj", "{B832738C-74DD-4CE2-8A29-98D0BCBB9EA4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmkorRestfulService", "..\..\_Library\AmkorRestfulService\AmkorRestfulService\AmkorRestfulService.csproj", "{58CFC90C-5068-46A2-A8DE-0E92EE9E0990}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FEQ0000", "SubProject\FEQ0000\FEQ0000.csproj", "{C2E0627D-0623-4B68-A558-37CBCE6BDCA6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FCOMMON", "SubProject\FCOMMON\FCOMMON.csproj", "{304BD018-194B-47DA-B4E0-F16DF7B606DA}" @@ -25,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FBS0000", "SubProject\FBS00 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arControl", "..\..\_Library\arControl\arControl\arControl.csproj", "{F31C242C-1B15-4518-9733-48558499FE4B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTPClass", "Sub\arftp\FTPClass.csproj", "{150859D3-1C5D-4E20-B324-F9EBE188D893}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MailManager", "MailManager\MailManager.csproj", "{0D8E0019-909A-4879-9088-B2927509264E}" @@ -35,6 +31,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTP_DB_Adapt", "FTP_DB_Adap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FPM0000", "SubProject\FPM0000\FPM0000.csproj", "{D01A7891-AD0B-489B-8C45-F598C875FE26}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arControl", "Sub\arCtl\arControl.csproj", "{F31C242C-1B15-4518-9733-48558499FE4B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmkorRestfulService", "Sub\AmkorRestfulService\AmkorRestfulService.csproj", "{58CFC90C-5068-46A2-A8DE-0E92EE9E0990}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,12 +57,6 @@ Global {B832738C-74DD-4CE2-8A29-98D0BCBB9EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU {B832738C-74DD-4CE2-8A29-98D0BCBB9EA4}.Release|Any CPU.Build.0 = Release|Any CPU {B832738C-74DD-4CE2-8A29-98D0BCBB9EA4}.Release|x86.ActiveCfg = Release|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|x86.ActiveCfg = Debug|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|Any CPU.Build.0 = Release|Any CPU - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|x86.ActiveCfg = Release|Any CPU {C2E0627D-0623-4B68-A558-37CBCE6BDCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2E0627D-0623-4B68-A558-37CBCE6BDCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2E0627D-0623-4B68-A558-37CBCE6BDCA6}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -99,12 +93,6 @@ Global {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.Build.0 = Release|Any CPU {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.ActiveCfg = Release|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|x86.ActiveCfg = Debug|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.Build.0 = Release|Any CPU - {F31C242C-1B15-4518-9733-48558499FE4B}.Release|x86.ActiveCfg = Release|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.Build.0 = Debug|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -133,22 +121,38 @@ Global {D01A7891-AD0B-489B-8C45-F598C875FE26}.Release|Any CPU.Build.0 = Release|Any CPU {D01A7891-AD0B-489B-8C45-F598C875FE26}.Release|x86.ActiveCfg = Release|Any CPU {D01A7891-AD0B-489B-8C45-F598C875FE26}.Release|x86.Build.0 = Release|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|x86.ActiveCfg = Debug|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Debug|x86.Build.0 = Debug|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.Build.0 = Release|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Release|x86.ActiveCfg = Release|Any CPU + {F31C242C-1B15-4518-9733-48558499FE4B}.Release|x86.Build.0 = Release|Any CPU + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|x86.ActiveCfg = Debug|x86 + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Debug|x86.Build.0 = Debug|x86 + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|Any CPU.Build.0 = Release|Any CPU + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|x86.ActiveCfg = Release|x86 + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {B832738C-74DD-4CE2-8A29-98D0BCBB9EA4} = {28105E67-9D33-4627-8E26-FCE67700622F} - {58CFC90C-5068-46A2-A8DE-0E92EE9E0990} = {28105E67-9D33-4627-8E26-FCE67700622F} {C2E0627D-0623-4B68-A558-37CBCE6BDCA6} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {304BD018-194B-47DA-B4E0-F16DF7B606DA} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {74836A5F-CB5B-449F-9210-99C9D1A23B97} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {26982882-C1FF-45F8-861C-D67558725FF1} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {F6F515C6-6628-47C4-8A94-683BDF9FBB9C} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE} = {28105E67-9D33-4627-8E26-FCE67700622F} - {F31C242C-1B15-4518-9733-48558499FE4B} = {28105E67-9D33-4627-8E26-FCE67700622F} {150859D3-1C5D-4E20-B324-F9EBE188D893} = {28105E67-9D33-4627-8E26-FCE67700622F} {D01A7891-AD0B-489B-8C45-F598C875FE26} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} + {F31C242C-1B15-4518-9733-48558499FE4B} = {28105E67-9D33-4627-8E26-FCE67700622F} + {58CFC90C-5068-46A2-A8DE-0E92EE9E0990} = {28105E67-9D33-4627-8E26-FCE67700622F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 80b9d84..d291af8 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -451,14 +451,6 @@ - - {58cfc90c-5068-46a2-a8de-0e92ee9e0990} - AmkorRestfulService - - - {f31c242c-1b15-4518-9733-48558499fe4b} - arControl - {f6f515c6-6628-47c4-8a94-683bdf9fbb9c} FBS0000 @@ -483,6 +475,10 @@ {d01a7891-ad0b-489b-8c45-f598c875fe26} FPM0000 + + {f31c242c-1b15-4518-9733-48558499fe4b} + arControl + {b832738c-74dd-4ce2-8a29-98d0bcbb9ea4} StaffLayoutCtl diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index e7850a0..dddc286 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -535,7 +535,7 @@ - + {f31c242c-1b15-4518-9733-48558499fe4b} arControl diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 72a8d23..7557749 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -407,7 +407,7 @@ - + {f31c242c-1b15-4518-9733-48558499fe4b} arControl diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 9c1f10d..ff40a9d 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -6596,11 +6596,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int qtyn { get { - try { - return ((int)(this[this.tableProjectsPart.qtynColumn])); + if (this.IsqtynNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'ProjectsPart\' 테이블의 \'qtyn\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableProjectsPart.qtynColumn])); } } set { @@ -6612,11 +6612,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public decimal amtn { get { - try { - return ((decimal)(this[this.tableProjectsPart.amtnColumn])); + if (this.IsamtnNull()) { + return 0m; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'ProjectsPart\' 테이블의 \'amtn\' 열의 값이 DBNull입니다.", e); + else { + return ((decimal)(this[this.tableProjectsPart.amtnColumn])); } } set { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index dc07d95..9bbd0f2 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1191,7 +1191,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1384,7 +1384,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1428,7 +1428,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1473,7 +1473,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1580,12 +1580,12 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - - + + - + @@ -1696,7 +1696,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1730,7 +1730,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1768,7 +1768,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index cf72bd8..ef582ee 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +