diff --git a/Project/Controller/PurchaseController.cs b/Project/Controller/PurchaseController.cs index 0a38ccc..3b05994 100644 --- a/Project/Controller/PurchaseController.cs +++ b/Project/Controller/PurchaseController.cs @@ -163,7 +163,7 @@ namespace Project tbody.AppendLine($"{item.pumprice}"); tbody.AppendLine($"{item.pumamt}"); tbody.AppendLine($"{item.supply}"); - if (item.project.Length > 10) tbody.AppendLine($"{item.project.Substring(0, 10)}..."); + if (item.project != null && item.project.Length > 10) tbody.AppendLine($"{item.project.Substring(0, 10)}..."); else tbody.AppendLine($"{item.project}"); if (item.bigo.Length > 10) tbody.AppendLine($"{item.bigo.Substring(0, 10)}..."); diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index b5d0d83..154a7f9 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("21.07.01.1130")] -[assembly: AssemblyFileVersion("21.07.01.1130")] +[assembly: AssemblyVersion("21.07.09.1100")] +[assembly: AssemblyFileVersion("21.07.09.1100")] diff --git a/Project/fMain.cs b/Project/fMain.cs index 07ceba5..a3dabcb 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -142,10 +142,13 @@ namespace Project { WebApp.Start(url: "http://127.0.0.1:9000"); Console.WriteLine("start webapp"); + Pub.log.AddI("웹지원 서버 준비 완료"); } catch (Exception ex) { + //Util.MsgE("Web Interface Error\r\n" + ex.Message)/; Console.WriteLine(ex.Message); + Pub.log.AddE("웹지원오류" + ex.Message); } diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index 4b191dd..7c6480a 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -102,6 +102,12 @@ fBase.cs + + Form + + + fFileExplorer.cs + Form @@ -157,6 +163,9 @@ fBase.cs + + fFileExplorer.cs + fFTPExplorer.cs diff --git a/SubProject/FCOMMON/fFileExplorer.Designer.cs b/SubProject/FCOMMON/fFileExplorer.Designer.cs new file mode 100644 index 0000000..d5f523b --- /dev/null +++ b/SubProject/FCOMMON/fFileExplorer.Designer.cs @@ -0,0 +1,191 @@ + +namespace FCOMMON +{ + partial class fFileExplorer + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fFileExplorer)); + this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.새로고침ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.contextMenuStrip1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // listView1 + // + this.listView1.AllowDrop = true; + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2, + this.columnHeader3, + this.columnHeader4}); + this.listView1.ContextMenuStrip = this.contextMenuStrip1; + this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listView1.FullRowSelect = true; + this.listView1.GridLines = true; + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(0, 0); + this.listView1.MultiSelect = false; + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(475, 207); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.fFileExplorer_DragDrop); + this.listView1.DragEnter += new System.Windows.Forms.DragEventHandler(this.listView1_DragEnter); + this.listView1.DragLeave += new System.EventHandler(this.listView1_DragLeave); + // + // columnHeader1 + // + this.columnHeader1.Text = "Nane"; + this.columnHeader1.Width = 200; + // + // columnHeader2 + // + this.columnHeader2.Text = "Ext"; + // + // columnHeader3 + // + this.columnHeader3.Text = "Size"; + this.columnHeader3.Width = 80; + // + // columnHeader4 + // + this.columnHeader4.Text = "변경일자"; + this.columnHeader4.Width = 70; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.새로고침ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26); + // + // 새로고침ToolStripMenuItem + // + this.새로고침ToolStripMenuItem.Name = "새로고침ToolStripMenuItem"; + this.새로고침ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.새로고침ToolStripMenuItem.Text = "새로 고침"; + this.새로고침ToolStripMenuItem.Click += new System.EventHandler(this.새로고침ToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1, + this.toolStripButton2, + this.toolStripButton3, + this.toolStripButton4}); + this.toolStrip1.Location = new System.Drawing.Point(0, 207); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(475, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(51, 22); + this.toolStripButton1.Text = "추가"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_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(51, 22); + this.toolStripButton2.Text = "받기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripButton3 + // + this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(51, 22); + this.toolStripButton3.Text = "삭제"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + // + // toolStripButton4 + // + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(75, 22); + this.toolStripButton4.Text = "새로고침"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // fFileExplorer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(475, 232); + this.Controls.Add(this.listView1); + this.Controls.Add(this.toolStrip1); + this.Name = "fFileExplorer"; + this.Text = "fFileExplorer"; + this.Load += new System.EventHandler(this.fFileExplorer_Load); + this.contextMenuStrip1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 새로고침ToolStripMenuItem; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; + private System.Windows.Forms.ToolStripButton toolStripButton4; + } +} \ No newline at end of file diff --git a/SubProject/FCOMMON/fFileExplorer.cs b/SubProject/FCOMMON/fFileExplorer.cs new file mode 100644 index 0000000..05253be --- /dev/null +++ b/SubProject/FCOMMON/fFileExplorer.cs @@ -0,0 +1,175 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FCOMMON +{ + public partial class fFileExplorer : Form + { + string p = string.Empty; + public fFileExplorer(string path_) + { + InitializeComponent(); + this.p = path_; + this.StartPosition = FormStartPosition.CenterScreen; + } + + private void fFileExplorer_Load(object sender, EventArgs e) + { + this.Show(); + Application.DoEvents(); + RefreshPath(); + + } + void RefreshPath() + { + if (System.IO.Directory.Exists(this.p) == false) + { + Util.MsgE("지정된 폴더가 존재하지 않습니다"); + return; + } + else + { + this.listView1.Items.Clear(); + var di = new System.IO.DirectoryInfo(this.p); + foreach (var item in di.GetFiles()) + { + var lv = this.listView1.Items.Add(item.Name); + lv.SubItems.Add(item.Extension); + lv.SubItems.Add(item.Length.ToString()); + lv.SubItems.Add(item.LastWriteTime.ToString("yy-MM-dd HH:mm:ss")); + lv.Tag = item; + } + } + } + + private void 새로고침ToolStripMenuItem_Click(object sender, EventArgs e) + { + RefreshPath(); + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + //추가 + var od = new OpenFileDialog(); + if (od.ShowDialog() != DialogResult.OK) return; + + var fi = new System.IO.FileInfo(od.FileName); + var newpath = System.IO.Path.Combine(this.p, fi.Name); + if (System.IO.File.Exists(newpath)) + { + if (FCOMMON.Util.MsgQ("이미 존재하는 파일명입니다. 덮어쓸까요?") != DialogResult.Yes) return; + } + try + { + System.IO.File.Copy(od.FileName, newpath, true); + FCOMMON.Util.MsgI("파일 저장 완료\r\n파일명:" + fi.Name); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + RefreshPath(); + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + //다운로드 + if (this.listView1.FocusedItem == null) return; + var lv = this.listView1.FocusedItem; + var oldfile = lv.Tag as System.IO.FileInfo;//.ToString(); + + var sd = new SaveFileDialog(); + sd.Filter = oldfile.Extension + "|" + oldfile.Extension.Replace(".", "*."); + sd.FilterIndex = 0; + sd.FileName = oldfile.Name; + + if (sd.ShowDialog() != DialogResult.OK) return; + //var newpath = System.IO.Path.Combine(this.p, sd.FileName); + if (System.IO.File.Exists(sd.FileName)) + { + if (FCOMMON.Util.MsgQ("이미 존재하는 파일명입니다. 덮어쓸까요?") != DialogResult.Yes) return; + } + try + { + System.IO.File.Copy(oldfile.FullName, sd.FileName, true); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + RefreshPath(); + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + //삭제 + if (this.listView1.FocusedItem == null) return; + var lv = this.listView1.FocusedItem; + var newpath = lv.Tag as System.IO.FileInfo;//.ToString(); + + //var newpath = System.IO.Path.Combine(this.p, od.FileName); + if (System.IO.File.Exists(newpath.FullName) == false) + { + Util.MsgE("해당 파일이 존재하지 않습니다"); + return; + } + + if (FCOMMON.Util.MsgQ("파일을 삭제할까요?") != DialogResult.Yes) return; + try + { + System.IO.File.Delete(newpath.FullName); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + RefreshPath(); + } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + RefreshPath(); + } + + private void listView1_DragEnter(object sender, DragEventArgs e) + { + e.Effect = DragDropEffects.All; + } + + private void fFileExplorer_DragDrop(object sender, DragEventArgs e) + { + var files = (string[])e.Data.GetData(DataFormats.FileDrop, false); + foreach (var item in files) + { + var fi = new System.IO.FileInfo(item); + var newpath = System.IO.Path.Combine(this.p, fi.Name); + if (System.IO.File.Exists(newpath)) + { + if (FCOMMON.Util.MsgQ("이미 존재하는 파일명입니다.\r\n" + fi.Name + "\r\n덮어쓸까요?") != DialogResult.Yes) return; + } + try + { + System.IO.File.Copy(item, newpath, true); + FCOMMON.Util.MsgI("파일 저장 완료\r\n파일명:" + fi.Name); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + RefreshPath(); + } + + private void listView1_DragLeave(object sender, EventArgs e) + { + //this.listView1.DoDragDrop(); + } + } +} diff --git a/SubProject/FCOMMON/fFileExplorer.resx b/SubProject/FCOMMON/fFileExplorer.resx new file mode 100644 index 0000000..f9e0d5e --- /dev/null +++ b/SubProject/FCOMMON/fFileExplorer.resx @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 175, 17 + + + + + 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== + + + + + 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== + + + + + 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== + + + + + 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== + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/DSEboard.Designer.cs b/SubProject/FPJ0000/DSEboard.Designer.cs index f62b201..380e705 100644 --- a/SubProject/FPJ0000/DSEboard.Designer.cs +++ b/SubProject/FPJ0000/DSEboard.Designer.cs @@ -345,6 +345,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn column결과2; + private global::System.Data.DataColumn columnrefdata; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_JobReport_EBoardDataTable() { @@ -642,6 +644,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn refdataColumn { + get { + return this.columnrefdata; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -711,7 +721,8 @@ namespace FPJ0000 { string wuid, System.DateTime wdate, string 원인2, - string 결과2) { + string 결과2, + bool refdata) { EETGW_JobReport_EBoardRow rowEETGW_JobReport_EBoardRow = ((EETGW_JobReport_EBoardRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -746,7 +757,8 @@ namespace FPJ0000 { wuid, wdate, 원인2, - 결과2}; + 결과2, + refdata}; rowEETGW_JobReport_EBoardRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_JobReport_EBoardRow); return rowEETGW_JobReport_EBoardRow; @@ -809,6 +821,7 @@ namespace FPJ0000 { this.columnwdate = base.Columns["wdate"]; this.column원인2 = base.Columns["원인2"]; this.column결과2 = base.Columns["결과2"]; + this.columnrefdata = base.Columns["refdata"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -880,6 +893,8 @@ namespace FPJ0000 { base.Columns.Add(this.column원인2); this.column결과2 = new global::System.Data.DataColumn("결과2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.column결과2); + this.columnrefdata = new global::System.Data.DataColumn("refdata", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrefdata); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1563,6 +1578,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool refdata { + get { + if (this.IsrefdataNull()) { + return false; + } + else { + return ((bool)(this[this.tableEETGW_JobReport_EBoard.refdataColumn])); + } + } + set { + this[this.tableEETGW_JobReport_EBoard.refdataColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -1910,6 +1941,18 @@ namespace FPJ0000 { public void Set결과2Null() { this[this.tableEETGW_JobReport_EBoard.결과2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrefdataNull() { + return this.IsNull(this.tableEETGW_JobReport_EBoard.refdataColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrefdataNull() { + this[this.tableEETGW_JobReport_EBoard.refdataColumn] = global::System.Convert.DBNull; + } } /// @@ -2104,6 +2147,7 @@ namespace FPJ0000.DSEboardTableAdapters { tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("원인2", "원인2"); tableMapping.ColumnMappings.Add("결과2", "결과2"); + tableMapping.ColumnMappings.Add("refdata", "refdata"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -2134,7 +2178,8 @@ namespace FPJ0000.DSEboardTableAdapters { "LL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] " + "IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS " + "NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdat" + - "e] = @Original_wdate))"; + "e] = @Original_wdate) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refd" + + "ata] = @Original_refdata)))"; 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2190,10 +2235,12 @@ namespace FPJ0000.DSEboardTableAdapters { 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("@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.SmallDateTime, 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_refdata", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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 [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [Site], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Process], [Equipment], [Model], [BoardName], [BoardVender], [원인], [결과], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [memo], [import], [wuid], [wdate], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @Site, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Process, @Equipment, @Model, @BoardName, @BoardVender, @원인, @결과, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @memo, @import, @wuid, @wdate, @원인2, @결과2); -SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [Site], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Process], [Equipment], [Model], [BoardName], [BoardVender], [원인], [결과], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [memo], [import], [wuid], [wdate], [원인2], [결과2], [refdata]) VALUES (@gcode, @pdate, @uid, @Site, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Process, @Equipment, @Model, @BoardName, @BoardVender, @원인, @결과, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @memo, @import, @wuid, @wdate, @원인2, @결과2, @refdata); +SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -2227,6 +2274,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 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("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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 [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @" + @@ -2236,38 +2284,39 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, "ender] = @BoardVender, [원인] = @원인, [결과] = @결과, [SN] = @SN, [QTY] = @QTY, [NPrice" + "] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @" + "CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [memo] = @memo, [impo" + - "rt] = @import, [wuid] = @wuid, [wdate] = @wdate, [원인2] = @원인2, [결과2] = @결과2 WHER" + - "E (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate =" + - " 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AN" + - "D [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_Site = 1 AND [Site] I" + - "S NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) O" + - "R ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완" + - "료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Stat" + - "us] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Orig" + - "inal_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line" + - ")) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original" + - "_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Te" + - "am)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_" + - "Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS NULL) OR ([Equipment] =" + - " @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] " + - "= @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([Bo" + - "ardName] = @Original_BoardName)) AND ((@IsNull_BoardVender = 1 AND [BoardVender]" + - " IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_SN = 1 AND [" + - "SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) " + - "OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([" + - "NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR (" + - "[OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS N" + - "ULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 A" + - "ND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND " + - "((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNu" + - "ll_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairT" + - "ime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) A" + - "ND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) " + - "AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));\r\nSELECT idx, gco" + - "de, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equ" + - "ipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCo" + - "st, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 FROM EE" + - "TGW_JobReport_EBoard WHERE (idx = @idx)"; + "rt] = @import, [wuid] = @wuid, [wdate] = @wdate, [원인2] = @원인2, [결과2] = @결과2, [re" + + "fdata] = @refdata WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode)" + + " AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AN" + + "D ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull" + + "_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = " + + "1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리" + + "완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Stat" + + "us] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS " + + "NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([" + + "Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR (" + + "[Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR " + + "([Team] = @Original_Team)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR (" + + "[Process] = @Original_Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS N" + + "ULL) OR ([Equipment] = @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model]" + + " IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [Board" + + "Name] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_BoardVender" + + " = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND " + + "((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY =" + + " 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [" + + "NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND " + + "[OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1" + + " AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNu" + + "ll_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Origina" + + "l_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Origi" + + "nal_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTim" + + "e] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo" + + "] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import]" + + " = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wda" + + "te) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Original_r" + + "efdata)));\r\nSELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, D" + + "ivision, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QT" + + "Y, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wu" + + "id, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2301,6 +2350,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 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("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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, "", "", "")); @@ -2355,6 +2405,8 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, 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("@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.SmallDateTime, 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_refdata", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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, "", "", "")); } @@ -2372,7 +2424,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, - RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 + RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (gcode = @gcode)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -2477,7 +2529,8 @@ WHERE (gcode = @gcode)"; string Original_memo, global::System.Nullable Original_import, string Original_wuid, - System.DateTime Original_wdate) { + System.DateTime Original_wdate, + global::System.Nullable Original_refdata) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -2692,6 +2745,14 @@ WHERE (gcode = @gcode)"; this.Adapter.DeleteCommand.Parameters[52].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[53].Value = ((System.DateTime)(Original_wdate)); + if ((Original_refdata.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[55].Value = ((bool)(Original_refdata.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[55].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)) { @@ -2744,7 +2805,8 @@ WHERE (gcode = @gcode)"; string wuid, System.DateTime wdate, string 원인2, - string 결과2) { + string 결과2, + global::System.Nullable refdata) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -2932,6 +2994,12 @@ WHERE (gcode = @gcode)"; else { this.Adapter.InsertCommand.Parameters[31].Value = ((string)(결과2)); } + if ((refdata.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[32].Value = ((bool)(refdata.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[32].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)) { @@ -2985,6 +3053,7 @@ WHERE (gcode = @gcode)"; System.DateTime wdate, string 원인2, string 결과2, + global::System.Nullable refdata, int Original_idx, string Original_gcode, string Original_pdate, @@ -3014,6 +3083,7 @@ WHERE (gcode = @gcode)"; global::System.Nullable Original_import, string Original_wuid, System.DateTime Original_wdate, + global::System.Nullable Original_refdata, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -3202,221 +3272,235 @@ WHERE (gcode = @gcode)"; else { this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(결과2)); } - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); + if ((refdata.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((bool)(refdata.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_gcode)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_pdate)); } if ((Original_uid == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_uid)); } if ((Original_Site == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_Site)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_Site)); } if ((Original_요청자 == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_요청자)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_요청자)); } if ((Original_수리완료일 == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_수리완료일)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_수리완료일)); } if ((Original_Status == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_Status)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_Status)); } if ((Original_분류 == null)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_분류)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_분류)); } if ((Original_Line == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_Line)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_Line)); } if ((Original_Division == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_Division)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_Division)); } if ((Original_Team == null)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_Team)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_Team)); } if ((Original_Process == null)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_Process)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_Process)); } if ((Original_Equipment == null)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_Equipment)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_Equipment)); } if ((Original_Model == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_Model)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_Model)); } if ((Original_BoardName == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_BoardName)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_BoardName)); } if ((Original_BoardVender == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_BoardVender)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_BoardVender)); } if ((Original_SN == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_SN)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_SN)); } if ((Original_QTY.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_QTY.Value)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((int)(Original_QTY.Value)); } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; } if ((Original_NPrice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((decimal)(Original_NPrice.Value)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((decimal)(Original_NPrice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; } if ((Original_OPrice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((decimal)(Original_OPrice.Value)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((decimal)(Original_OPrice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; } if ((Original_RepairCost.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((decimal)(Original_RepairCost.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((decimal)(Original_RepairCost.Value)); } else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; } if ((Original_CostReduction.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((decimal)(Original_CostReduction.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((decimal)(Original_CostReduction.Value)); } else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; } if ((Original_외주업체 == null)) { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_외주업체)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_외주업체)); } if ((Original_RepairTime.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((double)(Original_RepairTime.Value)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((double)(Original_RepairTime.Value)); } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_memo)); } if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[84].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[85].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[86].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((System.DateTime)(Original_wdate)); + if ((Original_refdata.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((bool)(Original_refdata.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[89].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)) { @@ -3470,6 +3554,7 @@ WHERE (gcode = @gcode)"; System.DateTime wdate, string 원인2, string 결과2, + global::System.Nullable refdata, int Original_idx, string Original_gcode, string Original_pdate, @@ -3498,8 +3583,9 @@ WHERE (gcode = @gcode)"; string Original_memo, global::System.Nullable Original_import, string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_Site, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Process, Original_Equipment, Original_Model, Original_BoardName, Original_BoardVender, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_memo, Original_import, Original_wuid, Original_wdate, Original_idx); + System.DateTime Original_wdate, + global::System.Nullable Original_refdata) { + return this.Update(gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_Site, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Process, Original_Equipment, Original_Model, Original_BoardName, Original_BoardVender, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_memo, Original_import, Original_wuid, Original_wdate, Original_refdata, Original_idx); } } diff --git a/SubProject/FPJ0000/DSEboard.xsd b/SubProject/FPJ0000/DSEboard.xsd index e7e7531..21d0254 100644 --- a/SubProject/FPJ0000/DSEboard.xsd +++ b/SubProject/FPJ0000/DSEboard.xsd @@ -12,7 +12,7 @@ - DELETE FROM [EETGW_JobReport_EBoard] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS NULL) OR ([Equipment] = @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [EETGW_JobReport_EBoard] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS NULL) OR ([Equipment] = @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Original_refdata))) @@ -68,13 +68,15 @@ + + - INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [Site], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Process], [Equipment], [Model], [BoardName], [BoardVender], [원인], [결과], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [memo], [import], [wuid], [wdate], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @Site, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Process, @Equipment, @Model, @BoardName, @BoardVender, @원인, @결과, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @memo, @import, @wuid, @wdate, @원인2, @결과2); -SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [Site], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Process], [Equipment], [Model], [BoardName], [BoardVender], [원인], [결과], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [memo], [import], [wuid], [wdate], [원인2], [결과2], [refdata]) VALUES (@gcode, @pdate, @uid, @Site, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Process, @Equipment, @Model, @BoardName, @BoardVender, @원인, @결과, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @memo, @import, @wuid, @wdate, @원인2, @결과2, @refdata); +SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) @@ -108,13 +110,14 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, + - + SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, - RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 + RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (gcode = @gcode) @@ -124,8 +127,8 @@ WHERE (gcode = @gcode) - UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [Site] = @Site, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Process] = @Process, [Equipment] = @Equipment, [Model] = @Model, [BoardName] = @BoardName, [BoardVender] = @BoardVender, [원인] = @원인, [결과] = @결과, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [memo] = @memo, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [원인2] = @원인2, [결과2] = @결과2 WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS NULL) OR ([Equipment] = @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = @idx) + UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [Site] = @Site, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Process] = @Process, [Equipment] = @Equipment, [Model] = @Model, [BoardName] = @BoardName, [BoardVender] = @BoardVender, [원인] = @원인, [결과] = @결과, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [memo] = @memo, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [원인2] = @원인2, [결과2] = @결과2, [refdata] = @refdata WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_Equipment = 1 AND [Equipment] IS NULL) OR ([Equipment] = @Original_Equipment)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Original_refdata))); +SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Process, Equipment, Model, BoardName, BoardVender, 원인, 결과, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, memo, import, wuid, wdate, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = @idx) @@ -159,6 +162,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, + @@ -213,6 +217,8 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, + + @@ -253,6 +259,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, + @@ -264,7 +271,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, - + @@ -444,6 +451,7 @@ SELECT idx, gcode, pdate, uid, Site, 요청자, 수리완료일, Status, 분류, + diff --git a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs index f4bb689..f86e024 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs @@ -67,7 +67,9 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btSave = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.panel1 = new System.Windows.Forms.Panel(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.cmbBoardVender = new System.Windows.Forms.ComboBox(); this.repairTimeTextBox = new System.Windows.Forms.TextBox(); this.cmb분류 = new System.Windows.Forms.ComboBox(); @@ -95,6 +97,7 @@ this.arLabel7 = new arCtl.arLabel(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); this.tableAdapterManager = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.tableAdapterManager1 = new FPJ0000.DSEboardTableAdapters.TableAdapterManager(); costoLabel = new System.Windows.Forms.Label(); costnLabel = new System.Windows.Forms.Label(); costeLabel = new System.Windows.Forms.Label(); @@ -128,7 +131,7 @@ // costoLabel.AutoSize = true; costoLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - costoLabel.Location = new System.Drawing.Point(274, 232); + costoLabel.Location = new System.Drawing.Point(280, 227); costoLabel.Name = "costoLabel"; costoLabel.Size = new System.Drawing.Size(80, 12); costoLabel.TabIndex = 34; @@ -138,7 +141,7 @@ // costnLabel.AutoSize = true; costnLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - costnLabel.Location = new System.Drawing.Point(247, 195); + costnLabel.Location = new System.Drawing.Point(253, 190); costnLabel.Name = "costnLabel"; costnLabel.Size = new System.Drawing.Size(107, 12); costnLabel.TabIndex = 32; @@ -148,7 +151,7 @@ // costeLabel.AutoSize = true; costeLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - costeLabel.Location = new System.Drawing.Point(224, 273); + costeLabel.Location = new System.Drawing.Point(230, 268); costeLabel.Name = "costeLabel"; costeLabel.Size = new System.Drawing.Size(130, 12); costeLabel.TabIndex = 36; @@ -158,7 +161,7 @@ // cntLabel.AutoSize = true; cntLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - cntLabel.Location = new System.Drawing.Point(325, 115); + cntLabel.Location = new System.Drawing.Point(331, 110); cntLabel.Name = "cntLabel"; cntLabel.Size = new System.Drawing.Size(29, 12); cntLabel.TabIndex = 28; @@ -168,7 +171,7 @@ // label1.AutoSize = true; label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - label1.Location = new System.Drawing.Point(253, 153); + label1.Location = new System.Drawing.Point(259, 148); label1.Name = "label1"; label1.Size = new System.Drawing.Size(101, 12); label1.TabIndex = 30; @@ -177,7 +180,7 @@ // uidLabel // uidLabel.AutoSize = true; - uidLabel.Location = new System.Drawing.Point(313, 387); + uidLabel.Location = new System.Drawing.Point(319, 382); uidLabel.Name = "uidLabel"; uidLabel.Size = new System.Drawing.Size(41, 12); uidLabel.TabIndex = 42; @@ -186,7 +189,7 @@ // siteLabel // siteLabel.AutoSize = true; - siteLabel.Location = new System.Drawing.Point(53, 150); + siteLabel.Location = new System.Drawing.Point(53, 145); siteLabel.Name = "siteLabel"; siteLabel.Size = new System.Drawing.Size(30, 12); siteLabel.TabIndex = 6; @@ -195,7 +198,7 @@ // lineLabel // lineLabel.AutoSize = true; - lineLabel.Location = new System.Drawing.Point(50, 226); + lineLabel.Location = new System.Drawing.Point(50, 221); lineLabel.Name = "lineLabel"; lineLabel.Size = new System.Drawing.Size(33, 12); lineLabel.TabIndex = 12; @@ -204,7 +207,7 @@ // divisionLabel // divisionLabel.AutoSize = true; - divisionLabel.Location = new System.Drawing.Point(30, 265); + divisionLabel.Location = new System.Drawing.Point(30, 260); divisionLabel.Name = "divisionLabel"; divisionLabel.Size = new System.Drawing.Size(53, 12); divisionLabel.TabIndex = 14; @@ -213,7 +216,7 @@ // processLabel // processLabel.AutoSize = true; - processLabel.Location = new System.Drawing.Point(27, 306); + processLabel.Location = new System.Drawing.Point(27, 301); processLabel.Name = "processLabel"; processLabel.Size = new System.Drawing.Size(56, 12); processLabel.TabIndex = 18; @@ -222,7 +225,7 @@ // modelLabel // modelLabel.AutoSize = true; - modelLabel.Location = new System.Drawing.Point(18, 345); + modelLabel.Location = new System.Drawing.Point(18, 340); modelLabel.Name = "modelLabel"; modelLabel.Size = new System.Drawing.Size(65, 12); modelLabel.TabIndex = 20; @@ -231,7 +234,7 @@ // boardNameLabel // boardNameLabel.AutoSize = true; - boardNameLabel.Location = new System.Drawing.Point(3, 384); + boardNameLabel.Location = new System.Drawing.Point(3, 379); boardNameLabel.Name = "boardNameLabel"; boardNameLabel.Size = new System.Drawing.Size(80, 12); boardNameLabel.TabIndex = 22; @@ -240,7 +243,7 @@ // sNLabel // sNLabel.AutoSize = true; - sNLabel.Location = new System.Drawing.Point(328, 73); + sNLabel.Location = new System.Drawing.Point(334, 68); sNLabel.Name = "sNLabel"; sNLabel.Size = new System.Drawing.Size(26, 12); sNLabel.TabIndex = 26; @@ -249,7 +252,7 @@ // 외주업체Label // 외주업체Label.AutoSize = true; - 외주업체Label.Location = new System.Drawing.Point(297, 310); + 외주업체Label.Location = new System.Drawing.Point(303, 305); 외주업체Label.Name = "외주업체Label"; 외주업체Label.Size = new System.Drawing.Size(57, 12); 외주업체Label.TabIndex = 38; @@ -267,7 +270,7 @@ // 분류Label // 분류Label.AutoSize = true; - 분류Label.Location = new System.Drawing.Point(43, 187); + 분류Label.Location = new System.Drawing.Point(43, 182); 분류Label.Name = "분류Label"; 분류Label.Size = new System.Drawing.Size(40, 12); 분류Label.TabIndex = 10; @@ -276,7 +279,7 @@ // repairTimeLabel // repairTimeLabel.AutoSize = true; - repairTimeLabel.Location = new System.Drawing.Point(276, 349); + repairTimeLabel.Location = new System.Drawing.Point(282, 344); repairTimeLabel.Name = "repairTimeLabel"; repairTimeLabel.Size = new System.Drawing.Size(78, 12); repairTimeLabel.TabIndex = 40; @@ -285,7 +288,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(301, 35); + label2.Location = new System.Drawing.Point(307, 35); label2.Name = "label2"; label2.Size = new System.Drawing.Size(53, 12); label2.TabIndex = 24; @@ -294,7 +297,7 @@ // tbSdate // this.tbSdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSdate.Location = new System.Drawing.Point(89, 69); + this.tbSdate.Location = new System.Drawing.Point(89, 64); this.tbSdate.Name = "tbSdate"; this.tbSdate.Size = new System.Drawing.Size(148, 21); this.tbSdate.TabIndex = 3; @@ -302,14 +305,14 @@ // tbEdate // this.tbEdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbEdate.Location = new System.Drawing.Point(89, 109); + this.tbEdate.Location = new System.Drawing.Point(89, 104); this.tbEdate.Name = "tbEdate"; this.tbEdate.Size = new System.Drawing.Size(148, 21); this.tbEdate.TabIndex = 5; // // tbCostRepair // - this.tbCostRepair.Location = new System.Drawing.Point(358, 227); + this.tbCostRepair.Location = new System.Drawing.Point(365, 222); this.tbCostRepair.Name = "tbCostRepair"; this.tbCostRepair.Size = new System.Drawing.Size(176, 21); this.tbCostRepair.TabIndex = 35; @@ -318,7 +321,7 @@ // // tbCostOutSource // - this.tbCostOutSource.Location = new System.Drawing.Point(358, 191); + this.tbCostOutSource.Location = new System.Drawing.Point(365, 186); this.tbCostOutSource.Name = "tbCostOutSource"; this.tbCostOutSource.Size = new System.Drawing.Size(176, 21); this.tbCostOutSource.TabIndex = 33; @@ -328,7 +331,7 @@ // tbCostReduct // this.tbCostReduct.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); - this.tbCostReduct.Location = new System.Drawing.Point(358, 269); + this.tbCostReduct.Location = new System.Drawing.Point(365, 264); this.tbCostReduct.Name = "tbCostReduct"; this.tbCostReduct.Size = new System.Drawing.Size(176, 21); this.tbCostReduct.TabIndex = 37; @@ -336,7 +339,7 @@ // // tbQty // - this.tbQty.Location = new System.Drawing.Point(358, 110); + this.tbQty.Location = new System.Drawing.Point(365, 105); this.tbQty.Name = "tbQty"; this.tbQty.Size = new System.Drawing.Size(176, 21); this.tbQty.TabIndex = 29; @@ -360,7 +363,8 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, - this.btSave}); + this.btSave, + this.toolStripButton1}); this.bn.Location = new System.Drawing.Point(0, 696); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -417,7 +421,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -461,9 +464,19 @@ this.btSave.Text = "확인(&S)"; this.btSave.Click += new System.EventHandler(this.btSave_Click); // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(75, 22); + this.toolStripButton1.Text = "폴더열기"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.checkBox1); this.panel1.Controls.Add(label2); this.panel1.Controls.Add(this.cmbBoardVender); this.panel1.Controls.Add(repairTimeLabel); @@ -511,6 +524,16 @@ this.panel1.TabIndex = 86; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(244, 381); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(72, 16); + this.checkBox1.TabIndex = 44; + this.checkBox1.Text = "참고자료"; + this.checkBox1.UseVisualStyleBackColor = true; + // // cmbBoardVender // this.cmbBoardVender.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; @@ -518,7 +541,7 @@ this.cmbBoardVender.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "BoardVender", true)); this.cmbBoardVender.Enabled = false; this.cmbBoardVender.FormattingEnabled = true; - this.cmbBoardVender.Location = new System.Drawing.Point(358, 30); + this.cmbBoardVender.Location = new System.Drawing.Point(365, 30); this.cmbBoardVender.Name = "cmbBoardVender"; this.cmbBoardVender.Size = new System.Drawing.Size(176, 20); this.cmbBoardVender.TabIndex = 25; @@ -526,7 +549,7 @@ // repairTimeTextBox // this.repairTimeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "RepairTime", true)); - this.repairTimeTextBox.Location = new System.Drawing.Point(358, 346); + this.repairTimeTextBox.Location = new System.Drawing.Point(365, 341); this.repairTimeTextBox.Name = "repairTimeTextBox"; this.repairTimeTextBox.Size = new System.Drawing.Size(176, 21); this.repairTimeTextBox.TabIndex = 41; @@ -538,7 +561,7 @@ this.cmb분류.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "분류", true)); this.cmb분류.Enabled = false; this.cmb분류.FormattingEnabled = true; - this.cmb분류.Location = new System.Drawing.Point(89, 186); + this.cmb분류.Location = new System.Drawing.Point(89, 181); this.cmb분류.Name = "cmb분류"; this.cmb분류.Size = new System.Drawing.Size(148, 20); this.cmb분류.TabIndex = 11; @@ -562,7 +585,7 @@ this.cmb외주업체.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "외주업체", true)); this.cmb외주업체.Enabled = false; this.cmb외주업체.FormattingEnabled = true; - this.cmb외주업체.Location = new System.Drawing.Point(358, 307); + this.cmb외주업체.Location = new System.Drawing.Point(365, 302); this.cmb외주업체.Name = "cmb외주업체"; this.cmb외주업체.Size = new System.Drawing.Size(176, 20); this.cmb외주업체.TabIndex = 39; @@ -574,7 +597,7 @@ this.cmbSN.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "SN", true)); this.cmbSN.Enabled = false; this.cmbSN.FormattingEnabled = true; - this.cmbSN.Location = new System.Drawing.Point(358, 70); + this.cmbSN.Location = new System.Drawing.Point(365, 65); this.cmbSN.Name = "cmbSN"; this.cmbSN.Size = new System.Drawing.Size(176, 20); this.cmbSN.TabIndex = 27; @@ -587,7 +610,7 @@ this.cmbBoardName.FormattingEnabled = true; this.cmbBoardName.Items.AddRange(new object[] { "IONIZER"}); - this.cmbBoardName.Location = new System.Drawing.Point(89, 383); + this.cmbBoardName.Location = new System.Drawing.Point(89, 378); this.cmbBoardName.Name = "cmbBoardName"; this.cmbBoardName.Size = new System.Drawing.Size(148, 20); this.cmbBoardName.TabIndex = 23; @@ -600,7 +623,7 @@ this.cmbModel.FormattingEnabled = true; this.cmbModel.Items.AddRange(new object[] { "IONIZER"}); - this.cmbModel.Location = new System.Drawing.Point(89, 344); + this.cmbModel.Location = new System.Drawing.Point(89, 339); this.cmbModel.Name = "cmbModel"; this.cmbModel.Size = new System.Drawing.Size(148, 20); this.cmbModel.TabIndex = 21; @@ -613,7 +636,7 @@ this.cmbProcess.FormattingEnabled = true; this.cmbProcess.Items.AddRange(new object[] { "IONIZER"}); - this.cmbProcess.Location = new System.Drawing.Point(89, 305); + this.cmbProcess.Location = new System.Drawing.Point(89, 300); this.cmbProcess.Name = "cmbProcess"; this.cmbProcess.Size = new System.Drawing.Size(148, 20); this.cmbProcess.TabIndex = 19; @@ -625,7 +648,7 @@ this.cmbDivision.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Division", true)); this.cmbDivision.Enabled = false; this.cmbDivision.FormattingEnabled = true; - this.cmbDivision.Location = new System.Drawing.Point(89, 264); + this.cmbDivision.Location = new System.Drawing.Point(89, 259); this.cmbDivision.Name = "cmbDivision"; this.cmbDivision.Size = new System.Drawing.Size(148, 20); this.cmbDivision.TabIndex = 15; @@ -637,7 +660,7 @@ this.cmbLine.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Line", true)); this.cmbLine.Enabled = false; this.cmbLine.FormattingEnabled = true; - this.cmbLine.Location = new System.Drawing.Point(89, 225); + this.cmbLine.Location = new System.Drawing.Point(89, 220); this.cmbLine.Name = "cmbLine"; this.cmbLine.Size = new System.Drawing.Size(148, 20); this.cmbLine.TabIndex = 13; @@ -649,7 +672,7 @@ this.cmbSite.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Site", true)); this.cmbSite.Enabled = false; this.cmbSite.FormattingEnabled = true; - this.cmbSite.Location = new System.Drawing.Point(89, 149); + this.cmbSite.Location = new System.Drawing.Point(89, 144); this.cmbSite.Name = "cmbSite"; this.cmbSite.Size = new System.Drawing.Size(148, 20); this.cmbSite.TabIndex = 7; @@ -661,14 +684,14 @@ this.cmbUID.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "uid", true)); this.cmbUID.Enabled = false; this.cmbUID.FormattingEnabled = true; - this.cmbUID.Location = new System.Drawing.Point(358, 383); + this.cmbUID.Location = new System.Drawing.Point(365, 378); this.cmbUID.Name = "cmbUID"; this.cmbUID.Size = new System.Drawing.Size(176, 20); this.cmbUID.TabIndex = 43; // // tbCostNew // - this.tbCostNew.Location = new System.Drawing.Point(358, 149); + this.tbCostNew.Location = new System.Drawing.Point(365, 144); this.tbCostNew.Name = "tbCostNew"; this.tbCostNew.Size = new System.Drawing.Size(176, 21); this.tbCostNew.TabIndex = 31; @@ -678,7 +701,7 @@ // linkLabel4 // this.linkLabel4.AutoSize = true; - this.linkLabel4.Location = new System.Drawing.Point(42, 111); + this.linkLabel4.Location = new System.Drawing.Point(42, 106); this.linkLabel4.Name = "linkLabel4"; this.linkLabel4.Size = new System.Drawing.Size(41, 12); this.linkLabel4.TabIndex = 4; @@ -733,7 +756,7 @@ // linkLabel2 // this.linkLabel2.AutoSize = true; - this.linkLabel2.Location = new System.Drawing.Point(42, 72); + this.linkLabel2.Location = new System.Drawing.Point(42, 67); this.linkLabel2.Name = "linkLabel2"; this.linkLabel2.Size = new System.Drawing.Size(41, 12); this.linkLabel2.TabIndex = 2; @@ -834,7 +857,7 @@ this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.richTextBoxEx1.Name = "richTextBoxEx1"; this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + - "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + + "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + "Ex1\\par\r\n}\r\n"; this.richTextBoxEx1.SetColorWithFont = true; this.richTextBoxEx1.ShowToolStrip = true; @@ -912,7 +935,7 @@ this.richTextBoxEx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.richTextBoxEx2.Name = "richTextBoxEx2"; this.richTextBoxEx2.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + - "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + + "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + "Ex2\\par\r\n}\r\n"; this.richTextBoxEx2.SetColorWithFont = true; this.richTextBoxEx2.ShowToolStrip = true; @@ -974,6 +997,7 @@ this.tableAdapterManager.EETGW_JobReport_EBoardTableAdapter = this.ta; this.tableAdapterManager.EETGW_NoteTableAdapter = null; this.tableAdapterManager.EETGW_ProjecthistoryDTableAdapter = null; + this.tableAdapterManager.EETGW_ProjectResonTableAdapter = null; this.tableAdapterManager.EETGW_ProjectsScheduleTableAdapter = null; this.tableAdapterManager.EETGW_ProjectToDoTableAdapter = null; this.tableAdapterManager.EETGW_SaveCostTableAdapter = null; @@ -987,6 +1011,11 @@ this.tableAdapterManager.SPMasterTableAdapter = null; this.tableAdapterManager.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // tableAdapterManager1 + // + this.tableAdapterManager1.BackupDataSetBeforeUpdate = false; + this.tableAdapterManager1.UpdateOrder = FPJ0000.DSEboardTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // // fEboardData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1063,5 +1092,8 @@ private System.Windows.Forms.ComboBox cmbBoardVender; private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; private RichTextBoxEx.RichTextBoxEx richTextBoxEx2; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.CheckBox checkBox1; + private DSEboardTableAdapters.TableAdapterManager tableAdapterManager1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardData.cs b/SubProject/FPJ0000/EBoard/fEboardData.cs index e347cbe..c991757 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.cs @@ -36,7 +36,7 @@ namespace FPJ0000 ctl.Items.Clear(); ctl.Items.AddRange(list); ctl.Enabled = true; - + } private void fProjectData_Load(object sender, EventArgs e) @@ -49,21 +49,21 @@ namespace FPJ0000 //UID목록 var lst_uid = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.uid) == false).OrderBy(t => t.uid).GroupBy(t => t.uid).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbUID,lst_uid.Select(t => t.uid).ToArray()); + SetComboboxItems(cmbUID, lst_uid.Select(t => t.uid).ToArray()); //요청자 var lst_req = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.요청자) == false).OrderBy(t => t.요청자).GroupBy(t => t.요청자).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmb요청자,lst_req.Select(t => t.요청자).ToArray()); + SetComboboxItems(cmb요청자, lst_req.Select(t => t.요청자).ToArray()); - ////모델 - //var lst_mod = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Model) == false).OrderBy(t => t.Model).GroupBy(t => t.Model).Select(t => t.FirstOrDefault()); - //SetComboboxItems(cmbModel,lst_mod.Select(t => t.Model).ToArray()); - // cmbModel.Enabled = true; + //모델 + var lst_mod = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Model) == false).OrderBy(t => t.Model).GroupBy(t => t.Model).Select(t => t.FirstOrDefault()); + SetComboboxItems(cmbModel, lst_mod.Select(t => t.Model).ToArray()); + cmbModel.Enabled = true; - ////BoardName - //var lst_bon = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardName) == false).OrderBy(t => t.BoardName).GroupBy(t => t.BoardName).Select(t => t.FirstOrDefault()); - //SetComboboxItems(cmbBoardName,lst_bon.Select(t => t.BoardName).ToArray()); - // cmbBoardName.Enabled = true; + //BoardName + var lst_bon = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardName) == false).OrderBy(t => t.BoardName).GroupBy(t => t.BoardName).Select(t => t.FirstOrDefault()); + SetComboboxItems(cmbBoardName, lst_bon.Select(t => t.BoardName).ToArray()); + cmbBoardName.Enabled = true; //BoardVender var lst_bvn = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardVender) == false).OrderBy(t => t.BoardVender).GroupBy(t => t.BoardVender).Select(t => t.FirstOrDefault()); @@ -71,7 +71,7 @@ namespace FPJ0000 //SN var lst_srn = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.SN) == false).OrderBy(t => t.SN).GroupBy(t => t.SN).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbSN,lst_srn.Select(t => t.SN).ToArray()); + SetComboboxItems(cmbSN, lst_srn.Select(t => t.SN).ToArray()); ////status //var lst_sta = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Status) == false).OrderBy(t => t.Status).GroupBy(t => t.Status).Select(t => t.FirstOrDefault()); @@ -79,32 +79,32 @@ namespace FPJ0000 //분류 var lst_cat = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.분류) == false).OrderBy(t => t.분류).GroupBy(t => t.분류).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmb분류,lst_cat.Select(t => t.분류).ToArray()); + SetComboboxItems(cmb분류, lst_cat.Select(t => t.분류).ToArray()); //Site var lst_sit = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Site) == false).OrderBy(t => t.Site).GroupBy(t => t.Site).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbSite,lst_sit.Select(t => t.Site).ToArray()); + SetComboboxItems(cmbSite, lst_sit.Select(t => t.Site).ToArray()); //Line var lst_lin = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Line) == false).OrderBy(t => t.Line).GroupBy(t => t.Line).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbLine,lst_lin.Select(t => t.Line).ToArray()); + SetComboboxItems(cmbLine, lst_lin.Select(t => t.Line).ToArray()); //division var lst_div = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Division) == false).OrderBy(t => t.Division).GroupBy(t => t.Division).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbDivision,lst_div.Select(t => t.Division).ToArray()); + SetComboboxItems(cmbDivision, lst_div.Select(t => t.Division).ToArray()); ////Team //var lst_tem = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Team) == false).OrderBy(t => t.Team).GroupBy(t => t.Team).Select(t => t.FirstOrDefault()); //SetComboboxItems(cmbTeam,lst_tem.Select(t => t.Team).ToArray()); - ////Process - //var lst_prc = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Process) == false).OrderBy(t => t.Process).GroupBy(t => t.Process).Select(t => t.FirstOrDefault()); - //SetComboboxItems(cmbProcess,lst_prc.Select(t => t.Process).ToArray()); - // cmbProcess.Enabled = true; + //Process + var lst_prc = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Process) == false).OrderBy(t => t.Process).GroupBy(t => t.Process).Select(t => t.FirstOrDefault()); + SetComboboxItems(cmbProcess, lst_prc.Select(t => t.Process).ToArray()); + cmbProcess.Enabled = true; //외주업체 var lst_ext = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.외주업체) == false).OrderBy(t => t.외주업체).GroupBy(t => t.외주업체).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmb외주업체,lst_ext.Select(t => t.외주업체).ToArray()); + SetComboboxItems(cmb외주업체, lst_ext.Select(t => t.외주업체).ToArray()); })); @@ -142,9 +142,7 @@ namespace FPJ0000 } } - - - + this.checkBox1.Checked = dr.refdata; this.tbSdate.Text = dr.pdate; this.tbEdate.Text = dr.수리완료일; this.tbQty.Text = dr.QTY.ToString(); @@ -185,11 +183,11 @@ namespace FPJ0000 tbCostRepair.Focus(); return; } - - if(tbSdate.Text.isEmpty()==false) + + if (tbSdate.Text.isEmpty() == false) { - if(tbSdate.Text.isDate()==false) + if (tbSdate.Text.isDate() == false) { FCOMMON.Util.MsgE("날짜형태로 입력하세요\n\n예) 2000-01-01"); tbSdate.SelectAll(); @@ -213,7 +211,8 @@ namespace FPJ0000 this.dr.결과 = richTextBoxEx2.Text; this.dr.결과2 = richTextBoxEx2.Rtf; - + this.dr.refdata = this.checkBox1.Checked; + this.dr.pdate = tbSdate.Text.Trim(); this.dr.수리완료일 = tbEdate.Text.Trim(); @@ -305,7 +304,15 @@ namespace FPJ0000 tbCostReduct.Text = reduction.ToString(); } + private void toolStripButton1_Click(object sender, EventArgs e) + { + if (dr != null && (dr.RowState == DataRowState.Modified || dr.RowState == DataRowState.Unchanged)) + { + Util.openEboarditemPath(dr.idx); + } + else FCOMMON.Util.MsgE("자료가 저장되기 전에는 폴더를 확인할 수 없습니다.\r\n자료를 저장한 후 다시 시도하세요"); + } - + } } diff --git a/SubProject/FPJ0000/EBoard/fEboardData.resx b/SubProject/FPJ0000/EBoard/fEboardData.resx index 28a9728..4a7d4f9 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.resx +++ b/SubProject/FPJ0000/EBoard/fEboardData.resx @@ -236,10 +236,31 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + 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== + + + + 17, 17 + 230, 17 292, 17 + + 17, 56 + \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 1726f78..5e6ecce 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -51,6 +51,7 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -76,6 +77,7 @@ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.btOpenFolder = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -90,7 +92,6 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -130,19 +131,20 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.panel3.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -174,7 +176,8 @@ this.btFind, this.toolStripSeparator6, this.toolStripButton1, - this.toolStripButton2}); + this.toolStripButton2, + this.btOpenFolder}); this.bn.Location = new System.Drawing.Point(0, 639); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -367,10 +370,19 @@ 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(134, 22); - this.toolStripButton2.Text = "Performance Report"; + this.toolStripButton2.Size = new System.Drawing.Size(63, 22); + this.toolStripButton2.Text = "보고서"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // + // btOpenFolder + // + this.btOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("btOpenFolder.Image"))); + this.btOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btOpenFolder.Name = "btOpenFolder"; + this.btOpenFolder.Size = new System.Drawing.Size(75, 22); + this.btOpenFolder.Text = "폴더열기"; + this.btOpenFolder.Click += new System.EventHandler(this.btOpenFolder_Click); + // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -492,166 +504,6 @@ this.fpSpread1.TabIndex = 2; this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - 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 = 21; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Engineer"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "완료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Status"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Line"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Division"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Process"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Equipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Board Name"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "보드규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "S/N"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Qty"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "New Price($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "OutSourcing\r\nPrice($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Repair Cost\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Cost Reduction\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "외주업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; - this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; - this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Reduction\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "costreduction"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; - this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -1062,6 +914,173 @@ // this.ta.ClearBeforeFill = true; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + 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 = 22; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Engineer"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "완료일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Status"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Line"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Division"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Process"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Equipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Board Name"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "보드규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "S/N"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Qty"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "New Price($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "OutSourcing\r\nPrice($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Repair Cost\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Cost Reduction\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "외주업체"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "참고자료"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; + this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Reduction\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "costreduction"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; + this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; + this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "refdata"; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "참고자료"; + this.fpSpread1_Sheet1.Columns.Get(21).Tag = "refdata"; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 38F; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.RowHeader.Columns.Get(0).Width = 32F; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fEboardList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1081,7 +1100,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1090,6 +1108,7 @@ this.panel3.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1159,7 +1178,6 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel2; private dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter ta; private System.Windows.Forms.ToolStripButton toolStripButton1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton2; @@ -1176,5 +1194,7 @@ private System.Windows.Forms.ToolStripComboBox cmbYearE; private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripButton btOpenFolder; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 4a8b46d..7358a11 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -151,18 +151,32 @@ namespace FPJ0000 this.fpSpread1.SuspendLayout(); var col_status = this.fpSpread1.ActiveSheet.Columns["status"].Index; var col_costreduc = this.fpSpread1.ActiveSheet.Columns["costreduction"].Index; + var col_refdata = this.fpSpread1.ActiveSheet.Columns["refdata"].Index; for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { var state = this.fpSpread1.ActiveSheet.GetValue(i, col_status); string stateStr = string.Empty; if (state != null) stateStr = state.ToString(); + var vrefdata = this.fpSpread1.ActiveSheet.GetValue(i, col_refdata); + Boolean refdata = false; + if (vrefdata != null) refdata = (bool)vrefdata; + if (stateStr.ToLower().Contains("완료")) this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.FromArgb(240, 240, 240); else if (stateStr.ToLower().Contains("외주")) this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.LightSteelBlue; else this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White; this.fpSpread1.ActiveSheet.Cells[i, col_costreduc].BackColor = Color.FromArgb(240, 240, 240); + + if(refdata) + { + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta; + } + else + { + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black; + } } FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); this.fpSpread1.ResumeLayout(); @@ -377,7 +391,7 @@ namespace FPJ0000 var sht = book.getSheet(0); //2번쨰 줄부터 데이터를 기록한다. var row = 1; - foreach (dsPRJ.EETGW_JobReport_EBoardRow dr in this.dsMSSQL.EETGW_JobReport_EBoard.Select(this.bs.Filter,this.bs.Sort)) + foreach (dsPRJ.EETGW_JobReport_EBoardRow dr in this.dsMSSQL.EETGW_JobReport_EBoard.Select(this.bs.Filter, this.bs.Sort)) { if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue; sht.writeStr(row, 3, dr.요청자); @@ -443,7 +457,7 @@ namespace FPJ0000 //cols.Add("완료월"); book.save(sd.FileName); var dlg2 = FCOMMON.Util.MsgQ("파일생성 완료\n\n열까요?" + sd.FileName); - if(dlg2 == DialogResult.Yes) FCOMMON.Util.RunExplorer(sd.FileName); + if (dlg2 == DialogResult.Yes) FCOMMON.Util.RunExplorer(sd.FileName); } } @@ -604,7 +618,7 @@ namespace FPJ0000 { var dt = DateTime.Parse(this.cmbYearS.Text); var f = new FCOMMON.fSelectDay(dt); - if(f.ShowDialog() == DialogResult.OK) + if (f.ShowDialog() == DialogResult.OK) { this.cmbYearS.Text = f.dtPick.SelectionStart.ToShortDateString(); } @@ -619,5 +633,17 @@ namespace FPJ0000 this.cmbYearE.Text = f.dtPick.SelectionStart.ToShortDateString(); } } + + private void btOpenFolder_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.EETGW_JobReport_EBoardRow; + if (dr != null && (dr.RowState == DataRowState.Modified || dr.RowState == DataRowState.Unchanged)) + { + Util.openEboarditemPath(dr.idx); + } + else FCOMMON.Util.MsgE("자료가 저장되기 전에는 폴더를 확인할 수 없습니다.\r\n자료를 저장한 후 다시 시도하세요"); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx index 135adbe..e200888 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.resx +++ b/SubProject/FPJ0000/EBoard/fEboardList.resx @@ -223,20 +223,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPhZLrS1NhHMf3Kv+EsF70UohS0qioF6XpmhrY - zVLMvM0pmtrQhUG1mEblJTRRoUKUohcVWqZTm5pzTjeckZeszOZdc3NNdzlHd8769pyz5QyEfvDhefGc - 74fz+54j4Cbipjr5dKlOFVOm+yWU6yhy0jzl3KmnY0oH6KgH2rFjMk3l3tiXO/jQ1om826cx2eiVmSUz - a3Gsw2L3sWLjoPFl0YZbzbOIL/vqFOUo/bxRz0Tf15oWli3swLQL+hkG+lkGumkG2qkNqL+vo33cgXUG - aPlK4dabGaQ9GqP+kQjlHdSacwNDcyw+zjHkZDDISzbQO7mO9+NOInBjaJGFfsGFYuUswm50v+DDceWh - xovy2N+SmvNIq76A6o4GFDWWI0weiFCCqPgoIhSHUNFSwa9ipxksW52IkPYyvOBSadjr7tFWtE48RbWu - gJckVUWh4HkichviIa49g9TaVLQML6N1zI53I2tYJT0JFX00LxBVivyE8jxW960Hz0YVKFHn8JLkmmgS - PovMxxnQTDr4VbomKKhID1aHC8Kifo+Am8j7vbS0LgWGSS1q9ddxrzMfceUnkVwVC8O0EwZSLFew5oen - EwsRRCi2CI7flrsOF+5BYqUIQz8GUNyTBYVSiviH4WhQv8WneQYGUuzAlAv9BJPNhbA7XkGwzF8SItuN - 3PoEXK6JRELFKV4iVSZC1phB3iQc3P3QLItB7hMTbKTI4DytRxAi2zkfIttFHvJHSIE/zpWEI/tJCjTj - KhSrCpH1KgXimkswEIGe/Bs6IqBdbgTlqX0rnMjroxdXaQzPszy93xZwrS4T6SQoqY1Hfv3VzTsO5wZL - BM0+AWebs/gE/8NBVgjKaPIJjkg/OEeMP39v9/B2mH+tuvcntdi9cVJkZqdxZs1pG5kyuY1mCkYThUkv - ZruLh2veTrNYMlvdFEWtBlxp++yNCwQHMzuyg8TtnQckKkuQpIneJN1D4F/ETXSAuM26L7WtKzBFmSYQ - CAR/AF7/oOjSHDLtAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPhZLrS1NhHMf3qv6EsF70UojSyqioF6WpTQ3s + Zipm3uYUTZfowiBbTCPzEpqoUCFK0YsKtdKpTc05pxvO0DRTm/dLTZ2XXc7RnTO/PedsOQOhH3x4Xjzn + ++H8vucIuAm4r4q9VKhVhhZpVwJlWoqcNE8xd+ro0MIeOviJZuisVF16KOztHj60c4IedakXzfTy5LyR + NVk3YLK4WTZz0PixYEbOxxlEFo3YhGmKva6oc0LyNYuzv5bYnik7dNMMdDMMtFMMNJObUP3cQPOwFRsM + 0DBCIad+GgnPhqh/JIGyZmrdtom+WRZfZxlyMujlJZvoNGzg87CNCBzoW2Chm7cjTzEDv3vtb/hwRLHv + xA1Z2Ja44hoSyq+jvKUGubXF8JN5wZcgzDuDAPlJlDSU8KtYaAbGVRsCJJ0MLwgv9HvfPtiIxrGXKNdm + 8ZKYsmBkvY5Gek0kRJWXEV8Zj4YBIxqHLPj0bR1rpKdAeRfNC4Slwr3+MgmrHe3Aq0E5ClRpvCS2IoSE + ryD5eRLUBiu/StsYBSXpYdVqR2But1PATVB+J51RFQe9QYNK3V08bs1ERPEFxJaFQT9lg54UyxWsHnd2 + YiKCAPkOwbkHMvup7IOILhWib7wHeR0pkCsyEPnUHzWqD+ifY6AnxfZM2tFNWDTb4ffQJTgu9RD7SA8g + vToKNyuCEFVykZdkKKIhrU0ib+IP7r5vhkUv94kJZlLkUYnGKfCR7pvzke4nD3nAJ8sDVwv8kfoiDuph + JfKU2Uh5FwdRRTj0RKAj/4aWCGi7A94SlXuF85IuemGNxsAcy9M5Oo87VclIJEFxZSQyq29v33HYNlki + qHcLONusyS34H1aygndSnVtwOuOLrd+wsLXbw7thXF5xHIlpsLjipMjk1onpdZu5f/y3Y2KJwsQiBYOL + JYudh2veQrOYN5ocFEWted5q+u6KCwQnkltSvUXNrcfESpO3uI7eJtGJ119EdbSnqGn1cHxTm1ecIkEg + EAj+ABQBoLtReJTrAAAAAElFTkSuQmCC @@ -252,6 +252,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + 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== @@ -297,7 +312,7 @@ - 585, 17 + 17, 56 320, 17 diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 8d1ff8c..061eb57 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -533,6 +533,7 @@ Model1.tt + Model1.tt diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 2155dd0..e73430c 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -39,11 +39,12 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -69,6 +70,7 @@ this.btReportDay = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.btImport = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -106,7 +108,7 @@ this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.btOpenFolder = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -148,7 +150,8 @@ this.toolStripButton1, this.toolStripButton3, this.toolStripButton5, - this.btImport}); + this.btImport, + this.btOpenFolder}); this.bn.Location = new System.Drawing.Point(0, 730); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -352,6 +355,17 @@ this.toolStripButton3.Text = "적정인원보고서"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(63, 22); + this.toolStripButton5.Text = "보고서"; + this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // btImport // this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -486,6 +500,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; @@ -524,7 +539,7 @@ 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 = 14; + this.fpSpread1_Sheet1.ColumnCount = 15; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -535,13 +550,14 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; - 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 = "*"; - 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, 7).Value = "(공정)업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; + 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.Rows.Get(0).Height = 28F; this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; @@ -576,52 +592,58 @@ this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류"; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName"; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType1.DecimalPlaces = 0; numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType1.MaximumValue = 2147483647D; numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; numberCellType2.MaximumValue = 999999999999999D; numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; numberCellType3.MaximumValue = 999999999999999D; numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot"; - this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag"; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "#"; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "#"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -783,16 +805,14 @@ this.richTextBox1.TabIndex = 5; this.richTextBox1.Text = ""; // - // toolStripButton5 + // btOpenFolder // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - 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(63, 22); - this.toolStripButton5.Text = "보고서"; - this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + this.btOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("btOpenFolder.Image"))); + this.btOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btOpenFolder.Name = "btOpenFolder"; + this.btOpenFolder.Size = new System.Drawing.Size(75, 22); + this.btOpenFolder.Text = "폴더열기"; + this.btOpenFolder.Click += new System.EventHandler(this.btOpenFolder_Click); // // fJobReport // @@ -879,7 +899,6 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.ToolStripButton toolStripButton3; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripSplitButton btSearch; private System.Windows.Forms.ToolStripMenuItem 태그자료만조회ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel4; @@ -887,5 +906,7 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton btImport; private System.Windows.Forms.ToolStripButton toolStripButton5; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton btOpenFolder; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index c64404f..ef1b786 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -234,7 +234,7 @@ namespace FPJ0000 //사용자 목록다중선택으로 인해 처리 - var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww"; + var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue"; sql += " FROM JobReport"; sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)"; if (request != "%") @@ -660,7 +660,7 @@ namespace FPJ0000 private void k5DailyFormToolStripMenuItem_Click(object sender, EventArgs e) { - + var f = new JobReport_.rK5Dailyform(); f.Show(); } @@ -673,7 +673,7 @@ namespace FPJ0000 private void btImport_Click(object sender, EventArgs e) { - + } private void toolStripButton5_Click(object sender, EventArgs e) @@ -681,5 +681,17 @@ namespace FPJ0000 var f = new JobReport_.rK5Dailyform(); f.Show(); } + + private void btOpenFolder_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.JobReportRow; + if (dr != null && (dr.RowState == DataRowState.Modified || dr.RowState == DataRowState.Unchanged)) + { + Util.openjobreportitem(dr.idx); + } + else FCOMMON.Util.MsgE("자료가 저장되기 전에는 폴더를 확인할 수 없습니다.\r\n자료를 저장한 후 다시 시도하세요"); + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 8241208..a89d346 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -260,20 +260,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s - ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz - vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud - t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA - 7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx - s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA - lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw - SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O - bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch - 98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec - 1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H - cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss - RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS - dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NhHMf3Kv+EsF70UohScmFRL0pTmxrY + zVTUvM0pmprowiBTppF5CU1UqBCl6EWFqOnUpuac0w1nZNpS8zov4GVOdzlHd8789pyz4QyEfvDhefGc + 74fz+54j4CboiTLhRrlGEV6h2Qou1lDkpHkquVNLh5cP06Ev1BOXparq0xEfj/GhwxPybFC1bqY3VzZM + rNG6C6PFzaaZg8bvVTMK2gyIrZi0iTLlHq6oc8JK1etrxh12eMEO7SIDrYGBZoGBen4Pyj+76NJbscsA + 7ZMUCloWkfxqgvpHElzUS+3Y9jC6xOL7EkNOBiO8ZA8DM7v4qrcRgQOjqyy0K3aUyA0IeNz3gQ9HVfrP + 3SuO2JfU3UFy7V3UdjehuLkSAYXe8CeISi4hSOaHqvYqfhULzWDNZEOQdIDhBZHlAZ/7xjvQMf0WtZo8 + XhJfE4q893HIaoqGuP4mkuqT0D62ho4JC7783ME26SlYNkjzAlG1yCNUls1qpvrxblyGMmUmL0moCyPh + W0h7nQrVjJVfpXeagoL0YLLaEVw85BRwE1I6QOc0JEI3o0a99hGe9+QiqvIaEmoioFuwQUeK5QpWzTo7 + MRJBkOyQ4MrTQvuF/FOIqxZhdHYYJf3pkMlzEP0yEE3KVvxYZqAjxQ7P2zFEWDfbEVDkEvhKPSVC6Ulk + NcYgti4EMVXXeUmOPA7S5lTyJoHg7kcNLEa4T0wwkyL9ctVOgVB6fFkoPUEe8oQwzxO3ywKR8SYRKr0C + JYp8pH9KhLguEjoi0JJ/Q0MEtN0B32yle4WruYP06jaNsWWWZ2BqBQ8b0pBCgpL6aOQ2Pji447DtsfDJ + lrsFQmJbMroF/8NKVvBJbXMLLuZ8s+kNm/tHPXwUJrPVcTa+3eKKkyLTeuYWd2xm/dKWY26Dwtw6hRkX + GxY7D9e8hWaxYbI4KIra9rrf+csVFwjOp3Vn+Ii7es5JFEYfSSt9QIoT75QWJ+IW2kvcaTqT1NnrnShP + FggEgr9Ef6FyBTeROAAAAABJRU5ErkJggg== @@ -286,6 +286,21 @@ f9ACdsMRsLfsgtSLhDC/ugQEF/f/gszO3nIBjZIwIaA8wjB4/1oukE6zVAQ6WOssLAjS2bwrkB5ogZAU MJkj4FQ9v46shJf66AIzCrzn5G5sZmIBK0AisMdAp4F6BWYm7JyD9Ycxf8jQQxybOGd5AAAAAElFTkSu QmCC + + + + + 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/FPJ0000/JobReport_/rK5Dailyform.cs b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs index 12d341e..14adf37 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs @@ -58,12 +58,10 @@ namespace FPJ0000.JobReport_ //var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter(); //var rawdata0 = ta.GetData(FCOMMON.info.Login.gcode, sd, ed); var rawdata = db.vJobReportForUser.AsNoTracking() - .Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1) + .Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0) .OrderBy(t => t.pdate).GroupBy(t => t.pdate); //ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString()); - - // var rawdata = rawdata0.GroupBy(t => t.pdate); this.progressBar1.Maximum = rawdata.Count(); @@ -75,6 +73,9 @@ namespace FPJ0000.JobReport_ this.progressBar1.Value += 1; var drDate = item.FirstOrDefault(); + if(drDate.ww == "19") + Console.WriteLine("asdf"); + //근무일원 var 휴가인원 = item.Where(t => t.svalue == "휴가").Count(); var 파견인원 = item.Where(t => t.svalue == "파견").Count(); diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 30af276..b6c176b 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -576,6 +576,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 47abed2..09730a0 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVJEFrTKUtcmLY0WGChF - SKESZ+02HWoyKiosXVMuc6WstRajWrmlk6lpS1vSV/sy+7Ld2tzW2sronu5uh+6WP9ULHg7u/TwPbz68 - if/G6PiIrptBGKzvoRtexMmhNyDpV4/EsYTB8Zh2YGx5aeBhFGZ3BH0PIiBSmV/IV1O7ixUzEmhP7Hu+ - lzjla4PBq4VujMQJd4vws9H0DGJGQr/nqzAfWrgMOnAJ5rkLIJAHbzh0cX7dAtNoRJjnQli8YeSKNxw8 - 75cU1FoUqmp6Fyp75VD3KSR+wjoZEruyRBIZaM7MrBbUWipUSn05qx9tRee4HlVndwhBnuGJULbAPh2G - fSoE52wIb78ksbd7SihQD1aoFNR2lrzbhD2mKpS2F0HesQUjvjCsvCaZvzd4/SmB6g4fVPTOmkpKzrY4 - GyGjitkSqmCb8dYSEukV2KYZwWvnvkKBsAW3gY1TvfUAlP3lqLu2D0cdh1FGbWI3Uxu38ht12j4gnlqB - Y4bB7dmsCNcTBsn02stqrtRA5yFxxF6PUqqILWzNhnnaRt5h+dtP3PFnN7g/xx2S8zGDXKl7lZB1FaNE - V4DC4xtWwzza64tCgYsL8mGh4Ab3ELm8CMahMfrWvQPy6kvEuAL304jg9QS4Aj6Qr7Juz28xI6GZfo5o - 8geYeAafo2kEmRSI3QYv8iVrvmcXMxKOmRcmGnoCqYaeedSd82P/6bV7+UcI4g9ANizFsmzDCQAAAABJ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF + SKESs3bThpqMigpL15TLXClrrcUoLbd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq/qWIU7MSGDc0e+5 + Xuq0twUGjw76US1OuBrJzzrTM4gZCT3ur2TeP38FjP8yzLMXQSEHwXDo0tyaBaaRMJlnQ1k8IWRLMBy8 + 4JMUVFkUqgpmF8q65FB3KyR+yjoRFLsyhONpaM5OrxRUWUpVSn0J1zzShLaxZpSf20GCAgPjwUyBfSoE + +2QQzpkg3n5JYG/HJClQ95WqFPR2TnuvHntM5Sg+VQB56xYMekOwCppg/97g9ac4Klq9UDE7K8toOdfo + rIOMLuSK6LxtxtuLiKeWYZtiidfOf0kB2YLfwMarxnoAyp4SVF/fh6OOw9hMb+A20uu3Chu12T4gllyG + Y5rFnZmMqOEnLBKp1ZfVXK2E3q3FEXsNiukCLr8pExZoGXyHpW8/cdeX2eD+LH9IzscssqXuUkLWXogi + fR7yj69bCQvobiyQgmE+KIRJwU3+IbJ5EYhBY/SueQfaay8R5QtcT8PE6/bzBUIgV5s63L/FjIQG5jki + iR9gY2l8jqQQYJOgdhs8yJWsYcguZiQcM8+P13b6k7Wdc6g+78P+M6v38o9Q1B82NSzBGIz5VAAAAABJ RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwcmMSBoxPDwESQYBXkLypCwGUJQ2AYIQ1axjG10Y0w6gY52fazr+vW/UUVNTHx802/6 - yP/z/T1K/bcWhwrmQ4OntfAvXh4+HvC/OLQ30FOQ85PfFOSMjRXtMXGKcrdZVMNIAzDIlfHOc0qJITJW - klx1nVO/OTp7RQm5ykLMqyNnTZyi6IHCuKErUCN1kIL1kNgnkEN9MFI8yUrA0EXi7Z331BY4jksy/Rba - xCnK13FYSGvbBG5Cwt8I4WMlNqdLEJu5DN5bBX7hBvj569jylBOXkc44+PqPiiZOAnoLtZS8Dp5uwtZc - Dbjxa5C5KVJVMKtn7vHvHWTG8/TmKyae6eCYlp0/rRLLgC5lQV1moEbvg6a7YXO60TrKonNiDQ5PGJm9 - mTgJaLIkDV2GLriR4u3QNvqQXG+BsnoH3oU2DM1yWP4sYWVDxVRAwMj8Fwza7uomTv5Cs0VNawK0TRuS - XHu2qhKughwsR48zisWIiGlWhjMoYZLYG1XR9ZaFiVOU516+Ymg8gZ9CXauHEqokcBkk38Vs2/6YCmcg - gQl/AqOMiNmwivbxyG7AUm1eVI7Tcd+7znRiuRWi7wFEpg7ip2p0kZkX1ySM+3bgjN+vqmgeXtoNYKpz - rzI1BzvoWwdinpo85Ue/HqjTp/wC5gjkYhXMkOq2DyKstY8Me8WJ82bE79VgZ/c1O1hrL9lF92QUjx2T - aWtti+EdaYG7sVh4XppbbB79c72sOHXJ9fACH7Q3YPhmkWR+/js9K91fPGI9KTtun9ndxb+Jor4CPqkk - GhONv8UAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy + JB5MNF7ARIMJBw9UYsC6YViUpBCMguyCUiS0hhAItAWEIh2xlLZOS6lMBabMdJZOp/P8WkZRExOXl3mZ + Jd/v/Zeh/lvLw0WL4aGzauQXr46cDAZeHtkf7C3K+8lvi/LGx0v2GThFudtNiq5nAOjkynr3OS3HER0v + S625LijfHJu/JoddFWHf62PnDZyi6MHihK7JUKJ1EEP1EJmnkML90NMcyUpC1wTind339DZYlk35Bky0 + gVOUv/Mon1F3CNyEZKAR/IdqbM2WIT53FZy3BtzSLXCLN7HtqSSuIJ2x8A8cFwycBPQVq2lpAxzdhO0F + C9iJG5DYGVKVN6pn74nvHWTH8/QVygae7eCEmps/oxBLgCbmQE3yQYk9Bk33wOZ0o22MQdfUOhyeCLJ7 + M3AS0GRK6ZoEjXcjzdmhbvYjtdEKee0+vEvtGJ5nsfpZxKdNBTNBHqOLXzBke6AZOPkLVpOSUXmoWzak + 2I5cVTlSAylUiV5nDMtRAbOMBGdIxDSxN6age5KBgVOU51GhrKscgZ9BWa+HHK4mcAVE/+Vc24G4Amcw + ialAEmM+AfMRBR0T0b2AlbsFMSlBJ1YmuzLJ1TYI/icQfHUQPtaim8y8vC5iwr8LZ/1uTYF1ZGUvwFeb + f91nOdxJ3zkU91gK5B/9ZvChNhPgsUAgFyNjjlS3vRdgtjTr9qpTF42I36vBzhywOhhzH9lFz3QMLY6p + jNnSontHW+FuLOVflOeXGkf/XK+qzlxxNV/iQvYGjNwuEY3Pf6fn5QdLR82nJce9c3u7+DdR1Fcz4yQR + j0qf7QAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Util.cs b/SubProject/FPJ0000/Util.cs new file mode 100644 index 0000000..86d5cd7 --- /dev/null +++ b/SubProject/FPJ0000/Util.cs @@ -0,0 +1,106 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FPJ0000 +{ + public static class Util + { + public static void openjobreportitem(int idx) + { + //업무일지 관려 ㄴ폴더 열기 -- 210708 + OpenPath("JobReportItem", idx.ToString()); + } + public static void openEboarditemPath(int idx) + { + //전자시 ㄹ업무일지 관련 폴더 열긴 -- 210708 + OpenPath("EBoardJobItem", idx.ToString()); + } + + static void OpenPath(string group, string dataidx, Boolean openexplore = false) + { + //전자시 ㄹ업무일지 관련 폴더 열긴 -- 210708 + + var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", group); + if (System.IO.Directory.Exists(serverpath) == false) + { + try + { + System.IO.Directory.CreateDirectory(serverpath); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("기본 폴더 를 생성하지 못했습니다\n" + ex.Message); + } + } + + var path = System.IO.Path.Combine(serverpath, dataidx); + if (System.IO.Directory.Exists(path) == false) + { + try + { + System.IO.Directory.CreateDirectory(path); + + //string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" }; + //foreach (var dir in subdir) + // System.IO.Directory.CreateDirectory(path + "\\" + dir); + + } + catch (Exception eX) + { + FCOMMON.Util.MsgE("저장소 생성실패\n" + eX.Message); + return; + } + } + + + if (openexplore) + FCOMMON.Util.RunExplorer(path); + else + { + var f = new FCOMMON.fFileExplorer(path); + f.ShowDialog(); + } + } + + public static void OpenProjectPath(string tbPath) + { + if (tbPath.StartsWith("\\") == false) + { + if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); + else tbPath = "\\" + tbPath; + } + //\\10.131.32.29\Data + var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project"); + if (System.IO.Directory.Exists(serverpath) == false) + { + FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + + serverpath); + return; + } + + var path = serverpath + tbPath; + if (System.IO.Directory.Exists(path) == false) + { + try + { + System.IO.Directory.CreateDirectory(path); + + string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" }; + foreach (var dir in subdir) + System.IO.Directory.CreateDirectory(path + "\\" + dir); + + } + catch (Exception eX) + { + FCOMMON.Util.MsgE("프로젝트 저장소 생성실패\n" + eX.Message); + return; + } + } + + FCOMMON.Util.RunExplorer(path); + } + } +} diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index f658fbd..e6d725e 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -3573,6 +3573,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columntag; + private global::System.Data.DataColumn columnsvalue; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public JobReportDataTable() { @@ -3790,6 +3792,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn svalueColumn { + get { + return this.columnsvalue; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3849,7 +3859,8 @@ namespace FPJ0000 { string process, string gcode, string description2, - string tag) { + string tag, + string svalue) { JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3874,7 +3885,8 @@ namespace FPJ0000 { process, gcode, description2, - tag}; + tag, + svalue}; rowJobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowJobReportRow); return rowJobReportRow; @@ -3927,6 +3939,7 @@ namespace FPJ0000 { this.columngcode = base.Columns["gcode"]; this.columndescription2 = base.Columns["description2"]; this.columntag = base.Columns["tag"]; + this.columnsvalue = base.Columns["svalue"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3978,6 +3991,8 @@ namespace FPJ0000 { base.Columns.Add(this.columndescription2); this.columntag = new global::System.Data.DataColumn("tag", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columntag); + this.columnsvalue = new global::System.Data.DataColumn("svalue", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsvalue); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -4007,6 +4022,8 @@ namespace FPJ0000 { this.columngcode.MaxLength = 10; this.columndescription2.MaxLength = 2147483647; this.columntag.MaxLength = 255; + this.columnsvalue.ReadOnly = true; + this.columnsvalue.MaxLength = 255; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8147,6 +8164,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn column결과2; + private global::System.Data.DataColumn columnrefdata; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_JobReport_EBoardDataTable() { @@ -8452,6 +8471,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn refdataColumn { + get { + return this.columnrefdata; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8522,7 +8549,8 @@ namespace FPJ0000 { string memo, string BoardVender, string 원인2, - string 결과2) { + string 결과2, + bool refdata) { EETGW_JobReport_EBoardRow rowEETGW_JobReport_EBoardRow = ((EETGW_JobReport_EBoardRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -8558,7 +8586,8 @@ namespace FPJ0000 { memo, BoardVender, 원인2, - 결과2}; + 결과2, + refdata}; rowEETGW_JobReport_EBoardRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_JobReport_EBoardRow); return rowEETGW_JobReport_EBoardRow; @@ -8622,6 +8651,7 @@ namespace FPJ0000 { this.columnBoardVender = base.Columns["BoardVender"]; this.column원인2 = base.Columns["원인2"]; this.column결과2 = base.Columns["결과2"]; + this.columnrefdata = base.Columns["refdata"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8695,6 +8725,8 @@ namespace FPJ0000 { base.Columns.Add(this.column원인2); this.column결과2 = new global::System.Data.DataColumn("결과2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.column결과2); + this.columnrefdata = new global::System.Data.DataColumn("refdata", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrefdata); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -13723,6 +13755,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string svalue { + get { + try { + return ((string)(this[this.tableJobReport.svalueColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'svalue\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableJobReport.svalueColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -13950,6 +13998,18 @@ namespace FPJ0000 { public void SettagNull() { this[this.tableJobReport.tagColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssvalueNull() { + return this.IsNull(this.tableJobReport.svalueColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsvalueNull() { + this[this.tableJobReport.svalueColumn] = global::System.Convert.DBNull; + } } /// @@ -17978,6 +18038,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool refdata { + get { + if (this.IsrefdataNull()) { + return false; + } + else { + return ((bool)(this[this.tableEETGW_JobReport_EBoard.refdataColumn])); + } + } + set { + this[this.tableEETGW_JobReport_EBoard.refdataColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -18337,6 +18413,18 @@ namespace FPJ0000 { public void Set결과2Null() { this[this.tableEETGW_JobReport_EBoard.결과2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrefdataNull() { + return this.IsNull(this.tableEETGW_JobReport_EBoard.refdataColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrefdataNull() { + this[this.tableEETGW_JobReport_EBoard.refdataColumn] = global::System.Convert.DBNull; + } } /// @@ -24588,6 +24676,7 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; tableMapping.ColumnMappings.Add("gcode", "gcode"); tableMapping.ColumnMappings.Add("description2", "description2"); tableMapping.ColumnMappings.Add("tag", "tag"); + tableMapping.ColumnMappings.Add("svalue", "svalue"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -24692,7 +24781,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -24713,9 +24802,9 @@ ORDER BY pdate DESC"; this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport -WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) and isnull(tag,'') <> '' +WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate 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, "", "", "")); @@ -24725,7 +24814,7 @@ ORDER BY pdate DESC"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -31228,6 +31317,7 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so tableMapping.ColumnMappings.Add("BoardVender", "BoardVender"); tableMapping.ColumnMappings.Add("원인2", "원인2"); tableMapping.ColumnMappings.Add("결과2", "결과2"); + tableMapping.ColumnMappings.Add("refdata", "refdata"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -31257,7 +31347,8 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so "ull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Pro" + "cess = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNul" + "l_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_Board" + - "Vender)))"; + "Vender)) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Origi" + + "nal_refdata)))"; 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -31311,10 +31402,12 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so 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_BoardVender", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_refdata", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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 [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2); -SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2], [refdata]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2, @refdata); +SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -31347,6 +31440,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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 [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @" + @@ -31356,37 +31450,39 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, "irCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [Repair" + "Time] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site" + "] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardV" + - "ender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2 WHERE (([idx] = @Original_idx)" + - " AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR" + - " ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid]" + - " = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Origina" + - "l_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완" + - "료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Sta" + - "tus)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@Is" + - "Null_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Di" + - "vision = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@" + - "IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_" + - "Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_Boa" + - "rdName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND " + - "((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY =" + - " 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [" + - "NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND " + - "[OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1" + - " AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNu" + - "ll_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Origina" + - "l_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Origi" + - "nal_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTim" + - "e] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([" + - "import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Origi" + - "nal_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Sit" + - "e)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND" + - " ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)" + - ") AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @" + - "Original_BoardVender)));\r\nSELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류," + - " Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, Co" + - "stReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS user" + - "name, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인" + - "2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC"; + "ender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2, [refdata] = @refdata WHERE ((" + + "[idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 A" + + "ND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [u" + + "id] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL" + + ") OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([" + + "수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([S" + + "tatus] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @O" + + "riginal_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_L" + + "ine)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Origi" + + "nal_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original" + + "_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Mod" + + "el)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Ori" + + "ginal_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN" + + ")) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@I" + + "sNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@" + + "IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((" + + "@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_Re" + + "pairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([Cos" + + "tReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NUL" + + "L) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] I" + + "S NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [" + + "import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid)" + + " AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR (" + + "[Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] " + + "= @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process" + + "] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL)" + + " OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_refdata = 1 AND [refd" + + "ata] IS NULL) OR ([refdata] = @Original_refdata)));\r\nSELECT idx, gcode, pdate, u" + + "id, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPr" + + "ice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, d" + + "bo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, mem" + + "o, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (id" + + "x = @idx) ORDER BY pdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -31419,6 +31515,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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, "", "", "")); @@ -31471,6 +31568,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, this._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_BoardVender", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_refdata", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_refdata", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "refdata", 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, "", "", "")); } @@ -31488,7 +31587,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, - wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 + wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) ORDER BY pdate DESC"; @@ -31641,7 +31740,8 @@ ORDER BY pdate DESC"; string Original_Site, string Original_memo, string Original_Process, - string Original_BoardVender) { + string Original_BoardVender, + global::System.Nullable Original_refdata) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -31848,6 +31948,14 @@ ORDER BY pdate DESC"; this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[51].Value = ((string)(Original_BoardVender)); } + if ((Original_refdata.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[53].Value = ((bool)(Original_refdata.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[53].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)) { @@ -31899,7 +32007,8 @@ ORDER BY pdate DESC"; string Process, string BoardVender, string 원인2, - string 결과2) { + string 결과2, + global::System.Nullable refdata) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -32081,6 +32190,12 @@ ORDER BY pdate DESC"; else { this.Adapter.InsertCommand.Parameters[30].Value = ((string)(결과2)); } + if ((refdata.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[31].Value = ((bool)(refdata.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[31].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)) { @@ -32133,6 +32248,7 @@ ORDER BY pdate DESC"; string BoardVender, string 원인2, string 결과2, + global::System.Nullable refdata, int Original_idx, string Original_gcode, string Original_pdate, @@ -32161,6 +32277,7 @@ ORDER BY pdate DESC"; string Original_memo, string Original_Process, string Original_BoardVender, + global::System.Nullable Original_refdata, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -32343,213 +32460,227 @@ ORDER BY pdate DESC"; else { this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(결과2)); } - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx)); + if ((refdata.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[31].Value = ((bool)(refdata.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_gcode)); } if ((Original_pdate == 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_pdate)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_pdate)); } if ((Original_uid == 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_uid)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid)); } if ((Original_요청자 == 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_요청자)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_요청자)); } if ((Original_수리완료일 == 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_수리완료일)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_수리완료일)); } if ((Original_Status == 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_Status)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_Status)); } if ((Original_분류 == 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_분류)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_분류)); } if ((Original_Line == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_Line)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_Line)); } if ((Original_Division == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_Division)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_Division)); } if ((Original_Team == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_Team)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_Team)); } if ((Original_Model == 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_Model)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_Model)); } if ((Original_BoardName == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_BoardName)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_BoardName)); } if ((Original_SN == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_SN)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_SN)); } if ((Original_QTY.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_QTY.Value)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_QTY.Value)); } else { - 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; } if ((Original_NPrice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((decimal)(Original_NPrice.Value)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((decimal)(Original_NPrice.Value)); } else { - 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; } if ((Original_OPrice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((decimal)(Original_OPrice.Value)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((decimal)(Original_OPrice.Value)); } else { - 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; } if ((Original_RepairCost.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((decimal)(Original_RepairCost.Value)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((decimal)(Original_RepairCost.Value)); } else { - 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; } if ((Original_CostReduction.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((decimal)(Original_CostReduction.Value)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((decimal)(Original_CostReduction.Value)); } else { - 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; } if ((Original_외주업체 == null)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_외주업체)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_외주업체)); } if ((Original_RepairTime.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((double)(Original_RepairTime.Value)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((double)(Original_RepairTime.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_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[72].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((bool)(Original_import.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; } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[74].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((System.DateTime)(Original_wdate)); if ((Original_Site == null)) { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_Site)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_Site)); } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_memo)); } if ((Original_Process == null)) { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_Process)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_Process)); } if ((Original_BoardVender == null)) { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_BoardVender)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_BoardVender)); } - this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(idx)); + if ((Original_refdata.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((bool)(Original_refdata.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[86].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)) { @@ -32602,6 +32733,7 @@ ORDER BY pdate DESC"; string BoardVender, string 원인2, string 결과2, + global::System.Nullable refdata, int Original_idx, string Original_gcode, string Original_pdate, @@ -32629,8 +32761,9 @@ ORDER BY pdate DESC"; string Original_Site, string Original_memo, string Original_Process, - string Original_BoardVender) { - return this.Update(gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Model, Original_BoardName, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_import, Original_wuid, Original_wdate, Original_Site, Original_memo, Original_Process, Original_BoardVender, Original_idx); + string Original_BoardVender, + global::System.Nullable Original_refdata) { + return this.Update(gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Model, Original_BoardName, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_import, Original_wuid, Original_wdate, Original_Site, Original_memo, Original_Process, Original_BoardVender, Original_refdata, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 5a11a17..7c9bc36 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -803,38 +803,38 @@ WHERE (Project = @pidx) - + INSERT INTO JobReport (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag) VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC @@ -847,33 +847,33 @@ ORDER BY pdate DESC - + UPDATE JobReport SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag WHERE (idx = @Original_idx); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -902,6 +902,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r + @@ -932,9 +933,9 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1 SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport -WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) and isnull(tag,'') <> '' +WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC @@ -949,7 +950,7 @@ ORDER BY pdate DESC SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC @@ -2005,7 +2006,7 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so - DELETE FROM [EETGW_JobReport_EBoard] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender))) + DELETE FROM [EETGW_JobReport_EBoard] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Original_refdata))) @@ -2059,13 +2060,15 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so + + - INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2); -SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2], [refdata]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2, @refdata); +SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC @@ -2098,13 +2101,14 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, + SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, - wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 + wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) ORDER BY pdate DESC @@ -2118,8 +2122,8 @@ ORDER BY pdate DESC - UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Model] = @Model, [BoardName] = @BoardName, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardVender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2 WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender))); -SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC + UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Model] = @Model, [BoardName] = @BoardName, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardVender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2, [refdata] = @refdata WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)) AND ((@IsNull_refdata = 1 AND [refdata] IS NULL) OR ([refdata] = @Original_refdata))); +SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC @@ -2152,6 +2156,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, + @@ -2204,6 +2209,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, + + @@ -2245,6 +2252,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, + @@ -3350,6 +3358,13 @@ WHERE (idx = @idx) + + + + + + + @@ -4229,6 +4244,7 @@ WHERE (idx = @idx) + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 4d975f9..b3aaec5 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,26 +4,26 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file