diff --git a/Project/History.txt b/Project/History.txt index ffdc1f5..cb6b9d3 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,6 +1,10 @@ -181210 chi NR구매등록시 이미지 표시 및 추가 기능 +181212 chi 구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가 +181210 chi NR구매등록시 이미지 표시 및 추가 기능 NR구매목록에서 권한 없는 사람이 더블클릭으로 편집할 수 있는 버그 수정 이미지 크기를 640*480 내에서 자동 조정 됨 + 구매내역 내보내기 하면 완료 메세지 추가 + 구매내역 검색 쿼리 정리 작업(간소화) + 181207 chi 업체정보화면 에 담당자 목록 추가 업체대표 및 담당자 테이블 데이터 추가 품목에 이미지 확인 사항 추가 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 14bbd42..f896657 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.12.10.1200")] -[assembly: AssemblyFileVersion("18.12.10.1200")] +[assembly: AssemblyVersion("18.12.13.0900")] +[assembly: AssemblyFileVersion("18.12.13.0900")] diff --git a/Project/_Common/fUserInfo.Designer.cs b/Project/_Common/fUserInfo.Designer.cs index 83c4fb8..f4506a3 100644 --- a/Project/_Common/fUserInfo.Designer.cs +++ b/Project/_Common/fUserInfo.Designer.cs @@ -42,6 +42,7 @@ System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; System.Windows.Forms.Label label3; + System.Windows.Forms.Label label4; this.idTextBox = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new Project.dsMSSQL(); @@ -60,6 +61,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); + this.tbKJPath = new System.Windows.Forms.TextBox(); idLabel = new System.Windows.Forms.Label(); passwordLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label(); @@ -73,6 +75,7 @@ label1 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.SuspendLayout(); @@ -80,119 +83,119 @@ // idLabel // idLabel.AutoSize = true; - idLabel.Location = new System.Drawing.Point(22, 15); + idLabel.Location = new System.Drawing.Point(33, 15); idLabel.Name = "idLabel"; - idLabel.Size = new System.Drawing.Size(19, 12); + idLabel.Size = new System.Drawing.Size(53, 12); idLabel.TabIndex = 0; - idLabel.Text = "id:"; + idLabel.Text = "사원번호"; // // passwordLabel // passwordLabel.AutoSize = true; - passwordLabel.Location = new System.Drawing.Point(22, 42); + passwordLabel.Location = new System.Drawing.Point(33, 42); passwordLabel.Name = "passwordLabel"; - passwordLabel.Size = new System.Drawing.Size(65, 12); + passwordLabel.Size = new System.Drawing.Size(53, 12); passwordLabel.TabIndex = 2; - passwordLabel.Text = "password:"; + passwordLabel.Text = "비밀번호"; // // nameLabel // nameLabel.AutoSize = true; - nameLabel.Location = new System.Drawing.Point(22, 69); + nameLabel.Location = new System.Drawing.Point(57, 69); nameLabel.Name = "nameLabel"; - nameLabel.Size = new System.Drawing.Size(41, 12); + nameLabel.Size = new System.Drawing.Size(29, 12); nameLabel.TabIndex = 4; - nameLabel.Text = "name:"; + nameLabel.Text = "이름"; // // deptLabel // deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(22, 122); + deptLabel.Location = new System.Drawing.Point(317, 69); deptLabel.Name = "deptLabel"; - deptLabel.Size = new System.Drawing.Size(33, 12); + deptLabel.Size = new System.Drawing.Size(29, 12); deptLabel.TabIndex = 8; - deptLabel.Text = "dept:"; + deptLabel.Text = "부서"; // // gradeLabel // gradeLabel.AutoSize = true; - gradeLabel.Location = new System.Drawing.Point(22, 149); + gradeLabel.Location = new System.Drawing.Point(317, 96); gradeLabel.Name = "gradeLabel"; - gradeLabel.Size = new System.Drawing.Size(41, 12); + gradeLabel.Size = new System.Drawing.Size(29, 12); gradeLabel.TabIndex = 10; - gradeLabel.Text = "grade:"; + gradeLabel.Text = "직책"; // // emailLabel // emailLabel.AutoSize = true; - emailLabel.Location = new System.Drawing.Point(22, 176); + emailLabel.Location = new System.Drawing.Point(33, 122); emailLabel.Name = "emailLabel"; - emailLabel.Size = new System.Drawing.Size(40, 12); + emailLabel.Size = new System.Drawing.Size(53, 12); emailLabel.TabIndex = 12; - emailLabel.Text = "email:"; + emailLabel.Text = "전자메일"; // // levelLabel // levelLabel.AutoSize = true; - levelLabel.Location = new System.Drawing.Point(22, 257); + levelLabel.Location = new System.Drawing.Point(319, 177); levelLabel.Name = "levelLabel"; - levelLabel.Size = new System.Drawing.Size(35, 12); + levelLabel.Size = new System.Drawing.Size(29, 12); levelLabel.TabIndex = 18; - levelLabel.Text = "level:"; + levelLabel.Text = "권한"; // // indateLabel // indateLabel.AutoSize = true; - indateLabel.Location = new System.Drawing.Point(22, 284); + indateLabel.Location = new System.Drawing.Point(305, 15); indateLabel.Name = "indateLabel"; - indateLabel.Size = new System.Drawing.Size(43, 12); + indateLabel.Size = new System.Drawing.Size(41, 12); indateLabel.TabIndex = 20; - indateLabel.Text = "indate:"; + indateLabel.Text = "입사일"; // // outdateLabel // outdateLabel.AutoSize = true; - outdateLabel.Location = new System.Drawing.Point(22, 311); + outdateLabel.Location = new System.Drawing.Point(305, 42); outdateLabel.Name = "outdateLabel"; - outdateLabel.Size = new System.Drawing.Size(50, 12); + outdateLabel.Size = new System.Drawing.Size(41, 12); outdateLabel.TabIndex = 22; - outdateLabel.Text = "outdate:"; + outdateLabel.Text = "퇴사일"; // // memoLabel // memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(22, 338); + memoLabel.Location = new System.Drawing.Point(320, 119); memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(45, 12); + memoLabel.Size = new System.Drawing.Size(29, 12); memoLabel.TabIndex = 24; - memoLabel.Text = "memo:"; + memoLabel.Text = "비고"; // // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(22, 203); + label1.Location = new System.Drawing.Point(21, 149); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(23, 12); + label1.Size = new System.Drawing.Size(65, 12); label1.TabIndex = 14; - label1.Text = "Tel"; + label1.Text = "사무실전화"; // // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(22, 230); + label2.Location = new System.Drawing.Point(33, 176); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(20, 12); + label2.Size = new System.Drawing.Size(53, 12); label2.TabIndex = 16; - label2.Text = "Hp"; + label2.Text = "휴대전화"; // // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(22, 95); + label3.Location = new System.Drawing.Point(23, 95); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(55, 12); + label3.Size = new System.Drawing.Size(63, 12); label3.TabIndex = 6; - label3.Text = "name(E)"; + label3.Text = "이름(영문)"; // // idTextBox // @@ -225,23 +228,23 @@ // deptTextBox // this.deptTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true)); - this.deptTextBox.Location = new System.Drawing.Point(93, 119); + this.deptTextBox.Location = new System.Drawing.Point(355, 66); this.deptTextBox.Name = "deptTextBox"; - this.deptTextBox.Size = new System.Drawing.Size(200, 21); + this.deptTextBox.Size = new System.Drawing.Size(177, 21); this.deptTextBox.TabIndex = 9; // // gradeTextBox // this.gradeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "grade", true)); - this.gradeTextBox.Location = new System.Drawing.Point(93, 146); + this.gradeTextBox.Location = new System.Drawing.Point(355, 93); this.gradeTextBox.Name = "gradeTextBox"; - this.gradeTextBox.Size = new System.Drawing.Size(200, 21); + this.gradeTextBox.Size = new System.Drawing.Size(177, 21); this.gradeTextBox.TabIndex = 11; // // emailTextBox // this.emailTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "email", true)); - this.emailTextBox.Location = new System.Drawing.Point(93, 173); + this.emailTextBox.Location = new System.Drawing.Point(93, 119); this.emailTextBox.Name = "emailTextBox"; this.emailTextBox.Size = new System.Drawing.Size(200, 21); this.emailTextBox.TabIndex = 13; @@ -249,33 +252,35 @@ // levelTextBox // this.levelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true)); - this.levelTextBox.Location = new System.Drawing.Point(93, 254); + this.levelTextBox.Location = new System.Drawing.Point(355, 173); this.levelTextBox.Name = "levelTextBox"; - this.levelTextBox.Size = new System.Drawing.Size(200, 21); + this.levelTextBox.ReadOnly = true; + this.levelTextBox.Size = new System.Drawing.Size(177, 21); this.levelTextBox.TabIndex = 19; // // indateTextBox // this.indateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "indate", true)); - this.indateTextBox.Location = new System.Drawing.Point(93, 281); + this.indateTextBox.Location = new System.Drawing.Point(355, 12); this.indateTextBox.Name = "indateTextBox"; - this.indateTextBox.Size = new System.Drawing.Size(200, 21); + this.indateTextBox.Size = new System.Drawing.Size(177, 21); this.indateTextBox.TabIndex = 21; // // outdateTextBox // this.outdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "outdate", true)); - this.outdateTextBox.Location = new System.Drawing.Point(93, 308); + this.outdateTextBox.Location = new System.Drawing.Point(355, 39); this.outdateTextBox.Name = "outdateTextBox"; - this.outdateTextBox.Size = new System.Drawing.Size(200, 21); + this.outdateTextBox.Size = new System.Drawing.Size(177, 21); this.outdateTextBox.TabIndex = 23; // // memoTextBox // this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(93, 335); + this.memoTextBox.Location = new System.Drawing.Point(355, 122); + this.memoTextBox.Multiline = true; this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.Size = new System.Drawing.Size(200, 21); + this.memoTextBox.Size = new System.Drawing.Size(177, 45); this.memoTextBox.TabIndex = 25; // // button1 @@ -284,17 +289,17 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(200, 21); this.button1.TabIndex = 3; - this.button1.Text = "Change"; + this.button1.Text = "변경"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // // button2 // - this.button2.Location = new System.Drawing.Point(93, 363); + this.button2.Location = new System.Drawing.Point(93, 231); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(200, 30); + this.button2.Size = new System.Drawing.Size(439, 30); this.button2.TabIndex = 26; - this.button2.Text = "Save"; + this.button2.Text = "저장(&S)"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // @@ -315,7 +320,7 @@ // textBox1 // this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "tel", true)); - this.textBox1.Location = new System.Drawing.Point(93, 200); + this.textBox1.Location = new System.Drawing.Point(93, 146); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(200, 21); this.textBox1.TabIndex = 15; @@ -323,7 +328,7 @@ // textBox2 // this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hp", true)); - this.textBox2.Location = new System.Drawing.Point(93, 227); + this.textBox2.Location = new System.Drawing.Point(93, 173); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(200, 21); this.textBox2.TabIndex = 17; @@ -336,11 +341,31 @@ this.textBox3.Size = new System.Drawing.Size(200, 21); this.textBox3.TabIndex = 7; // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(17, 204); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(69, 12); + label4.TabIndex = 27; + label4.Text = "견적서 위치"; + // + // tbKJPath + // + this.tbKJPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true)); + this.tbKJPath.Location = new System.Drawing.Point(93, 200); + this.tbKJPath.Name = "tbKJPath"; + this.tbKJPath.ReadOnly = true; + this.tbKJPath.Size = new System.Drawing.Size(439, 21); + this.tbKJPath.TabIndex = 28; + // // fUserInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(305, 402); + this.ClientSize = new System.Drawing.Size(542, 270); + this.Controls.Add(label4); + this.Controls.Add(this.tbKJPath); this.Controls.Add(label3); this.Controls.Add(this.textBox3); this.Controls.Add(label2); @@ -372,7 +397,7 @@ this.MinimizeBox = false; this.Name = "fUserInfo"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "fUserInfo"; + this.Text = "사용자 정보"; this.Load += new System.EventHandler(this.fUserInfo_Load); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); @@ -401,5 +426,6 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox tbKJPath; } } \ No newline at end of file diff --git a/Project/_Common/fUserInfo.cs b/Project/_Common/fUserInfo.cs index e79dba4..151a960 100644 --- a/Project/_Common/fUserInfo.cs +++ b/Project/_Common/fUserInfo.cs @@ -21,6 +21,10 @@ namespace Project._Common { // TODO: 이 코드는 데이터를 'dsMSSQL.Users' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no); + tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept); + tbKJPath.Tag = tbKJPath.Text; + if (FCOMMON.info.Login.level > 4) tbKJPath.Enabled = true; + else tbKJPath.Enabled = false; //this.bs.Filter = "id='" + FCOMMON.info.Login.no + "'"; } @@ -63,6 +67,18 @@ namespace Project._Common this.bs.EndEdit(); try { + if (tbKJPath.Enabled) + { + if (tbKJPath.Text.Trim() != tbKJPath.Tag.ToString().Trim()) + { + if (!FCOMMON.DBM.setPathKJ(FCOMMON.info.Login.dept, tbKJPath.Text.Trim())) + { + FCOMMON.Util.MsgE("견적서 폴더 업데이트 실패"); + } + else Pub.log.AddI("견적서폴더 업뎅트 : " + tbKJPath.Text); + } + } + var cnt = this.tam.UpdateAll(this.dsMSSQL); Util.MsgI(string.Format("{0}건의 자료가 업데이트 됨", cnt)); DialogResult = System.Windows.Forms.DialogResult.OK; diff --git a/Project/_Common/fUserInfo.resx b/Project/_Common/fUserInfo.resx index a3096cb..0d066e8 100644 --- a/Project/_Common/fUserInfo.resx +++ b/Project/_Common/fUserInfo.resx @@ -168,4 +168,7 @@ 248, 17 + + False + \ No newline at end of file diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index a6e7b28..b83d644 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -88,6 +88,7 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); @@ -526,10 +527,11 @@ this.toolStripButton1, this.toolStripButton2, this.toolStripButton3, - this.toolStripButton4}); + this.toolStripButton4, + this.toolStripButton5}); this.toolStrip.Location = new System.Drawing.Point(0, 4); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(25, 119); + this.toolStrip.Size = new System.Drawing.Size(25, 146); this.toolStrip.TabIndex = 32; this.toolStrip.Text = "ToolStrip"; // @@ -549,7 +551,7 @@ 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(23, 24); + this.toolStripButton2.Size = new System.Drawing.Size(30, 24); this.toolStripButton2.Text = "구매신청"; this.toolStripButton2.ToolTipText = "파트구매신청서 작성"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); @@ -560,7 +562,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(23, 24); + this.toolStripButton3.Size = new System.Drawing.Size(30, 24); this.toolStripButton3.Text = "toolStripButton3"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -570,10 +572,21 @@ 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(23, 24); + this.toolStripButton4.Size = new System.Drawing.Size(30, 24); this.toolStripButton4.Text = "toolStripButton4"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // + // toolStripButton5 + // + this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(30, 24); + this.toolStripButton5.Text = "toolStripButton5"; + this.toolStripButton5.ToolTipText = "로그인/로그아웃"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // tabControl1 // this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; @@ -585,7 +598,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1009, 594); + this.tabControl1.Size = new System.Drawing.Size(1009, 569); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); @@ -598,7 +611,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(10); - this.tabPage1.Size = new System.Drawing.Size(1001, 561); + this.tabPage1.Size = new System.Drawing.Size(1001, 536); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "요약"; // @@ -608,7 +621,7 @@ // toolStripContainer1.ContentPanel // this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 594); + this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569); this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load); this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; // @@ -719,6 +732,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem; private System.Windows.Forms.ToolStripContainer toolStripContainer1; + private System.Windows.Forms.ToolStripButton toolStripButton5; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index eacf2a1..cfefba5 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -82,21 +82,33 @@ namespace Project tmDisplay.Start(); //display timer + Func_Login(); + + bw.RunWorkerAsync(); //background worker + + } + void Func_Login() + { Dialog.fLogin flogIn = new Dialog.fLogin(); if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK) Application.ExitThread(); if (FCOMMON.info.Login.level >= 10) btDev.Visible = true; - sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3})", + sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3}) - {4}", FCOMMON.info.Login.title, FCOMMON.info.Login.no, FCOMMON.info.Login.nameK, - FCOMMON.info.Login.tel); + FCOMMON.info.Login.tel, + FCOMMON.info.Login.dept); Pub.log.Add("Program Start"); - bw.RunWorkerAsync(); //background worker + Func_RunStartForm(); + } + void Func_RunStartForm() + { + //시작폼 확인 if (Pub.setting.startForm == eFormList.NR구매관리) { menu_nrpurchase(); @@ -459,5 +471,22 @@ namespace Project e.Graphics.DrawString("X", this.Font, Brushes.Black, tabControl1.Right - 50, tabControl1.Top); } + private void toolStripButton5_Click(object sender, EventArgs e) + { + if(this.tabControl1.TabPages.Count > 1) + { + while(tabControl1.TabPages.Count > 1) + { + var tab = this.tabControl1.TabPages[1]; + var f = tab.Controls[0] as System.Windows.Forms.Form; + f.Close(); + f.Dispose(); + tabControl1.TabPages.Remove(tab); + this.tabControl1.Refresh(); + } + } + Func_Login(); + } + } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 1f94481..4c33522 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -155,14 +155,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5 - Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/03vz/tXX+/3bNb3w39dzrf/3 + Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/kzvz/tXX+/3bNrnw39dzrf/3 T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d - W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/4kbe/7GzKt4C9UKAUnN + W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/7Ebe/7GzKt4C9UKAUnN zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV - 3//t93YTNKB+++QfcXNKW6BaEcAroffvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j - 51X+SJhZYQrVhgBJzR2n3Lta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW + 3//t93YTNKB+++QfcXNKW6BaEcAtpvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j + 51X+SJhZYQrVhgBJzR2nnLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q - ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgAM56GbRv3GrQAAAABJRU5ErkJggg== + ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgC1jKF7RfhP4wAAAABJRU5ErkJggg== @@ -195,6 +195,18 @@ /6JfwD1zwJ0PBKGYjG27jpiCU51uaEW9AoiwfbM9P6TLZjMz+NZ7Aln5ja07LKbgWKsDS98j/IIklDx+ pXOIpnL0Y6kIJxSsxLOQ4jKW6cyZrIrZuQVs2lJrClq7XGiwd/DrabFfxSHbJX7O7KjY165rsPE9s2Wz mRlsPdlcFvzP7ywKIQR/ADe1RkU7UZGnAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFBSURBVDhPnZOxSgNBFEXzO5b6ATZLCrETYmWhnRAsLBRt + 7FNYCApCegtNkypFCgshjaAiSkCbBBQVAyaiaUYZPRNuMm93qyycZPLm3bOZndmCn+IqxBeF9kvfn111 + DQeN68Be7d5vHdUNRsIPAkieet/+fTA0UIupNHt+eWN/IpGA5lbny1fW5gzUGo+/gf7QBYGR8NG8644m + /wPn1R1f3y6OoRYLREaQF86TSLS0upsV0PzWbhnSgpPb0T8wAtZJ4+D5ITQrrDFzCkuwUCpbwcXhehCw + DAk0Zk5hYDeMgC1kF2hUWKTDEiSLK1aQbFb96c1nCMRwkJgjeHz5E+i8fliBwoJQGnpiwXyxlBXoWyHV + 0gKWawRsI0Webt7x5Y6CefpnZpOJgBeEkyXYY+BJA+sF7gqEx+fAORcG01zOOf8HE8Uw/ZN/lX0AAAAA + SUVORK5CYII= diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index ed9fde3..80d0c27 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -5547,7 +5547,7 @@ namespace FCM0000 { this.columnedate.MaxLength = 10; this.columnindate.MaxLength = 10; this.columnpo.MaxLength = 50; - this.columndept.MaxLength = 50; + this.columndept.MaxLength = 500; this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; @@ -17745,7 +17745,7 @@ SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, this._commandCollection[0].CommandText = @"SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, import, wuid, wdate FROM Purchase -WHERE (state <> 'Cancled') AND (pumidx = @pumidx) +WHERE (state <> 'Cancled') AND (pumidx = @pumidx) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17754,7 +17754,7 @@ ORDER BY pdate DESC"; this._commandCollection[1].CommandText = @"SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, import, wuid, wdate FROM Purchase -WHERE (ISNULL(indate, '') <> '') AND (pumidx = @pumidx) +WHERE (ISNULL(indate, '') <> '') AND (pumidx = @pumidx) AND (ISNULL(isdel, 0) = 0) ORDER BY indate DESC"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 2ed9dc5..cd0d6a3 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -1408,11 +1408,11 @@ SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, - + SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, import, wuid, wdate FROM Purchase -WHERE (state <> 'Cancled') AND (pumidx = @pumidx) +WHERE (state <> 'Cancled') AND (pumidx = @pumidx) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC @@ -1497,7 +1497,7 @@ SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, - + @@ -1539,7 +1539,7 @@ SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, import, wuid, wdate FROM Purchase -WHERE (ISNULL(indate, '') <> '') AND (pumidx = @pumidx) +WHERE (ISNULL(indate, '') <> '') AND (pumidx = @pumidx) AND (ISNULL(isdel, 0) = 0) ORDER BY indate DESC @@ -2398,7 +2398,7 @@ WHERE (supplyidx = @idx) - + diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 9a4dffa..422e017 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -500,6 +500,42 @@ namespace FCOMMON cn.Dispose(); return retval; } + + public static String getPathKJ(string dept) + { + var cn = getCn(); + cn.Open(); + var sql = "select isnull(path_kj,'') " + + " from UserGroup " + + " where dept = '" + dept + "'"; + + sql = string.Format(sql); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteScalar(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + if (rdr == null) return string.Empty; + else return rdr.ToString(); + } + public static Boolean setPathKJ(string dept,string path) + { + var cn = getCn(); + cn.Open(); + var sql = "update UserGroup set path_kj=@path" + + " where dept = @dept"; + + sql = string.Format(sql); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("path", path)); + cmd.Parameters.Add(new SqlParameter("dept", dept)); + var rdr = cmd.ExecuteNonQuery(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return rdr > 0; + } + public static List getDateList(string table, string where = "",Boolean desc =false) { return getGroupList("pdate", table, where,desc); diff --git a/SubProject/FCOMMON/Util_Farpoint.cs b/SubProject/FCOMMON/Util_Farpoint.cs index ae77f54..489867e 100644 --- a/SubProject/FCOMMON/Util_Farpoint.cs +++ b/SubProject/FCOMMON/Util_Farpoint.cs @@ -9,7 +9,15 @@ namespace FCOMMON { public static void FPColSizeAuto(FarPoint.Win.Spread.FpSpread fp) { - fp.ActiveSheet.DataAutoSizeColumns = true; + // fp.ActiveSheet.DataAutoSizeColumns = true; + + foreach (FarPoint.Win.Spread.Column col in fp.ActiveSheet.Columns) + { + col.Width = 0; + col.Width = col.GetPreferredWidth(); + } + + for (int i = 0; i < fp.ActiveSheet.Rows.Count; i++) fp.ActiveSheet.SetRowHeight(i, 25); } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index fd9ba48..7a45897 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -52,6 +52,7 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -108,6 +109,8 @@ this.금일입고품목ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.내가등록한자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.btViewDel = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); @@ -170,14 +173,14 @@ this.toolStripLabel2, this.tbFind, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 573); + 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(971, 31); + this.bn.Size = new System.Drawing.Size(1074, 31); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -462,10 +465,12 @@ this.tbRequest, this.btSearch, this.toolStripSeparator5, - this.toolStripDropDownButton1}); + this.toolStripDropDownButton1, + this.btViewDel, + this.toolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(971, 31); + this.toolStrip1.Size = new System.Drawing.Size(1074, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -586,6 +591,26 @@ this.이번달자료ToolStripMenuItem.Text = "이번달 자료"; this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click); // + // btViewDel + // + this.btViewDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btViewDel.CheckOnClick = true; + this.btViewDel.Image = ((System.Drawing.Image)(resources.GetObject("btViewDel.Image"))); + this.btViewDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btViewDel.Name = "btViewDel"; + this.btViewDel.Size = new System.Drawing.Size(107, 28); + this.btViewDel.Text = "삭제자료표시"; + this.btViewDel.Click += new System.EventHandler(this.btViewDel_Click); + // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(56, 28); + this.toolStripButton2.Text = "Test"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; @@ -597,7 +622,8 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(971, 542); + this.fpSpread1.Size = new System.Drawing.Size(1074, 603); + this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; // // fpSpread1_Sheet1 @@ -606,66 +632,86 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 23; + this.fpSpread1_Sheet1.ColumnCount = 24; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "state"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "sc#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "sid#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Item"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "등록일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "SC#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수령"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Model"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Qty"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Unit"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Price"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Amt"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Supply"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "모델"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "공급업체"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "관련프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "입고예정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; + this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "Date"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 34F; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 34F; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; 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 = 49F; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F; this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F; this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "sc#"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F; this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive"; 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).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoSort = true; this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "sid#"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 31F; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "Item"; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType6.DecimalPlaces = 0; @@ -680,7 +726,7 @@ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "Model"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "모델"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F; numberCellType7.DecimalPlaces = 0; numberCellType7.NegativeRed = true; @@ -691,13 +737,13 @@ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Qty"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 28F; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 44F; this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Unit"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 31F; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 46F; numberCellType8.DecimalPlaces = 0; numberCellType8.NegativeRed = true; numberCellType8.NullDisplay = "--"; @@ -707,17 +753,18 @@ this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "Price"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F; this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "Amt"; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F; + this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Supply"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType9.DecimalPlaces = 0; @@ -732,6 +779,7 @@ this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "관련프로젝트"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType10.DecimalPlaces = 0; @@ -746,23 +794,32 @@ this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset"; 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).Width = 35F; this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 38F; this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 42F; this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 23F; this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 33F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(23).Tag = "isdel"; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -773,7 +830,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(971, 604); + this.ClientSize = new System.Drawing.Size(1074, 665); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); @@ -854,7 +911,9 @@ private System.Windows.Forms.ToolStripMenuItem 금일입고품목ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 내가등록한자료ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 이번달자료ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem deleteDataToolStripMenuItem; + private System.Windows.Forms.ToolStripButton btViewDel; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index f699f2c..cdbc58d 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -100,6 +100,7 @@ namespace FEQ0000 } else { + btViewDel.Visible = false; fpSpread1.EditMode = false; fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; fpSpread1.EditModePermanent = false; @@ -108,6 +109,11 @@ namespace FEQ0000 foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns) col.Locked = true; } + + if(curLevel < 9) + { + toolStripButton2.Visible = false; + } refreshData(); FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); @@ -130,12 +136,17 @@ namespace FEQ0000 System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand(); cmd.CommandText = " select *" + " from purchase " + - " where isnull(" + dateField + ",'') between @sd and @ed " + - " and (isnull(request,'') like @req or isnull(receive,'') like @req)"; + " where isnull(" + dateField + ",'') between @sd and @ed "; + + if (btViewDel.Checked == false) + cmd.CommandText += " and isnull(isdel,0) = 0"; + + if(tbRequest.Text.Trim() != "") + cmd.CommandText += " and (isnull(request,'') like @req or isnull(receive,'') like @req)"; if (cmbState.SelectedIndex != 0) cmd.CommandText += " and isnull([state],'') like @st"; - else cmd.CommandText += " and (state < '04' or state > '07')"; - cmd.CommandText += " ORDER BY pdate DESC, idx DESC"; + // else cmd.CommandText += " and (state < '04' or state > '07')"; + cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC"; cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text)); cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@ed", dtED.Text)); @@ -154,6 +165,57 @@ namespace FEQ0000 { System.Windows.Forms.MessageBox.Show(ex.Message); } + + FormattingData(); + } + void FormattingData() + { + //삭제컬럼인덱스 + this.fpSpread1.SuspendLayout(); + var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index; + var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; + for(int i = 0; i< this.fpSpread1.ActiveSheet.Rows.Count;i++) + { + var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex); + string stateStr = string.Empty; + if (state != null) stateStr = state.ToString(); + + var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex); + if (value != null && (Boolean)value) + { + this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Red; + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.White; + } + else + { + this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White; + switch (stateStr.ToLower()) + { + case "cancled": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Red; + break; + case "rejected": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato; + break; + case "spr": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta; + break; + case "---": + case "----": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; + break; + case "received": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; + break; + default: + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black; + break; + } + + } + + } + this.fpSpread1.ResumeLayout(); } private void saveData() @@ -258,7 +320,15 @@ namespace FEQ0000 private void toolStripLabel3_Click(object sender, EventArgs e) { //사용자목록처리 - tbRequest.Text = string.Empty; + if(tbRequest.Text.Trim() == "") + { + tbRequest.Text = FCOMMON.info.Login.nameK; + } + else + { + tbRequest.Text = string.Empty; + } + refreshData(); } @@ -571,6 +641,7 @@ namespace FEQ0000 FarPoint.Excel.ExcelSaveFlags.SaveAsViewed | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); } } @@ -607,5 +678,15 @@ namespace FEQ0000 func_delete(); } + private void toolStripButton2_Click_1(object sender, EventArgs e) + { + this.fpSpread1.ActiveSheet.Rows[0].BackColor = Color.Red; + } + + private void btViewDel_Click(object sender, EventArgs e) + { + refreshData(); + } + } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 101dfab..38f0767 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -299,6 +299,31 @@ kBHypJw8OQKeD4C3u2Ww2XVDx9SAcJMmx1TKFMe7wNMOMNpSbkUO5MZbX9q5/LipXK0csMi3iphK+aH4 o8xnlLJi3IJdbKvsSg4L/MrpG8SVSzGitkGSyfQYdtNMV6YkkU3sEna+obyrS3TQ/y/lIGqEYgSRGChT wdMZXkp4+r8UxSdk1wcO0mb/TQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADuSURBVDhPY6AK+E8mgGqHGPB5/rz/X6ZP//+pq/P/5+pq + CM7N/f85Ofn/58jI/58DA/9HmknCMYYBIM1/X736//vBg/9/nj79//Py5f8/z50DGwzDJ4K8/28sc8Vu + AMhmkGawjbGxEFuhNoOxjw/cgARrGUwDQE4G2YqiOTQUxYDZriZ4DAD69+umTTg1EzYA5HSQX9E1YzEA + axiAnA4KSGwa0Q0IMZbAYgDQVlBAvgZ6BRfu1pfFbcBLU9P/95WV/9+Qlv5/ko8PjnewscExyOk4DSAG + 4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC + + + + + 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== diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index f91a649..2bee3fb 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -333,6 +333,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnpumidx; + private global::System.Data.DataColumn columnisdel; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public PurchaseDataTable() { @@ -582,6 +584,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn isdelColumn { + get { + return this.columnisdel; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -645,7 +655,8 @@ namespace FEQ0000 { string wuid, System.DateTime wdate, bool import, - int pumidx) { + int pumidx, + bool isdel) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -674,7 +685,8 @@ namespace FEQ0000 { wuid, wdate, import, - pumidx}; + pumidx, + isdel}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -731,6 +743,7 @@ namespace FEQ0000 { this.columnwdate = base.Columns["wdate"]; this.columnimport = base.Columns["import"]; this.columnpumidx = base.Columns["pumidx"]; + this.columnisdel = base.Columns["isdel"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -790,6 +803,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnimport); this.columnpumidx = new global::System.Data.DataColumn("pumidx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpumidx); + this.columnisdel = new global::System.Data.DataColumn("isdel", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisdel); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -814,7 +829,7 @@ namespace FEQ0000 { this.columnedate.MaxLength = 10; this.columnindate.MaxLength = 10; this.columnpo.MaxLength = 50; - this.columndept.MaxLength = 50; + this.columndept.MaxLength = 500; this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; @@ -1375,6 +1390,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool isdel { + get { + try { + return ((bool)(this[this.tablePurchase.isdelColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'isdel\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablePurchase.isdelColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IspdateNull() { @@ -1662,6 +1693,18 @@ namespace FEQ0000 { public void SetpumidxNull() { this[this.tablePurchase.pumidxColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsisdelNull() { + return this.IsNull(this.tablePurchase.isdelColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetisdelNull() { + this[this.tablePurchase.isdelColumn] = global::System.Convert.DBNull; + } } /// @@ -1850,85 +1893,17 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("pumidx", "pumidx"); + tableMapping.ColumnMappings.Add("isdel", "isdel"); 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 [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND" + - " [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [s" + - "tate] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [pr" + - "ocess] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AN" + - "D [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AN" + - "D [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request" + - "] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] I" + - "S NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS" + - " NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumu" + - "nit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [" + - "pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AN" + - "D [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt" + - " = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_suppl" + - "y = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supp" + - "lyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND (" + - "(@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_p" + - "rojectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original" + - "_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_ed" + - "ate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_in" + - "date)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@I" + - "sNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @" + - "Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [imp" + - "ort] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pu" + - "midx] IS NULL) OR ([pumidx] = @Original_pumidx)))"; + this._adapter.DeleteCommand.CommandText = "UPDATE Purchase\r\nSET isdel = 1\r\nWHERE (idx = @Original_idx)"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_state", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_receive", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "receive", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_receive", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "receive", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sc", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_request", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_request", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumscale", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumscale", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumunit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumunit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumprice", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumprice", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumprice", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "pumprice", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumamt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumamt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "pumamt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supply", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supply", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", 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_po", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_po", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", 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("@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("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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 [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1951,11 +1926,12 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@po", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [" + @@ -1964,34 +1940,35 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, "mprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supp" + "lyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edat" + "e] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wd" + - "ate] = @wdate, [import] = @import, [pumidx] = @pumidx WHERE (([idx] = @Original_" + - "idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)" + - ") AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) A" + - "ND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_proces" + - "s)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_r" + - "eceive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((" + - "@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) A" + - "ND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNul" + - "l_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND" + - " ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)" + - ") AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty" + - ")) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original" + - "_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Origi" + - "nal_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Orig" + - "inal_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyid" + - "x] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL" + - ") OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] " + - "IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS " + - "NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS N" + - "ULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR" + - " ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = " + - "@Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) A" + - "ND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) " + - "AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))" + - ");\r\nSELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumsc" + - "ale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, " + - "asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE " + - "(idx = @idx) ORDER BY pdate DESC"; + "ate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel WHERE ((" + + "[idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] " + + "= @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @" + + "Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] " + + "= @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([rece" + + "ive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Or" + + "iginal_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Or" + + "iginal_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_" + + "sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Origi" + + "nal_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = " + + "@Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] " + + "= @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pum" + + "price] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR " + + "([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR" + + " ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS N" + + "ULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [p" + + "rojectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asse" + + "t = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate =" + + " 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1" + + " AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AN" + + "D [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS N" + + "ULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = " + + "@Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @" + + "Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = " + + "@Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @O" + + "riginal_isdel)));\r\nSELECT idx, pdate, state, process, receive, sc, request, sid," + + " pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, projec" + + "t, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isde" + + "l FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2014,11 +1991,12 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@po", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2059,13 +2037,15 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_po", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_po", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.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.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.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.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -2083,8 +2063,9 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx + wdate, import, pumidx, isdel FROM Purchase +WHERE (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); @@ -2095,11 +2076,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx -FROM Purchase -WHERE (pdate BETWEEN @sd AND @ed) -ORDER BY pdate DESC, idx DESC"; + this._commandCollection[2].CommandText = @"SELECT asset, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2210,216 +2187,8 @@ ORDER BY pdate DESC, idx DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete( - int Original_idx, - string Original_pdate, - string Original_state, - string Original_process, - string Original_receive, - string Original_sc, - string Original_request, - string Original_sid, - string Original_pumscale, - string Original_pumunit, - global::System.Nullable Original_pumqty, - global::System.Nullable Original_pumprice, - global::System.Nullable Original_pumamt, - string Original_supply, - global::System.Nullable Original_supplyidx, - global::System.Nullable Original_projectidx, - string Original_asset, - string Original_edate, - string Original_indate, - string Original_po, - string Original_dept, - string Original_wuid, - System.DateTime Original_wdate, - global::System.Nullable Original_import, - global::System.Nullable Original_pumidx) { + public virtual int Delete(int Original_idx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_pdate == 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_pdate)); - } - if ((Original_state == 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_state)); - } - if ((Original_process == 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_process)); - } - if ((Original_receive == 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_receive)); - } - if ((Original_sc == 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_sc)); - } - if ((Original_request == 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_request)); - } - if ((Original_sid == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_sid)); - } - if ((Original_pumscale == 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_pumscale)); - } - if ((Original_pumunit == 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_pumunit)); - } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[20].Value = ((int)(Original_pumqty.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; - } - if ((Original_pumprice.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[22].Value = ((decimal)(Original_pumprice.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; - } - if ((Original_pumamt.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[24].Value = ((decimal)(Original_pumamt.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; - } - if ((Original_supply == 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_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[28].Value = ((int)(Original_supplyidx.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; - } - if ((Original_projectidx.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[30].Value = ((int)(Original_projectidx.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value; - } - if ((Original_asset == 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_asset)); - } - if ((Original_edate == null)) { - this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[34].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[34].Value = ((string)(Original_edate)); - } - if ((Original_indate == null)) { - this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[36].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[36].Value = ((string)(Original_indate)); - } - if ((Original_po == null)) { - this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[38].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[38].Value = ((string)(Original_po)); - } - if ((Original_dept == null)) { - this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[40].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[40].Value = ((string)(Original_dept)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[41].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[42].Value = ((System.DateTime)(Original_wdate)); - if ((Original_import.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[44].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[44].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[46].Value = ((int)(Original_pumidx.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[46].Value = global::System.DBNull.Value; - } 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)) { @@ -2466,7 +2235,8 @@ ORDER BY pdate DESC, idx DESC"; string wuid, System.DateTime wdate, global::System.Nullable import, - global::System.Nullable pumidx) { + global::System.Nullable pumidx, + global::System.Nullable isdel) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -2618,6 +2388,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[25].Value = global::System.DBNull.Value; } + if ((isdel.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[26].Value = ((bool)(isdel.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -2665,6 +2441,7 @@ ORDER BY pdate DESC, idx DESC"; System.DateTime wdate, global::System.Nullable import, global::System.Nullable pumidx, + global::System.Nullable isdel, int Original_idx, string Original_pdate, string Original_state, @@ -2690,6 +2467,7 @@ ORDER BY pdate DESC, idx DESC"; System.DateTime Original_wdate, global::System.Nullable Original_import, global::System.Nullable Original_pumidx, + global::System.Nullable Original_isdel, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -2842,191 +2620,205 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + if ((isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[26].Value = ((bool)(isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_pdate)); } if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_state)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_process)); } if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_receive)); } if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_sc)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_request)); } if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_sid)); } if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_pumscale)); } if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_pumunit)); } if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(Original_pumqty.Value)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((int)(Original_pumqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((decimal)(Original_pumprice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((decimal)(Original_pumamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_supply)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_projectidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_asset)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_edate)); } if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_indate)); } if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_po)); } if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[68].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } if ((Original_pumidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[72].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_pumidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(idx)); + if ((Original_isdel.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_isdel.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[76].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -3074,6 +2866,7 @@ ORDER BY pdate DESC, idx DESC"; System.DateTime wdate, global::System.Nullable import, global::System.Nullable pumidx, + global::System.Nullable isdel, int Original_idx, string Original_pdate, string Original_state, @@ -3098,8 +2891,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_import, - global::System.Nullable Original_pumidx) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_idx); + global::System.Nullable Original_pumidx, + global::System.Nullable Original_isdel) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsc b/SubProject/FEQ0000/dsPurchase.xsc index 05b0199..551fc56 100644 --- a/SubProject/FEQ0000/dsPurchase.xsc +++ b/SubProject/FEQ0000/dsPurchase.xsc @@ -1,9 +1,9 @@ - - - - + + + + \ No newline at end of file diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index e49f6d4..70debf4 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -11,63 +11,19 @@ - - DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))) + + UPDATE Purchase +SET isdel = 1 +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -90,27 +46,29 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + + SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx + wdate, import, pumidx, isdel FROM Purchase +WHERE (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC - UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC + UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel))); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -133,11 +91,12 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + + @@ -178,14 +137,16 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + - + + + @@ -219,6 +180,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -242,11 +204,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) - SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx -FROM Purchase -WHERE (pdate BETWEEN @sd AND @ed) -ORDER BY pdate DESC, idx DESC + SELECT asset, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC @@ -264,7 +222,7 @@ ORDER BY pdate DESC, idx DESC - + @@ -388,7 +346,7 @@ ORDER BY pdate DESC, idx DESC - + @@ -402,6 +360,7 @@ ORDER BY pdate DESC, idx DESC + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 128059e..8a66f12 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/SubProject/FEQ0000/dsPurchase.xss @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.xsc b/SubProject/FPJ0000/dsPRJ.xsc index 0434c0d..a933069 100644 --- a/SubProject/FPJ0000/dsPRJ.xsc +++ b/SubProject/FPJ0000/dsPRJ.xsc @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 6afe85a..60f3aa1 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file