From 146f32c64efbf6219823845d52e3162d7542778c Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 15 Dec 2022 09:12:19 +0900 Subject: [PATCH] =?UTF-8?q?cr=20=EC=88=98=EB=A0=B9=EC=9E=90,=20=EC=88=98?= =?UTF-8?q?=EB=A0=B9=EC=9D=BC=20=EC=B9=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.resx | 14 +- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- .../FPJ0000/Project/fPartList.Designer.cs | 53 +- SubProject/FPJ0000/Project/fPartList.resx | 28 +- .../FPJ0000/Project/fProjectList.Designer.cs | 425 ++++----- SubProject/FPJ0000/Project/fProjectList.resx | 44 +- .../Project/fProjectPartListEdit.Designer.cs | 72 +- .../FPJ0000/Project/fProjectPartListEdit.resx | 9 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 808 ++++++++++++++---- SubProject/FPJ0000/dsPRJ.xsd | 190 ++-- SubProject/FPJ0000/dsPRJ.xss | 30 +- 12 files changed, 1147 insertions(+), 558 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 189837b..ba149fd 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("22.12.13.1400")] -[assembly: AssemblyFileVersion("22.12.13.1400")] +[assembly: AssemblyVersion("22.12.15.0900")] +[assembly: AssemblyFileVersion("22.12.15.0900")] diff --git a/Project/fMain.resx b/Project/fMain.resx index 949bbd2..574e687 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lz4j7U7Mj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPZV9r+1Z8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/vtCb8vV7o9blnWyHc - gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc5v7tYpDa/20VTnuLr3d+BMkV3Ox5B9WCCmAuKLrZUwLi - v2iNEH9c5vn/VoblnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu + /U7m/E+5XP8/92TF/3lzYj/UbM//l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPZV1t/VZ8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf9vt8b/vV7o9blnWyHc + gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc6vbtYpDa/20VTnuLr3V8BMkV3Ox5B9WCCmAuKLrZUwLi + v2iNEH9c5vn/ZobFnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bPgd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP6fvV3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQDgIKwUgNNiRgAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b3gd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP7vPZ3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQC0pqv/CH07VQAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 4b96575..3d5752d 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY - zVTMdDqnaGpDFwbZYi4ydaGJChWiFL2o0C46talzzumGW2QuU5v3C3hZ6i7n6M7023POlhoI/eDD8+I5 - 3w/n9z2Hx07YfW3ypVKDOrrM8DtcZqDISXMo2dNIR5f20ZFP9JazUl1FQMzbfVxo90Q86tEt2ulli8Xi - sTnXYXPssGxnofFz3o7CT9OILxt2CbJV+31R70QV6xfZcN+kG8YpBsZpBoZJBvqJDWh/raN1yIl1Bmga - plD4YQqpzyzUP5JwWSu15tqAecaDrzMMORn0c5INdFvX8WXIRQSbMM97YJxzQ6GaRsi9zjdcOE4ZPH5D - FrMlrr6G1KrrqGqrR1GDEiGyQAQTBIozCJOfRHlTObeKg2awsOJCWFI3wwliS0Pedw42o3n0JaoM+Zwk - qTIS+a8TkVMfD1HNZaTUpKBpYAHNFgc+f1/DKukpXN5DcwJBhWB/gCzXYxjpwqtBOUq02ZwkuTqKhK8g - 43k6dFYnt0rHKAU16WHF6UZ4Ua9XwE5EcTctqRXCZNWjxngXj9vzEKe8gOTKGJgmXTCRYtmCdWPeTmxE - ECbfJTj3QOY+VXAYiRUCmMf6oOjKhFwlQfzTUNRrP+LbLAMTKbZvwo1ewqLdjZCHPsFxqZ+YLz2EnLoE - 3KyOQEL5RU4iUSVC2pBO3iQU7L152oN+9hMT7KTIoFy9V8CXHpjlSw+Sh/zAz/fD1ZJQZL0QQjekhkJd - gMx3QoiqY2EiAiP5NwxEQLs3iUC7s8L53B56fpXGwKyHo3tkDndqM5BGguKaeOTV3d6+Y3FteIigcUfA - 2mZsO4L/4WRXSN8lOC3RuGRFyq29Ht4LjUazeTSpyeGLkyIz2sen1lx29mJ8icL4IgWrjyWHm4Nt3kF7 - wxRFrfrfavnhi/N4JzLasoJEre3HxGpbkLiR3ibNS+BfRI20v6hl5UhKS0egUJXK4/F4fwDOPJ3GTY2P - twAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY + zXSY6XRO0dREFwbZahqZl9BEBxWiFL2o0C46tXmbc7rhFpnL1Ob9Al6Wuss5bmf67TlnSw2EfvDhefGc + 74fz+57DYyf0njrxYqlOFVWm+x0m01HkpDnK2VNPR5X20xFPtKYzUk2lf/TbfVxo94Q/6tUsWekVk8nk + ttg3YLHtsGJlofFzwYqCTzMQlo04BJlKH2/UM5HF2iU23D/lgn6agX6GgW6KgXbSCfWvDbQO27HBAE0j + FAo+TCP5mYn6RxIma6XWHU4YZ934OsuQk8EAJ3Gix7yBL8MOItiEccEN/bwLRcoZ8O92vuHCseXBE9dl + 0VuSmqtIrr6G6rZ6FDaUgy8LQDBBUHQaofITqGiq4Fax0QwWVx0ITehhOEFMKf9951AzmsdeolqXx0kS + qiKQ9zoeWfVCiBWXkKRIQtPgIppNNnz+vo410lOYvJfmBIJKgY+/LNutG+3GqyE5StSZnCSxJpKELyPt + eSo0Zju3SscYBRXpYdXuQlhhn0fATnhxD51TK4LBrIVCfweP23MRW34eiVXRMEw5YCDFsgVrxj2dWIgg + VL5LcPa+zHUy/xDiKwUwjvejqDsdcmUOhE9DUK/+iG9zDAyk2P5JF/oIS1YX+A+8gmNSX0mQ9CCy6uJw + oyYccRUXOEmOMh7ShlTyJiFg740zbgywn5hgJUUGZms9giDp/rkg6QHykC+C8nxxpSQEGS9E0AyrUKTK + R/o7EcQ1MTAQgZ78GzoioF2bRKDeWeFcdi+9sEZjcM7N0TM6j9u1aUghQYlCiNy6W9t3LA6nmwgadwSs + bdayI/gfdnaF1F2CUzldDtnD0q29Ht6Lrq6uzSMJTTZvnBSZ1j4xve6wshcTyxQmliiYvSzbXBxs8zba + E6Yoas3vZssPb5zHO57WlhEobm0/KlFZAiWN9DYpHgL+Im6k/cQtq4eTWjoCRMpkHo/H+wPLWp3CEq51 + jAAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 8731897..ea34bf7 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -61,8 +61,9 @@ 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 numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); @@ -1198,6 +1199,7 @@ flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); + this.fpSpread1.SetViewportLeftColumn(0, 0, 4); // // fpSpread1_Sheet1 // @@ -1205,7 +1207,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 = 25; + this.fpSpread1_Sheet1.ColumnCount = 27; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -1236,8 +1238,10 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "공급사"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "납기일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "취소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "수령인"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "취소"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; @@ -1399,6 +1403,7 @@ this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); numberCellType7.DecimalPlaces = 0; numberCellType7.NegativeRed = true; this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; @@ -1407,22 +1412,34 @@ this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = checkBoxCellType3; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "bCancel"; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "취소"; - this.fpSpread1_Sheet1.Columns.Get(21).Tag = "cancel"; + this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "recvDate"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "recvUser"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "수령인"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "Item"; - this.fpSpread1_Sheet1.Columns.Get(23).Tag = "item"; - this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "ItemSupplyidx"; - this.fpSpread1_Sheet1.Columns.Get(24).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bCancel"; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "취소"; + this.fpSpread1_Sheet1.Columns.Get(23).Tag = "cancel"; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "Item"; + this.fpSpread1_Sheet1.Columns.Get(25).Tag = "item"; + this.fpSpread1_Sheet1.Columns.Get(25).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "ItemSupplyidx"; + this.fpSpread1_Sheet1.Columns.Get(26).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bsPart; diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index e0f5ab4..acd89d7 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -379,20 +379,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY - zVTMvM0pmprowiBbzEXmJTRxQoUoXV5UaJZOberc5nTDGZnL1LzfwMtSdzln7mx+e87ZUgOhH3x4Xjzn - ++H8vufw2Am5r068VKpXRpbpf4dK9BQ5aY5y9jTQkaV9dPgTnemsWFvpF/VuHxfaPWGPerTLFnrVZDK5 - zDYHzNYdVi0sNH4uWlD4aRaxZSN2QZZivzfqmYhi3TIb7pt2wjDDwDDLQD/NQDe1CfUvB9qGbXAwQPMI - hcKPM0h5ZqL+kYRK2qgN+yYG5lz4OseQk0E/J9mEZtyBL8N2InBjYNEFw4ITMsUs+Pe63nLhmPKgyRuS - qC2R/BpSqq+jur0eRQ3l4Ev8EUQQyM4gRHoSFc0V3CpWmsHSmh0hCRqGE0SX8j90DbWgZewlqvX5nCSh - Khz5r+ORXR8LYc1lJNcko3lwCS0mKz5/38A66SlU2kNzAkGlYL+fJMelH+3GqyEpStRZnCRRHkHCV5D+ - PA3acRu3SucYBSXpYc3mRGhRr0fATlixhs6tTYJxXIcaw1087shDTPkFJFZFwThth5EUyxasnfB0YiaC - EOkuwbkHEuepgsOIrxRgYKIPsu4MSBW5iH0ajHp1E77NMzCSYvumnOglLFuc4D/0Co6LfUSB4kPIrovD - TXkY4ioucpJcRTzEDWnkTYLB3g/MutDPfmKChRQZkKPzCALFB+YDxQfJQz4IzPfB1ZJgZL5IgnZYCZmy - ABnvkyCUR8NIBAbyb+iJgHa6iUC9s8L5nB56cZ3G4LyLQzO6gDu16UglQVFNLPLqbm/fsdg3XUTQuCNg - bXPmHcH/sLErpO0SnM5V2d80Kbf2engvVGqt+2hCs9UbJ0Wmd0zObNgtKpXKPblCYXKZwriXFauTg23e - SpOwSuOmKGrd91brD2+cxzuR3p4ZIGzrOCZSmgNEjfQ2qR78/yJspH2FrWtHkls7/ZMUKTwej/cHMGye - UcYINAcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALtSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s + Zipm3uYUTU10YZAtppF5CU3coEIUoxcVrotOberc5nTDGZnL1LzfwMtSdzlHdza/PedsOQOhH3x4Xjzn + ++H8vufw2Al7oE6+XKFXRlfqf4eL9RQ5aY4q9jTQ0RX9dORTnemcSFvjH/P2ABfaOxGPe7UrFnrNZDI5 + zbYtmK1e1iwsNH4uWVD8aQ7xlaN2fo7CxxN1T1SZboUN9884YJhlYJhjoJ9hoJvehvrXFtpHbNhigJZR + CsUfZpH23ET9IwkXt1Ob9m0MzjvxdZ4hJ4MBTrINzcQWvozYicCFwSUnDIsOlCrmEHK/+w0XjqsKnrop + jtkRSq8jre4G6joaUdJchRBxAIIJ/NKzCJOcQnVLNbeKlWawvG5HWJKG4QSxFSHvu4db0Tr+CnX6Qk6S + VBuJwteJyG2Mh0B2BamyVLQMLaPVZMXn75vYID2FS3ppTsCv4fv4i/Oc+rEeNA1LUK7O4STJ0igSvorM + FxnQTti4VbrGKShJD+s2B8JL+twCdiLKNHR+fQqMEzrIDPfwpLMAcVUXkVwbA+OMHUZSLFuwdtLdiZkI + wiR7BOcfih2ni44gsYaPwcl+lPZkQaLIR/yzUDSqP+LbAgMjKbZ/2oE+worFgZBHHsEJka8wSHQYuQ0J + uCWNQEL1JU6Sr0iEqDmDvEko2PvBOScG2E9MsJAiA/N0bkGQ6OBCkOgQecgXQYW+uFYeiuyXKdCOKFGq + LELWuxQIpLEwEoGB/Bt6IqAdLiJQe1e4kNdLL23QGFpwcmjGFnG3PhPpJCiUxaOg4c7uHYt920kEcq+A + tc2bvYL/YWNXyNgjOJOvsjfJO3b2e3g/VCq161hSi9UTJ0Vmdk7NbtotKpXKNbVKYWqFwoSHVauDg23e + SrPhHhdFURt+t9t+eOI83snMjuxAQXvncaHSHCiU07ukuwn4i0BO+wna1o+mtnUFpCjSeDwe7w8pRp5F + 1uHuRwAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 178a56a..16b6ede 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -102,6 +102,7 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -163,13 +164,13 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); - 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(); @@ -179,7 +180,6 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -271,6 +271,7 @@ // 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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -393,6 +394,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -620,6 +622,214 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // + // 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.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "준수율\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "협업"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "userhw2"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "전장"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(11).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F; + 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; @@ -743,6 +953,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -1365,214 +1576,6 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // 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.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "준수율\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "협업"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "userhw2"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "전장"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F; - 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; - // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1594,6 +1597,7 @@ ((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); @@ -1606,7 +1610,6 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index e9549c3..ec92c0b 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL17TLXClrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9psBGKzvoR+Yx/H+N9Ayrx6JYwl9o1Fd78jiQu/DCMyuMLofhEEl07+Qq3r6MidmJDDu6Pdc - L3XS2wKDRwf9iBbHXI3kZ53pGcSMhB73VzLvn7sExn8R5pnzoJCDYDhwYXbVAtNwmMyzoSyeELIlGPaf - 80kKqiwKVQWzA2Vdcqi7FRI/ZR0Pil0ZwvE0NKenlguqLKUqJV3CNQ83oW20GeVntpGgwMBYMFNgnwzB - PhGEczqIt18S2N0xQQrUfaUqBb2V096txy5TOYpPFEDeugmD3hCsgsbZvzd4/SmOilYvVMz2yjJazjU6 - 6yCjC7kiOm+L8dYC4qkl2CZZ4rXzX1JAtuA3sPGqse6DsqcE1df24LDjIDbS67j19NrNwkZttg+IJZfg - mGJxezojaugJi0Rq5WU1Vyqhd2txyF6DYrqAy2/KhAVaBt9h8dtP3PFlNrg/wx+S8zGLbKm7lJC1F6JI - n4f8o2uWwwK66/OkYIgPCmFScIN/iGxeBGLQGL2r3oH26ktE+QLX0zDxuv18gRDI1YYO928xI6GBeY5I - 4gfYWBqfIykE2CSonQYPciVruGcXMxKOmOfGajv9ydrOWVSf9WHvqZV7+Uco6g/Suyykbx39sAAAAABJ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUpeTlkYLDJQi + pFCJWbtpQ01GRYWla47LXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G4PiIjlsB6K3voRtYwMn+N9Awrx6LYwl9o1GteWRp0fwoApMrjJ6HYVDJ9C/kqoE2c2JGAuOOfs/1 + Uqe9rdB7tNCNaHDC1UR+1hufQcxI6HV/JfP++Stg/Jdhmr0ICjkIhkOX5tYsMA6HyTwbyuIJIVuC4eAF + n6Sg2qJQVjK7UNYth6pHIfFT1vGg2JUhHE9DfXZqpaDaUqqsoEu4luFmtI+2oPzcDhIUGBgLZgrskyHY + J4JwTgfx9ksCezsnSIGqr1SpoLdzmnsN2GMsR/GpAsjbtmDQG4JV0Dj79wavP8VR2eaFktlZVUbLuSZn + PWR0IVdE520z3F5EPLUM2yRLvHb+SwrIFvwGNl611gOo6C1BzfV9OOo4jM30Bm4jvX6rsFG77QNiyWU4 + pljcmc6IGnrCIpFafVn11Sro3BocsdeimC7g8pszYYHWwXdY+vYTd32ZDR7M8ofknGGRLVV3BWQdhSjS + 5SH/+LqVsID2xgIpGOKDQpgU3OQfIpsXgRjUBu+ad6C59hJRvsD1NEy8bj9fIARytanT/VvMSGhkniOS + +AE2lsbnSAoBNglqt96DXMka79vFjIRjpvmxui5/sq5rDjXnfdh/ZvVe/hGK+gPPRCyj0HEz7AAAAABJ RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ0SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwcqGhA1wfBQEyQYBXkLypCwGTIxsA0QhqziGNvoxph0Ah3t+ljX9et/o4qamPj4pt/0 - kf/n+3uU+m8tDhfNh4dOa5FfvDxyPBh4cWhvsLco7ye/KcpzOEr2mDhFudstqmFkABjkynrnOa3EEXWU - pVZd59Rvjs1eUcKuirDv1ZGzJk5RzGBxwtAVqNF6SKEGSOwTyOF+GGmeZCVh6CLx9s57egscx6V8AxbG - xCnK33lYyGjbBG5GMtAE4WM1NqfLEJ+5DN5bA37hBvj569jyVBJXkM44+AeOiiZOAvqKtbS8Dp5pxtZc - Hbjxa5C5KVJVMKtn74nvHWTH8/QVKiae7eCYlps/oxLLgC7lQF32QY09AMP0wOp0o22MRdfEGuyeCLJ7 - M3ES0GxJGboMXXAjzdugbfQjtd4KZfUevAvtGJ7lsPxZwsqGiqmggNH5Lxiy0rqJk7/QYlEzmgBt04oU - 15GrqkRqIIcq0euMYTEqYpqV4QxJmCT2xlR0v2Nh4hTluV+oGBpP4KdQ1xqghKsJXAHJfzHXdiCuwhlM - YiKQxJhPxGxERcd4dDdg6U5BTE4wibeOrkxyuQ2i/yFEXz3ET7XoJjMvrkkY9+/AWb9fVdEysrQb4KvN - v+qrO9jJ3D4Q99QVKD/69SCtTwUEzBHIxSqYIdWtH0TQNG3Yqk6cNyN+r0Ybu6/FztJ9ZBc9kzE8tjsy - NH3T8I62wt1UKjwvzy81j/65XladuuR6dIEP2RoxcqtEMj//nZ6V7y8dpU/K9rtndnfxb6Kor5xiI5Ig - 8dqfAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ0SURBVDhPpZFLTNNwHMd78O7NuwcvIhJFpjcOJiYmHjwZ + Eg8mGi9gosGEgwcqMSBqguGhJkgwCvIWlCFhM2TBwDZAGLKKZWyzG2PSCXS062Nd16//jSpqYuLjm37T + R/6f7+9R6r+1NFK8EBk+o0d/8croiVDwxeF9ob7ivT/5TfFel6t0j4VTlLfDpplmFoBJrpx3njNqAjFX + eXrVc1775vjcVTXiqYywr46es3CKYoZKkqahQos1QA43QuaeQIkMwMwIJCsF05CIt3feM1vgeT7NDtoY + C6eoQNcRMatvE7gFqWAzxA812JwpR2L2CgR/LYTFmxAWbmDLV0VcSTrjERg8Jlk4Cegv0TPKOgSmBVvz + 9eAnrkPhp0lV0aqeuye/d5Abz9dfpFp4roPjen7+rEasAIacBw2FhRZ/AIbphd3tRfs4h+7JNTh9UeT2 + ZuEkoMWWNg0FhuhFRnBA3xhAer0N6uo9+Bc7MDLHY+WzjE8bGqZDIsYWvmDYThsWTv5Cq03L6iL0TTvS + fGe+qhqthRKuQp87jqWYhBlOgTssY4rYH9fQ85aDhVOU736RauoCgZ9CW2uEGqkhcCXkwKV828GEBnco + hclgCuOshLmohs6J2G7A8p3CuJJkki5Xdza10g4p8BAS2wDpYx16yMxLazImAjtwzu9WNbSOLu8GsHUF + 19j6Q13M7YMJX32h+qNfD9HGdFDEPIE8nIpZUt3+XgJN06aj+uQFK+L3anJw+1udHN1PdtE7FcdjpytL + 0zWmf6wN3uYy8XlFQZl19M/1svr0Zc+ji0LY0YTRW6Wy9fnv9KziQNkYfUpx3j27u4t/E0V9BZoUI5AR + tV0fAAAAAElFTkSuQmCC diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs index a1e8908..5a699e4 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs @@ -48,6 +48,8 @@ System.Windows.Forms.Label label1; System.Windows.Forms.Label itemModelLabel; System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; + System.Windows.Forms.Label label4; this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); @@ -63,13 +65,15 @@ this.textBox2 = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.tbRecvUser = new System.Windows.Forms.TextBox(); this.itemModelTextBox = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.panel3 = new System.Windows.Forms.Panel(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.bbuyCheckBox = new System.Windows.Forms.CheckBox(); this.itemSupplyTextBox = new System.Windows.Forms.TextBox(); - this.qtyinTextBox = new System.Windows.Forms.TextBox(); + this.tbInQty = new System.Windows.Forms.TextBox(); this.option1TextBox = new System.Windows.Forms.TextBox(); this.qtybuyTextBox = new System.Windows.Forms.TextBox(); this.amtTextBox = new System.Windows.Forms.TextBox(); @@ -101,6 +105,8 @@ label1 = new System.Windows.Forms.Label(); itemModelLabel = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); this.groupBox1.SuspendLayout(); @@ -237,7 +243,7 @@ // qtybuyLabel // qtybuyLabel.AutoSize = true; - qtybuyLabel.Location = new System.Drawing.Point(36, 167); + qtybuyLabel.Location = new System.Drawing.Point(38, 167); qtybuyLabel.Name = "qtybuyLabel"; qtybuyLabel.Size = new System.Drawing.Size(53, 12); qtybuyLabel.TabIndex = 20; @@ -246,7 +252,7 @@ // qtyinLabel // qtyinLabel.AutoSize = true; - qtyinLabel.Location = new System.Drawing.Point(389, 167); + qtyinLabel.Location = new System.Drawing.Point(38, 194); qtyinLabel.Name = "qtyinLabel"; qtyinLabel.Size = new System.Drawing.Size(53, 12); qtyinLabel.TabIndex = 22; @@ -279,6 +285,24 @@ label2.TabIndex = 14; label2.Text = "SCR/CF Due date"; // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(211, 221); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(41, 12); + label3.TabIndex = 26; + label3.Text = "수령인"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(211, 194); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(41, 12); + label4.TabIndex = 28; + label4.Text = "입고일"; + // // bs // this.bs.DataMember = "ProjectPartStatus"; @@ -428,12 +452,16 @@ // // groupBox2 // + this.groupBox2.Controls.Add(label4); + this.groupBox2.Controls.Add(this.textBox3); + this.groupBox2.Controls.Add(label3); + this.groupBox2.Controls.Add(this.tbRecvUser); this.groupBox2.Controls.Add(itemModelLabel); this.groupBox2.Controls.Add(this.itemModelTextBox); this.groupBox2.Controls.Add(this.textBox1); this.groupBox2.Controls.Add(this.panel3); this.groupBox2.Controls.Add(qtyinLabel); - this.groupBox2.Controls.Add(this.qtyinTextBox); + this.groupBox2.Controls.Add(this.tbInQty); this.groupBox2.Controls.Add(label1); this.groupBox2.Controls.Add(qtybuyLabel); this.groupBox2.Controls.Add(this.option1TextBox); @@ -463,6 +491,24 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "파트정보"; // + // textBox3 + // + this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "recvDate", true)); + this.textBox3.Location = new System.Drawing.Point(259, 190); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(247, 21); + this.textBox3.TabIndex = 29; + this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbRecvUser + // + this.tbRecvUser.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "recvUser", true)); + this.tbRecvUser.Location = new System.Drawing.Point(259, 217); + this.tbRecvUser.Name = "tbRecvUser"; + this.tbRecvUser.Size = new System.Drawing.Size(247, 21); + this.tbRecvUser.TabIndex = 27; + this.tbRecvUser.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // itemModelTextBox // this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true)); @@ -523,14 +569,14 @@ this.itemSupplyTextBox.Size = new System.Drawing.Size(204, 21); this.itemSupplyTextBox.TabIndex = 0; // - // qtyinTextBox + // tbInQty // - this.qtyinTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qtyin", true)); - this.qtyinTextBox.Location = new System.Drawing.Point(447, 163); - this.qtyinTextBox.Name = "qtyinTextBox"; - this.qtyinTextBox.Size = new System.Drawing.Size(100, 21); - this.qtyinTextBox.TabIndex = 23; - this.qtyinTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbInQty.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qtyin", true)); + this.tbInQty.Location = new System.Drawing.Point(98, 190); + this.tbInQty.Name = "tbInQty"; + this.tbInQty.Size = new System.Drawing.Size(100, 21); + this.tbInQty.TabIndex = 23; + this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // option1TextBox // @@ -691,7 +737,7 @@ private System.Windows.Forms.TextBox itemSidTextBox; private System.Windows.Forms.TextBox itemNameTextBox; private System.Windows.Forms.CheckBox bbuyCheckBox; - private System.Windows.Forms.TextBox qtyinTextBox; + private System.Windows.Forms.TextBox tbInQty; private System.Windows.Forms.TextBox qtybuyTextBox; private System.Windows.Forms.TextBox amtTextBox; private System.Windows.Forms.TextBox priceTextBox; @@ -702,5 +748,7 @@ private System.Windows.Forms.TextBox itemModelTextBox; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.TextBox tbRecvUser; + private System.Windows.Forms.TextBox textBox3; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx index e5209bf..60a3745 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx @@ -174,15 +174,18 @@ False + + False + + + False + 100, 17 17, 17 - - 17, 17 - 164, 17 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index f414fca..cb83abf 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -3006,6 +3006,12 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnbCancel; + private global::System.Data.DataColumn columnreqUser; + + private global::System.Data.DataColumn columnrecvUser; + + private global::System.Data.DataColumn columnrecvDate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsPartDataTable() { @@ -3295,6 +3301,30 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn reqUserColumn { + get { + return this.columnreqUser; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn recvUserColumn { + get { + return this.columnrecvUser; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn recvDateColumn { + get { + return this.columnrecvDate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3363,7 +3393,10 @@ namespace FPJ0000 { int qtyin, bool bbuy, bool bconfirm, - bool bCancel) { + bool bCancel, + string reqUser, + string recvUser, + string recvDate) { ProjectsPartRow rowProjectsPartRow = ((ProjectsPartRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3397,7 +3430,10 @@ namespace FPJ0000 { qtyin, bbuy, bconfirm, - bCancel}; + bCancel, + reqUser, + recvUser, + recvDate}; rowProjectsPartRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsPartRow); return rowProjectsPartRow; @@ -3459,6 +3495,9 @@ namespace FPJ0000 { this.columnbbuy = base.Columns["bbuy"]; this.columnbconfirm = base.Columns["bconfirm"]; this.columnbCancel = base.Columns["bCancel"]; + this.columnreqUser = base.Columns["reqUser"]; + this.columnrecvUser = base.Columns["recvUser"]; + this.columnrecvDate = base.Columns["recvDate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3532,6 +3571,12 @@ namespace FPJ0000 { base.Columns.Add(this.columnbconfirm); this.columnbCancel = new global::System.Data.DataColumn("bCancel", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbCancel); + this.columnreqUser = new global::System.Data.DataColumn("reqUser", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnreqUser); + this.columnrecvUser = new global::System.Data.DataColumn("recvUser", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrecvUser); + this.columnrecvDate = new global::System.Data.DataColumn("recvDate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrecvDate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -3555,6 +3600,9 @@ namespace FPJ0000 { this.columnremark.MaxLength = 255; this.columnItemSid.MaxLength = 50; this.columnItemUnit.MaxLength = 50; + this.columnreqUser.MaxLength = 30; + this.columnrecvUser.MaxLength = 30; + this.columnrecvDate.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6767,6 +6815,14 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnuserGroupName; + private global::System.Data.DataColumn columnrecvUser; + + private global::System.Data.DataColumn columnreqUser; + + private global::System.Data.DataColumn columnbCancel; + + private global::System.Data.DataColumn columnrecvDate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectPartStatusDataTable() { @@ -7120,6 +7176,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn recvUserColumn { + get { + return this.columnrecvUser; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn reqUserColumn { + get { + return this.columnreqUser; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn bCancelColumn { + get { + return this.columnbCancel; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn recvDateColumn { + get { + return this.columnrecvDate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -7196,7 +7284,11 @@ namespace FPJ0000 { bool bbuy, bool bconfirm, string crdue, - string userGroupName) { + string userGroupName, + string recvUser, + string reqUser, + bool bCancel, + string recvDate) { ProjectPartStatusRow rowProjectPartStatusRow = ((ProjectPartStatusRow)(this.NewRow())); object[] columnValuesArray = new object[] { gcode, @@ -7238,7 +7330,11 @@ namespace FPJ0000 { bbuy, bconfirm, crdue, - userGroupName}; + userGroupName, + recvUser, + reqUser, + bCancel, + recvDate}; rowProjectPartStatusRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectPartStatusRow); return rowProjectPartStatusRow; @@ -7308,6 +7404,10 @@ namespace FPJ0000 { this.columnbconfirm = base.Columns["bconfirm"]; this.columncrdue = base.Columns["crdue"]; this.columnuserGroupName = base.Columns["userGroupName"]; + this.columnrecvUser = base.Columns["recvUser"]; + this.columnreqUser = base.Columns["reqUser"]; + this.columnbCancel = base.Columns["bCancel"]; + this.columnrecvDate = base.Columns["recvDate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7397,6 +7497,14 @@ namespace FPJ0000 { base.Columns.Add(this.columncrdue); this.columnuserGroupName = new global::System.Data.DataColumn("userGroupName", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuserGroupName); + this.columnrecvUser = new global::System.Data.DataColumn("recvUser", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrecvUser); + this.columnreqUser = new global::System.Data.DataColumn("reqUser", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnreqUser); + this.columnbCancel = new global::System.Data.DataColumn("bCancel", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbCancel); + this.columnrecvDate = new global::System.Data.DataColumn("recvDate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrecvDate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columngcode.AllowDBNull = false; @@ -7432,6 +7540,9 @@ namespace FPJ0000 { this.columncrdue.MaxLength = 10; this.columnuserGroupName.ReadOnly = true; this.columnuserGroupName.MaxLength = 200; + this.columnrecvUser.MaxLength = 30; + this.columnreqUser.MaxLength = 30; + this.columnrecvDate.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13903,6 +14014,54 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string reqUser { + get { + if (this.IsreqUserNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectsPart.reqUserColumn])); + } + } + set { + this[this.tableProjectsPart.reqUserColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string recvUser { + get { + if (this.IsrecvUserNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectsPart.recvUserColumn])); + } + } + set { + this[this.tableProjectsPart.recvUserColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string recvDate { + get { + if (this.IsrecvDateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectsPart.recvDateColumn])); + } + } + set { + this[this.tableProjectsPart.recvDateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsProjectNull() { @@ -14250,6 +14409,42 @@ namespace FPJ0000 { public void SetbCancelNull() { this[this.tableProjectsPart.bCancelColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsreqUserNull() { + return this.IsNull(this.tableProjectsPart.reqUserColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetreqUserNull() { + this[this.tableProjectsPart.reqUserColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrecvUserNull() { + return this.IsNull(this.tableProjectsPart.recvUserColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrecvUserNull() { + this[this.tableProjectsPart.recvUserColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrecvDateNull() { + return this.IsNull(this.tableProjectsPart.recvDateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrecvDateNull() { + this[this.tableProjectsPart.recvDateColumn] = global::System.Convert.DBNull; + } } /// @@ -17668,6 +17863,70 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string recvUser { + get { + if (this.IsrecvUserNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectPartStatus.recvUserColumn])); + } + } + set { + this[this.tableProjectPartStatus.recvUserColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string reqUser { + get { + if (this.IsreqUserNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectPartStatus.reqUserColumn])); + } + } + set { + this[this.tableProjectPartStatus.reqUserColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool bCancel { + get { + if (this.IsbCancelNull()) { + return false; + } + else { + return ((bool)(this[this.tableProjectPartStatus.bCancelColumn])); + } + } + set { + this[this.tableProjectPartStatus.bCancelColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string recvDate { + get { + if (this.IsrecvDateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectPartStatus.recvDateColumn])); + } + } + set { + this[this.tableProjectPartStatus.recvDateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -18099,6 +18358,54 @@ namespace FPJ0000 { public void SetuserGroupNameNull() { this[this.tableProjectPartStatus.userGroupNameColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrecvUserNull() { + return this.IsNull(this.tableProjectPartStatus.recvUserColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrecvUserNull() { + this[this.tableProjectPartStatus.recvUserColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsreqUserNull() { + return this.IsNull(this.tableProjectPartStatus.reqUserColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetreqUserNull() { + this[this.tableProjectPartStatus.reqUserColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsbCancelNull() { + return this.IsNull(this.tableProjectPartStatus.bCancelColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetbCancelNull() { + this[this.tableProjectPartStatus.bCancelColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsrecvDateNull() { + return this.IsNull(this.tableProjectPartStatus.recvDateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetrecvDateNull() { + this[this.tableProjectPartStatus.recvDateColumn] = global::System.Convert.DBNull; + } } /// @@ -24469,6 +24776,9 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects tableMapping.ColumnMappings.Add("bbuy", "bbuy"); tableMapping.ColumnMappings.Add("bconfirm", "bconfirm"); tableMapping.ColumnMappings.Add("bCancel", "bCancel"); + tableMapping.ColumnMappings.Add("reqUser", "reqUser"); + tableMapping.ColumnMappings.Add("recvUser", "recvUser"); + tableMapping.ColumnMappings.Add("recvDate", "recvDate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -24503,7 +24813,10 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects "inal_qtyin)) AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_b" + "buy)) AND ((@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Origi" + "nal_bconfirm)) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = " + - "@Original_bCancel)))"; + "@Original_bCancel)) AND ((@IsNull_reqUser = 1 AND [reqUser] IS NULL) OR ([reqUse" + + "r] = @Original_reqUser)) AND ((@IsNull_recvUser = 1 AND [recvUser] IS NULL) OR (" + + "[recvUser] = @Original_recvUser)) AND ((@IsNull_recvDate = 1 AND [recvDate] IS N" + + "ULL) OR ([recvDate] = @Original_recvDate)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -24525,7 +24838,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemModel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemModel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemGroup", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemGroup", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemSid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -24566,10 +24879,16 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bconfirm", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bCancel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bCancel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqUser", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqUser", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_recvUser", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_recvUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_recvDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_recvDate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", 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 [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn], [qtyin], [bbuy], [bconfirm], [bCancel]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn, @qtyin, @bbuy, @bconfirm, @bCancel); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn], [qtyin], [bbuy], [bconfirm], [bCancel], [reqUser], [recvUser], [recvDate]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn, @qtyin, @bbuy, @bconfirm, @bCancel, @reqUser, @recvUser, @recvDate); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -24581,7 +24900,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.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("@ItemName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemGroup", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemSid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemSupply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSupply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -24602,6 +24921,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bbuy", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bbuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bconfirm", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCancel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqUser", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvDate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", 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 [ProjectsPart] SET [Project] = @Project, [Item] = @Item, [qty] = @qty, [pr" + @@ -24612,42 +24934,47 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I "= @remark, [ItemSupplyidx] = @ItemSupplyidx, [no] = @no, [ItemUnit] = @ItemUnit," + " [import] = @import, [qtyjago] = @qtyjago, [qtybuy] = @qtybuy, [qtyn] = @qtyn, [" + "amtn] = @amtn, [qtyin] = @qtyin, [bbuy] = @bbuy, [bconfirm] = @bconfirm, [bCance" + - "l] = @bCancel WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Proj" + - "ect] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [It" + - "em] IS NULL) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NU" + - "LL) OR ([qty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR " + - "([price] = @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] " + - "= @Original_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Origi" + - "nal_jago)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_mem" + - "o)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_" + - "ItemName = 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND (" + - "(@IsNull_ItemModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_Item" + - "Model)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @" + - "Original_ItemGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemS" + - "id] = @Original_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL)" + - " OR ([ItemSupply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemM" + - "anu] IS NULL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AN" + - "D [option1] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 =" + - " 1 AND [option2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_opti" + - "on3 = 1 AND [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull" + - "_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNul" + - "l_ItemSupplyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original" + - "_ItemSupplyidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)" + - ") AND ((@IsNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_" + - "ItemUnit)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Origin" + - "al_import)) AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Or" + - "iginal_qtyjago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @" + - "Original_qtybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Origi" + - "nal_qtyn)) AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amt" + - "n)) AND ((@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin))" + - " AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((" + - "@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm" + - ")) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bC" + - "ancel)));\r\nSELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, " + - "ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2," + - " option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, am" + - "tn, qtyin, bbuy, bconfirm, bCancel FROM ProjectsPart WHERE (idx = @idx) ORDER BY" + - " Project, no, ItemGroup, option1, ItemName"; + "l] = @bCancel, [reqUser] = @reqUser, [recvUser] = @recvUser, [recvDate] = @recvD" + + "ate WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NU" + + "LL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [Item] IS NUL" + + "L) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([q" + + "ty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] =" + + " @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] = @Origina" + + "l_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Original_jago))" + + " AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([" + + "wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ItemName =" + + " 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND ((@IsNull_I" + + "temModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_ItemModel)) AN" + + "D ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_I" + + "temGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemSid] = @Ori" + + "ginal_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL) OR ([Item" + + "Supply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemManu] IS NU" + + "LL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AND [option1" + + "] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 = 1 AND [op" + + "tion2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_option3 = 1 AN" + + "D [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull_remark = " + + "1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_ItemSupp" + + "lyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original_ItemSuppl" + + "yidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)) AND ((@I" + + "sNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_ItemUnit))" + + " AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)" + + ") AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Original_qty" + + "jago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @Original_q" + + "tybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Original_qtyn))" + + " AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amtn)) AND ((" + + "@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin)) AND ((@Is" + + "Null_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((@IsNull_bc" + + "onfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm)) AND ((@" + + "IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bCancel)) AN" + + "D ((@IsNull_reqUser = 1 AND [reqUser] IS NULL) OR ([reqUser] = @Original_reqUser" + + ")) AND ((@IsNull_recvUser = 1 AND [recvUser] IS NULL) OR ([recvUser] = @Original" + + "_recvUser)) AND ((@IsNull_recvDate = 1 AND [recvDate] IS NULL) OR ([recvDate] = " + + "@Original_recvDate)));\r\nSELECT idx, Project, Item, qty, price, amt, jago, memo, " + + "wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, opti" + + "on1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qty" + + "buy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FRO" + + "M ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, Item" + + "Name"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -24659,7 +24986,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.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("@ItemName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemGroup", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemSid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemSupply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSupply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -24680,6 +25007,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bbuy", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bbuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bconfirm", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCancel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqUser", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvDate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -24700,7 +25030,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemModel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemModel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemGroup", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ItemGroup", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemGroup", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ItemSid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -24741,6 +25071,12 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bconfirm", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bCancel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bCancel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCancel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqUser", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqUser", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_recvUser", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_recvUser", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_recvDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_recvDate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", 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, "", "", "")); } @@ -24758,7 +25094,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, - import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel + import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FROM ProjectsPart WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName"; @@ -24877,7 +25213,10 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable Original_qtyin, global::System.Nullable Original_bbuy, global::System.Nullable Original_bconfirm, - global::System.Nullable Original_bCancel) { + global::System.Nullable Original_bCancel, + string Original_reqUser, + string Original_recvUser, + string Original_recvDate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_Project.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); @@ -25118,6 +25457,30 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; this.Adapter.DeleteCommand.Parameters[59].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[60].Value = global::System.DBNull.Value; } + if ((Original_reqUser == null)) { + this.Adapter.DeleteCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[62].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[62].Value = ((string)(Original_reqUser)); + } + if ((Original_recvUser == null)) { + this.Adapter.DeleteCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[64].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[64].Value = ((string)(Original_recvUser)); + } + if ((Original_recvDate == null)) { + this.Adapter.DeleteCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[66].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[66].Value = ((string)(Original_recvDate)); + } 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)) { @@ -25169,7 +25532,10 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable qtyin, global::System.Nullable bbuy, global::System.Nullable bconfirm, - global::System.Nullable bCancel) { + global::System.Nullable bCancel, + string reqUser, + string recvUser, + string recvDate) { if ((Project.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(Project.Value)); } @@ -25351,6 +25717,24 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; else { this.Adapter.InsertCommand.Parameters[30].Value = global::System.DBNull.Value; } + if ((reqUser == null)) { + this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[31].Value = ((string)(reqUser)); + } + if ((recvUser == null)) { + this.Adapter.InsertCommand.Parameters[32].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[32].Value = ((string)(recvUser)); + } + if ((recvDate == null)) { + this.Adapter.InsertCommand.Parameters[33].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[33].Value = ((string)(recvDate)); + } 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)) { @@ -25403,6 +25787,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable bbuy, global::System.Nullable bconfirm, global::System.Nullable bCancel, + string reqUser, + string recvUser, + string recvDate, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, @@ -25435,6 +25822,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable Original_bbuy, global::System.Nullable Original_bconfirm, global::System.Nullable Original_bCancel, + string Original_reqUser, + string Original_recvUser, + string Original_recvDate, int idx) { if ((Project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(Project.Value)); @@ -25617,247 +26007,289 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; else { this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx)); - if ((Original_Project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_Project.Value)); + if ((reqUser == null)) { + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(reqUser)); + } + if ((recvUser == null)) { + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(recvUser)); + } + if ((recvDate == null)) { this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } - if ((Original_Item.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_Item.Value)); + else { + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(recvDate)); + } + this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(Original_idx)); + if ((Original_Project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((int)(Original_Project.Value)); } else { - 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; + } + if ((Original_Item.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((int)(Original_Item.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } if ((Original_qty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((int)(Original_qty.Value)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(Original_qty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } if ((Original_price.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((decimal)(Original_price.Value)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((decimal)(Original_price.Value)); } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } if ((Original_amt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((decimal)(Original_amt.Value)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((decimal)(Original_amt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } if ((Original_jago.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_jago.Value)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(Original_jago.Value)); } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].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[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[47].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((System.DateTime)(Original_wdate)); if ((Original_ItemName == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].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[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_ItemName)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_ItemName)); } if ((Original_ItemModel == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].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[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_ItemModel)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_ItemModel)); } if ((Original_ItemGroup == null)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].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[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_ItemGroup)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_ItemGroup)); } if ((Original_ItemSid == null)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].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[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_ItemSid)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_ItemSid)); } if ((Original_ItemSupply == null)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].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[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_ItemSupply)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_ItemSupply)); } if ((Original_ItemManu == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].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[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_ItemManu)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_ItemManu)); } if ((Original_option1 == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].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[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_option1)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_option1)); } if ((Original_option2 == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].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[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_option2)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_option2)); } if ((Original_option3 == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_option3)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_option3)); } if ((Original_remark == null)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_remark)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_remark)); } if ((Original_ItemSupplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_ItemSupplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((int)(Original_ItemSupplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].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_no.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_no.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_no.Value)); } else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].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_ItemUnit == null)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_ItemUnit)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_ItemUnit)); } if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; } if ((Original_qtyjago == null)) { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_qtyjago)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_qtyjago)); } if ((Original_qtybuy.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((int)(Original_qtybuy.Value)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((int)(Original_qtybuy.Value)); } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; } if ((Original_qtyn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((int)(Original_qtyn.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((int)(Original_qtyn.Value)); } else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].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_amtn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((decimal)(Original_amtn.Value)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((decimal)(Original_amtn.Value)); } else { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; } if ((Original_qtyin.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((int)(Original_qtyin.Value)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((int)(Original_qtyin.Value)); } else { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; } if ((Original_bbuy.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[87].Value = ((bool)(Original_bbuy.Value)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[90].Value = ((bool)(Original_bbuy.Value)); } else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[90].Value = global::System.DBNull.Value; } if ((Original_bconfirm.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((bool)(Original_bconfirm.Value)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[92].Value = ((bool)(Original_bconfirm.Value)); } else { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[92].Value = global::System.DBNull.Value; } if ((Original_bCancel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((bool)(Original_bCancel.Value)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((bool)(Original_bCancel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[94].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[92].Value = ((int)(idx)); + if ((Original_reqUser == null)) { + this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[96].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[95].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((string)(Original_reqUser)); + } + if ((Original_recvUser == null)) { + this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[98].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[98].Value = ((string)(Original_recvUser)); + } + if ((Original_recvDate == null)) { + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[100].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[100].Value = ((string)(Original_recvDate)); + } + this.Adapter.UpdateCommand.Parameters[101].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)) { @@ -25910,6 +26342,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable bbuy, global::System.Nullable bconfirm, global::System.Nullable bCancel, + string reqUser, + string recvUser, + string recvDate, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, @@ -25941,8 +26376,11 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable Original_qtyin, global::System.Nullable Original_bbuy, global::System.Nullable Original_bconfirm, - global::System.Nullable Original_bCancel) { - return this.Update(Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, Original_idx, Original_Project, Original_Item, Original_qty, Original_price, Original_amt, Original_jago, Original_memo, Original_wuid, Original_wdate, Original_ItemName, Original_ItemModel, Original_ItemGroup, Original_ItemSid, Original_ItemSupply, Original_ItemManu, Original_option1, Original_option2, Original_option3, Original_remark, Original_ItemSupplyidx, Original_no, Original_ItemUnit, Original_import, Original_qtyjago, Original_qtybuy, Original_qtyn, Original_amtn, Original_qtyin, Original_bbuy, Original_bconfirm, Original_bCancel, Original_idx); + global::System.Nullable Original_bCancel, + string Original_reqUser, + string Original_recvUser, + string Original_recvDate) { + return this.Update(Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate, Original_idx, Original_Project, Original_Item, Original_qty, Original_price, Original_amt, Original_jago, Original_memo, Original_wuid, Original_wdate, Original_ItemName, Original_ItemModel, Original_ItemGroup, Original_ItemSid, Original_ItemSupply, Original_ItemManu, Original_option1, Original_option2, Original_option3, Original_remark, Original_ItemSupplyidx, Original_no, Original_ItemUnit, Original_import, Original_qtyjago, Original_qtybuy, Original_qtyn, Original_amtn, Original_qtyin, Original_bbuy, Original_bconfirm, Original_bCancel, Original_reqUser, Original_recvUser, Original_recvDate, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -31864,6 +32302,10 @@ ORDER BY pdate"; tableMapping.ColumnMappings.Add("bconfirm", "bconfirm"); tableMapping.ColumnMappings.Add("crdue", "crdue"); tableMapping.ColumnMappings.Add("userGroupName", "userGroupName"); + tableMapping.ColumnMappings.Add("recvUser", "recvUser"); + tableMapping.ColumnMappings.Add("reqUser", "reqUser"); + tableMapping.ColumnMappings.Add("bCancel", "bCancel"); + tableMapping.ColumnMappings.Add("recvDate", "recvDate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -31874,7 +32316,8 @@ ORDER BY pdate"; this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE ProjectsPart SET qtybuy = @qtybuy, qtyin = @qtyin, bbuy = @bbuy, bconfirm = @bconfirm, memo = @memo, ItemSupply = @ItemSupply, option1 = @option1, option2 = @option2, option3 = @option3, - qty = @qty, price = @price, amt = @amt, ItemManu = @ItemManu, ItemSid = @ItemSid, ItemUnit = @ItemUnit, ItemModel = @ItemModel, ItemName = @ItemName, remark = @remark + qty = @qty, price = @price, amt = @amt, ItemManu = @ItemManu, ItemSid = @ItemSid, ItemUnit = @ItemUnit, ItemModel = @ItemModel, ItemName = @ItemName, remark = @remark, + recvUser = @recvUser, recvDate = @recvDate WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtybuy", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "qtybuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -31892,9 +32335,11 @@ WHERE (idx = @idx)"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemManu", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ItemManu", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemSid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ItemSid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemUnit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ItemUnit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemName", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemModel", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "ItemModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemName", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "ItemName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvUser", global::System.Data.SqlDbType.NVarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "recvUser", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@recvDate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "recvDate", global::System.Data.DataRowVersion.Current, 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.Original, false, null, "", "", "")); } @@ -31913,7 +32358,7 @@ WHERE (idx = @idx)"; this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) - AS userGroupName + AS userGroupName, recvUser, reqUser, bCancel, recvDate FROM vProjectPartPurchase WHERE (gcode = @gcode) ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx"; @@ -31921,11 +32366,7 @@ ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(P this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, - option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) - AS userGroupName -FROM vProjectPartPurchase -WHERE (gcode = @gcode) AND (idx = @idx)"; + this._commandCollection[1].CommandText = @"SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, userManager, wdate, wuid FROM vProjectPartPurchase WHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].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, "", "", "")); @@ -31937,7 +32378,7 @@ WHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[2].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.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "UPDATE ProjectsPart\r\nSET bconfirm = @bconfirm\r\nWHERE (idx = @idx)"; + this._commandCollection[3].CommandText = "UPDATE ProjectsPart\r\nSET bconfirm = @bconfirm\r\nWHERE (idx = @idx)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bconfirm", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].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.Original, false, null, "", "", "")); @@ -32079,7 +32520,6 @@ WHERE (gcode = @gcode) AND (idx = @idx)"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] public virtual int UpdateBConfirm(global::System.Nullable bconfirm, int idx) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((bconfirm.HasValue == true)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index dc0fd50..876712b 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -491,7 +491,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects - DELETE FROM [ProjectsPart] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [Item] IS NULL) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] = @Original_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Original_jago)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ItemName = 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND ((@IsNull_ItemModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_ItemModel)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemSid] = @Original_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL) OR ([ItemSupply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemManu] IS NULL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AND [option1] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 = 1 AND [option2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_option3 = 1 AND [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_ItemSupplyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original_ItemSupplyidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)) AND ((@IsNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_ItemUnit)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Original_qtyjago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @Original_qtybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Original_qtyn)) AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amtn)) AND ((@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin)) AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm)) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bCancel))) + DELETE FROM [ProjectsPart] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [Item] IS NULL) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] = @Original_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Original_jago)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ItemName = 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND ((@IsNull_ItemModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_ItemModel)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemSid] = @Original_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL) OR ([ItemSupply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemManu] IS NULL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AND [option1] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 = 1 AND [option2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_option3 = 1 AND [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_ItemSupplyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original_ItemSupplyidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)) AND ((@IsNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_ItemUnit)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Original_qtyjago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @Original_qtybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Original_qtyn)) AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amtn)) AND ((@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin)) AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm)) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bCancel)) AND ((@IsNull_reqUser = 1 AND [reqUser] IS NULL) OR ([reqUser] = @Original_reqUser)) AND ((@IsNull_recvUser = 1 AND [recvUser] IS NULL) OR ([recvUser] = @Original_recvUser)) AND ((@IsNull_recvDate = 1 AND [recvDate] IS NULL) OR ([recvDate] = @Original_recvDate))) @@ -513,7 +513,7 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects - + @@ -554,13 +554,19 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects + + + + + + - INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn], [qtyin], [bbuy], [bconfirm], [bCancel]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn, @qtyin, @bbuy, @bconfirm, @bCancel); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName + INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn], [qtyin], [bbuy], [bconfirm], [bCancel], [reqUser], [recvUser], [recvDate]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn, @qtyin, @bbuy, @bconfirm, @bCancel, @reqUser, @recvUser, @recvDate); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -572,7 +578,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + @@ -593,13 +599,16 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + + SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, - import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel + import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FROM ProjectsPart WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -610,8 +619,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName - UPDATE [ProjectsPart] SET [Project] = @Project, [Item] = @Item, [qty] = @qty, [price] = @price, [amt] = @amt, [jago] = @jago, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [ItemName] = @ItemName, [ItemModel] = @ItemModel, [ItemGroup] = @ItemGroup, [ItemSid] = @ItemSid, [ItemSupply] = @ItemSupply, [ItemManu] = @ItemManu, [option1] = @option1, [option2] = @option2, [option3] = @option3, [remark] = @remark, [ItemSupplyidx] = @ItemSupplyidx, [no] = @no, [ItemUnit] = @ItemUnit, [import] = @import, [qtyjago] = @qtyjago, [qtybuy] = @qtybuy, [qtyn] = @qtyn, [amtn] = @amtn, [qtyin] = @qtyin, [bbuy] = @bbuy, [bconfirm] = @bconfirm, [bCancel] = @bCancel WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [Item] IS NULL) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] = @Original_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Original_jago)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ItemName = 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND ((@IsNull_ItemModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_ItemModel)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemSid] = @Original_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL) OR ([ItemSupply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemManu] IS NULL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AND [option1] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 = 1 AND [option2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_option3 = 1 AND [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_ItemSupplyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original_ItemSupplyidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)) AND ((@IsNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_ItemUnit)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Original_qtyjago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @Original_qtybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Original_qtyn)) AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amtn)) AND ((@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin)) AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm)) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bCancel))); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName + UPDATE [ProjectsPart] SET [Project] = @Project, [Item] = @Item, [qty] = @qty, [price] = @price, [amt] = @amt, [jago] = @jago, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [ItemName] = @ItemName, [ItemModel] = @ItemModel, [ItemGroup] = @ItemGroup, [ItemSid] = @ItemSid, [ItemSupply] = @ItemSupply, [ItemManu] = @ItemManu, [option1] = @option1, [option2] = @option2, [option3] = @option3, [remark] = @remark, [ItemSupplyidx] = @ItemSupplyidx, [no] = @no, [ItemUnit] = @ItemUnit, [import] = @import, [qtyjago] = @qtyjago, [qtybuy] = @qtybuy, [qtyn] = @qtyn, [amtn] = @amtn, [qtyin] = @qtyin, [bbuy] = @bbuy, [bconfirm] = @bconfirm, [bCancel] = @bCancel, [reqUser] = @reqUser, [recvUser] = @recvUser, [recvDate] = @recvDate WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Item = 1 AND [Item] IS NULL) OR ([Item] = @Original_Item)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_amt = 1 AND [amt] IS NULL) OR ([amt] = @Original_amt)) AND ((@IsNull_jago = 1 AND [jago] IS NULL) OR ([jago] = @Original_jago)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ItemName = 1 AND [ItemName] IS NULL) OR ([ItemName] = @Original_ItemName)) AND ((@IsNull_ItemModel = 1 AND [ItemModel] IS NULL) OR ([ItemModel] = @Original_ItemModel)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup)) AND ((@IsNull_ItemSid = 1 AND [ItemSid] IS NULL) OR ([ItemSid] = @Original_ItemSid)) AND ((@IsNull_ItemSupply = 1 AND [ItemSupply] IS NULL) OR ([ItemSupply] = @Original_ItemSupply)) AND ((@IsNull_ItemManu = 1 AND [ItemManu] IS NULL) OR ([ItemManu] = @Original_ItemManu)) AND ((@IsNull_option1 = 1 AND [option1] IS NULL) OR ([option1] = @Original_option1)) AND ((@IsNull_option2 = 1 AND [option2] IS NULL) OR ([option2] = @Original_option2)) AND ((@IsNull_option3 = 1 AND [option3] IS NULL) OR ([option3] = @Original_option3)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_ItemSupplyidx = 1 AND [ItemSupplyidx] IS NULL) OR ([ItemSupplyidx] = @Original_ItemSupplyidx)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)) AND ((@IsNull_ItemUnit = 1 AND [ItemUnit] IS NULL) OR ([ItemUnit] = @Original_ItemUnit)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_qtyjago = 1 AND [qtyjago] IS NULL) OR ([qtyjago] = @Original_qtyjago)) AND ((@IsNull_qtybuy = 1 AND [qtybuy] IS NULL) OR ([qtybuy] = @Original_qtybuy)) AND ((@IsNull_qtyn = 1 AND [qtyn] IS NULL) OR ([qtyn] = @Original_qtyn)) AND ((@IsNull_amtn = 1 AND [amtn] IS NULL) OR ([amtn] = @Original_amtn)) AND ((@IsNull_qtyin = 1 AND [qtyin] IS NULL) OR ([qtyin] = @Original_qtyin)) AND ((@IsNull_bbuy = 1 AND [bbuy] IS NULL) OR ([bbuy] = @Original_bbuy)) AND ((@IsNull_bconfirm = 1 AND [bconfirm] IS NULL) OR ([bconfirm] = @Original_bconfirm)) AND ((@IsNull_bCancel = 1 AND [bCancel] IS NULL) OR ([bCancel] = @Original_bCancel)) AND ((@IsNull_reqUser = 1 AND [reqUser] IS NULL) OR ([reqUser] = @Original_reqUser)) AND ((@IsNull_recvUser = 1 AND [recvUser] IS NULL) OR ([recvUser] = @Original_recvUser)) AND ((@IsNull_recvDate = 1 AND [recvDate] IS NULL) OR ([recvDate] = @Original_recvDate))); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn, qtyin, bbuy, bconfirm, bCancel, reqUser, recvUser, recvDate FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -623,7 +632,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + @@ -644,6 +653,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + + @@ -664,7 +676,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + @@ -705,6 +717,12 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + + + + + @@ -744,6 +762,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + + @@ -1783,7 +1804,7 @@ WHERE (idx = @idx) SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) - AS userGroupName + AS userGroupName, recvUser, reqUser, bCancel, recvDate FROM vProjectPartPurchase WHERE (gcode = @gcode) ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx @@ -1793,31 +1814,34 @@ ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(P - + UPDATE ProjectsPart SET qtybuy = @qtybuy, qtyin = @qtyin, bbuy = @bbuy, bconfirm = @bconfirm, memo = @memo, ItemSupply = @ItemSupply, option1 = @option1, option2 = @option2, option3 = @option3, - qty = @qty, price = @price, amt = @amt, ItemManu = @ItemManu, ItemSid = @ItemSid, ItemUnit = @ItemUnit, ItemModel = @ItemModel, ItemName = @ItemName, remark = @remark + qty = @qty, price = @price, amt = @amt, ItemManu = @ItemManu, ItemSid = @ItemSid, ItemUnit = @ItemUnit, ItemModel = @ItemModel, ItemName = @ItemName, remark = @remark, + recvUser = @recvUser, recvDate = @recvDate WHERE (idx = @idx) - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1864,16 +1888,16 @@ WHERE (idx = @idx) + + + + - SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, - option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) - AS userGroupName -FROM vProjectPartPurchase -WHERE (gcode = @gcode) AND (idx = @idx) + SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, userManager, wdate, wuid FROM vProjectPartPurchase WHERE (gcode = @gcode) AND (idx = @idx) @@ -1894,7 +1918,18 @@ WHERE (idx = @idx) - + + + + UPDATE ProjectsPart +SET bconfirm = @bconfirm +WHERE (idx = @idx) + + + + + + UPDATE ProjectsPart @@ -2935,7 +2970,7 @@ WHERE (idx = @idx) - + @@ -3245,7 +3280,7 @@ WHERE (idx = @idx) - + @@ -3289,7 +3324,7 @@ WHERE (idx = @idx) - + @@ -3334,7 +3369,7 @@ WHERE (idx = @idx) - + @@ -3447,10 +3482,31 @@ WHERE (idx = @idx) + + + + + + + + + + + + + + + + + + + + + - + @@ -3624,7 +3680,7 @@ WHERE (idx = @idx) - + @@ -3662,7 +3718,7 @@ WHERE (idx = @idx) - + @@ -3778,7 +3834,7 @@ WHERE (idx = @idx) - + @@ -3829,7 +3885,7 @@ WHERE (idx = @idx) - + @@ -3842,7 +3898,7 @@ WHERE (idx = @idx) - + @@ -4014,7 +4070,7 @@ WHERE (idx = @idx) - + @@ -4195,10 +4251,32 @@ WHERE (idx = @idx) + + + + + + + + + + + + + + + + + + + + + + - + @@ -4243,7 +4321,7 @@ WHERE (idx = @idx) - + @@ -4320,7 +4398,7 @@ WHERE (idx = @idx) - + @@ -4511,7 +4589,7 @@ WHERE (idx = @idx) - + @@ -4650,7 +4728,7 @@ WHERE (idx = @idx) - + @@ -4709,7 +4787,7 @@ WHERE (idx = @idx) - + @@ -4755,7 +4833,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 2278956..9e3f287 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. --> - + - - + + - - + + - + - - - - - + + + + + - - - - + + + +