diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 0f9908b..548a7a2 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -80,39 +80,42 @@ namespace Project.Dialog var ta = new dsMSSQLTableAdapters.UsersTableAdapter(); try { - var users = ta.GetIDPW(encpass, tbID.Text.Trim()); - if (users.Rows.Count < 1) + var users = ta.GetIDPW(encpass, tbID.Text.Trim()); + if (users.Rows.Count != 1) { - Util.MsgE("입력한 사용자 계정이 존재하지 않습니다"); - tbPW.SelectAll(); - tbPW.Focus(); - return; - } - else - { - //이사용자의 부서 코드확인 - var userdr = users.Rows[0] as dsMSSQL.UsersRow; - if(userdr.level < 9 && userdr.dept != cmbDept.Text) + users = ta.GetByNamePw(tbID.Text.Trim(), encpass); + if(users.Rows.Count != 1) { - Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + Util.MsgE("입력한 사용자 계정이 존재하지 않습니다"); + tbPW.SelectAll(); + tbPW.Focus(); return; } - - FCOMMON.info.Login.no = userdr.id; - FCOMMON.info.Login.nameK = userdr.name; - FCOMMON.info.Login.dept = cmbDept.Text; - FCOMMON.info.Login.level = userdr.level; - FCOMMON.info.Login.email = userdr.email; - FCOMMON.info.Login.nameE = userdr.nameE; - FCOMMON.info.Login.hp = userdr.hp; - FCOMMON.info.Login.tel = userdr.tel; - FCOMMON.info.Login.title = userdr.ads_title; - var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); - var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); - FCOMMON.info.Login.gcode = gcode; - FCOMMON.info.Login.permission = 0; - FCOMMON.info.Login.gpermission = int.Parse( gperm); } + + //이사용자의 부서 코드확인 + var userdr = users.Rows[0] as dsMSSQL.UsersRow; + if (userdr.level < 9 && userdr.dept != cmbDept.Text) + { + Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + return; + } + + FCOMMON.info.Login.no = userdr.id; + FCOMMON.info.Login.nameK = userdr.name; + FCOMMON.info.Login.dept = cmbDept.Text; + FCOMMON.info.Login.level = userdr.level; + FCOMMON.info.Login.email = userdr.email; + FCOMMON.info.Login.nameE = userdr.nameE; + FCOMMON.info.Login.hp = userdr.hp; + FCOMMON.info.Login.tel = userdr.tel; + FCOMMON.info.Login.title = userdr.ads_title; + var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gcode; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + DialogResult = DialogResult.OK; }catch (Exception ex) { diff --git a/Project/History.txt b/Project/History.txt index 6f9a887..799d6a0 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ * 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인 +190819 chi 업무일지 출력물 그룹 분리 190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함 품목정보 정렬 기능 추가 190718 chi 목록조회화면에서 열 너비가 자동 불러오게 함 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d3c5963..213d3aa 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("19.08.06.1130")] -[assembly: AssemblyFileVersion("19.08.06.1130")] +[assembly: AssemblyVersion("19.08.22.1200")] +[assembly: AssemblyFileVersion("19.08.22.1200")] diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index a195317..a3e875b 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -5211,7 +5211,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te" + @@ -5223,34 +5223,42 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = "SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te" + "l, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate\r\nFROM " + - "Users\r\nwhere id = @id\r\nORDER BY name"; + "Users\r\nWHERE [name] = @username and (password = @encpw)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid FROM Users WHERE (password = @encpw) AND (level > 0) AND (email = @idkey) OR (password = @encpw) AND (level > 0) AND (id = @idkey) OR (password = @encpw) AND (level > 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })"; + this._commandCollection[2].CommandText = "SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te" + + "l, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate\r\nFROM " + + "Users\r\nwhere id = @id\r\nORDER BY name"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idkey", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"INSERT INTO Users + this._commandCollection[3].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid FROM Users WHERE (password = @encpw) AND (level > 0) AND (email = @idkey) OR (password = @encpw) AND (level > 0) AND (id = @idkey) OR (password = @encpw) AND (level > 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idkey", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = @"INSERT INTO Users (id, password, nameE, name, dept, email, level, tel, ads_employNo, ads_title, ads_created, memo, wuid, wdate) VALUES (@id, 'B6589FC6AB0DC82CF12099D1C2D40AB994E8410C',@nameE,@name,@dept,@email, 0,@tel,@ads_employNo,@ads_title,@ads_created,@memo,@wuid,@wdate); SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate FROM Users WHERE (id = @id) ORDER BY name"; - this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nameE", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_employNo", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_title", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_created", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nameE", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_employNo", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_title", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ads_created", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5293,8 +5301,56 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillID(dsMSSQL.UsersDataTable dataTable, string id) { + public virtual int FillByNamePw(dsMSSQL.UsersDataTable dataTable, string username, string encpw) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((username == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(username)); + } + if ((encpw == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(encpw)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.UsersDataTable GetByNamePw(string username, string encpw) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((username == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(username)); + } + if ((encpw == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(encpw)); + } + dsMSSQL.UsersDataTable dataTable = new dsMSSQL.UsersDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillID(dsMSSQL.UsersDataTable dataTable, string id) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((id == null)) { throw new global::System.ArgumentNullException("id"); } @@ -5313,7 +5369,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.UsersDataTable GetID(string id) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((id == null)) { throw new global::System.ArgumentNullException("id"); } @@ -5330,7 +5386,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillIDPW(dsMSSQL.UsersDataTable dataTable, string encpw, string idkey) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((encpw == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -5355,7 +5411,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.UsersDataTable GetIDPW(string encpw, string idkey) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((encpw == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -6091,7 +6147,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)] public virtual int InsertADSInfo(string id, string nameE, string name, string dept, string email, string tel, string ads_employNo, string ads_title, string ads_created, string memo, string wuid, System.DateTime wdate) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((id == null)) { throw new global::System.ArgumentNullException("id"); } diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index c6a98d3..1de5d6c 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -176,6 +176,19 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te + + + + SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate +FROM Users +WHERE [name] = @username and (password = @encpw) + + + + + + + @@ -792,7 +805,7 @@ WHERE (idx = @idx) - + @@ -919,7 +932,7 @@ WHERE (idx = @idx) - + @@ -990,7 +1003,7 @@ WHERE (idx = @idx) - + @@ -1048,7 +1061,7 @@ WHERE (idx = @idx) - + @@ -1118,7 +1131,7 @@ WHERE (idx = @idx) - + @@ -1162,7 +1175,7 @@ WHERE (idx = @idx) - + diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 49d7ebe..97255f1 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -92,6 +92,7 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); + this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -490,7 +491,8 @@ this.계정목록ToolStripMenuItem, this.그룹정보ToolStripMenuItem1, this.toolStripMenuItem1, - this.toolStripMenuItem3}); + this.toolStripMenuItem3, + this.임의테이블조작ToolStripMenuItem}); this.btDev.ForeColor = System.Drawing.Color.Blue; this.btDev.Name = "btDev"; this.btDev.Size = new System.Drawing.Size(91, 23); @@ -605,6 +607,13 @@ this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); // + // 임의테이블조작ToolStripMenuItem + // + this.임의테이블조작ToolStripMenuItem.Name = "임의테이블조작ToolStripMenuItem"; + this.임의테이블조작ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.임의테이블조작ToolStripMenuItem.Text = "구매내역 suuply 다시 설정 하기"; + this.임의테이블조작ToolStripMenuItem.Click += new System.EventHandler(this.임의테이블조작ToolStripMenuItem_Click); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -696,6 +705,7 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; private System.Windows.Forms.ToolStripMenuItem mn_logdata; + private System.Windows.Forms.ToolStripMenuItem 임의테이블조작ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 44d3b33..eee7b44 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -93,9 +93,9 @@ namespace Project //즐겨찾기 없데이트 g=17 //타입 var dt_type = FCOMMON.DBM.getCodeTable("17"); - foreach(DataRow dr in dt_type.Rows) + foreach (DataRow dr in dt_type.Rows) { - var bt = new ToolStripMenuItem(); + var bt = new ToolStripMenuItem(); bt.Text = dr["value"].ToString(); bt.Tag = dr["svalue"].ToString(); bt.Click += bt_Click; @@ -140,16 +140,16 @@ namespace Project } void Func_RunStartForm() { - var menu_purchaseVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase); - var menu_projectVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project); - var menu_dailyhistoryVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history); - var menu_jagoVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago); - var menu_eqVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment); - var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday); - var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); + var menu_purchaseVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase); + var menu_projectVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project); + var menu_dailyhistoryVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history); + var menu_jagoVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago); + var menu_eqVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment); + var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday); + var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); //시작폼 확인 - if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible==true) + if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true) { menu_nrpurchase(); } @@ -161,7 +161,7 @@ namespace Project { menu_projecT_list(); } - else if(Pub.setting.startForm == eFormList.재고관리 && menu_jagoVisible==true) + else if (Pub.setting.startForm == eFormList.재고관리 && menu_jagoVisible == true) { Menu_Inventory(); } @@ -174,7 +174,7 @@ namespace Project Menu_logData(); } } - + void _SetLang() { @@ -276,7 +276,7 @@ namespace Project private void staffGridToolStripMenuItem_Click(object sender, EventArgs e) { - + } @@ -377,7 +377,7 @@ namespace Project private void mailFormToolStripMenuItem_Click(object sender, EventArgs e) { - + } @@ -441,7 +441,7 @@ namespace Project private void aDSUserListToolStripMenuItem_Click(object sender, EventArgs e) { - + } private void myAccouserToolStripMenuItem_Click(object sender, EventArgs e) @@ -497,21 +497,21 @@ namespace Project this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].ContextMenuStrip = this.cmTab; this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Controls.Add(f); this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Tag = key; - this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1; + this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1; f.Show(); } void f_FormClosed(object sender, FormClosedEventArgs e) { var f = sender as Form; - var key = f.Tag.ToString(); - foreach(TabPage tab in this.tabControl1.TabPages) + var key = f.Tag.ToString(); + foreach (TabPage tab in this.tabControl1.TabPages) { if (tab.Visible == true) - { - this.tabControl1.TabPages.Remove(tab); - break; - } + { + this.tabControl1.TabPages.Remove(tab); + break; + } } if (this.tabControl1.TabPages.Count > 0) this.tabControl1.SelectedIndex = this.tabControl1.TabCount - 1; } @@ -642,12 +642,12 @@ namespace Project private void 재고관리ToolStripMenuItem_Click(object sender, EventArgs e) { - + } private void 그룹정보ToolStripMenuItem_Click(object sender, EventArgs e) { - + //string formkey = "USERGROUP"; //if (!ShowForm(formkey)) @@ -661,7 +661,7 @@ namespace Project cn.Open(); //string sql = "select " + field + " from " + table + " where idx = " + idx.ToString(); - var cmdupdate = new System.Data.SqlClient.SqlCommand("update items set [sid] = @sid where idx = @idx",cn); + var cmdupdate = new System.Data.SqlClient.SqlCommand("update items set [sid] = @sid where idx = @idx", cn); cmdupdate.Parameters.Add("sid", SqlDbType.VarChar); cmdupdate.Parameters.Add("idx", SqlDbType.Int); @@ -678,9 +678,9 @@ namespace Project dar.Dispose(); //임시SID는 전체 19자리이며 #TEMP#으로 시작하낟. - foreach(var idx in idxlist) + foreach (var idx in idxlist) { - var newsid = "#TEMP#" + idx.ToString("000000000000000") ; + var newsid = "#TEMP#" + idx.ToString("000000000000000"); cmdupdate.Parameters[0].Value = newsid; cmdupdate.Parameters[1].Value = idx; cmdupdate.ExecuteNonQuery(); @@ -772,5 +772,93 @@ namespace Project { Menu_logData(); } + + private void 임의테이블조작ToolStripMenuItem_Click(object sender, EventArgs e) + { + + var sql = "select * from Purchase where pdate = '2019-08-01' and orderno = '210000657'"; + var cn = FCOMMON.DBM.getCn(); + var cnU = FCOMMON.DBM.getCn(); + cn.Open(); + cnU.Open(); + + //string sql = "select " + field + " from " + table + " where idx = " + idx.ToString(); + var sqlU = "update Purchase set supply=@supply where pdate = '2019-08-01' and orderno = '210000657'"; + var cmdupdate = new System.Data.SqlClient.SqlCommand(sqlU, cn); + cmdupdate.Parameters.Add("supply", SqlDbType.VarChar); + cmdupdate.Parameters["supply"].Value = ""; + //cmdupdate.Parameters.Add("sidx", SqlDbType.Int); + + + var cmd = new System.Data.SqlClient.SqlCommand(sql, cnU); + var dar = cmd.ExecuteReader(); + + List idxlist = new List(); + while (dar.Read()) + { + //sid 가 잇다면 해당 sid 의 suuply를 찾아서 업데이트한다. + var sid = dar["sid"].ToString().Trim(); + var itemname = dar["pumname"].ToString().Trim(); + var itemmodel = dar["pumscale"].ToString().Trim(); + + if (itemname == "FIBER SENSOR(반사형)") + { + + } + + + bool sidOK = false; + if (sid.Length == 9) + { + cmdupdate.CommandText = "select isnull(itemsupply,'') from ProjectsPart where project=212 and isnull(itemsid,'') = '" + sid + "'"; + var data = cmdupdate.ExecuteScalar(); + if (data != null && data.ToString().Trim() != "") + { + var supplyname = cmdupdate.ExecuteScalar().ToString().Trim(); + if (supplyname != "") + { + cmdupdate.CommandText = "update Purchase set supply=@supply where pdate = '2019-08-01' and orderno = '210000657' and sid='" + sid + "'" ; + cmdupdate.Parameters["supply"].Value = supplyname; + if (cmdupdate.ExecuteNonQuery() > 0) sidOK = true; + } + } + } + + if(sidOK == false && itemname != "") + { + if(itemname == "FIBER SENSOR(반사형)") + { + + } + //아이템으로 찾아야함 + cmdupdate.CommandText = "select isnull(itemsupply,'') from ProjectsPart where project=212 and isnull(ItemName,'') = '" + itemname + "' and isnull(itemmodel,'') = '" + itemmodel + "'"; + var data = cmdupdate.ExecuteScalar(); + if (data != null && data.ToString().Trim() != "") + { + var supplyname = data.ToString().Trim(); + if (supplyname != "") + { + cmdupdate.CommandText = "update Purchase set supply=@supply where pdate = '2019-08-01' and orderno = '210000657' and pumname='" + itemname + "' and isnull(pumscale,'') = '"+ itemmodel +"'"; + cmdupdate.Parameters["supply"].Value = supplyname; + var cnt1 = cmdupdate.ExecuteNonQuery(); + } + } + + } + } + + + cmd.Dispose(); + dar.Close(); + dar.Dispose(); + + + cn.Close(); + cn.Dispose(); + cnU.Close(); + cnU.Dispose(); + + FCOMMON.Util.MsgI("complete"); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 2196060..76b851a 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -173,6 +173,34 @@ AAAIpABZCBxIcGCLgyw2PHiQoqHDhiwOtmAxQIXFixcDREQ4YIXHjx8JbJwoQQUCjBlHspAAsqVGiRRN WuxQoICJBiNCbKT4EUQBAR8ECCCR4EREFgRk/qQwYUIEBw4wQBBI4GMDARFKZFCgYEGCAwIHEAgQoAIK Dxq6GjCQAEBBgSJQyEVhwYBbiXhZQDhwAACKBRdG4p04EAAHBoIHwwSAWLFjgwEBADs= + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== @@ -235,34 +263,6 @@ AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL hQnTql2rNiAAOw== - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= - - - - - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow== diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 1dbcdc6..4979952 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -455,6 +455,11 @@ namespace FCOMMON public static sCodeData getCodeBySvalue(string GroupCode, string svalue) { var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + var cn = getCn(); cn.Open(); var sql = "select isnull(code,''),isnull(memo,'')" + @@ -477,6 +482,93 @@ namespace FCOMMON retval.svalue = svalue; return retval; } + public static sCodeData getCodeByMemo(string GroupCode, string memo) + { + var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and memo = '{1}'"; + + sql = string.Format(sql, GroupCode, memo); + var cmd = new SqlCommand(sql, cn); + var da = cmd.ExecuteReader(); + while (da.Read()) + { + retval.code = da[0].ToString(); + retval.title = da[1].ToString(); + } + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + retval.grp = GroupCode; + retval.svalue = memo; + return retval; + } + public static Boolean insertCode(string GroupCode, string code,string memo,string svalue="") + { + + var cn = getCn(); + cn.Open(); + var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" + + " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)"; + + sql = string.Format(sql, GroupCode, memo); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("grp", GroupCode)); + cmd.Parameters.Add(new SqlParameter("code", code)); + cmd.Parameters.Add(new SqlParameter("memo", memo)); + cmd.Parameters.Add(new SqlParameter("svalue", svalue)); + cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + var da = cmd.ExecuteNonQuery(); + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return da > 0; + } + + public static sCodeData getCodeByCode(string GroupCode, string code) + { + var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'"; + + sql = string.Format(sql, GroupCode, code); + var cmd = new SqlCommand(sql, cn); + var da = cmd.ExecuteReader(); + while (da.Read()) + { + retval.code = da[0].ToString(); + retval.title = da[1].ToString(); + } + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + retval.grp = GroupCode; + retval.svalue = code; + return retval; + } + /// /// 지정된 프로젝트의 마지막 업무일지 데이터를 반환함 /// diff --git a/SubProject/FLG0000/DSLog.Designer.cs b/SubProject/FLG0000/DSLog.Designer.cs index 75917f5..aef6bd7 100644 --- a/SubProject/FLG0000/DSLog.Designer.cs +++ b/SubProject/FLG0000/DSLog.Designer.cs @@ -2391,16 +2391,18 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, wdate, dbo.getUserName(wuid) AS userName FROM LogData -WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(serial, '') LIKE @search OR - ISNULL(result, '') LIKE @search OR - ISNULL(remark, '') LIKE @search) OR +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (serial LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (result LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (location LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (reason LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (remark LIKE @search) OR (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(wuid) LIKE @search) ORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2428,7 +2430,7 @@ ORDER BY pdate DESC"; this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); } if ((search == null)) { - throw new global::System.ArgumentNullException("search"); + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search)); @@ -2465,7 +2467,7 @@ ORDER BY pdate DESC"; this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); } if ((search == null)) { - throw new global::System.ArgumentNullException("search"); + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search)); diff --git a/SubProject/FLG0000/DSLog.xsd b/SubProject/FLG0000/DSLog.xsd index 4696040..bc31e0c 100644 --- a/SubProject/FLG0000/DSLog.xsd +++ b/SubProject/FLG0000/DSLog.xsd @@ -146,16 +146,18 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, wdate, dbo.getUserName(wuid) AS userName FROM LogData -WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(serial, '') LIKE @search OR - ISNULL(result, '') LIKE @search OR - ISNULL(remark, '') LIKE @search) OR +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (serial LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (result LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (location LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (reason LIKE @search) OR + (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (remark LIKE @search) OR (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(wuid) LIKE @search) ORDER BY pdate DESC - + @@ -220,7 +222,7 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, - + @@ -276,7 +278,7 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, - + diff --git a/SubProject/FLG0000/LogData/Add.Designer.cs b/SubProject/FLG0000/LogData/Add.Designer.cs index b1ab7ba..feceff4 100644 --- a/SubProject/FLG0000/LogData/Add.Designer.cs +++ b/SubProject/FLG0000/LogData/Add.Designer.cs @@ -73,6 +73,16 @@ label1.TabIndex = 0; label1.Text = "입력일"; // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(29, 64); + label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(46, 28); + label2.TabIndex = 9; + label2.Text = "S/N"; + // // tbRemark // this.tbRemark.ImeMode = System.Windows.Forms.ImeMode.Hangul; @@ -99,7 +109,7 @@ this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(532, 69); this.btSave.TabIndex = 8; - this.btSave.Text = "저장(&S)"; + this.btSave.Text = "확인(&S)"; this.btSave.UseVisualStyleBackColor = true; this.btSave.Click += new System.EventHandler(this.button1_Click); // @@ -111,6 +121,7 @@ this.linkLabel7.Name = "linkLabel7"; this.linkLabel7.Size = new System.Drawing.Size(52, 28); this.linkLabel7.TabIndex = 12; + this.linkLabel7.TabStop = true; this.linkLabel7.Text = "결과"; this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); // @@ -122,6 +133,7 @@ this.linkLabel6.Name = "linkLabel6"; this.linkLabel6.Size = new System.Drawing.Size(52, 28); this.linkLabel6.TabIndex = 11; + this.linkLabel6.TabStop = true; this.linkLabel6.Text = "원인"; this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); // @@ -133,6 +145,7 @@ this.linkLabel5.Name = "linkLabel5"; this.linkLabel5.Size = new System.Drawing.Size(52, 28); this.linkLabel5.TabIndex = 10; + this.linkLabel5.TabStop = true; this.linkLabel5.Text = "위치"; this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); // @@ -194,16 +207,6 @@ this.textBox1.TabIndex = 3; this.textBox1.TabStop = false; // - // label2 - // - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(29, 64); - label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(46, 28); - label2.TabIndex = 9; - label2.Text = "S/N"; - // // Add // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 28F); diff --git a/SubProject/FLG0000/LogData/Add.cs b/SubProject/FLG0000/LogData/Add.cs index d8b5639..b889d2f 100644 --- a/SubProject/FLG0000/LogData/Add.cs +++ b/SubProject/FLG0000/LogData/Add.cs @@ -50,9 +50,15 @@ namespace FLG0000.LogData //this.cbEQManu.DataSource = bsManu; dtPdate.Value = DateTime.Parse(dr.pdate); + tbLocation.Text = dr.location; tbReason.Text = dr.reason; tbResult.Text = dr.result; + + tbLocation.Tag = tbLocation.Text; + tbReason.Tag = tbReason.Text; + tbResult.Tag = tbResult.Text; + tbRemark.Text = dr.remark; this.Show(); @@ -79,11 +85,33 @@ namespace FLG0000.LogData else if (search.Contains("L")) //바코드입력 { var grpdata = FCOMMON.DBM.getCodeBySvalue("19", search); - if(grpdata.title != null) + if (grpdata.title != null) { - ctl.Text = grpdata.title; + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData.title != "") + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.title; + ctl.Tag = ctl.Text; + } SendKeys.Send("{TAB}"); - } + } else Lov_Location(search, false); } break; @@ -95,7 +123,29 @@ namespace FLG0000.LogData var grpdata = FCOMMON.DBM.getCodeBySvalue("19", search); if (grpdata.title != null) { - ctl.Text = grpdata.title; + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData.title != "") + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.title; + ctl.Tag = ctl.Text; + } SendKeys.Send("{TAB}"); } else Lov_Reason(search, false); @@ -107,7 +157,29 @@ namespace FLG0000.LogData var grpdata = FCOMMON.DBM.getCodeBySvalue("19", search); if (grpdata.title != null) { - ctl.Text = grpdata.title; + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData.title != "") + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.title; + ctl.Tag = ctl.Text; + } btSave.Focus(); } else Lov_Result(search, false); @@ -131,108 +203,36 @@ namespace FLG0000.LogData var f = new Lov_LogItem("00", "00"); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - this.tbLocation.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + if (f.tbItem.Text.Trim() != "") + this.tbLocation.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbLocation.Text = f.tbGrp.Text.Trim(); + this.tbLocation.Tag = this.tbLocation.Text; } - //if (search == "" && allowAll == false) - //{ - // FCOMMON.Util.MsgE("품명은 필수 값 입니다"); - // tbLocation.Focus(); - // return; - //} - //else if (search.ToLower() != tbLocation.Tag.ToString().ToLower() || tbPumIDX.Text == "-1" || tbPumIDX.Text == "") //값이 바뀌엇다면 검색을 해준다. - //{ - // var f = new FCM0000.fLovItem(search); - // if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - // { - // //인덱스값이 다르면 모델 및 가격을 업데이트 한다. - // tbLocation.Text = f.itemName; - // tbLocation.Tag = f.itemName; - - // this.tbPumIDX.Text = f.item.ToString(); - // this.tbPumModel.Text = f.itemmodel; - // this.tbPumPrice.Text = f.itemprice.ToString(); - // this.tbSID.Text = f.SID; - // this.tbSID.Tag = f.SID; - // this.tbPumUnit.Text = f.itemUnit; //181214 - - // this.tbPumModel.Enabled = false; - // this.tbPumUnit.Enabled = false; - // if (tbSID.Text != "") tbSID.Enabled = false; - // else tbSID.Enabled = true; - - // //제품을 찾앗다면 suppy 등을 업데이트 해준다. - // var pcInfo = FCOMMON.DBM.getLastPurchaseInfo(f.item); - // if (pcInfo.idx != -1) - // { - // tbReason.Text = pcInfo.supply; - // tbSupplyIndex.Text = pcInfo.supplyidx.ToString(); - // if (pcInfo.project != "" && tbResult.Text == "") - // tbResult.Text = pcInfo.project; - // } - // else - // { - // tbReason.Text = f.itemSupply; - // tbSupplyIndex.Text = f.itemSupplyidx.ToString(); - // } - - // //display image - // var image = FCOMMON.DBM.GetImageData("Items", "image", int.Parse(tbPumIDX.Text)); - // var oimage = this.pictureBox1.Image; - // this.pictureBox1.Image = image; - // if (oimage != null) oimage.Dispose(); - // } - //} - //this.tbPumQty.Focus(); } void Lov_Reason(string search, Boolean allowAll) { var f = new Lov_LogItem("00", "01"); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - this.tbReason.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + if (f.tbItem.Text.Trim() != "") + this.tbReason.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbResult.Text = f.tbGrp.Text.Trim(); + this.tbReason.Tag = this.tbReason.Text; } - //if (search != "" || allowAll == true) - //{ - // var f = new FCM0000.fLovProject(search); - // if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - // { - // this.tbResult.Text = f.Title; - // this.tbResult.Tag = f.Title; - // this.tbProjectIndex.Text = f.Index.ToString(); - // btSave.Focus(); - // } - // else - // { - // tbResult.SelectAll(); - // tbResult.Focus(); - // } - //} - //else this.btSave.Focus(); } void Lov_Result(string search, Boolean allowAll) { var f = new Lov_LogItem("00", "02"); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - this.tbResult.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + if (f.tbItem.Text.Trim() != "") + this.tbResult.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbResult.Text = f.tbGrp.Text.Trim(); + this.tbReason.Tag = this.tbReason.Text; } - //if (search != "" || allowAll == true) - //{ - // FCM0000.fLovSupply f = new FCM0000.fLovSupply(search); - // if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - // { - // tbReason.Text = f.Title; - // tbReason.Tag = f.Title; - // tbSupplyIndex.Text = f.Index.ToString(); - // this.tbResult.Focus(); - // } - // else - // { - // tbReason.Focus(); - // tbReason.SelectAll(); - // } - //} - //else tbResult.Focus(); } private bool saveData() { @@ -258,11 +258,137 @@ namespace FLG0000.LogData // return false; //} + //임의 기록데이터가 있다면 신규 목록을 추가 한다. + if (tbLocation.Text != tbLocation.Tag.ToString()) + { + var codeDatas = FCOMMON.DBM.getCodeTable("19"); + + var list = tbLocation.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "00"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData.title != "" && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = codeDatas.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + FCOMMON.DBM.insertCode("19", newCode, strData, "LA" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + + if (this.tbReason.Text != tbReason.Tag.ToString()) + { + var codeDatas = FCOMMON.DBM.getCodeTable("19"); + + var list = tbReason.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "01"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData.title != "" && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = codeDatas.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + FCOMMON.DBM.insertCode("19", newCode, strData, "LB" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + if (this.tbResult.Text != tbResult.Tag.ToString()) + { + var codeDatas = FCOMMON.DBM.getCodeTable("19"); + + var list = tbReason.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "02"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData.title != "" && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = codeDatas.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + FCOMMON.DBM.insertCode("19", newCode, strData, "LC" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + dr.gcode = FCOMMON.info.Login.gcode; dr.pdate = this.dtPdate.Value.ToShortDateString(); - dr.location = tbLocation.Text.Trim(); - dr.reason = tbReason.Text.Trim(); - dr.result = tbResult.Text.Trim(); + dr.location = tbLocation.Text.Trim().Replace("|", ""); + dr.reason = tbReason.Text.Trim().Replace("|", ""); + dr.result = tbResult.Text.Trim().Replace("|", ""); dr.remark = tbRemark.Text.Trim(); dr.EndEdit(); return true; diff --git a/SubProject/FLG0000/LogData/Add.resx b/SubProject/FLG0000/LogData/Add.resx index 862d631..a44dd72 100644 --- a/SubProject/FLG0000/LogData/Add.resx +++ b/SubProject/FLG0000/LogData/Add.resx @@ -123,6 +123,9 @@ False + + False + 257, 17 @@ -135,9 +138,6 @@ 195, 17 - - False - 58 diff --git a/SubProject/FLG0000/LogData/List.Designer.cs b/SubProject/FLG0000/LogData/List.Designer.cs index 293f84e..6998fe3 100644 --- a/SubProject/FLG0000/LogData/List.Designer.cs +++ b/SubProject/FLG0000/LogData/List.Designer.cs @@ -30,19 +30,20 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List)); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dsPurchase = new FLG0000.DSLog(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FLG0000.DSLogTableAdapters.LogDataTableAdapter(); this.tam = new FLG0000.DSLogTableAdapters.TableAdapterManager(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel6 = 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(); @@ -76,6 +77,8 @@ this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.cmbLogType = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); this.lbEnd = new System.Windows.Forms.ToolStripLabel(); @@ -88,9 +91,6 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); - this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); - this.cmbLogType = new System.Windows.Forms.ToolStripComboBox(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -171,6 +171,13 @@ this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // + // toolStripLabel6 + // + this.toolStripLabel6.ForeColor = System.Drawing.Color.Gray; + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(57, 23); + this.toolStripLabel6.Text = "[LG0000]"; + // // bindingNavigatorMoveFirstItem // this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -441,6 +448,18 @@ this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel7.Text = "종류"; + // + // cmbLogType + // + this.cmbLogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbLogType.Name = "cmbLogType"; + this.cmbLogType.Size = new System.Drawing.Size(170, 37); + // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; @@ -543,31 +562,31 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "등록자"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 40F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "location"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "위치"; this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "reason"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "원인"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "result"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "결과"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "remark"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userName"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "등록자"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F; @@ -578,25 +597,6 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripLabel6 - // - this.toolStripLabel6.ForeColor = System.Drawing.Color.Gray; - this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(57, 23); - this.toolStripLabel6.Text = "[LG0000]"; - // - // toolStripLabel7 - // - this.toolStripLabel7.Name = "toolStripLabel7"; - this.toolStripLabel7.Size = new System.Drawing.Size(31, 34); - this.toolStripLabel7.Text = "종류"; - // - // cmbLogType - // - this.cmbLogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbLogType.Name = "cmbLogType"; - this.cmbLogType.Size = new System.Drawing.Size(121, 37); - // // List // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FLG0000/LogData/List.cs b/SubProject/FLG0000/LogData/List.cs index 56bb5cb..5be08a7 100644 --- a/SubProject/FLG0000/LogData/List.cs +++ b/SubProject/FLG0000/LogData/List.cs @@ -70,7 +70,7 @@ namespace FLG0000.LogData void __Closed(object sender, FormClosedEventArgs e) { - + FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); } void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e) diff --git a/SubProject/FLG0000/LogData/List.resx b/SubProject/FLG0000/LogData/List.resx index 891b08c..6342ebf 100644 --- a/SubProject/FLG0000/LogData/List.resx +++ b/SubProject/FLG0000/LogData/List.resx @@ -269,25 +269,25 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQnSURBVEhLtVfvT1NXGL6ZM/NP8EeWuKCo+z5nsg/7ujAj - opjKhLLSKhWHiBQrILlYFWgv0KpFREQRWAsOtgWRQrEBpC0tVYEtGSoqpWzglo0Cm37T2udyDr1CdVSu - T3LSm7zPfZ+e8573x2UixZ4911fsyP557e78js935Xd8EZvX/vGXbNeHxCwuJGxntKzUyaVVDNkyq4fH - VDUjU2yj7+XJ5onAsSv3nydobDGEKg4kbNd6+VmP+XjtyD+6Nn+As0wvWqd/+jPwjaZzO3ll+ZDqHCrV - tYe/c5bwgnQtFJZqe20ZF4e8C1disd23O98SS2iLgRim6JyVBQ0Tz4QC2LHaPDaTXvmr86BxwKww9Fcp - DO7q/QZXSzx7ayt5nTlUMdQhfA8ru9b7NIlzJBFKeEC0sGXyBX1J1zYdUF979EdKqbtSUtgZTWhvxGJh - f0Ba0tdCzOGB4xXuVHtzKpB6ztOTyPV8Qij/i3A7zmsYe5Zc7DhMKK8DF2kupiFRub7/x6/S2z4ilCWB - CqvNXn9x69S8uKpm2Bd2AwqDq4FeJBxv6vk73ZGKAhBGTBOLe+VK44CTCsOnosxTR2hz2KexbULKUBJi - GsnxCrGvyN6dyDn24nmnpnsLfFG/2TVPniZorBt5IiDjnBzNU/zKytwXiSlixKot68kjD4XefSWUkkHf - wUJETAyDikT/VZ5pdHaX8F8tE8gEtWl0hvo/WD5o5Q3IW5RBajhcMejgDSLiuwu/uKh/aPG1/evcG+ty - ap9MU4PSeK+B8EWD8ty9Ruo/p3Z0Gk2GiWOt2042j88XjBS9p5LwRQN8Uv9oLnG51m0M2ltBs++9Cu83 - 9F+i/guafC/i8ts+449aGPxUo0f8oy4f+IH6V9U8nIpRta5mDhy4s1J4uXARCF80CC/X0ar7o7jQvEF5 - YeAWNahN3hkx0ymB7dqcZxqbpf7TKgY7iSkY/BJXiTDJkfTExGNhUYgE8jL3ZWFxknIOLTExTPwJ2yZV - 3eO/6L9CmYs/c/tT2FD+UAZ5YoTAyKSuezBJ/WbVP/47vrB9AzHPQa53m1HIKSnYJBwJRd3S7PqRCRR+ - QlsygkViFXyEfPrR7eqJOQSJzhaVefW3cSqMlhaMtx/PkQpDVKZ3taC1Un9ZV4d9kuBESiivI1lrVxY0 - j/9LyXRFIozjVRrv2oWibJPvP2lJbwahhEdyad+N0EVburBEY90iL3VXI6bCkGGMSubsb+92SdoeCWIq - FMUSCmOww4CHQQ8Dn7J8sBF5esLknaW3ly7sFKLzeRsOGD0xgoYbTTGyEhqDURYjrVBg8fIHVMGYJul6 - j5DXlo+3CWPHSBmZvv/7N16kdwU+V/DZgs8XdBrU3ozqYS+q37dcn1ZyyhZFqOICTRwfavhgQ2eLy7Ws - YVn2A2JeIhjmFdpO9IbYugJ4AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQjSURBVEhLtVdbT1NZGD3RMfoTHI2JxrvvOibz4KvRiYhi + KgplSqvUKyqVKkgOVkXaA7SjRWS0gxVs8YIadKgUG0Da0lJHYCaZeqetipcoBby8aafrsDc9QlU6HFey + 05N8a3+r+/JdNpMo1q27MHHV3qvT1hY0/rSmoPHnpPwbM5axzT8Qs7iQsE3zZKVubmtFt2O3yR/Mqbrf + x9YGPx2s643kmvwfUjWOFYQqDiRs80z5bz7rvrMP3ugawhHO1j9qHL7yMrJB0/QLmTJ+SHUulcp8/yln + iy9Ix0hhqbbNkX2yOzBypBU7Q2sLbEmENho4w0ydu7LQ2vteKIAV51qDAzsq/3FvMXZaFYaOUwqD17TJ + 4KlPYW8uIdOZbRXdjcJ5GCpz4EU650onlPiAaFF970c6SdfQH1GbHz7LLPVWSoqa5hHaFzFaOByRlrTX + E3N8YHuFK9X+2RfJOuZrTeNaZxHKNxFvxXnWwPuMYtdOQvkcuEhDZxoTles7Li/f0TCZUMYEKqy2BsLF + 1/uGxVVn/KG4C1AYPLX0ImF7s47fbklUFIAwzjStuE2uNHa6qTB8Ksp81YQ2hI0ax3yEDCXhTBPZXiE2 + HnW2pHGu9fherWlZCF/Ur+rM4xepGvtcngjIODdH4xS/sjLvSWJKGElq20zyyUOh9/4RC8mo72giIiaG + QUai/yrf0jO4RvivxglEQq6lZ4D631LeZecNiFukQWrYWdHl4g0iYvuJvz3UP7T43L4y79r0/ebH/dSg + NN6pJXzRoDx25zz1v9/c048iwySz9qUH60LDCSNT76skfNEAn9Q/iktynn0pg/JWWBf8rsKbDB2/U/+F + l4IfkwsaFvNbLTz8LKNP/K0u77xI/edU3etbobo+ldm8+fYk4eXCRSB80SC8XHtO3e3BheYNyhOdN6kh + 1xIYEDOcUtnmBfmW4CD1v7Wiq4mYoodf4ikRBjmCnph4jEwKiUBe5j0tTE5SzqUlJoZJOeCYn1P96BX9 + V0hzKUduLYIN6Q9pkCcmCLRM6up7z6nfPTWPXqcU3ZhDzEOQ671WJHJKihYJV+rRFunemge9SPyENmZE + k8QU+Ij5DKPa1RBzDBKdY/buqn+fUGGUNLUlEMZ3osIQlek99Sit1F9OlT8kiXakhPI5MrROZWFd6C0l + 05GIMLZXafzLKRRlLwXfSUvasgklPjJK26/FLtrYhSUa+0J5qdeEMxUeGdqoDM759WqXrm2V4EyFohhC + YTR2aPDQ6KHhU5Z3nUecHrAEBuntpQMrhehw3MYDWk+0oPFaU7SshMaglUVLKxQYPcIRVfRM03Vtu8i0 + 8eNrwlgxQkam7zj3xYv0f4HnCp4teL6g0iD3Zpv8AWS/X7l2reSQYzahigsUcTzU8GBDZUvOs/3IsuwE + Yh4jGOY/gmD0WF7YCuoAAAAASUVORK5CYII= @@ -303,7 +303,4 @@ 579, 23 - - 579, 23 - \ No newline at end of file diff --git a/SubProject/FLG0000/LogData/Lov_LogItem.Designer.cs b/SubProject/FLG0000/LogData/Lov_LogItem.Designer.cs index f9c446f..41b710b 100644 --- a/SubProject/FLG0000/LogData/Lov_LogItem.Designer.cs +++ b/SubProject/FLG0000/LogData/Lov_LogItem.Designer.cs @@ -40,7 +40,7 @@ // tbGrp // this.tbGrp.Location = new System.Drawing.Point(14, 192); - this.tbGrp.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbGrp.Margin = new System.Windows.Forms.Padding(2); this.tbGrp.Name = "tbGrp"; this.tbGrp.Size = new System.Drawing.Size(561, 46); this.tbGrp.TabIndex = 1; @@ -59,7 +59,7 @@ this.btOK.Name = "btOK"; this.btOK.Size = new System.Drawing.Size(563, 52); this.btOK.TabIndex = 3; - this.btOK.Text = "button1"; + this.btOK.Text = "확인"; this.btOK.UseVisualStyleBackColor = true; this.btOK.Click += new System.EventHandler(this.btOK_Click); // @@ -67,6 +67,9 @@ // this.listBox1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1}); + this.listBox1.FullRowSelect = true; + this.listBox1.GridLines = true; + this.listBox1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listBox1.Location = new System.Drawing.Point(14, 12); this.listBox1.Name = "listBox1"; this.listBox1.Size = new System.Drawing.Size(561, 175); @@ -82,6 +85,9 @@ // this.listBox2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader2}); + this.listBox2.FullRowSelect = true; + this.listBox2.GridLines = true; + this.listBox2.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listBox2.Location = new System.Drawing.Point(14, 246); this.listBox2.Name = "listBox2"; this.listBox2.Size = new System.Drawing.Size(561, 175); diff --git a/SubProject/FPJ0000/JobReport/rJobReport.cs b/SubProject/FPJ0000/JobReport/rJobReport.cs index d98c6a8..fdcd0e8 100644 --- a/SubProject/FPJ0000/JobReport/rJobReport.cs +++ b/SubProject/FPJ0000/JobReport/rJobReport.cs @@ -19,7 +19,7 @@ namespace FPJ0000.JobReport private void rJobReport_Load(object sender, EventArgs e) { - this.ta.Fill(this.dsReport.jobReport, DateTime.Now.Year.ToString("0000")); + this.ta.Fill(this.dsReport.jobReport, DateTime.Now.Year.ToString("0000"),FCOMMON.info.Login.gcode); this.reportViewer1.SetDisplayMode( Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; this.reportViewer1.RefreshReport(); diff --git a/SubProject/FPJ0000/JobReport/rJobReportDay.cs b/SubProject/FPJ0000/JobReport/rJobReportDay.cs index 0b3dc27..9d39f95 100644 --- a/SubProject/FPJ0000/JobReport/rJobReportDay.cs +++ b/SubProject/FPJ0000/JobReport/rJobReportDay.cs @@ -33,7 +33,7 @@ namespace FPJ0000.JobReport } void refrehData() { - this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text); + this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode); this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; this.reportViewer1.RefreshReport(); diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index afd308d..3be41c9 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,24 +30,24 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -139,6 +139,7 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -187,7 +188,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1084, 25); + this.bn.Size = new System.Drawing.Size(1384, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -358,7 +359,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(305, 404); + this.cm.Size = new System.Drawing.Size(305, 382); // // columnSizeToolStripMenuItem // @@ -505,14 +506,13 @@ this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fpSpread1.Location = new System.Drawing.Point(0, 25); + this.fpSpread1.Location = new System.Drawing.Point(0, 37); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1084, 262); + this.fpSpread1.Size = new System.Drawing.Size(1384, 250); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; - this.fpSpread1.SetViewportLeftColumn(0, 0, 3); // // fpSpread1_Sheet1 // @@ -565,113 +565,113 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + numberCellType21.DecimalPlaces = 0; + numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType21.MaximumValue = 2147483647D; + numberCellType21.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType21; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType53; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType54; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType55; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType56; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType57; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType58; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType59; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType60; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType61; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + numberCellType22.DecimalPlaces = 0; + numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType22.MaximumValue = 2147483647D; + numberCellType22.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType22; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + numberCellType23.MaximumValue = 999999999999999D; + numberCellType23.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType23; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType4; + numberCellType24.MaximumValue = 999999999999999D; + numberCellType24.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType24; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType5; + numberCellType25.MaximumValue = 999999999999999D; + numberCellType25.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType25; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType63; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType64; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "lasthistory"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType65; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -680,6 +680,7 @@ // // toolStrip1 // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel2, this.cmbYearS, @@ -696,44 +697,45 @@ this.toolStripLabel3, this.tbRequest, this.btSearch, + this.toolStripButton2, this.btViewDel, this.toolStripSeparator4, this.toolStripLabel5, this.cmbSort}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1084, 25); + this.toolStrip1.Size = new System.Drawing.Size(1384, 37); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(95, 22); + this.toolStripLabel2.Size = new System.Drawing.Size(95, 34); this.toolStripLabel2.Text = "프로젝트 시작일"; // // cmbYearS // this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearS.Name = "cmbYearS"; - this.cmbYearS.Size = new System.Drawing.Size(75, 25); + this.cmbYearS.Size = new System.Drawing.Size(75, 37); // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); + this.toolStripLabel4.Size = new System.Drawing.Size(15, 34); this.toolStripLabel4.Text = "~"; // // cmbYearE // this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearE.Name = "cmbYearE"; - this.cmbYearE.Size = new System.Drawing.Size(75, 25); + this.cmbYearE.Size = new System.Drawing.Size(75, 37); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); // // chk검토 // @@ -743,7 +745,7 @@ this.chk검토.Image = ((System.Drawing.Image)(resources.GetObject("chk검토.Image"))); this.chk검토.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk검토.Name = "chk검토"; - this.chk검토.Size = new System.Drawing.Size(51, 22); + this.chk검토.Size = new System.Drawing.Size(65, 34); this.chk검토.Text = "검토"; // // chk대기 @@ -754,7 +756,7 @@ this.chk대기.Image = ((System.Drawing.Image)(resources.GetObject("chk대기.Image"))); this.chk대기.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk대기.Name = "chk대기"; - this.chk대기.Size = new System.Drawing.Size(51, 22); + this.chk대기.Size = new System.Drawing.Size(65, 34); this.chk대기.Text = "대기"; // // chk진행 @@ -765,7 +767,7 @@ this.chk진행.Image = ((System.Drawing.Image)(resources.GetObject("chk진행.Image"))); this.chk진행.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk진행.Name = "chk진행"; - this.chk진행.Size = new System.Drawing.Size(51, 22); + this.chk진행.Size = new System.Drawing.Size(65, 34); this.chk진행.Text = "진행"; // // chk보류 @@ -776,7 +778,7 @@ this.chk보류.Image = ((System.Drawing.Image)(resources.GetObject("chk보류.Image"))); this.chk보류.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk보류.Name = "chk보류"; - this.chk보류.Size = new System.Drawing.Size(51, 22); + this.chk보류.Size = new System.Drawing.Size(65, 34); this.chk보류.Text = "보류"; // // chk취소 @@ -785,7 +787,7 @@ this.chk취소.Image = ((System.Drawing.Image)(resources.GetObject("chk취소.Image"))); this.chk취소.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk취소.Name = "chk취소"; - this.chk취소.Size = new System.Drawing.Size(51, 22); + this.chk취소.Size = new System.Drawing.Size(65, 34); this.chk취소.Text = "취소"; // // chk완료 @@ -794,18 +796,18 @@ this.chk완료.Image = ((System.Drawing.Image)(resources.GetObject("chk완료.Image"))); this.chk완료.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk완료.Name = "chk완료"; - this.chk완료.Size = new System.Drawing.Size(51, 22); + this.chk완료.Size = new System.Drawing.Size(65, 34); this.chk완료.Text = "완료"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(55, 22); + this.toolStripLabel3.Size = new System.Drawing.Size(55, 34); this.toolStripLabel3.Text = "담당자명"; this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // @@ -813,7 +815,7 @@ // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbRequest.Name = "tbRequest"; - this.tbRequest.Size = new System.Drawing.Size(70, 25); + this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // @@ -822,7 +824,7 @@ this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(90, 22); + this.btSearch.Size = new System.Drawing.Size(104, 34); this.btSearch.Text = "새로고침(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // @@ -833,18 +835,18 @@ this.btViewDel.Image = ((System.Drawing.Image)(resources.GetObject("btViewDel.Image"))); this.btViewDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.btViewDel.Name = "btViewDel"; - this.btViewDel.Size = new System.Drawing.Size(99, 22); + this.btViewDel.Size = new System.Drawing.Size(113, 34); this.btViewDel.Text = "삭제자료표시"; // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 37); // // toolStripLabel5 // this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel5.Size = new System.Drawing.Size(31, 34); this.toolStripLabel5.Text = "정렬"; // // cmbSort @@ -861,7 +863,7 @@ "Requestor", "Process"}); this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(75, 25); + this.cmbSort.Size = new System.Drawing.Size(100, 37); this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged); // // label1 @@ -872,7 +874,7 @@ this.label1.Location = new System.Drawing.Point(0, 287); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1084, 23); + this.label1.Size = new System.Drawing.Size(1384, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -892,7 +894,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1084, 171); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1384, 171); this.tableLayoutPanel1.TabIndex = 11; // // panel4 @@ -900,10 +902,10 @@ this.panel4.Controls.Add(this.label11); this.panel4.Controls.Add(this.label4); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(542, 0); + this.panel4.Location = new System.Drawing.Point(692, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(542, 25); + this.panel4.Size = new System.Drawing.Size(692, 25); this.panel4.TabIndex = 0; // // label11 @@ -911,7 +913,7 @@ this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(442, 25); + this.label11.Size = new System.Drawing.Size(592, 25); this.label11.TabIndex = 14; this.label11.Text = "주간 진행 내용"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -922,7 +924,7 @@ this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); this.label4.Dock = System.Windows.Forms.DockStyle.Right; this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(442, 0); + this.label4.Location = new System.Drawing.Point(592, 0); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 25); @@ -940,13 +942,13 @@ // this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox4.Location = new System.Drawing.Point(542, 25); + this.textBox4.Location = new System.Drawing.Point(692, 25); this.textBox4.Margin = new System.Windows.Forms.Padding(0); this.textBox4.Multiline = true; this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox4.Size = new System.Drawing.Size(542, 146); + this.textBox4.Size = new System.Drawing.Size(692, 146); this.textBox4.TabIndex = 10; // // label2 @@ -956,7 +958,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(542, 25); + this.label2.Size = new System.Drawing.Size(692, 25); this.label2.TabIndex = 0; this.label2.Text = "요청 사항"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -971,7 +973,7 @@ this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox3.Size = new System.Drawing.Size(542, 146); + this.textBox3.Size = new System.Drawing.Size(692, 146); this.textBox3.TabIndex = 8; // // tableLayoutPanel2 @@ -1007,7 +1009,7 @@ this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1084, 47); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1384, 47); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -1026,7 +1028,7 @@ // this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(817, 1); + this.label5.Location = new System.Drawing.Point(1042, 1); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(74, 24); this.label5.TabIndex = 0; @@ -1039,7 +1041,7 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(275, 1); + this.label9.Location = new System.Drawing.Point(350, 1); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(74, 24); this.label9.TabIndex = 0; @@ -1052,7 +1054,7 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label3.Location = new System.Drawing.Point(546, 1); + this.label3.Location = new System.Drawing.Point(696, 1); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 24); this.label3.TabIndex = 0; @@ -1066,7 +1068,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Location = new System.Drawing.Point(85, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(183, 24); + this.label7.Size = new System.Drawing.Size(258, 24); this.label7.TabIndex = 1; this.label7.Text = "--"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1075,9 +1077,9 @@ // this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(356, 1); + this.label8.Location = new System.Drawing.Point(431, 1); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(183, 24); + this.label8.Size = new System.Drawing.Size(258, 24); this.label8.TabIndex = 1; this.label8.Text = "--"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1086,9 +1088,9 @@ // this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(627, 1); + this.label10.Location = new System.Drawing.Point(777, 1); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(183, 24); + this.label10.Size = new System.Drawing.Size(258, 24); this.label10.TabIndex = 1; this.label10.Text = "--"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1097,9 +1099,9 @@ // this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; - this.label12.Location = new System.Drawing.Point(898, 1); + this.label12.Location = new System.Drawing.Point(1123, 1); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(182, 24); + this.label12.Size = new System.Drawing.Size(257, 24); this.label12.TabIndex = 1; this.label12.Text = "--"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1113,7 +1115,7 @@ this.label13.Location = new System.Drawing.Point(1, 26); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(270, 20); + this.label13.Size = new System.Drawing.Size(345, 20); this.label13.TabIndex = 0; this.label13.Text = "Cost Summary"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1123,7 +1125,7 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(272, 26); + this.label14.Location = new System.Drawing.Point(347, 26); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(80, 20); @@ -1136,7 +1138,7 @@ this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(543, 26); + this.label15.Location = new System.Drawing.Point(693, 26); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(80, 20); @@ -1149,7 +1151,7 @@ this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(814, 26); + this.label16.Location = new System.Drawing.Point(1039, 26); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(80, 20); @@ -1162,10 +1164,10 @@ this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(353, 26); + this.sbSumO.Location = new System.Drawing.Point(428, 26); this.sbSumO.Margin = new System.Windows.Forms.Padding(0); this.sbSumO.Name = "sbSumO"; - this.sbSumO.Size = new System.Drawing.Size(189, 20); + this.sbSumO.Size = new System.Drawing.Size(264, 20); this.sbSumO.TabIndex = 1; this.sbSumO.Text = "--"; this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1175,10 +1177,10 @@ this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(624, 26); + this.sbSumI.Location = new System.Drawing.Point(774, 26); this.sbSumI.Margin = new System.Windows.Forms.Padding(0); this.sbSumI.Name = "sbSumI"; - this.sbSumI.Size = new System.Drawing.Size(189, 20); + this.sbSumI.Size = new System.Drawing.Size(264, 20); this.sbSumI.TabIndex = 1; this.sbSumI.Text = "--"; this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1188,10 +1190,10 @@ this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(895, 26); + this.sbSumE.Location = new System.Drawing.Point(1120, 26); this.sbSumE.Margin = new System.Windows.Forms.Padding(0); this.sbSumE.Name = "sbSumE"; - this.sbSumE.Size = new System.Drawing.Size(188, 20); + this.sbSumE.Size = new System.Drawing.Size(263, 20); this.sbSumE.TabIndex = 1; this.sbSumE.Text = "--"; this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1207,13 +1209,23 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel3.Location = new System.Drawing.Point(0, 310); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1084, 218); + this.panel3.Size = new System.Drawing.Size(1384, 218); this.panel3.TabIndex = 7; // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1084, 553); + this.ClientSize = new System.Drawing.Size(1384, 553); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.label1); this.Controls.Add(this.panel3); @@ -1337,5 +1349,6 @@ private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 567132d..77e9912 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -142,9 +142,9 @@ namespace FPJ0000 "ISNULL(usersub, '') LIKE @username) "; if (state != "") State_where += " AND " + state; string State_order = "ORDER BY (CASE " + - " WHEN ([status] = '진행') THEN '0' " + - " WHEN ([status] = '대기') THEN '1' " + - " WHEN ([status] = '검토') THEN '2' " + + " WHEN ([status] = '진행') THEN '0' " + + " WHEN ([status] = '검토') THEN '1' " + + " WHEN ([status] = '대기') THEN '2' " + " WHEN ([status] = '완료') THEN '3' " + " WHEN ([status] = '보류') THEN '4' " + " WHEN ([status] = '취소') THEN '9' " + @@ -598,5 +598,10 @@ namespace FPJ0000 { funcCopy(); } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Close(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 306427e..a1687d8 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -208,6 +208,9 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + 387, 17 @@ -379,6 +382,16 @@ GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC @@ -394,10 +407,16 @@ 561, 17 + + 561, 17 + 731, 17 647, 17 + + 731, 17 + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs index 05f0189..f9ef138 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs @@ -79,14 +79,40 @@ namespace FPJ0000 //this.cbProcess.DataSource = new BindingSource(procList, ""); //담당자목록 - var userList = FCOMMON.DBM.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); - foreach (var user in userList) + //담당자목록 - 사용자목록으로 처리한다. + string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no); + if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)"; + this.cmbRequest.Items.Clear(); + this.cmbRequest.Items.Add(namestr); + try { - this.cmbRequest.Items.Add(user); + var cn = FCOMMON.DBM.getCn(); + cn.Open(); + string sql = "select [id],[name] " + + " from users" + + " where gcode='{1}' and id <> '{0}'" + + " order by [name]"; + sql = string.Format(sql, FCOMMON.info.Login.no, FCOMMON.info.Login.gcode); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + string cmbdata = string.Format("{1}({0})", rdr[0].ToString(), rdr[1].ToString()); + this.cmbRequest.Items.Add(cmbdata); + } + cmd.Dispose(); + cn.Close(); + cn.Dispose(); } + catch (Exception ex) + { + FCOMMON.Util.MsgE("User List Error\n\n" + ex.Message); + } + cmbRequest.Text = namestr;// FCOMMON.info.Login.nameK; + dtPdate.Value = DateTime.Now; - cmbRequest.Text = FCOMMON.info.Login.nameK; + cmbState.Text = "PO"; @@ -202,11 +228,14 @@ namespace FPJ0000 if (dlg2 != System.Windows.Forms.DialogResult.Yes) return false; + string userNo = this.cmbRequest.Text.Substring(cmbRequest.Text.LastIndexOf('(') + 1); + userNo = userNo.Substring(0, userNo.Length - 1); + //기존에 등록된 자료가 있는지 체크한다. var SQLExist = " select count(*) from Purchase" + " where import = 1" + - " and pdate = '{0}'" + + " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}'" + " and projectidx = {1}"; SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString()); var ExistCnt = FCOMMON.DBM.ExecuteScalarI(SQLExist); @@ -218,7 +247,7 @@ namespace FPJ0000 SQLExist = " delete from Purchase" + " where import = 1" + - " and pdate = '{0}'" + + " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}'" + " and projectidx = {1}"; SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString()); var delCnt = FCOMMON.DBM.ExecuteNonQuery(SQLExist); @@ -228,9 +257,9 @@ namespace FPJ0000 //insert query var SQL = - " insert into purchase(pdate,state,process,request,sid,pumname,pumidx,pumscale,pumunit," + + " insert into purchase(asset,dept,manuproc,gcode,pdate,state,process,request,sid,pumname,pumidx,pumscale,pumunit," + " pumqty,pumprice,pumamt,supply,supplyidx,project,projectidx,bigo,import,wuid,wdate,orderno)" + - " select '{0}' as pdate,'{1}','{2}' as process ,'{3}' as request,ItemSid," + + " select '{8}','{9}','{10}','{11}', '{0}' as pdate,'{1}','{2}' as process ,'{3}' as request,ItemSid," + " ItemName,Item,ItemModel,ItemUnit,qty,price,amt,ItemSupply,ItemSupplyidx,'{4}',Project," + " memo,1 as import,'{5}' as wuid, getdate() as wdate,'{6}' as orderno" + " from ProjectsPart" + @@ -240,11 +269,15 @@ namespace FPJ0000 dtPdate.Value.ToShortDateString(), cmbState.Text.Trim(), cbProcess.Text.Trim(), - cmbRequest.Text.Trim(), + userNo.Trim(), tbProject.Text.Trim(), FCOMMON.info.Login.no, tbOrderNo.Text.Trim(), - this.ProjectIndex.ToString() + this.ProjectIndex.ToString(), + this.cbEQModel.Text, + this.cbEQManu.Text, + this.cbManuProc.Text, + FCOMMON.info.Login.gcode ); // Console.WriteLine(SQL); diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index b14b971..a6ea0f6 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -1451,16 +1451,17 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot\r\nFROM vUserWorkTimeList\r\nWHERE (SUB" + - "STRING(yymm, 1, 4) = @yyyy)\r\nORDER BY yymm"; + "STRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)\r\nORDER BY yymm"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy) { + public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yyyy == null)) { throw new global::System.ArgumentNullException("yyyy"); @@ -1468,6 +1469,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -1479,7 +1486,7 @@ namespace FPJ0000.dsReportTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.jobReportDataTable GetData(string yyyy) { + public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yyyy == null)) { throw new global::System.ArgumentNullException("yyyy"); @@ -1487,6 +1494,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -1636,17 +1649,18 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT uid, dbo.getUserName(uid) AS uname, pdate, SUM(hrs) AS hrs, SUM(ot) AS ot" + - "\r\nFROM JobReport\r\nWHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> \'\')\r\nG" + - "ROUP BY uid, pdate\r\nORDER BY pdate, uname"; + "\r\nFROM JobReport\r\nWHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> \'\') AN" + + "D (gcode = @gcode)\r\nGROUP BY uid, pdate\r\nORDER BY pdate, uname"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yymm", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm) { + public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yymm == null)) { throw new global::System.ArgumentNullException("yymm"); @@ -1654,6 +1668,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yymm)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -1665,7 +1685,7 @@ namespace FPJ0000.dsReportTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.JobReportDayDataTable GetData(string yymm) { + public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yymm == null)) { throw new global::System.ArgumentNullException("yymm"); @@ -1673,6 +1693,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yymm)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsReport.JobReportDayDataTable dataTable = new dsReport.JobReportDayDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index 003a4e1..b41a558 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -11,13 +11,14 @@ - + SELECT yymm, total, uid, uname, hrs, ot FROM vUserWorkTimeList -WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) +WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) ORDER BY yymm + @@ -40,11 +41,12 @@ ORDER BY yymm SELECT uid, dbo.getUserName(uid) AS uname, pdate, SUM(hrs) AS hrs, SUM(ot) AS ot FROM JobReport -WHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> '') +WHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> '') AND (gcode = @gcode) GROUP BY uid, pdate ORDER BY pdate, uname + @@ -67,10 +69,10 @@ ORDER BY pdate, uname - + - + @@ -78,7 +80,7 @@ ORDER BY pdate, uname - + @@ -97,7 +99,7 @@ ORDER BY pdate, uname - +