diff --git a/Project/History.txt b/Project/History.txt index 92fc437..14518b9 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ -200519 chi 업무일지 그림 넣기 가능하게 +200618 chi 사용자 정보 변경 기능 수정 (저장에서 오류가 있었음) +200519 chi 업무일지 그림 넣기 가능하게 200512 chi 구매내역 엑셀 반입 기능 추가 200106 chi 구매내역목록에서 정렬 기능 추가 (등록일,완료일,S/C) 업무일지 및 프로젝트에 담당자 공정추가하고 해당 공정별 데이터 분리 작업 diff --git a/Project/_Common/fUserInfo.Designer.cs b/Project/_Common/fUserInfo.Designer.cs index e4bf90a..624a387 100644 --- a/Project/_Common/fUserInfo.Designer.cs +++ b/Project/_Common/fUserInfo.Designer.cs @@ -44,26 +44,26 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label4; System.Windows.Forms.Label label5; - this.idTextBox = new System.Windows.Forms.TextBox(); + this.tbId = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new Project.dsMSSQL(); - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.deptTextBox = new System.Windows.Forms.TextBox(); - this.gradeTextBox = new System.Windows.Forms.TextBox(); - this.emailTextBox = new System.Windows.Forms.TextBox(); - this.levelTextBox = new System.Windows.Forms.TextBox(); - this.indateTextBox = new System.Windows.Forms.TextBox(); - this.outdateTextBox = new System.Windows.Forms.TextBox(); - this.memoTextBox = new System.Windows.Forms.TextBox(); + this.tbNameK = new System.Windows.Forms.TextBox(); + this.tbDept = new System.Windows.Forms.TextBox(); + this.tbGrade = new System.Windows.Forms.TextBox(); + this.tbEmail = new System.Windows.Forms.TextBox(); + this.tbLevel = new System.Windows.Forms.TextBox(); + this.tbDateIn = new System.Windows.Forms.TextBox(); + this.tbDateO = new System.Windows.Forms.TextBox(); + this.tbMemo = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.ta = new Project.dsMSSQLTableAdapters.UsersTableAdapter(); this.tam = new Project.dsMSSQLTableAdapters.TableAdapterManager(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); + this.tbTel = new System.Windows.Forms.TextBox(); + this.tbHp = new System.Windows.Forms.TextBox(); + this.tbNameE = new System.Windows.Forms.TextBox(); this.tbKJPath = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); + this.tbProcess = new System.Windows.Forms.TextBox(); idLabel = new System.Windows.Forms.Label(); passwordLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label(); @@ -209,14 +209,23 @@ label4.TabIndex = 27; label4.Text = "견적서 위치"; // - // idTextBox + // label5 // - this.idTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "id", true)); - this.idTextBox.Location = new System.Drawing.Point(105, 11); - this.idTextBox.Name = "idTextBox"; - this.idTextBox.ReadOnly = true; - this.idTextBox.Size = new System.Drawing.Size(200, 29); - this.idTextBox.TabIndex = 1; + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(360, 193); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(42, 21); + label5.TabIndex = 29; + label5.Text = "공정"; + // + // tbId + // + this.tbId.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "id", true)); + this.tbId.Location = new System.Drawing.Point(105, 11); + this.tbId.Name = "tbId"; + this.tbId.ReadOnly = true; + this.tbId.Size = new System.Drawing.Size(200, 29); + this.tbId.TabIndex = 1; // // bs // @@ -229,70 +238,70 @@ this.dsMSSQL.DataSetName = "dsMSSQL"; this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // nameTextBox + // tbNameK // - this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); - this.nameTextBox.Location = new System.Drawing.Point(105, 82); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(200, 29); - this.nameTextBox.TabIndex = 5; + this.tbNameK.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); + this.tbNameK.Location = new System.Drawing.Point(105, 82); + this.tbNameK.Name = "tbNameK"; + this.tbNameK.Size = new System.Drawing.Size(200, 29); + this.tbNameK.TabIndex = 5; // - // deptTextBox + // tbDept // - this.deptTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true)); - this.deptTextBox.Location = new System.Drawing.Point(105, 119); - this.deptTextBox.Name = "deptTextBox"; - this.deptTextBox.Size = new System.Drawing.Size(200, 29); - this.deptTextBox.TabIndex = 9; + this.tbDept.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true)); + this.tbDept.Location = new System.Drawing.Point(105, 119); + this.tbDept.Name = "tbDept"; + this.tbDept.Size = new System.Drawing.Size(200, 29); + this.tbDept.TabIndex = 9; // - // gradeTextBox + // tbGrade // - this.gradeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "grade", true)); - this.gradeTextBox.Location = new System.Drawing.Point(407, 119); - this.gradeTextBox.Name = "gradeTextBox"; - this.gradeTextBox.Size = new System.Drawing.Size(189, 29); - this.gradeTextBox.TabIndex = 11; + this.tbGrade.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "grade", true)); + this.tbGrade.Location = new System.Drawing.Point(407, 119); + this.tbGrade.Name = "tbGrade"; + this.tbGrade.Size = new System.Drawing.Size(189, 29); + this.tbGrade.TabIndex = 11; // - // emailTextBox + // tbEmail // - this.emailTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "email", true)); - this.emailTextBox.Location = new System.Drawing.Point(105, 156); - this.emailTextBox.Name = "emailTextBox"; - this.emailTextBox.Size = new System.Drawing.Size(200, 29); - this.emailTextBox.TabIndex = 13; + this.tbEmail.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "email", true)); + this.tbEmail.Location = new System.Drawing.Point(105, 156); + this.tbEmail.Name = "tbEmail"; + this.tbEmail.Size = new System.Drawing.Size(200, 29); + this.tbEmail.TabIndex = 13; // - // levelTextBox + // tbLevel // - this.levelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true)); - this.levelTextBox.Location = new System.Drawing.Point(407, 225); - this.levelTextBox.Name = "levelTextBox"; - this.levelTextBox.ReadOnly = true; - this.levelTextBox.Size = new System.Drawing.Size(189, 29); - this.levelTextBox.TabIndex = 19; + this.tbLevel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true)); + this.tbLevel.Location = new System.Drawing.Point(407, 225); + this.tbLevel.Name = "tbLevel"; + this.tbLevel.ReadOnly = true; + this.tbLevel.Size = new System.Drawing.Size(189, 29); + this.tbLevel.TabIndex = 19; // - // indateTextBox + // tbDateIn // - this.indateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "indate", true)); - this.indateTextBox.Location = new System.Drawing.Point(407, 11); - this.indateTextBox.Name = "indateTextBox"; - this.indateTextBox.Size = new System.Drawing.Size(189, 29); - this.indateTextBox.TabIndex = 21; + this.tbDateIn.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "indate", true)); + this.tbDateIn.Location = new System.Drawing.Point(407, 11); + this.tbDateIn.Name = "tbDateIn"; + this.tbDateIn.Size = new System.Drawing.Size(189, 29); + this.tbDateIn.TabIndex = 21; // - // outdateTextBox + // tbDateO // - this.outdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "outdate", true)); - this.outdateTextBox.Location = new System.Drawing.Point(407, 45); - this.outdateTextBox.Name = "outdateTextBox"; - this.outdateTextBox.Size = new System.Drawing.Size(189, 29); - this.outdateTextBox.TabIndex = 23; + this.tbDateO.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "outdate", true)); + this.tbDateO.Location = new System.Drawing.Point(407, 45); + this.tbDateO.Name = "tbDateO"; + this.tbDateO.Size = new System.Drawing.Size(189, 29); + this.tbDateO.TabIndex = 23; // - // memoTextBox + // tbMemo // - this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(407, 156); - this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.Size = new System.Drawing.Size(189, 29); - this.memoTextBox.TabIndex = 25; + this.tbMemo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); + this.tbMemo.Location = new System.Drawing.Point(407, 156); + this.tbMemo.Name = "tbMemo"; + this.tbMemo.Size = new System.Drawing.Size(189, 29); + this.tbMemo.TabIndex = 25; // // button1 // @@ -325,33 +334,34 @@ this.tam.ItemsTableAdapter = null; this.tam.LineCodeTableAdapter = null; this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; this.tam.UserGroupTableAdapter = null; this.tam.UsersTableAdapter = this.ta; // - // textBox1 + // tbTel // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "tel", true)); - this.textBox1.Location = new System.Drawing.Point(105, 190); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(200, 29); - this.textBox1.TabIndex = 15; + this.tbTel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "tel", true)); + this.tbTel.Location = new System.Drawing.Point(105, 190); + this.tbTel.Name = "tbTel"; + this.tbTel.Size = new System.Drawing.Size(200, 29); + this.tbTel.TabIndex = 15; // - // textBox2 + // tbHp // - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hp", true)); - this.textBox2.Location = new System.Drawing.Point(105, 225); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(200, 29); - this.textBox2.TabIndex = 17; + this.tbHp.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hp", true)); + this.tbHp.Location = new System.Drawing.Point(105, 225); + this.tbHp.Name = "tbHp"; + this.tbHp.Size = new System.Drawing.Size(200, 29); + this.tbHp.TabIndex = 17; // - // textBox3 + // tbNameE // - this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "nameE", true)); - this.textBox3.Location = new System.Drawing.Point(407, 82); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(189, 29); - this.textBox3.TabIndex = 7; + this.tbNameE.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "nameE", true)); + this.tbNameE.Location = new System.Drawing.Point(407, 82); + this.tbNameE.Name = "tbNameE"; + this.tbNameE.Size = new System.Drawing.Size(189, 29); + this.tbNameE.TabIndex = 7; // // tbKJPath // @@ -362,58 +372,49 @@ this.tbKJPath.Size = new System.Drawing.Size(177, 29); this.tbKJPath.TabIndex = 28; // - // label5 + // tbProcess // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(360, 193); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(42, 21); - label5.TabIndex = 29; - label5.Text = "공정"; - // - // textBox4 - // - this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "processs", true)); - this.textBox4.Location = new System.Drawing.Point(407, 190); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(189, 29); - this.textBox4.TabIndex = 30; + this.tbProcess.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "processs", true)); + this.tbProcess.Location = new System.Drawing.Point(407, 190); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(189, 29); + this.tbProcess.TabIndex = 30; // // fUserInfo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(601, 326); this.Controls.Add(label5); - this.Controls.Add(this.textBox4); + this.Controls.Add(this.tbProcess); this.Controls.Add(label4); this.Controls.Add(this.tbKJPath); this.Controls.Add(label3); - this.Controls.Add(this.textBox3); + this.Controls.Add(this.tbNameE); this.Controls.Add(label2); - this.Controls.Add(this.textBox2); + this.Controls.Add(this.tbHp); this.Controls.Add(label1); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.tbTel); this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Controls.Add(idLabel); - this.Controls.Add(this.idTextBox); + this.Controls.Add(this.tbId); this.Controls.Add(passwordLabel); this.Controls.Add(nameLabel); - this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.tbNameK); this.Controls.Add(deptLabel); - this.Controls.Add(this.deptTextBox); + this.Controls.Add(this.tbDept); this.Controls.Add(gradeLabel); - this.Controls.Add(this.gradeTextBox); + this.Controls.Add(this.tbGrade); this.Controls.Add(emailLabel); - this.Controls.Add(this.emailTextBox); + this.Controls.Add(this.tbEmail); this.Controls.Add(levelLabel); - this.Controls.Add(this.levelTextBox); + this.Controls.Add(this.tbLevel); this.Controls.Add(indateLabel); - this.Controls.Add(this.indateTextBox); + this.Controls.Add(this.tbDateIn); this.Controls.Add(outdateLabel); - this.Controls.Add(this.outdateTextBox); + this.Controls.Add(this.tbDateO); this.Controls.Add(memoLabel); - this.Controls.Add(this.memoTextBox); + this.Controls.Add(this.tbMemo); this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -433,21 +434,21 @@ private System.Windows.Forms.BindingSource bs; private dsMSSQLTableAdapters.UsersTableAdapter ta; private dsMSSQLTableAdapters.TableAdapterManager tam; - private System.Windows.Forms.TextBox idTextBox; - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.TextBox deptTextBox; - private System.Windows.Forms.TextBox gradeTextBox; - private System.Windows.Forms.TextBox emailTextBox; - private System.Windows.Forms.TextBox levelTextBox; - private System.Windows.Forms.TextBox indateTextBox; - private System.Windows.Forms.TextBox outdateTextBox; - private System.Windows.Forms.TextBox memoTextBox; + private System.Windows.Forms.TextBox tbId; + private System.Windows.Forms.TextBox tbNameK; + private System.Windows.Forms.TextBox tbDept; + private System.Windows.Forms.TextBox tbGrade; + private System.Windows.Forms.TextBox tbEmail; + private System.Windows.Forms.TextBox tbLevel; + private System.Windows.Forms.TextBox tbDateIn; + private System.Windows.Forms.TextBox tbDateO; + private System.Windows.Forms.TextBox tbMemo; private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox tbTel; + private System.Windows.Forms.TextBox tbHp; + private System.Windows.Forms.TextBox tbNameE; private System.Windows.Forms.TextBox tbKJPath; - private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox tbProcess; } } \ No newline at end of file diff --git a/Project/_Common/fUserInfo.cs b/Project/_Common/fUserInfo.cs index e70a114..ec9afdf 100644 --- a/Project/_Common/fUserInfo.cs +++ b/Project/_Common/fUserInfo.cs @@ -9,18 +9,20 @@ using System.Windows.Forms; namespace Project._Common { - public partial class fUserInfo : FCOMMON.fBase + public partial class fUserInfo : Form // FCOMMON.fBase { public fUserInfo() { InitializeComponent(); } + dsMSSQL.UsersRow dr = null; private void fUserInfo_Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsMSSQL.Users' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. + // this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no); + dr = this.dsMSSQL.Users.Rows[0] as dsMSSQL.UsersRow; tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept); tbKJPath.Tag = tbKJPath.Text; if (FCOMMON.info.Login.level > 4) tbKJPath.Enabled = true; @@ -42,11 +44,13 @@ namespace Project._Common } else { - this.Validate(); - this.bs.EndEdit(); - var drv = bs.Current as DataRowView; - drv["password"] = encpassN; - this.bs.EndEdit(); + //this.Validate(); + //this.bs.EndEdit(); + dr.password = encpassN; + dr.EndEdit(); + //var drv = bs.Current as DataRowView; + //drv["password"] = encpassN; + //this.bs.EndEdit(); } } } @@ -64,7 +68,28 @@ namespace Project._Common private void button2_Click(object sender, EventArgs e) { this.Validate(); + + dr.name = tbNameK.Text; + dr.dept = tbDept.Text; + dr.email = tbEmail.Text; + dr.tel = tbTel.Text; + dr.hp = tbHp.Text; + dr.indate = tbDateIn.Text; + dr.outdate = tbDateO.Text; + dr.nameE = tbNameE.Text; + dr.grade = tbGrade.Text; + dr.memo = tbMemo.Text; + dr.processs = tbProcess.Text; + dr.level = short.Parse(tbLevel.Text); + dr.EndEdit(); + + this.bs.EndEdit(); + + + // dr.processs = tbProcess.Text; + // dr.EndEdit(); + try { if (tbKJPath.Enabled) @@ -79,9 +104,15 @@ namespace Project._Common } } - var cnt = this.tam.UpdateAll(this.dsMSSQL); - Util.MsgI(string.Format("{0}건의 자료가 업데이트 됨", cnt)); - DialogResult = System.Windows.Forms.DialogResult.OK; + var cnt = this.ta.Update(this.dsMSSQL.Users); + if(cnt == 1) + { + Util.MsgI(string.Format("{0}건의 자료가 업데이트 됨", cnt)); + DialogResult = System.Windows.Forms.DialogResult.OK; + } + else + Util.MsgE(string.Format("{0}건의 자료가 업데이트 됨", cnt)); + } catch (Exception ex) { diff --git a/Project/_Common/fUserInfo.resx b/Project/_Common/fUserInfo.resx index ea13df7..03cc7c8 100644 --- a/Project/_Common/fUserInfo.resx +++ b/Project/_Common/fUserInfo.resx @@ -159,8 +159,8 @@ False - - 122, 17 + + False 122, 17 @@ -177,7 +177,4 @@ 248, 17 - - False - \ No newline at end of file diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 10e9b00..c0f8206 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -6332,43 +6332,9 @@ namespace Project.dsMSSQLTableAdapters { this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Users] WHERE (([id] = @Original_id) AND ((@IsNull_password = 1 AND [password] IS NULL) OR ([password] = @Original_password)) AND ((@IsNull_nameE = 1 AND [nameE] IS NULL) OR ([nameE] = @Original_nameE)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_outdate = 1 AND [outdate] IS NULL) OR ([outdate] = @Original_outdate)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_hp = 1 AND [hp] IS NULL) OR ([hp] = @Original_hp)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_ads_employNo = 1 AND [ads_employNo] IS NULL) OR ([ads_employNo] = @Original_ads_employNo)) AND ((@IsNull_ads_title = 1 AND [ads_title] IS NULL) OR ([ads_title] = @Original_ads_title)) AND ((@IsNull_ads_created = 1 AND [ads_created] IS NULL) OR ([ads_created] = @Original_ads_created)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM Users\r\nWHERE (id = @Original_id)"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_password", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_password", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_nameE", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_nameE", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "nameE", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_dept", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grade", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grade", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_level", global::System.Data.SqlDbType.SmallInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_outdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "outdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_outdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "outdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_place", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_place", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ads_employNo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ads_employNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_employNo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ads_title", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ads_title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ads_created", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ads_created", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ads_created", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO Users @@ -6400,13 +6366,12 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE Users -SET id = @id, password = @password, nameE = @nameE, name = @name, dept = @dept, grade = @grade, email = @email, level = @level, indate = @indate, outdate = @outdate, tel = @tel, - hp = @hp, place = @place, ads_employNo = @ads_employNo, ads_title = @ads_title, ads_created = @ads_created, memo = @memo, wuid = @wuid, wdate = @wdate, processs = @process, +SET password = @password, nameE = @nameE, name = @name, dept = @dept, grade = @grade, email = @email, level = @level, indate = @indate, outdate = @outdate, tel = @tel, hp = @hp, + place = @place, ads_employNo = @ads_employNo, ads_title = @ads_title, ads_created = @ads_created, memo = @memo, wuid = @wuid, wdate = @wdate, processs = @process, gcode = @gcode -WHERE (id = @Original_id); +WHERE (id = @Original_id); 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._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.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._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@password", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.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._adapter.UpdateCommand.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, "", "", "")); @@ -6428,6 +6393,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "processs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.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, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.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.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6720,167 +6686,13 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete( - string Original_id, - string Original_password, - string Original_nameE, - string Original_name, - string Original_dept, - string Original_grade, - string Original_email, - global::System.Nullable Original_level, - string Original_indate, - string Original_outdate, - string Original_tel, - string Original_hp, - string Original_place, - string Original_ads_employNo, - string Original_ads_title, - string Original_ads_created, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate) { + public virtual int Delete(string Original_id) { if ((Original_id == null)) { throw new global::System.ArgumentNullException("Original_id"); } else { this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_id)); } - if ((Original_password == null)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_password)); - } - if ((Original_nameE == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_nameE)); - } - if ((Original_name == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_name)); - } - if ((Original_dept == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_dept)); - } - if ((Original_grade == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_grade)); - } - if ((Original_email == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_email)); - } - if ((Original_level.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((short)(Original_level.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - if ((Original_indate == null)) { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_indate)); - } - if ((Original_outdate == null)) { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_outdate)); - } - if ((Original_tel == null)) { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[20].Value = ((string)(Original_tel)); - } - if ((Original_hp == null)) { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_hp)); - } - if ((Original_place == null)) { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_place)); - } - if ((Original_ads_employNo == null)) { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[26].Value = ((string)(Original_ads_employNo)); - } - if ((Original_ads_title == null)) { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_ads_title)); - } - if ((Original_ads_created == null)) { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[30].Value = ((string)(Original_ads_created)); - } - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[32].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[32].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[33].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[34].Value = ((System.DateTime)(Original_wdate)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -7065,7 +6877,6 @@ 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.Update, true)] public virtual int Update( - string id, string password, string nameE, string name, @@ -7086,133 +6897,134 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te System.DateTime wdate, string process, string gcode, - string Original_id) { - if ((id == null)) { - throw new global::System.ArgumentNullException("id"); + string Original_id, + string id) { + if ((password == null)) { + this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(id)); + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(password)); } - if ((password == null)) { + if ((nameE == null)) { this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(password)); + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(nameE)); } - if ((nameE == null)) { + if ((name == null)) { this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(nameE)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(name)); } - if ((name == null)) { + if ((dept == null)) { this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(name)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(dept)); } - if ((dept == null)) { + if ((grade == null)) { this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(dept)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(grade)); } - if ((grade == null)) { + if ((email == null)) { this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(grade)); - } - if ((email == null)) { - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(email)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(email)); } if ((level.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((short)(level.Value)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((short)(level.Value)); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; } if ((indate == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(indate)); + } + if ((outdate == null)) { this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(indate)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(outdate)); } - if ((outdate == null)) { + if ((tel == null)) { this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(outdate)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(tel)); } - if ((tel == null)) { + if ((hp == null)) { this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(tel)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(hp)); } - if ((hp == null)) { + if ((place == null)) { this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(hp)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(place)); } - if ((place == null)) { + if ((ads_employNo == null)) { this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(place)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(ads_employNo)); } - if ((ads_employNo == null)) { + if ((ads_title == null)) { this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(ads_employNo)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(ads_title)); } - if ((ads_title == null)) { + if ((ads_created == null)) { this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(ads_title)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(ads_created)); } - if ((ads_created == null)) { + if ((memo == null)) { this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(ads_created)); - } - if ((memo == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(memo)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(memo)); } if ((wuid == null)) { throw new global::System.ArgumentNullException("wuid"); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(wuid)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(wuid)); } - this.Adapter.UpdateCommand.Parameters[18].Value = ((System.DateTime)(wdate)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(wdate)); if ((process == null)) { + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(process)); + } + if ((gcode == null)) { this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(process)); - } - if ((gcode == null)) { - this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(gcode)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(gcode)); } if ((Original_id == null)) { throw new global::System.ArgumentNullException("Original_id"); } else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_id)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_id)); + } + if ((id == null)) { + throw new global::System.ArgumentNullException("id"); + } + else { + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(id)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -7230,35 +7042,6 @@ 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", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update( - string password, - string nameE, - string name, - string dept, - string grade, - string email, - global::System.Nullable level, - string indate, - string outdate, - string tel, - string hp, - string place, - string ads_employNo, - string ads_title, - string ads_created, - string memo, - string wuid, - System.DateTime wdate, - string process, - string gcode, - string Original_id) { - return this.Update(Original_id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, process, gcode, Original_id); - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 9128eaf..8b31b8d 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -11,44 +11,11 @@ - - DELETE FROM [Users] WHERE (([id] = @Original_id) AND ((@IsNull_password = 1 AND [password] IS NULL) OR ([password] = @Original_password)) AND ((@IsNull_nameE = 1 AND [nameE] IS NULL) OR ([nameE] = @Original_nameE)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_outdate = 1 AND [outdate] IS NULL) OR ([outdate] = @Original_outdate)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_hp = 1 AND [hp] IS NULL) OR ([hp] = @Original_hp)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_ads_employNo = 1 AND [ads_employNo] IS NULL) OR ([ads_employNo] = @Original_ads_employNo)) AND ((@IsNull_ads_title = 1 AND [ads_title] IS NULL) OR ([ads_title] = @Original_ads_title)) AND ((@IsNull_ads_created = 1 AND [ads_created] IS NULL) OR ([ads_created] = @Original_ads_created)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + + DELETE FROM Users +WHERE (id = @Original_id) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -96,36 +63,36 @@ ORDER BY name - + UPDATE Users -SET id = @id, password = @password, nameE = @nameE, name = @name, dept = @dept, grade = @grade, email = @email, level = @level, indate = @indate, outdate = @outdate, tel = @tel, - hp = @hp, place = @place, ads_employNo = @ads_employNo, ads_title = @ads_title, ads_created = @ads_created, memo = @memo, wuid = @wuid, wdate = @wdate, processs = @process, +SET password = @password, nameE = @nameE, name = @name, dept = @dept, grade = @grade, email = @email, level = @level, indate = @indate, outdate = @outdate, tel = @tel, hp = @hp, + place = @place, ads_employNo = @ads_employNo, ads_title = @ads_title, ads_created = @ads_created, memo = @memo, wuid = @wuid, wdate = @wdate, processs = @process, gcode = @gcode -WHERE (id = @Original_id); +WHERE (id = @Original_id); 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 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -997,7 +964,7 @@ WHERE (idx = @idx) - + @@ -1138,7 +1105,7 @@ WHERE (idx = @idx) - + @@ -1209,7 +1176,7 @@ WHERE (idx = @idx) - + @@ -1267,7 +1234,7 @@ WHERE (idx = @idx) - + @@ -1337,7 +1304,7 @@ WHERE (idx = @idx) - + @@ -1381,7 +1348,7 @@ WHERE (idx = @idx) - + @@ -1410,7 +1377,7 @@ WHERE (idx = @idx) - + diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 9e19209..ab90d6d 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -4,9 +4,9 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 1d66b6e..6f1db92 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -38,7 +38,6 @@ this.sbBWRun = new System.Windows.Forms.ToolStripStatusLabel(); this.sbBCD = new System.Windows.Forms.ToolStripStatusLabel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.sbRedis = new System.Windows.Forms.ToolStripStatusLabel(); this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); @@ -102,9 +101,9 @@ this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -152,7 +151,6 @@ // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.sbBWRun, - this.sbRedis, this.sbBCD, this.sbLogin}); this.statusStrip1.Location = new System.Drawing.Point(1, 622); @@ -161,12 +159,6 @@ this.statusStrip1.TabIndex = 30; this.statusStrip1.Text = "statusStrip1"; // - // sbRedis - // - this.sbRedis.Name = "sbRedis"; - this.sbRedis.Size = new System.Drawing.Size(55, 17); - this.sbRedis.Text = "● REDIS"; - // // sbLogin // this.sbLogin.Name = "sbLogin"; @@ -711,35 +703,35 @@ this.toolStrip1.TabIndex = 35; this.toolStrip1.Text = "toolStrip1"; // - // toolStripMenuItem6 + // toolStripMenuItem8 // - this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); - this.toolStripMenuItem6.Text = "프로젝트"; - this.toolStripMenuItem6.ToolTipText = "프로젝트"; - this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); + this.toolStripMenuItem8.Name = "toolStripMenuItem8"; + this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem8.Text = "업무일지"; + this.toolStripMenuItem8.ToolTipText = "업무일지"; + this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripMenuItem7 // this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20); this.toolStripMenuItem7.Text = "구매신청"; this.toolStripMenuItem7.ToolTipText = "구매신청"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); // - // toolStripMenuItem8 + // toolStripMenuItem6 // - this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); - this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); - this.toolStripMenuItem8.Text = "업무일지"; - this.toolStripMenuItem8.ToolTipText = "업무일지"; - this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); + this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem6.Text = "프로젝트"; + this.toolStripMenuItem6.ToolTipText = "프로젝트"; + this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); // // toolStripButton4 // @@ -747,7 +739,7 @@ this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(29, 20); + this.toolStripButton4.Size = new System.Drawing.Size(26, 20); this.toolStripButton4.Text = "PMP 자료 보기(베타)"; this.toolStripButton4.ToolTipText = "PMP 자료 보기(베타)"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1); @@ -817,7 +809,6 @@ private System.Windows.Forms.ToolStripMenuItem purchaseImportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customerToolStripMenuItem; - private System.Windows.Forms.ToolStripStatusLabel sbRedis; private System.Windows.Forms.ToolStripMenuItem userAccountToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem; diff --git a/Project/fMain.cs b/Project/fMain.cs index 06af9b7..ed9e067 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -157,7 +157,7 @@ namespace Project var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); - Menu_Note(); + // Menu_Note(); //시작폼 확인 if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true) diff --git a/Project/fMain.resx b/Project/fMain.resx index e4ebf34..a503095 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -153,43 +153,6 @@ Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw== - - - - - R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O - fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo - oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E - RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 - - - - - 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== @@ -210,6 +173,15 @@ gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG CyQdKlaIsLHjggEBADs= + + + + + R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O + fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo + oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E + RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 @@ -282,24 +254,47 @@ gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG CyQdKlaIsLHjggEBADs= + + + + + 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== 709, 17 - + - R0lGODlhEAAQAIZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4 - Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKB - QaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDP - kP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXD - g+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzg - q/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6 - if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///////yH/C05FVFNDQVBFMi4wAwEBAAAh+QQB - AAB/ACwAAAAAEAAQAAAI3QD/CBzop6CfgQgJ+klwAAKYggn/FEzQIEAXBFV8GIEoceGCBVDSrJBw54OW - I24MzllgRwQRDTUk6KATIcIIGAUboLCQ5I0FBDk2GNDjYMieggEu/Cgh4AsCA2WeMMFDhkvBAxeaBPmR - BcEEKykUKIjyoCAEHBzqyABwxQsGB2hsKCBQcAASM0BcTGHhpEKRG2sokCjI54ULNlLCzDhToEKLPBRC - FDQRoA+IDAJU0JjQWI2cDgY9DBigRMgWBj2WiJEDh2PBNiew7GDwIEYcjggL8hhDgAruiB1/CwwIADs= + R0lGODlhEAAQAIQAANnq+K7T5HiUsMHb+v/vlOXs9IyzzHWs1/T5/1ZtjUlVa+z1/+3x9uTx/6a2ysng + +FFhe0NLXIDG/fD4/ykxQz5FVf/41vr8/6TI3MvM0XHG/vbHQPn8//b8/4PL/f///yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CLSwQaDBDwQPAghAYIMAAxAFCGiYQIDAAA4aCgDA + EUBGhxAuLjhwwIOEkydJOkggEAMDDzBjxtRQgOUHDAU46OTQoQOCnxMKhPxggMEFnj2BTgg6tOjRBz4f + SF2woIACgQZySkXwYALVAQ2sCjxQoOcDrlQbgC0QQaCAslwnPFjQQC0Atm7hdl0woG/HCm4n+PRKt0FH + BoA/JHjAoACDx5AfZ6DgNoFlCBAUKIgQoUIFCkMPih4dEAA7 @@ -318,30 +313,35 @@ AABJRU5ErkJggg== - + - R0lGODlhEAAQAIQAANnq+K7T5HiUsMHb+v/vlOXs9IyzzHWs1/T5/1ZtjUlVa+z1/+3x9uTx/6a2ysng - +FFhe0NLXIDG/fD4/ykxQz5FVf/41vr8/6TI3MvM0XHG/vbHQPn8//b8/4PL/f///yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CLSwQaDBDwQPAghAYIMAAxAFCGiYQIDAAA4aCgDA - EUBGhxAuLjhwwIOEkydJOkggEAMDDzBjxtRQgOUHDAU46OTQoQOCnxMKhPxggMEFnj2BTgg6tOjRBz4f - SF2woIACgQZySkXwYALVAQ2sCjxQoOcDrlQbgC0QQaCAslwnPFjQQC0Atm7hdl0woG/HCm4n+PRKt0FH - BoA/JHjAoACDx5AfZ6DgNoFlCBAUKIgQoUIFCkMPih4dEAA7 + R0lGODlhEAAQAIZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4 + Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKB + QaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDP + kP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXD + g+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzg + q/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6 + if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///////yH/C05FVFNDQVBFMi4wAwEBAAAh+QQB + AAB/ACwAAAAAEAAQAAAI3QD/CBzop6CfgQgJ+klwAAKYggn/FEzQIEAXBFV8GIEoceGCBVDSrJBw54OW + I24MzllgRwQRDTUk6KATIcIIGAUboLCQ5I0FBDk2GNDjYMieggEu/Cgh4AsCA2WeMMFDhkvBAxeaBPmR + BcEEKykUKIjyoCAEHBzqyABwxQsGB2hsKCBQcAASM0BcTGHhpEKRG2sokCjI54ULNlLCzDhToEKLPBRC + FDQRoA+IDAJU0JjQWI2cDgY9DBigRMgWBj2WiJEDh2PBNiew7GDwIEYcjggL8hhDgAruiB1/CwwIADs= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJESURBVDhPjVPtS1NxGP1B7i/oY/9DH9KVEEFCWJkKUZTQ - kMJFIVQjayuauiDaQPogpCayL01ZJCVFYF0GEkLvUcSa0b4tCDZ1xDbv7l0vp+f87pUlKvTAw/1w73nO - 85xzrvrfynqU/6tHzcuzIG2nPeq39B/39eYlH49lPCpPQL7nGBZDZ7E0cB7LkQDkHdzP1pew+RYaVC7X - vB2LwTMo3gigNBJEKbwHK9Fm/JztRzW0yYDsFhUXRjN/ugvFaB9+XG2FGfPCHtmF2pjTv1IDsK9tMCDb - oKZltdpS/zmUbgdRiexAzQXaU3thPetA9dVx2LlRlN82rh1AZoKXBy+gPBGCdcvrAJMtqD4/AjPdDfPL - Kd3293GU33vrA3gz1yYzwfbwTg22nrTB/OjToG9pHx687EQ41YLRD4PYFv/nBArGm7n2KrNldMLMnMSK - gKdfdMA/uxttj5uw/1EjYu/C2DrhDqBV9LR48yIq15vqzAIufO7G0Nw+tLvAE4kgeseTSBifcOjyjDOA - PtOqSvyKFow3c20yE3xAgIfvH0XvnSQmjQymjAXcfZpxBgi7nyGhz7SK7Fowd20yExxJpDQwNvkGPVFD - wPesg30zrynePBPGkNBnWkW1KRhv5tpkJjgwPKeB7ZceturVWbJBgfFkwvTt4jPZqTYF481cm8wEu7B6 - yQCb2WY89foSEg6gVZpdBCM7117DvFq8nz8Gs63jKQljSOgzraLajmAbsLNon2yhfwxmm/FkwhgS+kyl - 2VqwdaXUXw9z9ScDat5eAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFC + QwoXhVCNrK1o6oJoA+mDkJrIvjRlkJQUgXUZSAi9R1FrRvu2INjUEdu8210vp+f87pUlKvTAw/1w73nO + 85xzrvrfyhjK99VQ8/LMS9ufDPVb+o/7evOSj8fShsoRkOs5hsXgWSwNnMdy2A95B/ez9SVs3oUGlc02 + b8di4AwKN/wojgRQDO3BSqQZP2f7UQluMiCzRcVShrJyp7tQiPThx9VWWFEP7JFdqI05/Ss5APvaBgMy + DWpaVqst9Z9D8XYA5fAO1FygPbUX1acdqLw8Djs7itKbxrUDyEzw8uAFlCaCqN7yOMBECyrPjsBKdcP6 + ckq3/X0cpXee+gDezLXJTLA9vFODq4/bYH3watC3lBf3X3QilGzB6PtBbIv9cwIF481ce5W5anbCSp/E + ioCnn3fAN7sbbY+asP9hI6JvQ9g64Q6gVfS0cPMiyteb6swCzn/uxtDcPrS7wBPxAHrHE4ibH3Ho8owz + gD7TqnLsihaMN3NtMhN8QICH7x1F750EJs00pswF3H2SdgYIu48hoc+0iuxaMHdtMhMcjic1MDr5Gj0R + U8CJ6sG+mVcUb54JY0joM62i2hSMN3NtMhPsH57TwPZLD1r16izZIM94MmH6dvGZ7FSbgvFmrk1mgl1Y + vWSAzWwznnp9CQkH0CrNLoKRnWuvYV4t3s8fg9nW8ZSEMST0mVZRbUewDdhZtE+20D8Gs814MmEMCX2m + 0mwt2LpS6i/8SvUc1lO/igAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 57b5e2a..a616cfe 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -35,60 +35,63 @@ System.Windows.Forms.Label sdateLabel; System.Windows.Forms.Label edateLabel; System.Windows.Forms.Label odateLabel; - System.Windows.Forms.Label memoLabel; System.Windows.Forms.Label statusLabel; System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartList)); - FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer2 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer3 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer4 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - 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 numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.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 textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); - this.btConf = new System.Windows.Forms.Button(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.prb4 = new arCtl.arLabel(); - this.prb3 = new arCtl.arLabel(); - this.prb2 = new arCtl.arLabel(); - this.prb5 = new arCtl.arLabel(); this.button2 = new System.Windows.Forms.Button(); - this.radSortGrp = new System.Windows.Forms.RadioButton(); - this.radSortNo = new System.Windows.Forms.RadioButton(); + this.panel5 = new System.Windows.Forms.Panel(); + this.btConf = new System.Windows.Forms.Button(); + this.panel4 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.requestTextBox = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); + this.statusTextBox = new System.Windows.Forms.TextBox(); + this.odateTextBox = new System.Windows.Forms.TextBox(); + this.radSortGrp = new System.Windows.Forms.RadioButton(); + this.radSortNo = new System.Windows.Forms.RadioButton(); + this.edateTextBox = new System.Windows.Forms.TextBox(); + this.sdateTextBox = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.reqstaffTextBox = new System.Windows.Forms.TextBox(); this.idxTextBox = new System.Windows.Forms.TextBox(); this.nameTextBox = new System.Windows.Forms.TextBox(); this.pdateTextBox = new System.Windows.Forms.TextBox(); - this.requestTextBox = new System.Windows.Forms.TextBox(); - this.reqstaffTextBox = new System.Windows.Forms.TextBox(); - this.sdateTextBox = new System.Windows.Forms.TextBox(); - this.edateTextBox = new System.Windows.Forms.TextBox(); - this.odateTextBox = new System.Windows.Forms.TextBox(); - this.memoTextBox = new System.Windows.Forms.TextBox(); - this.statusTextBox = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.prb3 = new arCtl.arLabel(); + this.prb2 = new arCtl.arLabel(); + this.prb5 = new arCtl.arLabel(); + this.prb4 = new arCtl.arLabel(); + this.prbPO = new arCtl.arLabel(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -124,27 +127,27 @@ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); pdateLabel = new System.Windows.Forms.Label(); requestLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); sdateLabel = new System.Windows.Forms.Label(); edateLabel = new System.Windows.Forms.Label(); odateLabel = new System.Windows.Forms.Label(); - memoLabel = new System.Windows.Forms.Label(); statusLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); + this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.cm1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsPart)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -156,7 +159,7 @@ // pdateLabel // pdateLabel.AutoSize = true; - pdateLabel.Location = new System.Drawing.Point(23, 43); + pdateLabel.Location = new System.Drawing.Point(10, 40); pdateLabel.Name = "pdateLabel"; pdateLabel.Size = new System.Drawing.Size(41, 12); pdateLabel.TabIndex = 4; @@ -165,7 +168,7 @@ // requestLabel // requestLabel.AutoSize = true; - requestLabel.Location = new System.Drawing.Point(330, 15); + requestLabel.Location = new System.Drawing.Point(317, 12); requestLabel.Name = "requestLabel"; requestLabel.Size = new System.Drawing.Size(53, 12); requestLabel.TabIndex = 6; @@ -174,7 +177,7 @@ // reqstaffLabel // reqstaffLabel.AutoSize = true; - reqstaffLabel.Location = new System.Drawing.Point(330, 42); + reqstaffLabel.Location = new System.Drawing.Point(317, 39); reqstaffLabel.Name = "reqstaffLabel"; reqstaffLabel.Size = new System.Drawing.Size(53, 12); reqstaffLabel.TabIndex = 8; @@ -183,7 +186,7 @@ // sdateLabel // sdateLabel.AutoSize = true; - sdateLabel.Location = new System.Drawing.Point(178, 42); + sdateLabel.Location = new System.Drawing.Point(165, 39); sdateLabel.Name = "sdateLabel"; sdateLabel.Size = new System.Drawing.Size(41, 12); sdateLabel.TabIndex = 10; @@ -192,7 +195,7 @@ // edateLabel // edateLabel.AutoSize = true; - edateLabel.Location = new System.Drawing.Point(178, 69); + edateLabel.Location = new System.Drawing.Point(165, 66); edateLabel.Name = "edateLabel"; edateLabel.Size = new System.Drawing.Size(41, 12); edateLabel.TabIndex = 12; @@ -201,25 +204,16 @@ // odateLabel // odateLabel.AutoSize = true; - odateLabel.Location = new System.Drawing.Point(35, 69); + odateLabel.Location = new System.Drawing.Point(22, 66); odateLabel.Name = "odateLabel"; odateLabel.Size = new System.Drawing.Size(29, 12); odateLabel.TabIndex = 14; odateLabel.Text = "출고"; // - // memoLabel - // - memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(616, 42); - memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(29, 12); - memoLabel.TabIndex = 16; - memoLabel.Text = "비고"; - // // statusLabel // statusLabel.AutoSize = true; - statusLabel.Location = new System.Drawing.Point(354, 69); + statusLabel.Location = new System.Drawing.Point(341, 66); statusLabel.Name = "statusLabel"; statusLabel.Size = new System.Drawing.Size(29, 12); statusLabel.TabIndex = 22; @@ -228,7 +222,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(601, 15); + label1.Location = new System.Drawing.Point(333, 94); label1.Name = "label1"; label1.Size = new System.Drawing.Size(44, 12); label1.TabIndex = 24; @@ -237,127 +231,275 @@ // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(592, 70); + label2.Location = new System.Drawing.Point(22, 94); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(53, 12); + label2.Size = new System.Drawing.Size(29, 12); label2.TabIndex = 27; label2.Tag = ""; - label2.Text = "정렬방식"; + label2.Text = "정렬"; // // panel1 // - this.panel1.Controls.Add(this.btConf); - this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Controls.Add(this.button2); - this.panel1.Controls.Add(this.radSortGrp); - this.panel1.Controls.Add(this.radSortNo); - this.panel1.Controls.Add(label2); + this.panel1.Controls.Add(this.panel5); + this.panel1.Controls.Add(this.btConf); + this.panel1.Controls.Add(this.panel4); this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(label1); - this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(this.idxTextBox); - this.panel1.Controls.Add(this.nameTextBox); - this.panel1.Controls.Add(pdateLabel); - this.panel1.Controls.Add(this.pdateTextBox); - this.panel1.Controls.Add(requestLabel); - this.panel1.Controls.Add(this.requestTextBox); - this.panel1.Controls.Add(reqstaffLabel); - this.panel1.Controls.Add(this.reqstaffTextBox); - this.panel1.Controls.Add(sdateLabel); - this.panel1.Controls.Add(this.sdateTextBox); - this.panel1.Controls.Add(edateLabel); - this.panel1.Controls.Add(this.edateTextBox); - this.panel1.Controls.Add(odateLabel); - this.panel1.Controls.Add(this.odateTextBox); - this.panel1.Controls.Add(memoLabel); - this.panel1.Controls.Add(this.memoTextBox); - this.panel1.Controls.Add(statusLabel); - this.panel1.Controls.Add(this.statusTextBox); + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel2); + this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1217, 148); + this.panel1.Size = new System.Drawing.Size(1217, 170); this.panel1.TabIndex = 0; // + // button2 + // + this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.button2.Dock = System.Windows.Forms.DockStyle.Left; + this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image"))); + this.button2.Location = new System.Drawing.Point(774, 0); + this.button2.Name = "button2"; + this.button2.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.button2.Size = new System.Drawing.Size(87, 119); + this.button2.TabIndex = 30; + this.button2.Text = "저장(&S)"; + this.button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // panel5 + // + this.panel5.Dock = System.Windows.Forms.DockStyle.Left; + this.panel5.Location = new System.Drawing.Point(767, 0); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(7, 119); + this.panel5.TabIndex = 38; + // // btConf // + this.btConf.Dock = System.Windows.Forms.DockStyle.Left; this.btConf.Image = ((System.Drawing.Image)(resources.GetObject("btConf.Image"))); - this.btConf.Location = new System.Drawing.Point(952, 11); + this.btConf.Location = new System.Drawing.Point(680, 0); this.btConf.Name = "btConf"; - this.btConf.Size = new System.Drawing.Size(98, 78); + this.btConf.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.btConf.Size = new System.Drawing.Size(87, 119); this.btConf.TabIndex = 34; this.btConf.Text = "수량 검토"; this.btConf.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.btConf.UseVisualStyleBackColor = true; this.btConf.Click += new System.EventHandler(this.btConf_Click); // + // panel4 + // + this.panel4.Dock = System.Windows.Forms.DockStyle.Left; + this.panel4.Location = new System.Drawing.Point(673, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(7, 119); + this.panel4.TabIndex = 37; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Left; + this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); + this.button1.Location = new System.Drawing.Point(586, 0); + this.button1.Name = "button1"; + this.button1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.button1.Size = new System.Drawing.Size(87, 119); + this.button1.TabIndex = 26; + this.button1.Text = "새로고침(&R)"; + this.button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // panel3 + // + this.panel3.Dock = System.Windows.Forms.DockStyle.Left; + this.panel3.Location = new System.Drawing.Point(579, 0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(7, 119); + this.panel3.TabIndex = 36; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel2.Controls.Add(this.requestTextBox); + this.panel2.Controls.Add(this.statusTextBox); + this.panel2.Controls.Add(statusLabel); + this.panel2.Controls.Add(this.odateTextBox); + this.panel2.Controls.Add(this.radSortGrp); + this.panel2.Controls.Add(odateLabel); + this.panel2.Controls.Add(this.radSortNo); + this.panel2.Controls.Add(this.edateTextBox); + this.panel2.Controls.Add(label2); + this.panel2.Controls.Add(edateLabel); + this.panel2.Controls.Add(this.sdateTextBox); + this.panel2.Controls.Add(label1); + this.panel2.Controls.Add(sdateLabel); + this.panel2.Controls.Add(this.textBox1); + this.panel2.Controls.Add(this.reqstaffTextBox); + this.panel2.Controls.Add(this.idxTextBox); + this.panel2.Controls.Add(reqstaffLabel); + this.panel2.Controls.Add(this.nameTextBox); + this.panel2.Controls.Add(requestLabel); + this.panel2.Controls.Add(pdateLabel); + this.panel2.Controls.Add(this.pdateTextBox); + this.panel2.Dock = System.Windows.Forms.DockStyle.Left; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(579, 119); + this.panel2.TabIndex = 35; + // + // requestTextBox + // + this.requestTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "process", true)); + this.requestTextBox.Enabled = false; + this.requestTextBox.Location = new System.Drawing.Point(383, 9); + this.requestTextBox.Name = "requestTextBox"; + this.requestTextBox.Size = new System.Drawing.Size(186, 21); + this.requestTextBox.TabIndex = 7; + // + // bs + // + this.bs.DataMember = "Projects"; + this.bs.DataSource = this.dsPRJ; + this.bs.Sort = ""; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // statusTextBox + // + this.statusTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "status", true)); + this.statusTextBox.Enabled = false; + this.statusTextBox.Location = new System.Drawing.Point(383, 63); + this.statusTextBox.Name = "statusTextBox"; + this.statusTextBox.Size = new System.Drawing.Size(186, 21); + this.statusTextBox.TabIndex = 23; + this.statusTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // odateTextBox + // + this.odateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); + this.odateTextBox.Enabled = false; + this.odateTextBox.Location = new System.Drawing.Point(57, 63); + this.odateTextBox.Name = "odateTextBox"; + this.odateTextBox.Size = new System.Drawing.Size(92, 21); + this.odateTextBox.TabIndex = 15; + this.odateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // radSortGrp + // + this.radSortGrp.AutoSize = true; + this.radSortGrp.Checked = true; + this.radSortGrp.Location = new System.Drawing.Point(56, 92); + this.radSortGrp.Name = "radSortGrp"; + this.radSortGrp.Size = new System.Drawing.Size(131, 16); + this.radSortGrp.TabIndex = 29; + this.radSortGrp.TabStop = true; + this.radSortGrp.Text = "중분류+소분류+번호"; + this.radSortGrp.UseVisualStyleBackColor = true; + // + // radSortNo + // + this.radSortNo.AutoSize = true; + this.radSortNo.Location = new System.Drawing.Point(193, 92); + this.radSortNo.Name = "radSortNo"; + this.radSortNo.Size = new System.Drawing.Size(47, 16); + this.radSortNo.TabIndex = 28; + this.radSortNo.Text = "번호"; + this.radSortNo.UseVisualStyleBackColor = true; + // + // edateTextBox + // + this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); + this.edateTextBox.Enabled = false; + this.edateTextBox.Location = new System.Drawing.Point(211, 63); + this.edateTextBox.Name = "edateTextBox"; + this.edateTextBox.Size = new System.Drawing.Size(92, 21); + this.edateTextBox.TabIndex = 13; + this.edateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // sdateTextBox + // + this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); + this.sdateTextBox.Enabled = false; + this.sdateTextBox.Location = new System.Drawing.Point(211, 36); + this.sdateTextBox.Name = "sdateTextBox"; + this.sdateTextBox.Size = new System.Drawing.Size(92, 21); + this.sdateTextBox.TabIndex = 11; + this.sdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "orderno", true)); + this.textBox1.Enabled = false; + this.textBox1.Location = new System.Drawing.Point(383, 90); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(186, 21); + this.textBox1.TabIndex = 25; + // + // reqstaffTextBox + // + this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true)); + this.reqstaffTextBox.Enabled = false; + this.reqstaffTextBox.Location = new System.Drawing.Point(383, 36); + this.reqstaffTextBox.Name = "reqstaffTextBox"; + this.reqstaffTextBox.Size = new System.Drawing.Size(186, 21); + this.reqstaffTextBox.TabIndex = 9; + // + // idxTextBox + // + this.idxTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); + this.idxTextBox.Location = new System.Drawing.Point(11, 9); + this.idxTextBox.Name = "idxTextBox"; + this.idxTextBox.ReadOnly = true; + this.idxTextBox.Size = new System.Drawing.Size(40, 21); + this.idxTextBox.TabIndex = 1; + // + // nameTextBox + // + this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(57, 9); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(246, 21); + this.nameTextBox.TabIndex = 3; + // + // pdateTextBox + // + this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pdate", true)); + this.pdateTextBox.Enabled = false; + this.pdateTextBox.Location = new System.Drawing.Point(57, 36); + this.pdateTextBox.Name = "pdateTextBox"; + this.pdateTextBox.Size = new System.Drawing.Size(92, 21); + this.pdateTextBox.TabIndex = 5; + this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 4; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Controls.Add(this.prb4, 3, 0); + this.tableLayoutPanel1.ColumnCount = 5; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0); this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0); this.tableLayoutPanel1.Controls.Add(this.prb5, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.prb4, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.prbPO, 3, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 97); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 119); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Size = new System.Drawing.Size(1217, 51); this.tableLayoutPanel1.TabIndex = 33; // - // prb4 - // - this.prb4.BackColor = System.Drawing.Color.LightGreen; - this.prb4.BackColor2 = System.Drawing.Color.Lime; - this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0); - this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); - this.prb4.BorderColorOver = System.Drawing.Color.Red; - this.prb4.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); - this.prb4.ColorTheme = arCtl.arLabel.eColorTheme.Custom; - this.prb4.Cursor = System.Windows.Forms.Cursors.Arrow; - this.prb4.Dock = System.Windows.Forms.DockStyle.Fill; - this.prb4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.prb4.ForeColor = System.Drawing.Color.Black; - this.prb4.GradientEnable = true; - this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; - this.prb4.GradientRepeatBG = false; - this.prb4.isButton = false; - this.prb4.Location = new System.Drawing.Point(917, 5); - this.prb4.Margin = new System.Windows.Forms.Padding(5); - this.prb4.MouseDownColor = System.Drawing.Color.Yellow; - this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.prb4.msg = null; - this.prb4.Name = "prb4"; - this.prb4.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); - this.prb4.ProgressBorderColor = System.Drawing.Color.Black; - this.prb4.ProgressColor1 = System.Drawing.Color.Yellow; - this.prb4.ProgressColor2 = System.Drawing.Color.Gold; - this.prb4.ProgressEnable = true; - this.prb4.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); - this.prb4.ProgressForeColor = System.Drawing.Color.Black; - this.prb4.ProgressMax = 100F; - this.prb4.ProgressMin = 0F; - this.prb4.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); - this.prb4.ProgressValue = 50F; - this.prb4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb4.Sign = ""; - this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight; - this.prb4.SignColor = System.Drawing.Color.Yellow; - this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb4.Size = new System.Drawing.Size(295, 41); - this.prb4.TabIndex = 32; - this.prb4.Text = "구매 완료"; - this.prb4.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.prb4.TextShadow = false; - this.prb4.TextVisible = true; - this.toolTip1.SetToolTip(this.prb4, "구매대상 중 구매완료 율"); - // // prb3 // this.prb3.BackColor = System.Drawing.Color.Magenta; @@ -375,7 +517,7 @@ this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb3.GradientRepeatBG = false; this.prb3.isButton = false; - this.prb3.Location = new System.Drawing.Point(613, 5); + this.prb3.Location = new System.Drawing.Point(491, 5); this.prb3.Margin = new System.Windows.Forms.Padding(5); this.prb3.MouseDownColor = System.Drawing.Color.Yellow; this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -397,7 +539,7 @@ this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb3.SignColor = System.Drawing.Color.Yellow; this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb3.Size = new System.Drawing.Size(294, 41); + this.prb3.Size = new System.Drawing.Size(233, 41); this.prb3.TabIndex = 32; this.prb3.Text = "구매 진행 중"; this.prb3.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -422,7 +564,7 @@ this.prb2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb2.GradientRepeatBG = false; this.prb2.isButton = false; - this.prb2.Location = new System.Drawing.Point(309, 5); + this.prb2.Location = new System.Drawing.Point(248, 5); this.prb2.Margin = new System.Windows.Forms.Padding(5); this.prb2.MouseDownColor = System.Drawing.Color.Yellow; this.prb2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -444,7 +586,7 @@ this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb2.SignColor = System.Drawing.Color.Yellow; this.prb2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb2.Size = new System.Drawing.Size(294, 41); + this.prb2.Size = new System.Drawing.Size(233, 41); this.prb2.TabIndex = 32; this.prb2.Text = "구매 등록 신청"; this.prb2.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -490,7 +632,7 @@ this.prb5.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb5.SignColor = System.Drawing.Color.Yellow; this.prb5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb5.Size = new System.Drawing.Size(294, 41); + this.prb5.Size = new System.Drawing.Size(233, 41); this.prb5.TabIndex = 32; this.prb5.Text = "비 구매"; this.prb5.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -498,167 +640,98 @@ this.prb5.TextVisible = true; this.toolTip1.SetToolTip(this.prb5, "전체 수량 중 구매 불필요 수량"); // - // button2 + // prb4 // - this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image"))); - this.button2.Location = new System.Drawing.Point(1056, 11); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(98, 78); - this.button2.TabIndex = 30; - this.button2.Text = "저장(&S)"; - this.button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); + this.prb4.BackColor = System.Drawing.Color.LightGreen; + this.prb4.BackColor2 = System.Drawing.Color.Lime; + this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb4.BorderColorOver = System.Drawing.Color.Red; + this.prb4.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb4.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.prb4.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb4.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prb4.ForeColor = System.Drawing.Color.Black; + this.prb4.GradientEnable = true; + this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb4.GradientRepeatBG = false; + this.prb4.isButton = false; + this.prb4.Location = new System.Drawing.Point(977, 5); + this.prb4.Margin = new System.Windows.Forms.Padding(5); + this.prb4.MouseDownColor = System.Drawing.Color.Yellow; + this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.prb4.msg = null; + this.prb4.Name = "prb4"; + this.prb4.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prb4.ProgressBorderColor = System.Drawing.Color.Black; + this.prb4.ProgressColor1 = System.Drawing.Color.Yellow; + this.prb4.ProgressColor2 = System.Drawing.Color.Gold; + this.prb4.ProgressEnable = true; + this.prb4.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb4.ProgressForeColor = System.Drawing.Color.Black; + this.prb4.ProgressMax = 100F; + this.prb4.ProgressMin = 0F; + this.prb4.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); + this.prb4.ProgressValue = 50F; + this.prb4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb4.Sign = ""; + this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prb4.SignColor = System.Drawing.Color.Yellow; + this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.prb4.Size = new System.Drawing.Size(235, 41); + this.prb4.TabIndex = 32; + this.prb4.Text = "구매 완료"; + this.prb4.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.prb4.TextShadow = false; + this.prb4.TextVisible = true; + this.toolTip1.SetToolTip(this.prb4, "구매대상 중 구매완료 율"); // - // radSortGrp + // prbPO // - this.radSortGrp.AutoSize = true; - this.radSortGrp.Checked = true; - this.radSortGrp.Location = new System.Drawing.Point(651, 68); - this.radSortGrp.Name = "radSortGrp"; - this.radSortGrp.Size = new System.Drawing.Size(131, 16); - this.radSortGrp.TabIndex = 29; - this.radSortGrp.TabStop = true; - this.radSortGrp.Text = "중분류+소분류+번호"; - this.radSortGrp.UseVisualStyleBackColor = true; - // - // radSortNo - // - this.radSortNo.AutoSize = true; - this.radSortNo.Location = new System.Drawing.Point(788, 68); - this.radSortNo.Name = "radSortNo"; - this.radSortNo.Size = new System.Drawing.Size(47, 16); - this.radSortNo.TabIndex = 28; - this.radSortNo.Text = "번호"; - this.radSortNo.UseVisualStyleBackColor = true; - // - // button1 - // - this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); - this.button1.Location = new System.Drawing.Point(848, 11); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(98, 78); - this.button1.TabIndex = 26; - this.button1.Text = "새로고침(&R)"; - this.button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // textBox1 - // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "orderno", true)); - this.textBox1.Enabled = false; - this.textBox1.Location = new System.Drawing.Point(651, 12); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(184, 21); - this.textBox1.TabIndex = 25; - // - // bs - // - this.bs.DataMember = "Projects"; - this.bs.DataSource = this.dsPRJ; - this.bs.Sort = ""; - // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // idxTextBox - // - this.idxTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); - this.idxTextBox.Location = new System.Drawing.Point(24, 12); - this.idxTextBox.Name = "idxTextBox"; - this.idxTextBox.ReadOnly = true; - this.idxTextBox.Size = new System.Drawing.Size(40, 21); - this.idxTextBox.TabIndex = 1; - // - // nameTextBox - // - this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(70, 12); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(246, 21); - this.nameTextBox.TabIndex = 3; - // - // pdateTextBox - // - this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pdate", true)); - this.pdateTextBox.Enabled = false; - this.pdateTextBox.Location = new System.Drawing.Point(70, 39); - this.pdateTextBox.Name = "pdateTextBox"; - this.pdateTextBox.Size = new System.Drawing.Size(92, 21); - this.pdateTextBox.TabIndex = 5; - this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // requestTextBox - // - this.requestTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "process", true)); - this.requestTextBox.Enabled = false; - this.requestTextBox.Location = new System.Drawing.Point(396, 12); - this.requestTextBox.Name = "requestTextBox"; - this.requestTextBox.Size = new System.Drawing.Size(186, 21); - this.requestTextBox.TabIndex = 7; - // - // reqstaffTextBox - // - this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true)); - this.reqstaffTextBox.Enabled = false; - this.reqstaffTextBox.Location = new System.Drawing.Point(396, 39); - this.reqstaffTextBox.Name = "reqstaffTextBox"; - this.reqstaffTextBox.Size = new System.Drawing.Size(186, 21); - this.reqstaffTextBox.TabIndex = 9; - // - // sdateTextBox - // - this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); - this.sdateTextBox.Enabled = false; - this.sdateTextBox.Location = new System.Drawing.Point(224, 39); - this.sdateTextBox.Name = "sdateTextBox"; - this.sdateTextBox.Size = new System.Drawing.Size(92, 21); - this.sdateTextBox.TabIndex = 11; - this.sdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // edateTextBox - // - this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); - this.edateTextBox.Enabled = false; - this.edateTextBox.Location = new System.Drawing.Point(224, 66); - this.edateTextBox.Name = "edateTextBox"; - this.edateTextBox.Size = new System.Drawing.Size(92, 21); - this.edateTextBox.TabIndex = 13; - this.edateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // odateTextBox - // - this.odateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); - this.odateTextBox.Enabled = false; - this.odateTextBox.Location = new System.Drawing.Point(70, 66); - this.odateTextBox.Name = "odateTextBox"; - this.odateTextBox.Size = new System.Drawing.Size(92, 21); - this.odateTextBox.TabIndex = 15; - this.odateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // memoTextBox - // - this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Enabled = false; - this.memoTextBox.Location = new System.Drawing.Point(651, 39); - this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.Size = new System.Drawing.Size(184, 21); - this.memoTextBox.TabIndex = 17; - // - // statusTextBox - // - this.statusTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "status", true)); - this.statusTextBox.Enabled = false; - this.statusTextBox.Location = new System.Drawing.Point(396, 66); - this.statusTextBox.Name = "statusTextBox"; - this.statusTextBox.Size = new System.Drawing.Size(186, 21); - this.statusTextBox.TabIndex = 23; - this.statusTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.prbPO.BackColor = System.Drawing.Color.OrangeRed; + this.prbPO.BackColor2 = System.Drawing.Color.Orange; + this.prbPO.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prbPO.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prbPO.BorderColorOver = System.Drawing.Color.Red; + this.prbPO.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prbPO.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.prbPO.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prbPO.Dock = System.Windows.Forms.DockStyle.Fill; + this.prbPO.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prbPO.ForeColor = System.Drawing.Color.Black; + this.prbPO.GradientEnable = true; + this.prbPO.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prbPO.GradientRepeatBG = false; + this.prbPO.isButton = false; + this.prbPO.Location = new System.Drawing.Point(734, 5); + this.prbPO.Margin = new System.Windows.Forms.Padding(5); + this.prbPO.MouseDownColor = System.Drawing.Color.Yellow; + this.prbPO.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.prbPO.msg = null; + this.prbPO.Name = "prbPO"; + this.prbPO.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prbPO.ProgressBorderColor = System.Drawing.Color.Black; + this.prbPO.ProgressColor1 = System.Drawing.Color.Yellow; + this.prbPO.ProgressColor2 = System.Drawing.Color.Gold; + this.prbPO.ProgressEnable = true; + this.prbPO.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prbPO.ProgressForeColor = System.Drawing.Color.Black; + this.prbPO.ProgressMax = 100F; + this.prbPO.ProgressMin = 0F; + this.prbPO.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); + this.prbPO.ProgressValue = 50F; + this.prbPO.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prbPO.Sign = ""; + this.prbPO.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prbPO.SignColor = System.Drawing.Color.Yellow; + this.prbPO.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.prbPO.Size = new System.Drawing.Size(233, 41); + this.prbPO.TabIndex = 32; + this.prbPO.Text = "PO 발행"; + this.prbPO.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.prbPO.TextShadow = false; + this.prbPO.TextVisible = true; // // cm1 // @@ -746,6 +819,7 @@ this.bn.CountItem = this.bindingNavigatorCountItem; this.bn.DeleteItem = this.bindingNavigatorDeleteItem; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(20, 20); this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -772,14 +846,14 @@ this.toolStripButton4, this.toolStripButton5, this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 636); + this.bn.Location = new System.Drawing.Point(0, 634); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1217, 25); + this.bn.Size = new System.Drawing.Size(1217, 27); this.bn.TabIndex = 3; this.bn.Text = "bindingNavigator1"; // @@ -788,13 +862,13 @@ this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(67, 22); + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(71, 24); this.bindingNavigatorAddNewItem.Text = "추가(&A)"; // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // @@ -803,7 +877,7 @@ this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(68, 22); + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(72, 24); this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // @@ -813,7 +887,7 @@ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -822,13 +896,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorPositionItem // @@ -842,7 +916,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorMoveNextItem // @@ -850,7 +924,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -859,13 +933,13 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27); // // toolStripButton2 // @@ -873,65 +947,65 @@ 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(75, 22); + this.toolStripButton2.Size = new System.Drawing.Size(79, 24); this.toolStripButton2.Text = "비용요약"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27); // // toolStripButton7 // this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton7.Name = "toolStripButton7"; - this.toolStripButton7.Size = new System.Drawing.Size(97, 22); + this.toolStripButton7.Size = new System.Drawing.Size(101, 24); this.toolStripButton7.Text = "PMP검색(F5)"; this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27); // // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Size = new System.Drawing.Size(31, 24); this.toolStripLabel2.Text = "검색"; // // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.Size = new System.Drawing.Size(100, 27); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27); // // toolStripLabel1 // this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel1.Size = new System.Drawing.Size(31, 24); this.toolStripLabel1.Text = "total"; // // lbSum // this.lbSum.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSum.Name = "lbSum"; - this.lbSum.Size = new System.Drawing.Size(19, 22); + this.lbSum.Size = new System.Drawing.Size(19, 24); this.lbSum.Text = "0"; // // toolStripSeparator2 // this.toolStripSeparator2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27); // // toolStripButton3 // @@ -939,7 +1013,7 @@ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(99, 22); + this.toolStripButton3.Size = new System.Drawing.Size(103, 24); this.toolStripButton3.Text = "목록가져오기"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -949,7 +1023,7 @@ this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(75, 22); + this.toolStripButton4.Size = new System.Drawing.Size(79, 24); this.toolStripButton4.Text = "구매등록"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // @@ -960,10 +1034,21 @@ this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(108, 22); + this.toolStripButton5.Size = new System.Drawing.Size(112, 24); this.toolStripButton5.Text = "PMP 재고 검사"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click_1); // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.ForeColor = System.Drawing.Color.Black; + this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.find; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(79, 24); + this.toolStripButton1.Text = "S/C 체크"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); + // // ta // this.ta.ClearBeforeFill = true; @@ -995,26 +1080,27 @@ this.fpSpread1.ContextMenuStrip = this.cm1; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer2; + this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer1; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer3; - this.fpSpread1.Location = new System.Drawing.Point(0, 148); + flatScrollBarRenderer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer1; + this.fpSpread1.Location = new System.Drawing.Point(0, 170); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1217, 488); + this.fpSpread1.Size = new System.Drawing.Size(1217, 464); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; this.fpSpread1.TabIndex = 4; this.fpSpread1.TitleInfo.Text = "PartList"; this.fpSpread1.TitleInfo.Value = "PartList"; this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer4; + flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); + this.fpSpread1.SetViewportLeftColumn(0, 0, 1); // // fpSpread1_Sheet1 // @@ -1057,94 +1143,94 @@ this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemGroup"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "중분류"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 89F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "option1"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "소분류"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 86F; - numberCellType10.DecimalPlaces = 0; - numberCellType10.NegativeRed = true; - numberCellType10.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType10; + numberCellType1.DecimalPlaces = 0; + numberCellType1.NegativeRed = true; + numberCellType1.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "no"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "번호"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 79F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(3).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 99F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemUnit"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "unit"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType11.DecimalPlaces = 0; - numberCellType11.MaximumValue = 10000000D; - numberCellType11.MinimumValue = -10000000D; - numberCellType11.NegativeRed = true; - numberCellType11.NullDisplay = "0"; - numberCellType11.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType11; + numberCellType2.DecimalPlaces = 0; + numberCellType2.MaximumValue = 10000000D; + numberCellType2.MinimumValue = -10000000D; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "0"; + numberCellType2.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(7).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "price"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - numberCellType12.DecimalPlaces = 0; - numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType12.MaximumValue = 2147483647D; - numberCellType12.MinimumValue = -2147483648D; - numberCellType12.NegativeRed = true; - numberCellType12.Separator = ","; - numberCellType12.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType12; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + numberCellType3.NegativeRed = true; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "1대 수량"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType13.DecimalPlaces = 0; - numberCellType13.NegativeRed = true; - numberCellType13.Separator = ","; - numberCellType13.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType13; + numberCellType4.DecimalPlaces = 0; + numberCellType4.NegativeRed = true; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "N대 수량"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType14.DecimalPlaces = 0; - numberCellType14.MaximumValue = 9999999999999.99D; - numberCellType14.MinimumValue = -9999999999999.99D; - numberCellType14.NegativeRed = true; - numberCellType14.NullDisplay = "--"; - numberCellType14.Separator = ","; - numberCellType14.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType14; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 9999999999999.99D; + numberCellType5.MinimumValue = -9999999999999.99D; + numberCellType5.NegativeRed = true; + numberCellType5.NullDisplay = "--"; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[-3]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -1152,45 +1238,45 @@ this.fpSpread1_Sheet1.Columns.Get(10).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType14; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amtn"; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-4]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 금액"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "PMP"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType15.DecimalPlaces = 0; - numberCellType15.NegativeRed = true; - numberCellType15.NullDisplay = "--"; - numberCellType15.Separator = ","; - numberCellType15.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType15; + numberCellType6.DecimalPlaces = 0; + numberCellType6.NegativeRed = true; + numberCellType6.NullDisplay = "--"; + numberCellType6.Separator = ","; + numberCellType6.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "구매수량"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매확정"; this.fpSpread1_Sheet1.Columns.Get(14).Tag = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType16.DecimalPlaces = 0; - numberCellType16.NegativeRed = true; - numberCellType16.NullDisplay = "0"; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType16; + numberCellType7.DecimalPlaces = 0; + numberCellType7.NegativeRed = true; + numberCellType7.NullDisplay = "0"; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(16).Label = "제조사"; @@ -1198,28 +1284,29 @@ this.fpSpread1_Sheet1.Columns.Get(16).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(17).ImeMode = System.Windows.Forms.ImeMode.Hangul; this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급사"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "option2"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(18).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType17; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType18; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "ItemSupplyidx"; this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; @@ -1233,11 +1320,11 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo2.HardMarginX = 0F; - noPrinterPrintInfo2.HardMarginY = 0F; - noPrinterPrintInfo2.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; + noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo1.HardMarginX = 0F; + noPrinterPrintInfo1.HardMarginY = 0F; + noPrinterPrintInfo1.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -1250,17 +1337,6 @@ this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.ForeColor = System.Drawing.Color.Black; - this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.find; - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(75, 22); - this.toolStripButton1.Text = "S/C 체크"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); - // // fPartList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1273,10 +1349,11 @@ this.Text = "파트리스트"; this.Load += new System.EventHandler(this.fPartList_Load); this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.cm1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bsPart)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); @@ -1304,7 +1381,6 @@ private System.Windows.Forms.TextBox sdateTextBox; private System.Windows.Forms.TextBox edateTextBox; private System.Windows.Forms.TextBox odateTextBox; - private System.Windows.Forms.TextBox memoTextBox; private System.Windows.Forms.TextBox statusTextBox; private dsPRJTableAdapters.ProjectsPartTableAdapter taPart; private System.Windows.Forms.BindingSource bsPart; @@ -1355,7 +1431,12 @@ private arCtl.arLabel prb5; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button btConf; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton1; + private arCtl.arLabel prbPO; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel3; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 9d61b17..2d1d059 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -174,8 +174,11 @@ namespace FPJ0000 var col_qtyin = this.fpSpread1.ActiveSheet.Columns["qtyin"].Index; var col_qtyn = this.fpSpread1.ActiveSheet.Columns["qtyn"].Index; //N대수량(전체수량) var col_bbuy = this.fpSpread1.ActiveSheet.Columns["bbuy"].Index; + var col_supply = this.fpSpread1.ActiveSheet.Columns["supply"].Index; // var col_bconf = this.fpSpread1.ActiveSheet.Columns["bconfirm"].Index; + var PO발행 = 0; + var PO발행전체 = 0; var 전체건수 = 0; var 비구매건수 = 0; var 구매진행건수 = 0; @@ -192,6 +195,7 @@ namespace FPJ0000 var value_buy = this.fpSpread1.ActiveSheet.GetValue(i, col_buy); var value_in = this.fpSpread1.ActiveSheet.GetValue(i, col_qtyin); var value_bbuy = this.fpSpread1.ActiveSheet.GetValue(i, col_bbuy); + var value_supply = this.fpSpread1.ActiveSheet.GetValue(i, col_supply).ToString().Trim(); //var value_bconf = this.fpSpread1.ActiveSheet.GetValue(i, col_bconf); Boolean bbuy = false; @@ -200,19 +204,31 @@ namespace FPJ0000 if (value_bbuy != null) bbuy = (Boolean)value_bbuy; // if (value_bconf != null) bconf = (Boolean)value_bconf; + if (bbuy) PO발행전체 += 1; + // if (bbuy && string.IsNullOrEmpty(value_supply)) + + 전체건수 += 1; int qty_in = 0; int qty_buy = -1; if (value_in != null) qty_in = (int)value_in; if (value_buy != null) qty_buy = (int)value_buy; - + if (bbuy) { - //구매진행중인데 수량이 다르면 색상 변경 - if (qty_in != qty_buy) + if (qty_in == 0 && string.IsNullOrEmpty(value_supply)) { - if(qty_buy < 1) + //입고량이 0인데 공급사가 없다면 PO발행대기건 + row.ForeColor = Color.White; + row.BackColor = Color.OrangeRed; + PO발행 += 1; + } + //구매진행중인데 수량이 다르면 색상 변경 + else if (qty_in != qty_buy) + { + //공급사가 없다면 ㅔo발행건으로 한다. + if (qty_buy < 1) { row.ForeColor = Color.Red; row.BackColor = Color.DarkMagenta; @@ -223,6 +239,7 @@ namespace FPJ0000 row.BackColor = Color.DarkMagenta; } 구매진행건수 += 1; + } else { @@ -243,7 +260,7 @@ namespace FPJ0000 } else { - + row.ForeColor = Color.Black; row.BackColor = Color.SkyBlue; } @@ -254,13 +271,16 @@ namespace FPJ0000 //prb6.Text = string.Format("전체 진행 ({0}/{1})", 비구매건수 + 구매완료건수, 전체건수); //prb6.ProgressMax = 전체건수; //prb6.ProgressValue = 비구매건수 + 구매완료건수; + prbPO.Text = string.Format("PO 발행 ({0}/{1})", PO발행, PO발행전체); + prbPO.ProgressMax = PO발행전체; + prbPO.ProgressValue = PO발행; prb5.Text = string.Format("비 구매 ({0}/{1})", 비구매건수, 전체건수); prb5.ProgressMax = 전체건수; prb5.ProgressValue = 비구매건수; - prb2.Text = string.Format("구매 등록 신청 ({0}/{1})", 구매등록건수, 전체건수- 비구매건수); - prb2.ProgressMax = 전체건수- 비구매건수; + prb2.Text = string.Format("구매 등록 신청 ({0}/{1})", 구매등록건수, 전체건수 - 비구매건수); + prb2.ProgressMax = 전체건수 - 비구매건수; prb2.ProgressValue = 구매등록건수; prb4.Text = string.Format("구매 완료 ({0}/{1})", 구매완료건수, 구매등록건수); @@ -431,8 +451,10 @@ namespace FPJ0000 fpSpread1.ActiveSheet.Cells[Rowidx, colidx_itemname].Value = f.itemName; fpSpread1.ActiveSheet.Cells[Rowidx, colidx_sid].Value = f.SID; - fpSpread1.ActiveSheet.Cells[Rowidx, colidx_supplyidx].Value = f.itemSupplyidx; - fpSpread1.ActiveSheet.Cells[Rowidx, colidx_supply].Value = f.itemSupply; + + //공급사는 기록하지 않는다 200623 + //fpSpread1.ActiveSheet.Cells[Rowidx, colidx_supplyidx].Value = f.itemSupplyidx; + //fpSpread1.ActiveSheet.Cells[Rowidx, colidx_supply].Value = f.itemSupply; if (f.itemmodel != "") @@ -495,7 +517,7 @@ namespace FPJ0000 return; } - var f = new fProjectPartToPurchase(ProjectIndex); + var f = new fProjectPartToPurchase(ProjectIndex, sortkey); f.ShowDialog(); } diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 6ee1b0e..e809446 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -135,9 +135,6 @@ False - - False - False @@ -148,6 +145,18 @@ False + + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG + 7AAABuwBHnU4NQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN + S8MwGIf7Z3sXvHSIIlU2u01oL0rXzTm/ceuGzM+rB0FchTEQbx1MwUrllbTLIV3bZUknyQPPpdD+HtIo + kkVRXGsMm8YN0Xbj2QvdLDV9s977mUfDdnxwXbO/KoVWAU2nw65eD16evIBk/2IUuWd1grcPj0qj3g3u + Ou5nRW1to/lkeAfCdzNFsghcUfVI/HkYCEJkWT3WUEY8eQWC9447SYzMMxC8bb/O/t15B4IzI5chEIyN + XJZA0NrtuShrCovAOJMCoQVlTfnXgQ/OexS4pZ8E+v7lXFatqz+L5hlxJzRzIG9lIK0ykNZUgZp5FJw6 + j1yELXw7VSC8yAvYwrdlYFbECHTHixVHjBNkiRiBpHtEI44YJ8gSMQJJ94hGHDFOkCUykJZUgTurteFB + qTsI3SjX/MPz/jcPYQvfhhaUJaFEUX4B8Gv8C+/jmnoAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAwNJREFUaEPt @@ -165,21 +174,6 @@ 5swA2AYJO4Tv/B/1EdhOyIkwuWkrvOKqMhmAvqTonI+OSki/tH+rjKDj1ZMGTfpTbGIHJs8Sb6MX3bcj 8Y+tg6glvoD4FqVJDlICGIRtwTW2hdPRJRkA1ItDFUDZVAFUVFT8D9RqfwE5bBq0JSR6DQAAAABJRU5E rkJggg== - - - - 766, 18 - - - - iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG - 7AAABuwBHnU4NQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN - S8MwGIf7Z3sXvHSIIlU2u01oL0rXzTm/ceuGzM+rB0FchTEQbx1MwUrllbTLIV3bZUknyQPPpdD+HtIo - kkVRXGsMm8YN0Xbj2QvdLDV9s977mUfDdnxwXbO/KoVWAU2nw65eD16evIBk/2IUuWd1grcPj0qj3g3u - Ou5nRW1to/lkeAfCdzNFsghcUfVI/HkYCEJkWT3WUEY8eQWC9447SYzMMxC8bb/O/t15B4IzI5chEIyN - XJZA0NrtuShrCovAOJMCoQVlTfnXgQ/OexS4pZ8E+v7lXFatqz+L5hlxJzRzIG9lIK0ykNZUgZp5FJw6 - j1yELXw7VSC8yAvYwrdlYFbECHTHixVHjBNkiRiBpHtEI44YJ8gSMQJJ94hGHDFOkCUykJZUgTurteFB - qTsI3SjX/MPz/jcPYQvfhhaUJaFEUX4B8Gv8C+/jmnoAAAAASUVORK5CYII= @@ -215,14 +209,11 @@ 100, 17 - - 100, 17 - 17, 17 - - 17, 17 + + 766, 18 539, 18 @@ -376,20 +367,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s - Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn - fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl - Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy - QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB - xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb - x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk - fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd - iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB - Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox - BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC - pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn - D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8 - AcSjn/E9z3PXAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyiipF6WpTQ3s + Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc3ddMMZmuZ18zIv4GWpu5yjO2d+e87ZUgOhH3x4Xjzn + ++H8vucIuAl+qEy4UqpTRJTpfodIdRQ5aZ5y7tTTEaW9dNgz7fB5ibryWOT7A3xo74Q+0aiXrfTq8LiJ + tdg3YbHtsmrloDG6aEXBFzNiysYcwkz5QU/UPeHF2uXRyWm2d8YJ/SwDvZmBboaBdnoLyslNtI3YsckA + zWMUCj7NIvnFMPWPJETaRm04ttA/x+LHHENOBn28ZAsq4ya+jTiIwIX+RRb6BSeK5GYEPuh6x4ejywOm + bkkjt8U1N5BcfRPV7Q0obCxHoNQHAQRh0TkEy86gormCX8VGM1hacyA4WcXwgqjSwI9dQy1omXiNal0e + L4mvCkPe2zhkNcRAVHsVSbVJaB5cQsuwDV9/bmCd9BQi09C8QFgpPOgvzWZ14914MyRDiTKTlyTUhJPw + NaS9TIXaaOdX6ZygoCA9rNmdCCnscQu4CS1W0Tl1iTAYtajV38fTjlxEl19CQlUkDDMOGEixXMFqk7sT + CxEEy/YILjySOs/mH0VcpRD9pl4UdadDJs9BzPMgNCg/Y2CegYEU2zvtRA9h2epE4GOP4JTES+wnOYKs + +ljcrglFbMVlXpIjj4OkMZW8SRC4+34ziz7uExOspEjfbK1b4Cc5NO8nOUwe8oJfnheulwQh41Ui1CMK + FCnykf4hEaKaKBiIQE/+DR0R0E4XESh3V7iYraEX12kMzrM8qvEF3KtLQwoJimtjkFt/d+eOw7HFEkHT + roCzzVl2Bf/Dzq2Qukfgn/PdoRmY2N7v4f0wzZhdJ+KbbZ44KTKtY2p2w2HVDBpdUysUppYpGD2s2Jw8 + XPM2msW4adZFUdS6953WX564QHA6rT3DV9TWcVKssPiKm+gdUtz4/EXURHuLWteOJ7V2+iTKkwUCgeAP + hd2fyiWmpNkAAAAASUVORK5CYII= @@ -435,9 +426,6 @@ 385, 17 - 17, 57 - - - 766, 18 + 863, 18 \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchase.Designer.cs index 5205195..9ca4324 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.Designer.cs @@ -90,6 +90,8 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.taProject = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); + this.columnHeader11 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); processLabel = new System.Windows.Forms.Label(); projectLabel = new System.Windows.Forms.Label(); assetLabel = new System.Windows.Forms.Label(); @@ -473,7 +475,8 @@ this.columnHeader7, this.columnHeader8, this.columnHeader9, - this.columnHeader10}); + this.columnHeader10, + this.columnHeader11}); this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; this.listView1.FullRowSelect = true; this.listView1.GridLines = true; @@ -564,7 +567,8 @@ this.toolStripButton6, this.toolStripButton5, this.toolStripButton7, - this.toolStripButton4}); + this.toolStripButton4, + this.toolStripButton8}); this.toolStrip1.Location = new System.Drawing.Point(3, 442); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1168, 25); @@ -681,6 +685,19 @@ // this.taPart.ClearBeforeFill = true; // + // columnHeader11 + // + this.columnHeader11.Text = "PO"; + // + // toolStripButton8 + // + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(75, 22); + this.toolStripButton8.Text = "새로고침"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // // fProjectPartToPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -763,5 +780,7 @@ private System.Windows.Forms.ColumnHeader columnHeader10; private System.Windows.Forms.RadioButton radioButton1; private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.ColumnHeader columnHeader11; + private System.Windows.Forms.ToolStripButton toolStripButton8; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs index 44c412b..e0c1d7f 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs @@ -13,7 +13,7 @@ namespace FPJ0000 { BindingSource bsModel; int ProjectIndex = -1; - public fProjectPartToPurchase(int pidx) + public fProjectPartToPurchase(int pidx,string sortkey) { InitializeComponent(); this.ProjectIndex = pidx; @@ -29,21 +29,26 @@ namespace FPJ0000 this.listView1.SuspendLayout(); this.listView1.Items.Clear(); var orderdata = dt - .OrderBy(t => string.Concat(t.ItemGroup, t.option1, t.ItemSid, t.ItemName)); + .OrderBy(t => string.Concat( (t.bbuy ? "1":"0"), t.ItemName)); foreach (dsPRJ.ProjectsPartRow dr in orderdata) { var lvitem = this.listView1.Items.Add(dr.ItemGroup); lvitem.Tag = dr; - lvitem.Checked = true; + lvitem.Checked = dr.bbuy ? false : true; lvitem.SubItems.Add(dr.option1); lvitem.SubItems.Add(dr.ItemSid); lvitem.SubItems.Add(dr.ItemName); lvitem.SubItems.Add(dr.ItemModel); - lvitem.SubItems.Add(dr.qty.ToString("N0")); + lvitem.SubItems.Add(dr.qty.ToString("N0")); //실 필요 구매 수량으로 처리 lvitem.SubItems.Add(dr.price.ToString("N0")); lvitem.SubItems.Add(dr.amt.ToString("N0")); + Boolean bbuy = dr.bbuy; + var supplyname = dr.ItemSupply.Trim(); + + + if(dr.qtybuy == dr.qty) { //동일하면 보기 편하게 표시하지 않는다. @@ -56,7 +61,22 @@ namespace FPJ0000 var amt = dr.qtybuy * dr.price; lvitem.SubItems.Add(amt.ToString("N0")); } - + lvitem.SubItems.Add(string.IsNullOrEmpty(supplyname) ? "O" : "--"); + + if (dr.bbuy == false) lvitem.BackColor = Color.SkyBlue; + else if (dr.qtybuy == 0) + { + //구매핌ㄹ요없다. + lvitem.BackColor = Color.LightGray; + lvitem.Checked = false; + } + else if (dr.qtyin == dr.qtybuy) + { + //모두 + lvitem.BackColor = Color.Lime; + lvitem.Checked = false; + } + } this.listView1.ResumeLayout(); @@ -159,6 +179,13 @@ namespace FPJ0000 Application.DoEvents(); } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + //파트리스트 합계금액 + var dtPart = taPart.GetData(this.ProjectIndex); + MakeList(dtPart); + } void showSummary() { //모든 선택된 자료의 합계를 표시한다 @@ -528,5 +555,6 @@ namespace FPJ0000 "프로젝트 : " + this.ProjectIndex.ToString()); } } + } } diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.resx b/SubProject/FPJ0000/Project/fProjectPartToPurchase.resx index 4c108d1..a6f86c0 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.resx +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.resx @@ -156,6 +156,9 @@ 257, 17 + + 257, 17 + 17, 17 @@ -217,59 +220,60 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKhSURBVDhPjZFdSFNhHMZPbqObiLqqiC4WXXXZbV2UHxdd - dNWF0FWQF0F0U5RWxAJhzjSGY9NsDsGZbn7MfTh3tp3cSLww0YWyjTnW0Pahq3142DLN9vS+r0dKEPKB - Fw4v7+85/+f5c//T1NTUSafT6bPb7ZpAICCXro8mCfaPj4+XLRaLSM7RTSjscDj8o6OjlfX1dZTLZQwM - DGybzWZNV1fXcenZ4dqHR0ZGKplMBuQbJAJEUUR/f//vvr4+V29vr0J6flAUJo+FfZiCw8PDcLvdKBaL - bBKDwSB2d3drVCrVwTj7sNVqraTTaUxMTGBoaAiTk5NYjKehdYdhn18FiVDV6XRBrVZ7SkL3YFKWQIpi - sM1mw+DgIFwuF/L5PAzeKJqMc3hsXsRaKgMCi52dndcOhck3SFksey6XQzAYxPd8AS+sIVg/RuEUZtDW - 1rZDTi0zoDBpe2djYwNjY2O0bZadwmSNmJ6eRjKZRDiWwHuHgI6Oju329vYrDKYisI+MW02lUojH4/D5 - fAymE5DpkEgksPBOhcCdixBqFeBrFRm+vqZFwjmOFCUuLS2hVCphZWUFsViMTUCbj0Qi+PT2JT4/uYot - 9xtUIzwqlkeYf3B5118nf8gMyN+zs7Oz8Hg8KBQKiEajzCQcDiMUCsF7+zx+EBi6W0DzaUCtxLfX1+G+ - IfvCDIxG4xmTybTj9/vZ6mjrm5ubWF5ehiAIbOzqgg3/qqg6S6LIq8yASq/Xn+jp6cnRzHSFNDfP89Bo - NFt8gyJbNt0DCPTzKYcCOav3ZeAbZCkJ3xM1IfvN0vy0QLKmLbVafWmm8dyrubvKX5lmJXLPFEg0HcOH - m/JdT33Ncwn9K2pCoGxra6tIYemam2m80OKtkyXp2N562dc9mOP+AB//HBjCJtvFAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKoSURBVDhPjZJfSFNhGMZPbqObiLqqiCCjqy67rYuaCt10 + 1YXQTRd5EUQ3RWlFLATnTGM6TLM5RGe6+Wfuj3Nn28mNxAsTXSjbmGMOa390tU0PW6bZnr7v80gJQj5w + 4OPj/T3f+7zv4f6niYmJ43a73WO1WjU+n08uXR9OEuwdHR0tDA4OiiaT6fAmFLbZbN6hoaHi6uoqCoUC + ent7t4xGo6atre2oVHaw9mCz2VxMpVIgZ5AIEEURPT09v7u7ux1dXV0KqXy/KEyKhT2YgqR9OJ1O5PN5 + 1kl7e7vY0dGhUalU++PswSRrMZlMYmxsDAMDAxgfH8d8NAmtMwjr7ApaW1tLOp3Or9VqT0joLkyGJZDX + GGyxWNDf3w+Hw4FsNos37jBq9DN4ZJzHl0QKBBZbWlquHgiTM8iwWPZMJgO/34/v2RyemwMwfwzDLkxB + rVZvNzY2KpkBhYeHh7fX1tYwMjKCvr4+lp3CZI2YnJxEPB5HMBLDe5uA5ubmraampssMpiKwh7xYSiQS + iEaj8Hg8DKYdkO4Qi8Uw904F3+0LEJQK8EpFiq8sq5NwjiODEhcWFrC+vo6lpSVEIhHWAZ18KBTCp7cv + 8PnxFWw6X6MU4lE0PcTs/Us73gr5A2ZAhpWenp6Gy+VCLpdDOBxmJsFgEIFAAO5bZ/GDwNDdBGpPAupy + fHt1Dc7rsmVmoNfrTxkMhm2v18tWR6e+sbGBxcVFCILA2i7NWfCv8qrTcCnlJWZARX6OY52dnRmama6Q + 5uZ5HhqNZpOvUqQLhrsAgX4+4ZAj38o9GfgqWULCd0VNyH7TND8dIFnTJlnXxanqMy9n7pz/laotR+ap + ArGaI/hwQ77jqix7JqF/RU0aGhrS9fX1IoWla26q+lydu0IWp227K2Vfd2GO+wO5mRvpRRgUDgAAAABJ + RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEkSURBVDhPlZFNaoRAEIUnyTkSkjOEmTlGzpCd1wkuvEKO - 4MaNgt7AQygi+P8HlXrFVOOoHZKCB211va+f3SeuF9aZdTnQK+uR9Wudu64bl2Uh1TzP1Pc9ua77xftv + 4MaNgt7AQygi+P8HlXrFVOOoHZKCB211va+f3SeuF9aZdTnQK+uR9Wud27Ydl2Uh1TzP1Pc9ua77xftv rCeZtNQFJhjSNKUgCMj3fUqShMIwJMdxvnnmg2VNI4BhGCiKIpqmyST5axoBwAgA1v9NIwCcFMexAGxp - dO+WxkAMACdhvU1T1zWVZUlZlkmPL508z1PIHrBNA0NVVZTnufRU8FoB6zUgbdsKpCgKk2QH0FPXgDUE + dO+WxkAMACdhvU1T1zWVZUlZlkmv6zryPE8he8A2DQxVVVGe59JTwWsFrNeA8FMLpCgKk2QH0FPXgDUE SfR3DgFHCVTojeMokKZp7gC4CCyurE8d1jRr4XIBwcXi++aTemDhSa7YOEqgfUD0eXneALR2adS4lQ2A - uktjE79KzTPvMNhK09jE5tPzD32tWECVpCwAAAAAAElFTkSuQmCC + uktjE99DzTPvMNhK09jE5tPzD3F6WDpkXI0xAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGRSURBVDhPxZL9KwNxHMf3Ly5CkodIithDUztS0qJE0poI - CVnnKcTE5aH4wVNElLH8pLbm+e52t+02b9/P93alZQo/eNW7rnd3r+/nPne2P2N3iI19CxG1LRiBMMMy - fQPv5DVaJ67gGb+Ee+wCrpEzOIZP0RI4RpP/EEJgX6XnuMA3H84ObsTw0zQO7GS5gE7+Tep7d8EFwvQt - voJu+o7a7i1T4J0K8yIUCkGSJH5NWIInRUf8RUP0IYH7uIK7qMz7at9mTsAWRnx+mLAEb5qBZzWJB5mJ - XnXEHjXeV3aumwLaNkECK4QlUJMGFN2AnDDwoqTxKCd5X9GxZgroUxGKonz5CnrKQIKFRHJORJS3r5gC - 9+g5LyxB/gTJbBYpw4CeNqCxkIgoE5ZMQcvQCS8KTZBmAit6JgONyYhiz7wpaPYf8aLQBJn3d550Likm - IYrcs6agafCAF/lYgkLYXaIpsDuDYkP/Hv+z6nq2UeOTUNW1wba8yhdV1raMUu8iSloX2Nhz7GQRdicl - KHLBP2OzfQBhoZa2cGu7rQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGRSURBVDhPxZL9KwNxHMf3Ly5CkodIYmEWtZGSFiXS0kRI + yDo2IaZZHoofPEVEeVh+Ulubx7vb3bbbeft+vrcrLVP4wavedb27e30/97mz/Blrq9A0GIjInb4IXPMs + c7dwzlyjY/oK7VOXcExeoG38DK1jp2jxHsM2cgiXd1+m57jA7b/WPaEYfprG4R2dC+jk36R+YBdc4Jq7 + w1fQTd9R27dlCJyzN7wIBoMIh8P8mjAFT5KK+IuCaCKJh7iE+6jI+2r3Zk7AFkZ8fpgwBW+Khmc5hYTI + RK8qYo8K7yt7NgwBbZsggRnCFMgpDZKqQUxqeJEyeBRTvK/oXjcE9KkISZK+fAU1rSHJQiIxJyLKu1YN + gWPinBemIH+ClK4jrWlQMxoUFhIRZa5lQ9AyesKLQhNkmMCMms1CYTKiuN1vCJpHjnhRaILs+ztPJpc0 + kxBFjgVDYPMc8CIfU1AIa5tgCKx2n9AwtMf/rLr+bdS4w6jqDbEtr/FFlXWuoNS5hJKOABt7kZ0swGqn + +AQu+Gcslg9awZa0vUW1VQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJmSURBVDhPrZPtS1NhGIfP36KFYDCi8kMRQkWR23S6o5vL - zSknD25mLGJpys4wzaDEUMMPoZbaq6v2ITVdEJnSpJReHE46K9S1Uxu1pjub21J+bevEEGcQdMHv233d - D8/93A/x31mqrc1c1OtNH2madVVogx/iWdBq2HmqzDRXrswUytLjrqkhWb2e+97VjsjkM0TnZhB9PQV+ - eAjLBhrvykluVi0jhfLNJGRXdTW/+nAIG64FxGyPEBvsQKz3Cn7e78G63QZvowHTSin/SnVsc5MlnS7D - RdOe4N1BbLAOxK5fQqDDjJX2BkSumRHtZBBpO4fI6D24T1Owk0c9k/IjGYJOEIs6HeNrNmHdMZs8ca2L - gf+yEeGWU5sSPE8hYr2Ft7JcvCjOZQSdID7FBxay3kbM0otAWx2+aYvTZrWOAt/eBK+5Hs+LDrCCThDO - KiocHbci1mVG4KIB2+FV5cOvL8dKbzdskj1hQSeIeUobXrP0I9JqQPhCtVC+lUQDH63GSk83xqSiVAOn - tpT1tzVhrYNB8KwmWZg2ZTIEmhux3GiETSxKXcGhVTKsQoKwZQCBkwr4afkWmSuVgjshR2jwBqYK92FM - nJ0a4vtKecYbDelx11Qi9KA/OTCfuvC3qCoAp4jLikLwA32YryjGSF62Z1iyM/WMCWZVUtJekscvVqkR - utOPH60MvFQZvmhU8LeYwN/sg1NThMfiLH4kLyv9NtrjG/ay5DA3Iz+Irw1G+DuvJvO5/gwm8vfG5V3c - tvIfppSHMidk+01Pi3LY8fyc4Jh4d3C4QMQ+kWSbRo/v+Ptn+ncI4hfcmNLS8/uIgwAAAABJRU5ErkJg - gg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJnSURBVDhPrZPtS1NhGIfP36K9wCIpyg9FCBVFbtPptqbL + zZMcO2wzYxFLc+wM0wxKDDX8EGqpvWo1CF/mgsgUB+XoRVPprPClnZrUmu7suC3l11wnhjiDoAt+3+7r + fnju536I/85seXn6jMlk+0jTrJckQx/imSb17CRVZBsvLkgXy1IzX1amYk0m7ntzAyLDzxAdH0P01Qj4 + 3m7MmWm8LVZxHp1CJZavZ032Ggz80qNurHqnEXM9RqyrEbG2q/j5oBUrbhf8VjPcGjn/Unt0fZNZozHN + S9O+0L0urLITiN24jGCjHYsNVYhctyPaxCBSfx6R/vuYP0PBrTriG1YeThN1gpgxGpmFGhtWJjyJE5eb + GQSuWCDUnl6X0AUKEcdtvFFk4YU6ixF1gvgUH1jYcQexnjYE6yvwjVSnzFIFBb6hGn57JZ7n72dFnSAm + SykhOuhArNmO4CUzNsOvzUHAVIzFthYMSncLok4Q7ylSWO7pQKTODOGiQSzfyFqDBVqHxdYWOGU7kw2m + yEI2UF+N5UYGoXP6RGHKFCkQrLFizmqBS5qRvMIEWcCwGhmEnk4ESzUI0MoNMlcoB3dCiXDXTYzk7YVT + KkkO8V2JMu21XuWbLytB+GFHYmALurzfojYXnCYua/LAd7Zj8qQafdkSX69sa/IZ1/Bo5apRdTY/c0qH + 8N0O/Khj4KeK8EWvRaDWBv5WO6b0+Xgi3cb3ZW9PvY3u+IaNHj/EjSkP4GuVBYGma4l8rjyLoZw9cXkH + t6n8h5GCg+lDin22p/mZrFOeGRqQ7gr15mawAzKJrf/Ylr9/pn+HIH4BuWDSvnsWQwwAAAAASUVORK5C + YII= @@ -281,6 +285,21 @@ AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg==