From 5c77244a45be14147c0780eb066f7961c7334ad3 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Thu, 18 Jul 2019 08:40:57 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A9=EB=A1=9D=ED=99=94=EB=A9=B4=EB=93=A4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=ED=9B=84=20=EC=BB=AC=EB=9F=BC=20=EB=84=88=EB=B9=84=EB=A5=BC=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B2=8C=20?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/History.txt | 2 + Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FCM0000/fCustoms.Designer.cs | 176 ++++----- SubProject/FCM0000/fCustoms.cs | 6 +- SubProject/FEQ0000/Purchase/fPurchase.cs | 24 +- SubProject/FEQ0000/Purchase/fPurchase_Add.cs | 28 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 323 +--------------- SubProject/FEQ0000/dsPurchase.xsd | 78 +--- SubProject/FPJ0000/JobReport/fJobReport.cs | 4 +- SubProject/FPJ0000/Project/fPartList.cs | 8 +- SubProject/FPJ0000/Project/fProjectIOMap.cs | 26 +- .../FPJ0000/Project/fProjectList.Designer.cs | 14 +- SubProject/FPJ0000/Project/fProjectList.cs | 9 +- SubProject/FPJ0000/Project/fProjectList.resx | 4 +- .../FPJ0000/Project/fProjectSchedule.cs | 9 +- SubProject/FPJ0000/Properties/AssemblyInfo.cs | 4 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 350 +----------------- SubProject/FPJ0000/dsPRJ.xsd | 164 +++----- SubProject/FPJ0000/dsPRJ.xss | 20 +- SubProject/FPJ0000/fMailList.cs | 5 +- SubProject/FPJ0000/fMailSend.cs | 1 + 21 files changed, 268 insertions(+), 991 deletions(-) diff --git a/Project/History.txt b/Project/History.txt index a67f43a..c54d80c 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,6 @@ * 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인 +190718 chi 목록조회화면에서 열 너비가 자동 불러오게 함 +190711 chi 프로젝트목록 엑셀저장시 컬럼도 저장되게 190423 chi 프로젝트 편집창에 FTP Explorer 기능 추가 190417 chi No# => CR/CF# 190416 chi OrderNo 를 구매와 프로젝트에 추가함 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 969797c..809e03a 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("19.05.29.1400")] -[assembly: AssemblyFileVersion("19.05.29.1400")] +[assembly: AssemblyVersion("19.07.18.0830")] +[assembly: AssemblyFileVersion("19.07.18.0830")] diff --git a/SubProject/FCM0000/fCustoms.Designer.cs b/SubProject/FCM0000/fCustoms.Designer.cs index ae0bd97..a8c05a2 100644 --- a/SubProject/FCM0000/fCustoms.Designer.cs +++ b/SubProject/FCM0000/fCustoms.Designer.cs @@ -30,12 +30,6 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fCustoms)); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.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.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(); @@ -45,6 +39,12 @@ 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(); + 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(); this.dsMSSQL = new FCM0000.dsMSSQL(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FCM0000.dsMSSQLTableAdapters.CustomsTableAdapter(); @@ -75,6 +75,7 @@ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.fpSpread2 = new FarPoint.Win.Spread.FpSpread(); this.cm2 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -99,13 +100,13 @@ this.bindingNavigatorSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.cm1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread2)).BeginInit(); this.cm2.SuspendLayout(); @@ -113,7 +114,6 @@ ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // dsMSSQL @@ -137,11 +137,13 @@ this.tam.BoardTableAdapter = null; this.tam.CommonTableAdapter = null; this.tam.CustomsTableAdapter = this.ta; + this.tam.HolidayLIstTableAdapter = null; this.tam.InventoryTableAdapter = null; this.tam.ItemsTableAdapter = null; this.tam.MailDataTableAdapter = null; this.tam.MailFormTableAdapter = null; this.tam.ProjectsTableAdapter = null; + this.tam.PurchaseTableAdapter = null; this.tam.RequestItemTableAdapter = null; this.tam.StaffTableAdapter = this.taStaff; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; @@ -380,6 +382,84 @@ this.fpSpread1.Size = new System.Drawing.Size(1134, 449); 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 = 9; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "그룹"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "업체명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "보조명칭"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "전화"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "팩스"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "이메일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "주소"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F; + 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(0).Width = 88F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "grp"; + 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 = 113F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; + 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(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name2"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "보조명칭"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "tel"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "전화"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "fax"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "팩스"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "email"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "이메일"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "address"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "주소"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(8).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; + // // groupBox1 // this.groupBox1.Controls.Add(this.fpSpread2); @@ -633,84 +713,6 @@ this.toolStripButton3.Text = "담당자 저장"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // 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 = 9; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "그룹"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "업체명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "보조명칭"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "전화"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "팩스"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "이메일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "주소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F; - 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(0).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "grp"; - 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 = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - 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(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name2"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "보조명칭"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "tel"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "전화"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "fax"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "팩스"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "email"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "이메일"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "address"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "주소"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(8).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; - // // fCustoms // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -729,6 +731,7 @@ this.bn.PerformLayout(); this.cm1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread2)).EndInit(); @@ -738,7 +741,6 @@ ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); this.bindingNavigator1.ResumeLayout(false); this.bindingNavigator1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FCM0000/fCustoms.cs b/SubProject/FCM0000/fCustoms.cs index 15f78d6..09cd062 100644 --- a/SubProject/FCM0000/fCustoms.cs +++ b/SubProject/FCM0000/fCustoms.cs @@ -27,8 +27,7 @@ namespace FCM0000 refreshData(); refreshDataS(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); - FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2); + this.dsMSSQL.Customs.TableNewRow += Customs_TableNewRow; this.dsMSSQL.Staff.TableNewRow += Staff_TableNewRow; } @@ -53,6 +52,8 @@ namespace FCM0000 { this.ta.Fill(this.dsMSSQL.Customs); // this.taStaff.Fill(this.dsMSSQL.Staff); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); + }catch (Exception ex) { FCOMMON.Util.MsgE(ex.Message); @@ -64,6 +65,7 @@ namespace FCM0000 { // this.ta.Fill(this.dsMSSQL.Customs); this.taStaff.Fill(this.dsMSSQL.Staff); + FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2); } catch (Exception ex) { diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 5d10d5c..cc9e2b5 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -119,7 +119,7 @@ namespace FEQ0000 } refreshData(); - FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } @@ -176,6 +176,7 @@ namespace FEQ0000 da.Fill(this.dsPurchase.Purchase); this.dsPurchase.AcceptChanges(); showSummary(); + FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } catch (System.Exception ex) { @@ -329,7 +330,22 @@ namespace FEQ0000 } this.dsPurchase.Purchase.AddPurchaseRow(newdr); - this.ta.Update(newdr); + + int cnt = this.ta.Update(newdr); + if(cnt == 1) + { + if (f.repeatAdd) + { + FCOMMON.Util.MsgI("저장 완료\n\n연속 저장 모드이므로 직전에 입력된 자료가 자동으로 설정 됩니다."); + + } else FCOMMON.Util.MsgI("저장 완료"); + } + else + { + FCOMMON.Util.MsgE("저장 실패\n\n다시 시도하시고 증상이 반복되면 chikyun.kim@amkor.co.kr 로 문의 주십시요"); + } + + newdr.AcceptChanges(); if (f.repeatAdd) { @@ -594,6 +610,7 @@ namespace FEQ0000 { fpSpread1.SaveExcel(sd.FileName, FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); @@ -656,11 +673,12 @@ namespace FEQ0000 //현재 데이터를 입력하여 신규 추가를 한다. var newdr = this.dsPurchase.Purchase.NewPurchaseRow(); FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr); + newdr.pdate = DateTime.Now.ToShortDateString(); newdr.wdate = DateTime.Now; newdr.wuid = FCOMMON.info.Login.no; newdr.state = "---"; newdr.request = FCOMMON.info.Login.nameK; - newdr.receive = FCOMMON.info.Login.nameK; + newdr.receive = "";// FCOMMON.info.Login.nameK; newdr.sc = string.Empty; newdr.po = string.Empty; newdr.indate = string.Empty; diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 023f747..997d238 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -133,7 +133,7 @@ namespace FEQ0000 cbEQModel.Text = dr.asset; //제조모델명 if (cbEQModel.SelectedIndex == -1) { - FCOMMON.Util.MsgE("모델을 다시 선택하세요"); + //FCOMMON.Util.MsgE("모델을 다시 선택하세요"); } } @@ -397,12 +397,12 @@ namespace FEQ0000 tbSID.Text = sidTrim(tbSID.Text); - if (cbProcess.Text.Trim() == "") - { - FCOMMON.Util.MsgE("프로세스를 선택하세요."); - cbProcess.Focus(); - return false; - } + //if (cbProcess.Text.Trim() == "") + //{ + // FCOMMON.Util.MsgE("추가정보내의 [공정]을 선택하세요."); + // cbProcess.Focus(); + // return false; + //} if (tbPumName.Text.isEmpty()) { @@ -433,7 +433,7 @@ namespace FEQ0000 var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00"); if (overtime.TotalSeconds > 0) { - if (this.cbProcess.SelectedIndex == -1) + if (this.cbProcess.Text.Trim()=="") { if (FCOMMON.info.Login.level >= 5) { @@ -458,11 +458,11 @@ namespace FEQ0000 return false; } } - if (cbManuProc.SelectedIndex == -1) + if (cbManuProc.Text.Trim() == "") { if (FCOMMON.info.Login.level >= 5) { - var dlg = FCOMMON.Util.MsgQ("제조공정을 입력하지 않고 진행 하시겠습니까?\n\n" + + var dlg = FCOMMON.Util.MsgQ("[제조공정]을 입력하지 않고 진행 하시겠습니까?\n\n" + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + "BongSeok Jung(T.7191)\n" + "BongSeok.Jung@amkor.co.kr"); @@ -474,7 +474,7 @@ namespace FEQ0000 } else { - FCOMMON.Util.MsgE("제조공정을 선택하세요\n\n" + + FCOMMON.Util.MsgE("[제조공정]을 선택하세요\n\n" + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + "BongSeok Jung(T.7191)\n" + "BongSeok.Jung@amkor.co.kr"); @@ -483,11 +483,11 @@ namespace FEQ0000 return false; } } - if (this.cbEQManu.SelectedIndex == -1) + if (this.cbEQManu.Text.Trim() == "") { if (FCOMMON.info.Login.level >= 5) { - var dlg = FCOMMON.Util.MsgQ("장비제조사를 입력하지 않고 진행 하시겠습니까?\n\n" + + var dlg = FCOMMON.Util.MsgQ("[장비제조사]를 입력하지 않고 진행 하시겠습니까?\n\n" + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + "BongSeok Jung(T.7191)\n" + "BongSeok.Jung@amkor.co.kr"); @@ -499,7 +499,7 @@ namespace FEQ0000 } else { - FCOMMON.Util.MsgE("장비 제조사를 선택하세요.\n\n" + + FCOMMON.Util.MsgE("[장비제조사]를 선택하세요.\n\n" + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + "BongSeok Jung(T.7191)\n" + "BongSeok.Jung@amkor.co.kr"); diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 28af0e9..12b45df 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -2075,45 +2075,13 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE Purchase\r\nSET pdate = @pdate, state = @state, process = @process, r" + - "eceive = @receive, sc = @sc, request = @request, sid = @sid, pumname = @pumname," + - " pumscale = @pumscale, pumunit = @pumunit, \r\n pumqty = @pumqty, pu" + - "mprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, " + - "project = @project, projectidx = @projectidx, asset = @asset, edate = @edate, \r\n" + - " indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @" + - "wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manupro" + - "c = @manuproc, \r\n orderno = @orderno\r\nWHERE (idx = @Original_idx)" + - " AND (@IsNull_pdate = 1 AND pdate IS NULL OR\r\n pdate = @Original_p" + - "date) AND (@IsNull_state = 1 AND state IS NULL OR\r\n state = @Origi" + - "nal_state) AND (@IsNull_process = 1 AND process IS NULL OR\r\n proce" + - "ss = @Original_process) AND (@IsNull_receive = 1 AND receive IS NULL OR\r\n " + - " receive = @Original_receive) AND (@IsNull_sc = 1 AND sc IS NULL OR\r\n " + - " sc = @Original_sc) AND (@IsNull_request = 1 AND request IS NULL OR\r\n " + - " request = @Original_request) AND (@IsNull_sid = 1 AND sid IS NULL " + - "OR\r\n sid = @Original_sid) AND (@IsNull_pumscale = 1 AND pumscale I" + - "S NULL OR\r\n pumscale = @Original_pumscale) AND (@IsNull_pumunit = " + - "1 AND pumunit IS NULL OR\r\n pumunit = @Original_pumunit) AND (@IsNu" + - "ll_pumqty = 1 AND pumqty IS NULL OR\r\n pumqty = @Original_pumqty) A" + - "ND (@IsNull_pumprice = 1 AND pumprice IS NULL OR\r\n pumprice = @Ori" + - "ginal_pumprice) AND (@IsNull_pumamt = 1 AND pumamt IS NULL OR\r\n pu" + - "mamt = @Original_pumamt) AND (@IsNull_supply = 1 AND supply IS NULL OR\r\n " + - " supply = @Original_supply) AND (@IsNull_supplyidx = 1 AND supplyidx IS NU" + - "LL OR\r\n supplyidx = @Original_supplyidx) AND (@IsNull_projectidx =" + - " 1 AND projectidx IS NULL OR\r\n projectidx = @Original_projectidx) " + - "AND (@IsNull_asset = 1 AND asset IS NULL OR\r\n asset = @Original_as" + - "set) AND (@IsNull_edate = 1 AND edate IS NULL OR\r\n edate = @Origin" + - "al_edate) AND (@IsNull_indate = 1 AND indate IS NULL OR\r\n indate =" + - " @Original_indate) AND (@IsNull_po = 1 AND po IS NULL OR\r\n po = @O" + - "riginal_po) AND (@IsNull_dept = 1 AND dept IS NULL OR\r\n dept = @Or" + - "iginal_dept) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsN" + - "ull_import = 1 AND import IS NULL OR\r\n import = @Original_import) " + - "AND (@IsNull_pumidx = 1 AND pumidx IS NULL OR\r\n pumidx = @Original" + - "_pumidx) AND (@IsNull_isdel = 1 AND isdel IS NULL OR\r\n isdel = @Or" + - "iginal_isdel) AND (@IsNull_bigo = 1 AND bigo IS NULL OR\r\n bigo = @" + - "Original_bigo); \r\nSELECT idx, pdate, state, process, receive, sc, request, sid," + - " pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, projec" + - "t, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isde" + - "l, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; + this._adapter.UpdateCommand.CommandText = @"UPDATE Purchase +SET pdate = @pdate, state = @state, process = @process, receive = @receive, sc = @sc, request = @request, sid = @sid, pumname = @pumname, pumscale = @pumscale, pumunit = @pumunit, + pumqty = @pumqty, pumprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, project = @project, projectidx = @projectidx, asset = @asset, edate = @edate, + indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manuproc = @manuproc, + orderno = @orderno +WHERE (idx = @Original_idx); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2146,56 +2114,6 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manuproc", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "manuproc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", 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, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_state", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_state", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_receive", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "receive", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_receive", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "receive", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sc", global::System.Data.SqlDbType.VarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, "sc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_request", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_request", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "request", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumscale", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumscale", global::System.Data.SqlDbType.VarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "pumscale", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumunit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumunit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "pumunit", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumqty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumqty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumqty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumprice", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumprice", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumprice", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "pumprice", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumamt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumamt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "pumamt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supply", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supply", global::System.Data.SqlDbType.VarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "supply", 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, 4, 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_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_po", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_po", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "po", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_dept", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 20, 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, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bigo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, "bigo", 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.Original, false, null, "", "", "")); } @@ -2619,32 +2537,6 @@ ORDER BY pdate DESC, idx DESC"; string manuproc, string orderno, int Original_idx, - string Original_pdate, - string Original_state, - string Original_process, - string Original_receive, - string Original_sc, - string Original_request, - string Original_sid, - string Original_pumscale, - string Original_pumunit, - global::System.Nullable Original_pumqty, - global::System.Nullable Original_pumprice, - global::System.Nullable Original_pumamt, - string Original_supply, - global::System.Nullable Original_supplyidx, - global::System.Nullable Original_projectidx, - string Original_asset, - string Original_edate, - string Original_indate, - string Original_po, - string Original_dept, - string Original_wuid, - System.DateTime Original_wdate, - global::System.Nullable Original_import, - global::System.Nullable Original_pumidx, - global::System.Nullable Original_isdel, - string Original_bigo, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -2822,206 +2714,7 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(orderno)); } this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_pdate)); - } - if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_state)); - } - if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_process)); - } - if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_receive)); - } - if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_sc)); - } - if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_request)); - } - if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_sid)); - } - if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_pumscale)); - } - if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_pumunit)); - } - if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((int)(Original_pumqty.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; - } - if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[52].Value = ((decimal)(Original_pumprice.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; - } - if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((decimal)(Original_pumamt.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; - } - if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_supply)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_supplyidx.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; - } - if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(Original_projectidx.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; - } - if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_asset)); - } - if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_edate)); - } - if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_indate)); - } - if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_po)); - } - if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_dept)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[72].Value = ((System.DateTime)(Original_wdate)); - if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[74].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; - } - if ((Original_pumidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[76].Value = ((int)(Original_pumidx.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; - } - if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[78].Value = ((bool)(Original_isdel.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; - } - if ((Original_bigo == null)) { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_bigo)); - } - this.Adapter.UpdateCommand.Parameters[81].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[31].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)) { diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index e82b7b3..ef47af0 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -78,31 +78,7 @@ SET pdate = @pdate, state = @state, process = @process, receive = @receiv pumqty = @pumqty, pumprice = @pumprice, pumamt = @pumamt, supply = @supply, supplyidx = @supplyidx, project = @project, projectidx = @projectidx, asset = @asset, edate = @edate, indate = @indate, po = @po, dept = @dept, wuid = @wuid, wdate = @wdate, import = @import, pumidx = @pumidx, isdel = @isdel, bigo = @bigo, manuproc = @manuproc, orderno = @orderno -WHERE (idx = @Original_idx) AND (@IsNull_pdate = 1 AND pdate IS NULL OR - pdate = @Original_pdate) AND (@IsNull_state = 1 AND state IS NULL OR - state = @Original_state) AND (@IsNull_process = 1 AND process IS NULL OR - process = @Original_process) AND (@IsNull_receive = 1 AND receive IS NULL OR - receive = @Original_receive) AND (@IsNull_sc = 1 AND sc IS NULL OR - sc = @Original_sc) AND (@IsNull_request = 1 AND request IS NULL OR - request = @Original_request) AND (@IsNull_sid = 1 AND sid IS NULL OR - sid = @Original_sid) AND (@IsNull_pumscale = 1 AND pumscale IS NULL OR - pumscale = @Original_pumscale) AND (@IsNull_pumunit = 1 AND pumunit IS NULL OR - pumunit = @Original_pumunit) AND (@IsNull_pumqty = 1 AND pumqty IS NULL OR - pumqty = @Original_pumqty) AND (@IsNull_pumprice = 1 AND pumprice IS NULL OR - pumprice = @Original_pumprice) AND (@IsNull_pumamt = 1 AND pumamt IS NULL OR - pumamt = @Original_pumamt) AND (@IsNull_supply = 1 AND supply IS NULL OR - supply = @Original_supply) AND (@IsNull_supplyidx = 1 AND supplyidx IS NULL OR - supplyidx = @Original_supplyidx) AND (@IsNull_projectidx = 1 AND projectidx IS NULL OR - projectidx = @Original_projectidx) AND (@IsNull_asset = 1 AND asset IS NULL OR - asset = @Original_asset) AND (@IsNull_edate = 1 AND edate IS NULL OR - edate = @Original_edate) AND (@IsNull_indate = 1 AND indate IS NULL OR - indate = @Original_indate) AND (@IsNull_po = 1 AND po IS NULL OR - po = @Original_po) AND (@IsNull_dept = 1 AND dept IS NULL OR - dept = @Original_dept) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNull_import = 1 AND import IS NULL OR - import = @Original_import) AND (@IsNull_pumidx = 1 AND pumidx IS NULL OR - pumidx = @Original_pumidx) AND (@IsNull_isdel = 1 AND isdel IS NULL OR - isdel = @Original_isdel) AND (@IsNull_bigo = 1 AND bigo IS NULL OR - bigo = @Original_bigo); +WHERE (idx = @Original_idx); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -136,56 +112,6 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -266,7 +192,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) - + diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index 6882146..53016c1 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -105,7 +105,7 @@ namespace FPJ0000 } refreshData(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } void RefreshTime() { @@ -184,6 +184,7 @@ namespace FPJ0000 this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request); RefreshTime(); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } void funcSave() @@ -363,6 +364,7 @@ namespace FPJ0000 { fpSpread1.SaveExcel(sd.FileName, FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index c023182..9f139f3 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -74,7 +74,7 @@ namespace FPJ0000 this.Show(); Application.DoEvents(); RefreshData(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } @@ -108,6 +108,7 @@ namespace FPJ0000 //} //this.dsPRJ.AcceptChanges(); RefreshSum(); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } void RefreshSum() @@ -154,9 +155,10 @@ namespace FPJ0000 if(sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders ); + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } //dv1.ExportData("partlist.csv"); diff --git a/SubProject/FPJ0000/Project/fProjectIOMap.cs b/SubProject/FPJ0000/Project/fProjectIOMap.cs index d20b477..7f431e6 100644 --- a/SubProject/FPJ0000/Project/fProjectIOMap.cs +++ b/SubProject/FPJ0000/Project/fProjectIOMap.cs @@ -36,20 +36,22 @@ namespace FPJ0000 private void fProjectSchedule_Load(object sender, EventArgs e) { RefreshData(); - FPUtil.ColSizeLoad(ref this.fpIN, fn_fpcolsizeI); - FPUtil.ColSizeLoad(ref this.fpOut, fn_fpcolsizeO); - FPUtil.ColSizeLoad(ref this.fpEtc, fn_fpcolsizeE); + } void RefreshData() { try { this.ta.Fill(this.dsPRJ.ProjectsIOMap, this.projectindex); + FPUtil.ColSizeLoad(ref this.fpIN, fn_fpcolsizeI); + FPUtil.ColSizeLoad(ref this.fpOut, fn_fpcolsizeO); + FPUtil.ColSizeLoad(ref this.fpEtc, fn_fpcolsizeE); } catch (System.Exception ex) { System.Windows.Forms.MessageBox.Show(ex.Message); } + } @@ -84,7 +86,11 @@ namespace FPJ0000 private void exportListToolStripMenuItem_Click(object sender, EventArgs e) { - fpIN.SaveExcel("iomap_in.xls"); + fpIN.SaveExcel("iomap_in.xls", + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } private void toolStripButton1_Click(object sender, EventArgs e) @@ -105,12 +111,20 @@ namespace FPJ0000 private void toolStripMenuItem7_Click(object sender, EventArgs e) { - fpIN.SaveExcel("iomap_out.xls"); + fpIN.SaveExcel("iomap_out.xls", + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } private void toolStripMenuItem13_Click(object sender, EventArgs e) { - fpIN.SaveExcel("iomap_etc.xls"); + fpIN.SaveExcel("iomap_etc.xls", + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } private void toolStripMenuItem9_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index fe36b81..afd308d 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -83,8 +83,8 @@ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.메일발송주소관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); @@ -456,18 +456,18 @@ this.makeRepeatToolStripMenuItem.Text = "복사"; this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); // - // 편집ToolStripMenuItem1 - // - this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); - this.편집ToolStripMenuItem1.Text = "편집"; - // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); this.삭제ToolStripMenuItem.Text = "삭제"; // + // 편집ToolStripMenuItem1 + // + this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); + this.편집ToolStripMenuItem1.Text = "편집"; + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 9a2d4b6..17b1c55 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -175,7 +175,7 @@ namespace FPJ0000 sbSumI.Text = this.dsMSSQL.Projects.Sum(t => t.costn).ToString("N2"); FormattingData(); - + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } void FormattingData() @@ -431,7 +431,12 @@ namespace FPJ0000 var dlg = sd.ShowDialog(); if (dlg == System.Windows.Forms.DialogResult.OK) { - this.fpSpread1.SaveExcel(sd.FileName); + this.fpSpread1.SaveExcel(sd.FileName, + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + FCOMMON.Util.MsgI("파일생성 완료\n\n" + sd.FileName); } } diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index f6c6d67..306427e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -257,7 +257,7 @@ 248, 17 - 17, 56 + 828, 17 455, 17 @@ -395,7 +395,7 @@ 561, 17 - 883, 17 + 731, 17 647, 17 diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index cc28281..1a8c3cb 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -31,13 +31,14 @@ namespace FPJ0000 private void fProjectSchedule_Load(object sender, EventArgs e) { RefreshData(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } void RefreshData() { try { this.ta.Fill(this.dsPRJ.ProjectsSchedule, this.projectindex); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } catch (System.Exception ex) { @@ -87,7 +88,11 @@ namespace FPJ0000 private void exportListToolStripMenuItem_Click(object sender, EventArgs e) { - fpSpread1.SaveExcel("schedule.xls"); + fpSpread1.SaveExcel("schedule.xls", + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } } } diff --git a/SubProject/FPJ0000/Properties/AssemblyInfo.cs b/SubProject/FPJ0000/Properties/AssemblyInfo.cs index a62df76..9f7adc4 100644 --- a/SubProject/FPJ0000/Properties/AssemblyInfo.cs +++ b/SubProject/FPJ0000/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 버전이 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("19.07.11.0830")] +[assembly: AssemblyFileVersion("19.07.11.0830")] diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 7983ca4..4ceef87 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -7403,50 +7403,13 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", 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\r\nSET status = @status, pdate = @pdate, name = @name, userm" + - "ain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate" + - " = @edate, odate = @odate, memo = @memo, \r\n wuid = @wuid, wdate = " + - "@wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, pa" + - "rt = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, \r\n " + - " remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate," + - " progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = " + - "@path, userhw2 = @userhw2, \r\n orderno = @orderno\r\nWHERE (idx = @O" + - "riginal_idx) AND (@IsNull_status = 1 AND status IS NULL OR\r\n statu" + - "s = @Original_status) AND (@IsNull_pdate = 1 AND pdate IS NULL OR\r\n " + - " pdate = @Original_pdate) AND (@IsNull_name = 1 AND name IS NULL OR\r\n " + - " name = @Original_name) AND (@IsNull_usermain = 1 AND usermain IS NULL OR\r\n " + - " usermain = @Original_usermain) AND (@IsNull_usersub = 1 AND usersu" + - "b IS NULL OR\r\n usersub = @Original_usersub) AND (@IsNull_reqstaff " + - "= 1 AND reqstaff IS NULL OR\r\n reqstaff = @Original_reqstaff) AND (" + - "@IsNull_sdate = 1 AND sdate IS NULL OR\r\n sdate = @Original_sdate) " + - "AND (@IsNull_edate = 1 AND edate IS NULL OR\r\n edate = @Original_ed" + - "ate) AND (@IsNull_odate = 1 AND odate IS NULL OR\r\n odate = @Origin" + - "al_odate) AND (@IsNull_memo = 1 AND memo IS NULL OR\r\n memo = @Orig" + - "inal_memo) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNul" + - "l_rev = 1 AND rev IS NULL OR\r\n rev = @Original_rev) AND (@IsNull_p" + - "idx = 1 AND pidx IS NULL OR\r\n pidx = @Original_pidx) AND (@IsNull_" + - "userManager = 1 AND userManager IS NULL OR\r\n userManager = @Origin" + - "al_userManager) AND (@IsNull_level = 1 AND level IS NULL OR\r\n leve" + - "l = @Original_level) AND (@IsNull_part = 1 AND part IS NULL OR\r\n p" + - "art = @Original_part) AND (@IsNull_process = 1 AND process IS NULL OR\r\n " + - " process = @Original_process) AND (@IsNull_costo = 1 AND costo IS NULL OR\r\n" + - " costo = @Original_costo) AND (@IsNull_costn = 1 AND costn IS NULL" + - " OR\r\n costn = @Original_costn) AND (@IsNull_cnt = 1 AND cnt IS NUL" + - "L OR\r\n cnt = @Original_cnt) AND (@IsNull_ddate = 1 AND ddate IS NU" + - "LL OR\r\n ddate = @Original_ddate) AND (@IsNull_progress = 1 AND pro" + - "gress IS NULL OR\r\n progress = @Original_progress) AND (@IsNull_imp" + - "ort = 1 AND import IS NULL OR\r\n import = @Original_import) AND (@I" + - "sNull_asset = 1 AND asset IS NULL OR\r\n asset = @Original_asset) AN" + - "D (@IsNull_isdel = 1 AND isdel IS NULL OR\r\n isdel = @Original_isde" + - "l) AND (@IsNull_path = 1 AND path IS NULL OR\r\n path = @Original_pa" + - "th) AND (@IsNull_userhw2 = 1 AND userhw2 IS NULL OR\r\n userhw2 = @O" + - "riginal_userhw2); \r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaff" + - ", sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, p" + - "rocess, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asse" + - "t, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [st" + - "atus] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THE" + - "N \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' E" + - "ND)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE Projects +SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, + wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, + remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, + orderno = @orderno +WHERE (idx = @Original_idx); +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)"; 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, 50, 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, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7480,60 +7443,6 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", 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, 4, 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, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usermain", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usermain", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usersub", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usersub", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqstaff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_odate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 255, 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, 20, 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, 8, 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, 4, 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, 4, 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("@IsNull_userManager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_level", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_part", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costo", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costn", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costn", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cnt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ddate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 300, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userhw2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", 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.Original, false, null, "", "", "")); } @@ -8015,34 +7924,6 @@ WHERE (ISNULL(name, N'') LIKE @search OR string userhw2, string orderno, int Original_idx, - string Original_status, - string Original_pdate, - string Original_name, - string Original_usermain, - string Original_usersub, - 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, - string Original_userManager, - global::System.Nullable Original_level, - string Original_part, - string Original_process, - global::System.Nullable Original_costo, - global::System.Nullable Original_costn, - global::System.Nullable Original_cnt, - string Original_ddate, - global::System.Nullable Original_progress, - global::System.Nullable Original_import, - string Original_asset, - global::System.Nullable Original_isdel, - string Original_path, - string Original_userhw2, int idx) { if ((status == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -8226,222 +8107,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(orderno)); } this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx)); - if ((Original_status == 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_status)); - } - if ((Original_pdate == 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_pdate)); - } - if ((Original_name == 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_name)); - } - if ((Original_usermain == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_usermain)); - } - if ((Original_usersub == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_usersub)); - } - if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_reqstaff)); - } - if ((Original_sdate == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_sdate)); - } - if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_edate)); - } - if ((Original_odate == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_odate)); - } - if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[53].Value = ((System.DateTime)(Original_wdate)); - if ((Original_rev.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_rev.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; - } - if ((Original_pidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_pidx.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; - } - if ((Original_userManager == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_userManager)); - } - if ((Original_level.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((int)(Original_level.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; - } - if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_part)); - } - if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_process)); - } - if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((double)(Original_costo.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; - } - if ((Original_costn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((double)(Original_costn.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; - } - if ((Original_cnt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_cnt.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; - } - if ((Original_ddate == null)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_ddate)); - } - if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((int)(Original_progress.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; - } - if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; - } - if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_asset)); - } - if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((bool)(Original_isdel.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; - } - if ((Original_path == null)) { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_path)); - } - if ((Original_userhw2 == null)) { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_userhw2)); - } - this.Adapter.UpdateCommand.Parameters[86].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[32].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)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index bc3b062..c94c6a4 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -79,128 +79,48 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN - + UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, orderno = @orderno -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_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) AND (@IsNull_userManager = 1 AND userManager IS NULL OR - userManager = @Original_userManager) AND (@IsNull_level = 1 AND level IS NULL OR - level = @Original_level) AND (@IsNull_part = 1 AND part IS NULL OR - part = @Original_part) AND (@IsNull_process = 1 AND process IS NULL OR - process = @Original_process) AND (@IsNull_costo = 1 AND costo IS NULL OR - costo = @Original_costo) AND (@IsNull_costn = 1 AND costn IS NULL OR - costn = @Original_costn) AND (@IsNull_cnt = 1 AND cnt IS NULL OR - cnt = @Original_cnt) AND (@IsNull_ddate = 1 AND ddate IS NULL OR - ddate = @Original_ddate) AND (@IsNull_progress = 1 AND progress IS NULL OR - progress = @Original_progress) AND (@IsNull_import = 1 AND import IS NULL OR - import = @Original_import) AND (@IsNull_asset = 1 AND asset IS NULL OR - asset = @Original_asset) AND (@IsNull_isdel = 1 AND isdel IS NULL OR - isdel = @Original_isdel) AND (@IsNull_path = 1 AND path IS NULL OR - path = @Original_path) AND (@IsNull_userhw2 = 1 AND userhw2 IS NULL OR - userhw2 = @Original_userhw2); +WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1132,7 +1052,7 @@ WHERE (pidx = @pidx) - + @@ -1304,7 +1224,7 @@ WHERE (pidx = @pidx) - + @@ -1348,7 +1268,7 @@ WHERE (pidx = @pidx) - + @@ -1393,7 +1313,7 @@ WHERE (pidx = @pidx) - + @@ -1501,7 +1421,7 @@ WHERE (pidx = @pidx) - + @@ -1605,7 +1525,7 @@ WHERE (pidx = @pidx) - + @@ -1639,7 +1559,7 @@ WHERE (pidx = @pidx) - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 5f28270..6713199 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/fMailList.cs b/SubProject/FPJ0000/fMailList.cs index bdbe00b..3a87325 100644 --- a/SubProject/FPJ0000/fMailList.cs +++ b/SubProject/FPJ0000/fMailList.cs @@ -93,9 +93,10 @@ namespace FPJ0000 if(sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders ); + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); } //dv1.ExportData("partlist.csv"); diff --git a/SubProject/FPJ0000/fMailSend.cs b/SubProject/FPJ0000/fMailSend.cs index 7a72828..f580bdd 100644 --- a/SubProject/FPJ0000/fMailSend.cs +++ b/SubProject/FPJ0000/fMailSend.cs @@ -220,6 +220,7 @@ namespace FPJ0000 { fpSpread1.SaveExcel(sd.FileName, FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); }