From 3f68c3c5e87499515aafb985af6174214a26b8f3 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Mon, 26 Nov 2018 11:34:20 +0900 Subject: [PATCH] .. --- FarpointGridSetting/fPurchase.xml | 7 +- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FCM0000/dsMSSQL.Designer.cs | 2 +- SubProject/FCM0000/dsMSSQL.xsd | 20 +- SubProject/FCM0000/fInventory.cs | 4 +- .../FEQ0000/Purchase/fPurchase.Designer.cs | 417 ++++++------ SubProject/FEQ0000/Purchase/fPurchase.resx | 2 +- .../FEQ0000/Purchase/fPurchase_Import.cs | 2 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 56 +- SubProject/FEQ0000/dsPurchase.xsd | 16 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 617 +++++++++++++----- SubProject/FPJ0000/dsPRJ.xsd | 99 ++- SubProject/FPJ0000/dsPRJ.xss | 2 +- SubProject/FPJ0000/fPartList.Designer.cs | 179 +++-- SubProject/FPJ0000/fPartList.cs | 24 +- SubProject/FPJ0000/fPartList.resx | 14 +- SubProject/FPJ0000/fProjectList.Designer.cs | 253 +++---- SubProject/FPJ0000/fProjectList.cs | 15 + SubProject/FPJ0000/fProjectList.resx | 3 - 19 files changed, 1072 insertions(+), 664 deletions(-) diff --git a/FarpointGridSetting/fPurchase.xml b/FarpointGridSetting/fPurchase.xml index ead9b3a..d38c5a5 100644 --- a/FarpointGridSetting/fPurchase.xml +++ b/FarpointGridSetting/fPurchase.xml @@ -967,7 +967,7 @@ 0 0 800 - 1029 + 904 spreadNotesContainer ControlText @@ -1031,7 +1031,7 @@ 0 0 800 - 1029 + 904 spreadShapesContainer ControlText @@ -1087,7 +1087,8 @@ - stateName + state + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:System.String diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index fb9904d..1c50cce 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.10.31.0930")] -[assembly: AssemblyFileVersion("18.10.31.0930")] +[assembly: AssemblyVersion("18.11.19.1300")] +[assembly: AssemblyFileVersion("18.11.19.1300")] diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index a2706e1..242e86a 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -8706,7 +8706,7 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = "SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj" + "ect, wuid, wdate, invtype, ItemName, projectName\r\nFROM Inventory\r\nWHERE (pd" + - "ate BETWEEN @sd AND @ed) AND (dbo.getUserName(uid) = @uname)\r\nORDER BY pdate"; + "ate BETWEEN @sd AND @ed) AND (dbo.getUserName(uid) LIKE @uname)\r\nORDER BY pdate"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 24434f5..35fb42e 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -346,7 +346,7 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, project, wuid, wdate, invtype, ItemName, projectName FROM Inventory -WHERE (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(uid) = @uname) +WHERE (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(uid) LIKE @uname) ORDER BY pdate @@ -1163,7 +1163,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1237,7 +1237,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1307,7 +1307,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1378,7 +1378,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1423,7 +1423,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1490,7 +1490,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1549,7 +1549,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1613,7 +1613,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1702,7 +1702,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + diff --git a/SubProject/FCM0000/fInventory.cs b/SubProject/FCM0000/fInventory.cs index 89d21ca..9b1cf38 100644 --- a/SubProject/FCM0000/fInventory.cs +++ b/SubProject/FCM0000/fInventory.cs @@ -85,7 +85,9 @@ namespace FCM0000 { string sd = dtSD.Text; string ed = dtED.Text; - this.ta.FillByName(this.dsMSSQL.Inventory, sd, ed,tbName.Text); + string name = "%"; + if (tbName.Text != "") name = tbName.Text.Trim(); + this.ta.FillByName(this.dsMSSQL.Inventory, sd, ed, name); this.dsMSSQL.Inventory.AcceptChanges(); dv1.AutoResizeColumns(); } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 1416915..2d4f962 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,29 +30,28 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType36 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType101 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType102 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -103,13 +102,13 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.sheetView1 = new FarPoint.Win.Spread.SheetView(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); this.금일입고품목ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.내가등록한자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -117,7 +116,7 @@ this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.sheetView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // dsPurchase @@ -538,185 +537,6 @@ this.btSearch.Text = "Refresh(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.ContextMenuStrip = this.cm1; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.EditModeReplace = true; - this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1.Location = new System.Drawing.Point(0, 25); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.sheetView1}); - this.fpSpread1.Size = new System.Drawing.Size(878, 468); - this.fpSpread1.TabIndex = 4; - // - // sheetView1 - // - this.sheetView1.Reset(); - this.sheetView1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.sheetView1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.sheetView1.ColumnCount = 23; - this.sheetView1.ActiveColumnIndex = -1; - this.sheetView1.ActiveRowIndex = -1; - this.sheetView1.AutoGenerateColumns = false; - this.sheetView1.ColumnHeader.Cells.Get(0, 0).Value = "Date"; - this.sheetView1.ColumnHeader.Cells.Get(0, 1).Value = "state"; - this.sheetView1.ColumnHeader.Cells.Get(0, 4).Value = "sc#"; - this.sheetView1.ColumnHeader.Cells.Get(0, 6).Value = "sid#"; - this.sheetView1.ColumnHeader.Cells.Get(0, 7).Value = "Item"; - this.sheetView1.ColumnHeader.Cells.Get(0, 8).Value = "*"; - this.sheetView1.ColumnHeader.Cells.Get(0, 9).Value = "Model"; - this.sheetView1.ColumnHeader.Cells.Get(0, 10).Value = "Qty"; - this.sheetView1.ColumnHeader.Cells.Get(0, 11).Value = "Unit"; - this.sheetView1.ColumnHeader.Cells.Get(0, 12).Value = "Price"; - this.sheetView1.ColumnHeader.Cells.Get(0, 13).Value = "Amt"; - this.sheetView1.ColumnHeader.Cells.Get(0, 14).Value = "Supply"; - this.sheetView1.ColumnHeader.Cells.Get(0, 15).Value = "*"; - this.sheetView1.ColumnHeader.Cells.Get(0, 17).Value = "*"; - this.sheetView1.ColumnHeader.Rows.Get(0).Height = 37F; - this.sheetView1.Columns.Get(0).CellType = textCellType86; - this.sheetView1.Columns.Get(0).DataField = "pdate"; - this.sheetView1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(0).Label = "Date"; - this.sheetView1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.sheetView1.Columns.Get(0).Width = 34F; - this.sheetView1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.sheetView1.Columns.Get(1).CellType = textCellType87; - this.sheetView1.Columns.Get(1).DataField = "stateName"; - this.sheetView1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(1).Label = "state"; - this.sheetView1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.sheetView1.Columns.Get(1).Width = 34F; - this.sheetView1.Columns.Get(2).CellType = textCellType88; - this.sheetView1.Columns.Get(2).DataField = "process"; - this.sheetView1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.sheetView1.Columns.Get(2).Width = 49F; - this.sheetView1.Columns.Get(3).CellType = textCellType89; - this.sheetView1.Columns.Get(3).DataField = "request"; - this.sheetView1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(3).Width = 48F; - this.sheetView1.Columns.Get(4).CellType = textCellType90; - this.sheetView1.Columns.Get(4).DataField = "sc"; - this.sheetView1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(4).Label = "sc#"; - this.sheetView1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.sheetView1.Columns.Get(4).Width = 27F; - this.sheetView1.Columns.Get(5).CellType = textCellType91; - this.sheetView1.Columns.Get(5).DataField = "receive"; - this.sheetView1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(5).Width = 46F; - this.sheetView1.Columns.Get(6).CellType = textCellType92; - this.sheetView1.Columns.Get(6).DataField = "sid"; - this.sheetView1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(6).Label = "sid#"; - this.sheetView1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.sheetView1.Columns.Get(6).Width = 31F; - this.sheetView1.Columns.Get(7).CellType = textCellType93; - this.sheetView1.Columns.Get(7).DataField = "pumname"; - this.sheetView1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(7).Label = "Item"; - this.sheetView1.Columns.Get(7).Width = 33F; - this.sheetView1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType31.DecimalPlaces = 0; - numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType31.MaximumValue = 2147483647D; - numberCellType31.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(8).CellType = numberCellType31; - this.sheetView1.Columns.Get(8).DataField = "pumidx"; - this.sheetView1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(8).Label = "*"; - this.sheetView1.Columns.Get(8).Width = 14F; - this.sheetView1.Columns.Get(9).CellType = textCellType94; - this.sheetView1.Columns.Get(9).DataField = "pumscale"; - this.sheetView1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(9).Label = "Model"; - this.sheetView1.Columns.Get(9).Width = 43F; - numberCellType32.DecimalPlaces = 0; - numberCellType32.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType32.MaximumValue = 2147483647D; - numberCellType32.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(10).CellType = numberCellType32; - this.sheetView1.Columns.Get(10).DataField = "pumqty"; - this.sheetView1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(10).Label = "Qty"; - this.sheetView1.Columns.Get(10).Width = 28F; - this.sheetView1.Columns.Get(11).CellType = textCellType95; - this.sheetView1.Columns.Get(11).DataField = "pumunit"; - this.sheetView1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(11).Label = "Unit"; - this.sheetView1.Columns.Get(11).Width = 31F; - numberCellType33.MaximumValue = 999999999999999D; - numberCellType33.MinimumValue = -999999999999999D; - this.sheetView1.Columns.Get(12).CellType = numberCellType33; - this.sheetView1.Columns.Get(12).DataField = "pumprice"; - this.sheetView1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.sheetView1.Columns.Get(12).Label = "Price"; - this.sheetView1.Columns.Get(12).Width = 35F; - numberCellType34.MaximumValue = 999999999999999D; - numberCellType34.MinimumValue = -999999999999999D; - this.sheetView1.Columns.Get(13).CellType = numberCellType34; - this.sheetView1.Columns.Get(13).DataField = "pumamt"; - this.sheetView1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.sheetView1.Columns.Get(13).Label = "Amt"; - this.sheetView1.Columns.Get(13).Width = 32F; - this.sheetView1.Columns.Get(14).CellType = textCellType96; - this.sheetView1.Columns.Get(14).DataField = "supply"; - this.sheetView1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(14).Label = "Supply"; - this.sheetView1.Columns.Get(14).Width = 46F; - this.sheetView1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType35.DecimalPlaces = 0; - numberCellType35.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType35.MaximumValue = 2147483647D; - numberCellType35.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(15).CellType = numberCellType35; - this.sheetView1.Columns.Get(15).DataField = "supplyidx"; - this.sheetView1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(15).Label = "*"; - this.sheetView1.Columns.Get(15).Width = 14F; - this.sheetView1.Columns.Get(16).CellType = textCellType97; - this.sheetView1.Columns.Get(16).DataField = "project"; - this.sheetView1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(16).Width = 46F; - this.sheetView1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType36.DecimalPlaces = 0; - numberCellType36.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType36.MaximumValue = 2147483647D; - numberCellType36.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(17).CellType = numberCellType36; - this.sheetView1.Columns.Get(17).DataField = "projectidx"; - this.sheetView1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(17).Label = "*"; - this.sheetView1.Columns.Get(17).Width = 14F; - this.sheetView1.Columns.Get(18).CellType = textCellType98; - this.sheetView1.Columns.Get(18).DataField = "asset"; - this.sheetView1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(18).Width = 35F; - this.sheetView1.Columns.Get(19).CellType = textCellType99; - this.sheetView1.Columns.Get(19).DataField = "edate"; - this.sheetView1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(19).Width = 38F; - this.sheetView1.Columns.Get(20).CellType = textCellType100; - this.sheetView1.Columns.Get(20).DataField = "indate"; - this.sheetView1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(20).Width = 42F; - this.sheetView1.Columns.Get(21).CellType = textCellType101; - this.sheetView1.Columns.Get(21).DataField = "po"; - this.sheetView1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.sheetView1.Columns.Get(21).Width = 23F; - this.sheetView1.Columns.Get(22).CellType = textCellType102; - this.sheetView1.Columns.Get(22).DataField = "dept"; - this.sheetView1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.sheetView1.Columns.Get(22).Width = 33F; - this.sheetView1.DataAutoSizeColumns = false; - this.sheetView1.DataSource = this.bs; - this.sheetView1.RowHeader.Columns.Default.Resizable = false; - this.sheetView1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; @@ -755,6 +575,189 @@ this.이번달자료ToolStripMenuItem.Text = "이번달 자료"; this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click); // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.ContextMenuStrip = this.cm1; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.EditModeReplace = true; + this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.fpSpread1.Location = new System.Drawing.Point(0, 25); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(878, 468); + this.fpSpread1.TabIndex = 4; + // + // 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 = 23; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "state"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "sc#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "sid#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Item"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Model"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Qty"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Unit"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Price"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Amt"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Supply"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "Date"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 34F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 34F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 49F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "sc#"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "sid#"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 31F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "Item"; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F; + this.fpSpread1_Sheet1.Columns.Get(8).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(8).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 14F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "Model"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Qty"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 28F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Unit"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 31F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "Price"; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "Amt"; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "Supply"; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "supplyidx"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 14F; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 14F; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 38F; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 42F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 23F; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "dept"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 33F; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + 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; + // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -776,7 +779,7 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.sheetView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -833,7 +836,6 @@ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; private System.Windows.Forms.ToolStripButton btEdit; - private FarPoint.Win.Spread.SheetView sheetView1; private System.Windows.Forms.ToolStripMenuItem exportDataToolStripMenuItem; private System.Windows.Forms.ToolStripComboBox cmDate; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; @@ -841,5 +843,6 @@ private System.Windows.Forms.ToolStripMenuItem 금일입고품목ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 내가등록한자료ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 이번달자료ToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index c34f868..5f29fe3 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -301,7 +301,7 @@ wdMZXkp4+r8UxSdk1wcO0mb/TQAAAABJRU5ErkJggg== - + 577, 17 \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs index 3da2c66..2075606 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs @@ -254,7 +254,7 @@ namespace FEQ0000 newdr["receive"] = dr[2].ToString(); newdr["sc"] = dr[3].ToString(); newdr["request"] = dr[4].ToString(); - newdr["sid"] = dr[5].ToString(); + newdr["sid"] = dr[5].ToString().Replace(" ",""); //181116 - 빈공백제거 //이름 변경함 if (dr[6].ToString() != "") dr[6] = dr[6].ToString().Replace("*", "x"); diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index a8dd98f..e1581c5 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -333,8 +333,6 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnpumidx; - private global::System.Data.DataColumn columnstateName; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public PurchaseDataTable() { @@ -584,14 +582,6 @@ namespace FEQ0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn stateNameColumn { - get { - return this.columnstateName; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -655,8 +645,7 @@ namespace FEQ0000 { string wuid, System.DateTime wdate, bool import, - int pumidx, - string stateName) { + int pumidx) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -685,8 +674,7 @@ namespace FEQ0000 { wuid, wdate, import, - pumidx, - stateName}; + pumidx}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -743,7 +731,6 @@ namespace FEQ0000 { this.columnwdate = base.Columns["wdate"]; this.columnimport = base.Columns["import"]; this.columnpumidx = base.Columns["pumidx"]; - this.columnstateName = base.Columns["stateName"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -803,8 +790,6 @@ namespace FEQ0000 { base.Columns.Add(this.columnimport); this.columnpumidx = new global::System.Data.DataColumn("pumidx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpumidx); - this.columnstateName = new global::System.Data.DataColumn("stateName", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnstateName); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -833,8 +818,6 @@ namespace FEQ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; - this.columnstateName.ReadOnly = true; - this.columnstateName.MaxLength = 200; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1392,22 +1375,6 @@ namespace FEQ0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string stateName { - get { - if (this.IsstateNameNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablePurchase.stateNameColumn])); - } - } - set { - this[this.tablePurchase.stateNameColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IspdateNull() { @@ -1695,18 +1662,6 @@ namespace FEQ0000 { public void SetpumidxNull() { this[this.tablePurchase.pumidxColumn] = global::System.Convert.DBNull; } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsstateNameNull() { - return this.IsNull(this.tablePurchase.stateNameColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetstateNameNull() { - this[this.tablePurchase.stateNameColumn] = global::System.Convert.DBNull; - } } /// @@ -1895,7 +1850,6 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("pumidx", "pumidx"); - tableMapping.ColumnMappings.Add("stateName", "stateName"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -2129,7 +2083,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName + wdate, import, pumidx FROM Purchase ORDER BY pdate DESC, idx DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -2142,9 +2096,9 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName + wdate, import, pumidx FROM Purchase -where pdate between @sd and @ed +WHERE (pdate BETWEEN @sd AND @ed) ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 1cdfba5..9c540e0 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -101,7 +101,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName + wdate, import, pumidx FROM Purchase ORDER BY pdate DESC, idx DESC @@ -219,7 +219,6 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - @@ -244,9 +243,9 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName + wdate, import, pumidx FROM Purchase -where pdate between @sd and @ed +WHERE (pdate BETWEEN @sd AND @ed) ORDER BY pdate DESC, idx DESC @@ -265,7 +264,7 @@ ORDER BY pdate DESC, idx DESC - + @@ -403,13 +402,6 @@ ORDER BY pdate DESC, idx DESC - - - - - - - diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 6149608..56f5921 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -408,12 +408,14 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnstatus; - private global::System.Data.DataColumn columnstatusName; - private global::System.Data.DataColumn columnusermain; private global::System.Data.DataColumn columnusersub; + private global::System.Data.DataColumn columnrev; + + private global::System.Data.DataColumn columnpidx; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() { @@ -543,14 +545,6 @@ namespace FPJ0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn statusNameColumn { - get { - return this.columnstatusName; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn usermainColumn { @@ -567,6 +561,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn revColumn { + get { + return this.columnrev; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pidxColumn { + get { + return this.columnpidx; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -604,7 +614,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsRow AddProjectsRow(string name, string pdate, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate, string status, string statusName, string usermain, string usersub) { + public ProjectsRow AddProjectsRow(string name, string pdate, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate, string status, string usermain, string usersub, int rev, int pidx) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -619,9 +629,10 @@ namespace FPJ0000 { wuid, wdate, status, - statusName, usermain, - usersub}; + usersub, + rev, + pidx}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -663,9 +674,10 @@ namespace FPJ0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnstatus = base.Columns["status"]; - this.columnstatusName = base.Columns["statusName"]; this.columnusermain = base.Columns["usermain"]; this.columnusersub = base.Columns["usersub"]; + this.columnrev = base.Columns["rev"]; + this.columnpidx = base.Columns["pidx"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -695,12 +707,14 @@ namespace FPJ0000 { base.Columns.Add(this.columnwdate); this.columnstatus = new global::System.Data.DataColumn("status", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnstatus); - this.columnstatusName = new global::System.Data.DataColumn("statusName", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnstatusName); this.columnusermain = new global::System.Data.DataColumn("usermain", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnusermain); this.columnusersub = new global::System.Data.DataColumn("usersub", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnusersub); + this.columnrev = new global::System.Data.DataColumn("rev", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrev); + this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpidx); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -720,9 +734,7 @@ namespace FPJ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; - this.columnstatus.MaxLength = 2; - this.columnstatusName.ReadOnly = true; - this.columnstatusName.MaxLength = 200; + this.columnstatus.MaxLength = 20; this.columnusermain.MaxLength = 50; this.columnusersub.MaxLength = 50; } @@ -888,6 +900,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnitemSID; + private global::System.Data.DataColumn columnItemGroup; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsPartDataTable() { @@ -1041,6 +1055,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ItemGroupColumn { + get { + return this.columnItemGroup; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1078,7 +1100,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsPartRow AddProjectsPartRow(int Project, int Item, int qty, decimal price, decimal amt, int jago, string memo, string wuid, System.DateTime wdate, string ItemName, string ItemModel, int supplyidx, string supplyName, string itemSID) { + public ProjectsPartRow AddProjectsPartRow(int Project, int Item, int qty, decimal price, decimal amt, int jago, string memo, string wuid, System.DateTime wdate, string ItemName, string ItemModel, int supplyidx, string supplyName, string itemSID, string ItemGroup) { ProjectsPartRow rowProjectsPartRow = ((ProjectsPartRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1095,7 +1117,8 @@ namespace FPJ0000 { ItemModel, supplyidx, supplyName, - itemSID}; + itemSID, + ItemGroup}; rowProjectsPartRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsPartRow); return rowProjectsPartRow; @@ -1140,6 +1163,7 @@ namespace FPJ0000 { this.columnsupplyidx = base.Columns["supplyidx"]; this.columnsupplyName = base.Columns["supplyName"]; this.columnitemSID = base.Columns["itemSID"]; + this.columnItemGroup = base.Columns["ItemGroup"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1179,6 +1203,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnsupplyName); this.columnitemSID = new global::System.Data.DataColumn("itemSID", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnitemSID); + this.columnItemGroup = new global::System.Data.DataColumn("ItemGroup", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnItemGroup); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1196,6 +1222,7 @@ namespace FPJ0000 { this.columnsupplyName.MaxLength = 200; this.columnitemSID.ReadOnly = true; this.columnitemSID.MaxLength = 200; + this.columnItemGroup.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2350,30 +2377,14 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string statusName { + public string usermain { get { - if (this.IsstatusNameNull()) { + if (this.IsusermainNull()) { return string.Empty; } else { - return ((string)(this[this.tableProjects.statusNameColumn])); - } - } - set { - this[this.tableProjects.statusNameColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string usermain { - get { - try { return ((string)(this[this.tableProjects.usermainColumn])); } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'usermain\' 열의 값이 DBNull입니다.", e); - } } set { this[this.tableProjects.usermainColumn] = value; @@ -2384,11 +2395,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string usersub { get { - try { - return ((string)(this[this.tableProjects.usersubColumn])); + if (this.IsusersubNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'usersub\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableProjects.usersubColumn])); } } set { @@ -2396,6 +2407,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int rev { + get { + if (this.IsrevNull()) { + return 0; + } + else { + return ((int)(this[this.tableProjects.revColumn])); + } + } + set { + this[this.tableProjects.revColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int pidx { + get { + if (this.IspidxNull()) { + return -1; + } + else { + return ((int)(this[this.tableProjects.pidxColumn])); + } + } + set { + this[this.tableProjects.pidxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -2504,18 +2547,6 @@ namespace FPJ0000 { this[this.tableProjects.statusColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsstatusNameNull() { - return this.IsNull(this.tableProjects.statusNameColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetstatusNameNull() { - this[this.tableProjects.statusNameColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsusermainNull() { @@ -2539,6 +2570,30 @@ namespace FPJ0000 { public void SetusersubNull() { this[this.tableProjects.usersubColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsrevNull() { + return this.IsNull(this.tableProjects.revColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetrevNull() { + this[this.tableProjects.revColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspidxNull() { + return this.IsNull(this.tableProjects.pidxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpidxNull() { + this[this.tableProjects.pidxColumn] = global::System.Convert.DBNull; + } } /// @@ -2780,6 +2835,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string ItemGroup { + get { + if (this.IsItemGroupNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjectsPart.ItemGroupColumn])); + } + } + set { + this[this.tableProjectsPart.ItemGroupColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsProjectNull() { @@ -2923,6 +2994,18 @@ namespace FPJ0000 { public void SetitemSIDNull() { this[this.tableProjectsPart.itemSIDColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsItemGroupNull() { + return this.IsNull(this.tableProjectsPart.ItemGroupColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetItemGroupNull() { + this[this.tableProjectsPart.ItemGroupColumn] = global::System.Convert.DBNull; + } } /// @@ -3770,13 +3853,14 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("status", "status"); - tableMapping.ColumnMappings.Add("statusName", "statusName"); tableMapping.ColumnMappings.Add("usermain", "usermain"); tableMapping.ColumnMappings.Add("usersub", "usersub"); + tableMapping.ColumnMappings.Add("rev", "rev"); + tableMapping.ColumnMappings.Add("pidx", "pidx"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)))"; 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_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -3803,10 +3887,14 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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 [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate); -SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -3821,10 +3909,30 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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 [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate FROM Projects WHERE (idx = @idx) ORDER BY status"; + this._adapter.UpdateCommand.CommandText = "UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [user" + + "main] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @req" + + "staff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wu" + + "id] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx WHERE (([idx] = @Ori" + + "ginal_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Origin" + + "al_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original" + + "_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)" + + ") AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_" + + "usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Ori" + + "ginal_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] =" + + " @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([req" + + "staff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([" + + "sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([eda" + + "te] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate]" + + " = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Or" + + "iginal_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND " + + "((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_p" + + "idx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)));\r\nSELECT idx, status," + + " pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, w" + + "uid, wdate, rev, pidx FROM Projects WHERE (idx = @idx) ORDER BY status"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -3839,6 +3947,8 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -3864,6 +3974,10 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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, "", "", "")); } @@ -3880,16 +3994,16 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, status, dbo.getCodeName(\'01\', status) AS statusName, pdate, name, us" + - "ermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate\r\nFROM" + - " Projects\r\nWHERE (status LIKE @state)\r\nORDER BY status"; + this._commandCollection[0].CommandText = "SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed" + + "ate, odate, memo, wuid, wdate, rev, pidx\r\nFROM Projects\r\nWHERE (status LIKE" + + " @state)\r\nORDER BY status"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", 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 idx, status, dbo.getCodeName(\'01\', status) AS statusName, pdate, name, us" + - "ermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate\r\nFROM" + - " Projects\r\nWHERE (idx = @idx)"; + this._commandCollection[1].CommandText = "SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate" + + ", status, usermain, usersub, wdate, wuid\r\nFROM Projects\r\nWHERE (idx = @idx)" + + ""; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; 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, "", "", "")); } @@ -3989,7 +4103,23 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_status, string Original_pdate, string Original_name, string Original_usermain, string Original_usersub, string Original_request, string Original_reqstaff, string Original_sdate, string Original_edate, string Original_odate, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete( + int Original_idx, + string Original_status, + string Original_pdate, + string Original_name, + string Original_usermain, + string Original_usersub, + string Original_request, + string Original_reqstaff, + string Original_sdate, + string Original_edate, + string Original_odate, + string Original_memo, + string Original_wuid, + System.DateTime Original_wdate, + global::System.Nullable Original_rev, + global::System.Nullable Original_pidx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_status == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -4086,6 +4216,22 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this.Adapter.DeleteCommand.Parameters[23].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[24].Value = ((System.DateTime)(Original_wdate)); + if ((Original_rev.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[26].Value = ((int)(Original_rev.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; + } + if ((Original_pidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[28].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4106,7 +4252,7 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string status, string pdate, string name, string usermain, string usersub, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate) { + public virtual int Insert(string status, string pdate, string name, string usermain, string usersub, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate, global::System.Nullable rev, global::System.Nullable pidx) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4180,6 +4326,18 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this.Adapter.InsertCommand.Parameters[11].Value = ((string)(wuid)); } this.Adapter.InsertCommand.Parameters[12].Value = ((System.DateTime)(wdate)); + if ((rev.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[13].Value = ((int)(rev.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value; + } + if ((pidx.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[14].Value = ((int)(pidx.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4214,6 +4372,8 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us string memo, string wuid, System.DateTime wdate, + global::System.Nullable rev, + global::System.Nullable pidx, int Original_idx, string Original_status, string Original_pdate, @@ -4228,6 +4388,8 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us string Original_memo, string Original_wuid, System.DateTime Original_wdate, + global::System.Nullable Original_rev, + global::System.Nullable Original_pidx, int idx) { if ((status == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4302,103 +4464,131 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(wuid)); } this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx)); - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + if ((rev.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(rev.Value)); } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } - if ((Original_pdate == null)) { + if ((pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(pidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx)); + if ((Original_status == null)) { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_status)); } - if ((Original_name == null)) { + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_pdate)); } - if ((Original_usermain == null)) { + if ((Original_name == null)) { this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_name)); } - if ((Original_usersub == null)) { + if ((Original_usermain == null)) { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_usersub)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_usermain)); } - if ((Original_request == null)) { + if ((Original_usersub == null)) { this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_usersub)); } - if ((Original_reqstaff == null)) { + if ((Original_request == null)) { this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_request)); } - if ((Original_sdate == null)) { + if ((Original_reqstaff == null)) { this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_sdate)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_reqstaff)); } - if ((Original_edate == null)) { + if ((Original_sdate == null)) { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_sdate)); } - if ((Original_odate == null)) { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_odate)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_edate)); } - if ((Original_memo == null)) { + if ((Original_odate == null)) { this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_odate)); + } + if ((Original_memo == null)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[37].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_wdate)); + if ((Original_rev.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((int)(Original_rev.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + } + if ((Original_pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[44].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)) { @@ -4433,6 +4623,8 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us string memo, string wuid, System.DateTime wdate, + global::System.Nullable rev, + global::System.Nullable pidx, int Original_idx, string Original_status, string Original_pdate, @@ -4446,8 +4638,10 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us string Original_odate, string Original_memo, string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_request, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_idx); + System.DateTime Original_wdate, + global::System.Nullable Original_rev, + global::System.Nullable Original_pidx) { + return this.Update(status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_request, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_idx); } } @@ -4587,10 +4781,11 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us tableMapping.ColumnMappings.Add("supplyidx", "supplyidx"); tableMapping.ColumnMappings.Add("supplyName", "supplyName"); tableMapping.ColumnMappings.Add("itemSID", "itemSID"); + tableMapping.ColumnMappings.Add("ItemGroup", "ItemGroup"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)))"; + this._adapter.DeleteCommand.CommandText = @"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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup)))"; 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, "", "", "")); @@ -4615,10 +4810,12 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us 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("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_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.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], [supplyidx]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @supplyidx); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [supplyidx], [ItemGroup]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @supplyidx, @ItemGroup); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID, ItemGroup FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY())"; 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, "", "", "")); @@ -4632,10 +4829,11 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I 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("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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.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, [price] = @price, [amt] = @amt, [jago] = @jago, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [ItemName] = @ItemName, [ItemModel] = @ItemModel, [supplyidx] = @supplyidx 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx FROM ProjectsPart WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"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, [supplyidx] = @supplyidx, [ItemGroup] = @ItemGroup 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup))); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID, ItemGroup FROM ProjectsPart WHERE (idx = @idx)"; 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, "", "", "")); @@ -4649,6 +4847,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("@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("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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("@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, "", "", "")); @@ -4672,6 +4871,8 @@ 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_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("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4690,7 +4891,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I" + "temModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(It" + - "em) AS itemSID\r\nFROM ProjectsPart\r\nWHERE (Project = @prj)"; + "em) AS itemSID, ItemGroup\r\nFROM ProjectsPart\r\nWHERE (Project = @prj)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prj", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4764,7 +4965,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, global::System.Nullable Original_qty, global::System.Nullable Original_price, global::System.Nullable Original_amt, global::System.Nullable Original_jago, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_ItemName, string Original_ItemModel, global::System.Nullable Original_supplyidx) { + public virtual int Delete(int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, global::System.Nullable Original_qty, global::System.Nullable Original_price, global::System.Nullable Original_amt, global::System.Nullable Original_jago, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_ItemName, string Original_ItemModel, global::System.Nullable Original_supplyidx, string Original_ItemGroup) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_Project.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); @@ -4853,6 +5054,14 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; } + if ((Original_ItemGroup == null)) { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_ItemGroup)); + } 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)) { @@ -4873,7 +5082,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(global::System.Nullable Project, global::System.Nullable Item, global::System.Nullable qty, global::System.Nullable price, global::System.Nullable amt, global::System.Nullable jago, string memo, string wuid, System.DateTime wdate, string ItemName, string ItemModel, global::System.Nullable supplyidx) { + public virtual int Insert(global::System.Nullable Project, global::System.Nullable Item, global::System.Nullable qty, global::System.Nullable price, global::System.Nullable amt, global::System.Nullable jago, string memo, string wuid, System.DateTime wdate, string ItemName, string ItemModel, global::System.Nullable supplyidx, string ItemGroup) { if ((Project.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(Project.Value)); } @@ -4941,6 +5150,12 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I else { this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value; } + if ((ItemGroup == null)) { + this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[12].Value = ((string)(ItemGroup)); + } 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)) { @@ -4974,6 +5189,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I string ItemName, string ItemModel, global::System.Nullable supplyidx, + string ItemGroup, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, @@ -4987,6 +5203,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I string Original_ItemName, string Original_ItemModel, global::System.Nullable Original_supplyidx, + string Original_ItemGroup, int idx) { if ((Project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(Project.Value)); @@ -5055,95 +5272,109 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I else { this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_idx)); - if ((Original_Project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_Project.Value)); + if ((ItemGroup == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(ItemGroup)); + } + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx)); + if ((Original_Project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_Project.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } if ((Original_Item.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_Item.Value)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_Item.Value)); } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } if ((Original_qty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_qty.Value)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_qty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } if ((Original_price.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((decimal)(Original_price.Value)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((decimal)(Original_price.Value)); } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } if ((Original_amt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((decimal)(Original_amt.Value)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((decimal)(Original_amt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } if ((Original_jago.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_jago.Value)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_jago.Value)); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[28].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((System.DateTime)(Original_wdate)); if ((Original_ItemName == null)) { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_ItemName)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_ItemName)); } if ((Original_ItemModel == null)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_ItemModel)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_ItemModel)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(idx)); + if ((Original_ItemGroup == null)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_ItemGroup)); + } + this.Adapter.UpdateCommand.Parameters[38].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)) { @@ -5177,6 +5408,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I string ItemName, string ItemModel, global::System.Nullable supplyidx, + string ItemGroup, int Original_idx, global::System.Nullable Original_Project, global::System.Nullable Original_Item, @@ -5189,8 +5421,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I System.DateTime Original_wdate, string Original_ItemName, string Original_ItemModel, - global::System.Nullable Original_supplyidx) { - return this.Update(Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, 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_supplyidx, Original_idx); + global::System.Nullable Original_supplyidx, + string Original_ItemGroup) { + return this.Update(Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, ItemGroup, 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_supplyidx, Original_ItemGroup, Original_idx); } } @@ -6594,6 +6827,78 @@ SELECT idx, project, title, sw, ew, memo, wuid, wdate, swa, ewa FROM ProjectsSch } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class QueriesTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.IDbCommand[] _commandCollection; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected global::System.Data.IDbCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.IDbCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FPJ0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "dbo.CopyProjectData"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userno", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int CopyProjectData(global::System.Nullable pidx, string userno) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[0])); + if ((pidx.HasValue == true)) { + command.Parameters[1].Value = ((int)(pidx.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((userno == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(userno)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 6aa7e9b..fea6ded 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))) @@ -39,13 +39,17 @@ + + + + - INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate); -SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status + INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status @@ -60,24 +64,26 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us + + - SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate + SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (status LIKE @state) ORDER BY status - + - UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate FROM Projects WHERE (idx = @idx) ORDER BY status + UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = @idx) ORDER BY status @@ -92,6 +98,8 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us + + @@ -117,6 +125,10 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us + + + + @@ -136,15 +148,16 @@ SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, us - + + - SELECT idx, status, dbo.getCodeName('01', status) AS statusName, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate + SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate, status, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = @idx) @@ -160,7 +173,7 @@ WHERE (idx = @idx) - 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))) + 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup))) @@ -185,13 +198,15 @@ WHERE (idx = @idx) + + - INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [supplyidx]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @supplyidx); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [supplyidx], [ItemGroup]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @supplyidx, @ItemGroup); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID, ItemGroup FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) @@ -205,12 +220,13 @@ 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, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID + SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID, ItemGroup FROM ProjectsPart WHERE (Project = @prj) @@ -220,8 +236,8 @@ WHERE (Project = @prj) - 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, [supplyidx] = @supplyidx 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx FROM ProjectsPart WHERE (idx = @idx) + 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, [supplyidx] = @supplyidx, [ItemGroup] = @ItemGroup 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_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_ItemGroup = 1 AND [ItemGroup] IS NULL) OR ([ItemGroup] = @Original_ItemGroup))); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, supplyidx, dbo.getCustName(supplyidx) AS supplyName, dbo.getItemSID(Item) AS itemSID, ItemGroup FROM ProjectsPart WHERE (idx = @idx) @@ -235,6 +251,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + @@ -258,7 +275,9 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + + + @@ -280,6 +299,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + @@ -525,14 +545,27 @@ SELECT idx, project, title, sw, ew, memo, wuid, wdate, swa, ewa FROM ProjectsSch - + + + + + dbo.CopyProjectData + + + + + + + + + - + @@ -603,35 +636,30 @@ SELECT idx, project, title, sw, ew, memo, wuid, wdate, swa, ewa FROM ProjectsSch - + - - - - - - - - + - + + + - + @@ -685,10 +713,17 @@ SELECT idx, project, title, sw, ew, memo, wuid, wdate, swa, ewa FROM ProjectsSch + + + + + + + - + @@ -761,7 +796,7 @@ SELECT idx, project, title, sw, ew, memo, wuid, wdate, swa, ewa FROM ProjectsSch - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 5fb6f8d..6afe85a 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/SubProject/FPJ0000/fPartList.Designer.cs b/SubProject/FPJ0000/fPartList.Designer.cs index 31f40b4..29bbea3 100644 --- a/SubProject/FPJ0000/fPartList.Designer.cs +++ b/SubProject/FPJ0000/fPartList.Designer.cs @@ -42,16 +42,17 @@ FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.idxTextBox = new System.Windows.Forms.TextBox(); @@ -87,6 +88,8 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btRefresh = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -227,6 +230,7 @@ // this.bs.DataMember = "Projects"; this.bs.DataSource = this.dsPRJ; + this.bs.Sort = ""; // // dsPRJ // @@ -379,6 +383,7 @@ // this.bsPart.DataMember = "ProjectsPart"; this.bsPart.DataSource = this.dsPRJ; + this.bsPart.Sort = "ItemGroup,ItemName"; // // bn // @@ -397,6 +402,8 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, + this.btRefresh, + this.toolStripSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, this.toolStripButton1, @@ -498,6 +505,20 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // + // btRefresh + // + this.btRefresh.Image = ((System.Drawing.Image)(resources.GetObject("btRefresh.Image"))); + this.btRefresh.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRefresh.Name = "btRefresh"; + this.btRefresh.Size = new System.Drawing.Size(66, 22); + this.btRefresh.Text = "Refresh"; + this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // // toolStripButton1 // this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); @@ -585,7 +606,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 = 11; + this.fpSpread1_Sheet1.ColumnCount = 12; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -595,104 +616,124 @@ this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "CornerFooterFlat"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Item"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Model"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Stock"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Supply"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "SID"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Group"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Item"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Model"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Stock"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Supply"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "SID"; 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"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemName"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "Item"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemGroup"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "Group"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ItemName"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "Item"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(2).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(1).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "Item"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "ItemModel"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "Model"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Item"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 88F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemModel"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "Model"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; 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 = "qty"; - 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 = 88F; + numberCellType2.NegativeRed = true; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "qty"; + 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 = 97F; + numberCellType3.DecimalPlaces = 0; numberCellType3.MaximumValue = 999999999999999D; numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(4).Formula = "qty*price"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "amt"; + numberCellType3.NegativeRed = true; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(5).Formula = "qty*price"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType4.DecimalPlaces = 0; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + numberCellType4.NegativeRed = true; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "amt"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; numberCellType5.DecimalPlaces = 0; numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType5.MaximumValue = 2147483647D; numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "jago"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Stock"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "jago"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "Stock"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(7).Width = 88F; this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "supplyName"; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Supply"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 100F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supplyName"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(9).ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "Supply"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType6.DecimalPlaces = 0; numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType6.MaximumValue = 2147483647D; numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "itemSID"; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "SID"; + 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 = 88F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "itemSID"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "SID"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bsPart; this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -792,6 +833,8 @@ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripButton btRefresh; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fPartList.cs b/SubProject/FPJ0000/fPartList.cs index 895b25f..9bcc5ee 100644 --- a/SubProject/FPJ0000/fPartList.cs +++ b/SubProject/FPJ0000/fPartList.cs @@ -71,11 +71,25 @@ namespace FPJ0000 } RefreshData(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + + } void RefreshData() { - this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex); - this.taPart.Fill(this.dsPRJ.ProjectsPart, this.ProjectIndex); + if(dsPRJ.HasChanges()) + { + var dlg = FCOMMON.Util.MsgQ("변경 사항이 있습니다. 갱신하면 변경 내용이 손실 됩니다.\n지금 갱신 하겠습니까?"); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + } + + try { + this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex); + this.taPart.Fill(this.dsPRJ.ProjectsPart, this.ProjectIndex); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } //로딩후에 sid 와 suuply 를 조회해준다. //foreach (dsPRJ.ProjectsPartRow dr in this.dsPRJ.ProjectsPart.Rows) @@ -113,6 +127,7 @@ namespace FPJ0000 { var cnt = this.tam.UpdateAll(this.dsPRJ); FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 업데이트 되었습니다."); + this.dsPRJ.AcceptChanges(); } catch (Exception ex) { @@ -269,5 +284,10 @@ namespace FPJ0000 } } + + private void btRefresh_Click(object sender, EventArgs e) + { + RefreshData(); + } } } diff --git a/SubProject/FPJ0000/fPartList.resx b/SubProject/FPJ0000/fPartList.resx index f5ffeef..c020eec 100644 --- a/SubProject/FPJ0000/fPartList.resx +++ b/SubProject/FPJ0000/fPartList.resx @@ -258,6 +258,18 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFKSURBVDhPtZMxSwNRDMfvu9SC4ODW0q1+G8GhIIp2qINL + ERGk0IK4ugkiKjq0q4KDRZw8QfHQoUhxExShsb+YXE+9K3TwB+Hx8vJPcnnvgizkF+aO/bZNh4DSckMK + ZsWVHRXB7OKurhb6l/ChJ8XVlrR7b3IWveqKFdYPpN4OJV/Zy07Awcx8XYWN7rNa+TCU8lEkm1d9OXn6 + lNzSaXoCF2/sd3TFphdasn0ZaYK5475s3bxLrno+PgHtJ6Hl5t2HirGpWlf9JhuBk4H5ISsdkIC2qYw4 + v3Ydx8SoZ0JM+g0OMlOBSlSkMh14MGuywx/gRMyU+V7Mr8thNswITDYCJ5URMm2mzvTpAEveTnaCYdsk + 4L5JwP37W2he3GaLgQNa5qXx4qiOIcRo//7xRQaDMQn8jQNv3/8D/gmw0HQ0Yoht471j7v8gCL4AjZn0 + BRhVTtsAAAAASUVORK5CYII= @@ -296,6 +308,6 @@ 385, 17 - 17, 56 + 610, 17 \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index fb8dd29..a6d9145 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -30,16 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -66,10 +68,11 @@ this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.partListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.scheduleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 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.lbStt = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); @@ -82,15 +85,15 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.scheduleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -240,9 +243,10 @@ this.refreshToolStripMenuItem, this.toolStripMenuItem1, this.partListToolStripMenuItem, - this.scheduleToolStripMenuItem}); + this.scheduleToolStripMenuItem, + this.makeRepeatToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(226, 182); + this.cm.Size = new System.Drawing.Size(233, 196); // // columnSizeToolStripMenuItem // @@ -252,7 +256,7 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(232, 36); this.columnSizeToolStripMenuItem.Text = "Column Size"; // // autoToolStripMenuItem @@ -290,27 +294,41 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(222, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(229, 6); // // refreshToolStripMenuItem // this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.refreshToolStripMenuItem.Size = new System.Drawing.Size(232, 36); this.refreshToolStripMenuItem.Text = "Refresh"; this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(222, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(229, 6); // // partListToolStripMenuItem // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; - this.partListToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.partListToolStripMenuItem.Size = new System.Drawing.Size(232, 36); this.partListToolStripMenuItem.Text = "PartList"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // + // scheduleToolStripMenuItem + // + this.scheduleToolStripMenuItem.Name = "scheduleToolStripMenuItem"; + this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(232, 36); + this.scheduleToolStripMenuItem.Text = "Schedule"; + this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click); + // + // makeRepeatToolStripMenuItem + // + this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(232, 36); + this.makeRepeatToolStripMenuItem.Text = "Make Repeat"; + this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); + // // ta // this.ta.ClearBeforeFill = true; @@ -338,91 +356,6 @@ this.fpSpread1.Size = new System.Drawing.Size(736, 421); 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 = 10; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Stat"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Title"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "User"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Req.Dept"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Req.Staff"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Start"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "End"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Release"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "Date"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "statusName"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "Stat"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "Title"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "User"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 70F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "request"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "Req.Dept"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "Req.Staff"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Start"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "End"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "odate"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Release"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; - 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.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -516,12 +449,107 @@ this.btSearch.Text = "Refresh(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // scheduleToolStripMenuItem + // fpSpread1_Sheet1 // - this.scheduleToolStripMenuItem.Name = "scheduleToolStripMenuItem"; - this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(225, 36); - this.scheduleToolStripMenuItem.Text = "Schedule"; - this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click); + 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 = 12; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Stat"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Title"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "User"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Req.Dept"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Req.Staff"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Start"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "End"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Release"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; + 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).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "Date"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "Stat"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "Title"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "rev"; + 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(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "User"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 70F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "request"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Req.Dept"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + 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).Label = "Req.Staff"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Start"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "End"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "odate"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Release"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F; + 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 // @@ -542,9 +570,9 @@ ((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(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -593,7 +621,8 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel3; private System.Windows.Forms.ToolStripTextBox tbRequest; private System.Windows.Forms.ToolStripButton btSearch; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem scheduleToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem makeRepeatToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index 73de434..1d23000 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -137,5 +137,20 @@ namespace FPJ0000 f.MdiParent = this.MdiParent; f.Show(); } + + private void makeRepeatToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + var dlg = FCOMMON.Util.MsgQ("하위 데이터를 복사하시겠습니까?\n\n이 작업은 취소할 수 없습니다."); + if(dlg == System.Windows.Forms.DialogResult.Yes) + { + dsPRJTableAdapters.QueriesTableAdapter ta = new dsPRJTableAdapters.QueriesTableAdapter(); + int retval = ta.CopyProjectData(dr.idx, FCOMMON.info.Login.no); + + refreshData(); + } + } } } diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index 1d7c9e1..dae9562 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -198,9 +198,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - 387, 17