diff --git a/EETGW.v12.suo b/EETGW.v12.suo index a03c177..2d40dd9 100644 Binary files a/EETGW.v12.suo and b/EETGW.v12.suo differ diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 979830b..41ab65e 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -237,6 +237,12 @@ fInfo_Staff.cs + + Form + + + EQfilter.cs + Form @@ -255,11 +261,11 @@ fLineCode.cs - + Form - - rpt_equipment.cs + + rpt_equipmentB.cs Form @@ -313,6 +319,9 @@ fInfo_Staff.cs + + EQfilter.cs + fEquipment.cs @@ -322,9 +331,10 @@ fLineCode.cs - - - rpt_equipment.cs + + + + rpt_equipmentB.cs fProjectList.cs diff --git a/Project/Manager/DataBaseManager.cs b/Project/Manager/DataBaseManager.cs index 16e12bb..8b897eb 100644 --- a/Project/Manager/DataBaseManager.cs +++ b/Project/Manager/DataBaseManager.cs @@ -14,13 +14,13 @@ namespace Project.Manager cn.ConnectionString = cs; return cn; } - public static List getEQGroupLiist(string GroupColumn) + public static List getEQGroupLiist(string GroupColumn,string table) { List retval = new List(); var cn = getCn(); cn.Open(); - var sql = "select {0} from Equipment where isnull({0},'') != '' group by {0} order by {0}"; - sql = string.Format(sql, "[" + GroupColumn +"]"); + var sql = "select {0} from {1} where isnull({0},'') != '' group by {0} order by {0}"; + sql = string.Format(sql, "[" + GroupColumn +"]",table); var cmd = new System.Data.SqlClient.SqlCommand(sql,cn); var rdr = cmd.ExecuteReader(); while(rdr.Read()) diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs index 5c99141..af3c980 100644 --- a/Project/Properties/Settings.Designer.cs +++ b/Project/Properties/Settings.Designer.cs @@ -33,5 +33,19 @@ namespace Project.Properties { return ((string)(this["gwcs"])); } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("using System; \r\nnamespace HelloWorld \r\n{ \r\n public static class HelloWorldCla" + + "ss \r\n { \r\n public static string test() \r\n { \r\n " + + " return {0};\r\n } \r\n } \r\n};")] + public string nilliila { + get { + return ((string)(this["nilliila"])); + } + set { + this["nilliila"] = value; + } + } } } diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings index ecfa3f2..ca634ed 100644 --- a/Project/Properties/Settings.settings +++ b/Project/Properties/Settings.settings @@ -10,5 +10,18 @@ </SerializableConnectionString> Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123! + + using System; +namespace HelloWorld +{ + public static class HelloWorldClass + { + public static string test() + { + return {0}; + } + } +}; + \ No newline at end of file diff --git a/Project/Pub.cs b/Project/Pub.cs index 67a1d1f..9320832 100644 --- a/Project/Pub.cs +++ b/Project/Pub.cs @@ -29,7 +29,7 @@ namespace Project public static DateTime LastInputTime = DateTime.Now; public static CResult Result = new CResult(); - public static void init() + public static void init() { string Path = Util.CurrentPath; if (Util.isLocalApplication()) @@ -53,5 +53,51 @@ namespace Project //language Lang.Loading(Pub.setting.Language + ".ini"); } + + public static void SetFormStatus(ref System.Windows.Forms.Form f, string formid,Boolean read) + { + var fi = new System.IO.FileInfo(Util.CurrentPath + "formSetting\\" + formid + ".xml"); + if (fi.Directory.Exists == false) fi.Directory.Create(); + arUtil.XMLHelper xml = new arUtil.XMLHelper(fi.FullName); + if (!xml.Exist()) + { + xml.CreateFile(); + if (read) return; //읽기인데 파일이 없으므로 넘어간다. + } + if (read) + { + var leftStr = xml.get_Data("position", "left"); + var topStr = xml.get_Data("position", "top"); + int l = 0; + int t = 0; + if (!int.TryParse(leftStr, out l)) l = 0; + if (!int.TryParse(topStr, out t)) t = 0; + if (l != 0 || t != 0) + { + f.Location = new System.Drawing.Point(l, t); + } + + var wStr = xml.get_Data("size", "width"); + var hStr = xml.get_Data("size", "height"); + int w = 0; + int h = 0; + if (!int.TryParse(wStr, out w)) w = 0; + if (!int.TryParse(hStr, out h)) h = 0; + if (w != 0 || h != 0) + { + f.Size = new System.Drawing.Size(w, h); + } + } + else + { + xml.set_Data("position", "left", f.Left.ToString()); + xml.set_Data("position", "top", f.Top.ToString()); + xml.set_Data("size", "width", f.Width.ToString()); + xml.set_Data("size", "height", f.Height.ToString()); + xml.Save(); + } + + } + } } diff --git a/Project/_Management/Report1.rdlc b/Project/_Management/Report1.rdlc deleted file mode 100644 index 70b1bb1..0000000 --- a/Project/_Management/Report1.rdlc +++ /dev/null @@ -1,1156 +0,0 @@ - - - - - - - - - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - - - - - Textbox4 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - - - - - Textbox30 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - true - true - - - - - Process - - - - - - - Textbox8 - - - #4c68a2 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - manu - - - - - - - Textbox5 - - - #4c68a2 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - model - - - - - - - Textbox31 - - - #4c68a2 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - 1.01833cm - - - 1.17708cm - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox18 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox15 - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox19 - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox12 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox20 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - =Fields!team.Value - - - - - =Fields!team.Value - - - - 0.6cm - - - true - true - - - - - =Fields!team.Value - - - - - - - team - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!part.Value - - - - - =Fields!part.Value - - - - 0.6cm - - - true - true - - - - - =Fields!part.Value - - - - - - - part - - - #c6daf8 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - true - team - - - - - - - 0.6cm - - - true - true - - - - - Total - - - - - - - Textbox16 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - true - true - - - - - cnt - - - - - - - Textbox17 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - =Fields!grp.Value - - - - - =Fields!grp.Value - - - - 4.96062cm - - - true - true - - - - - =Fields!grp.Value - - - - - - - grp - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!manu.Value - - - - - =Fields!manu.Value - - - - 2.5cm - - - true - true - - - - - =Fields!manu.Value - - - - - - - manu - - - #c6daf8 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!model.Value - - - - - =Fields!model.Value - - - - 2.79104cm - - - true - true - - - - - =Fields!model.Value - - - - - - - model - - - #c6daf8 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - true - grp - - - - - 2.5cm - - - true - true - - - - - = "Total (" & count(Fields!manu.Value) & ")" - - - - - - - Textbox14 - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 2.79104cm - - - true - true - - - - - - - - - - - - Textbox33 - - - #9eb6e4 - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - Before - - - - - - 4.96062cm - - - true - true - - - - - Total - - - - - - - Textbox10 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 2.5cm - - - true - true - - - - - - - - - - - - Textbox11 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 2.79104cm - - - true - true - - - - - - - - - - - - Textbox34 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - Before - - - - DataSet1 - 3cm - 12.44708cm - - - 맑은 고딕 - 8pt - - - - 1.65354in -