diff --git a/Project/History.txt b/Project/History.txt index 93ef6c8..170a49e 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,7 @@ -181214 chi NR구매 메뉴 한글화 +181222 chi NR구매 등록화면 데이터 불러오기시 금액에 천단위 기호 추가 + Redis 오류 발생시 try catch 제거 + NR구매등록시 적용장비/적용위치 항목 추가(공통코드 06,07) +181214 chi NR구매 메뉴 한글화 출력메뉴를 하단에서 상단으로 이동 웹캠기능 추가 unit 가 저장되지 않는현상제거(김효천c) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f896657..6e3671d 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.12.13.0900")] -[assembly: AssemblyFileVersion("18.12.13.0900")] +[assembly: AssemblyVersion("18.12.22.2000")] +[assembly: AssemblyFileVersion("18.12.22.2000")] diff --git a/Project/StateMachine/_BW.cs b/Project/StateMachine/_BW.cs index 9fd13ee..4a6b6cf 100644 --- a/Project/StateMachine/_BW.cs +++ b/Project/StateMachine/_BW.cs @@ -11,6 +11,7 @@ namespace Project { public partial class fMain { + DateTime redisTryTime = DateTime.Parse("1982-11-23"); Boolean bBW = true; private void bw_DoWork(object sender, DoWorkEventArgs e) { @@ -18,8 +19,18 @@ namespace Project { if(redisConnection == null) { - Console.WriteLine("redis conn : 10.131.36.205:6379"); - redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379"); + var ts = DateTime.Now - redisTryTime; + if(ts.TotalMinutes>5) + { + Console.WriteLine("redis conn : 10.131.36.205:6379"); + try + { + redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379"); + }catch (Exception ex) + { + + } + } } else { diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index b83d644..b9b9290 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -73,12 +73,6 @@ this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.nRPurchaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowsMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.cascadeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tileVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tileHorizontalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.closeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.arrangeIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.btDev = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -92,6 +86,7 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); + this.패치내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -190,10 +185,9 @@ this.commonToolStripMenuItem, this.boardsToolStripMenuItem, this.managementToolStripMenuItem, - this.windowsMenu, + this.패치내역ToolStripMenuItem, this.btDev}); this.menuStrip1.Location = new System.Drawing.Point(1, 1); - this.menuStrip1.MdiWindowListItem = this.windowsMenu; this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(1034, 27); this.menuStrip1.TabIndex = 29; @@ -439,53 +433,6 @@ this.nRPurchaseToolStripMenuItem.Text = "NR구매신청"; this.nRPurchaseToolStripMenuItem.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); // - // windowsMenu - // - this.windowsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.cascadeToolStripMenuItem, - this.tileVerticalToolStripMenuItem, - this.tileHorizontalToolStripMenuItem, - this.closeAllToolStripMenuItem, - this.arrangeIconsToolStripMenuItem}); - this.windowsMenu.Name = "windowsMenu"; - this.windowsMenu.Size = new System.Drawing.Size(84, 23); - this.windowsMenu.Text = "윈도우(&W)"; - // - // cascadeToolStripMenuItem - // - this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem"; - this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(218, 24); - this.cascadeToolStripMenuItem.Text = "계단식 배열(&C)"; - this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.cascadeToolStripMenuItem_Click); - // - // tileVerticalToolStripMenuItem - // - this.tileVerticalToolStripMenuItem.Name = "tileVerticalToolStripMenuItem"; - this.tileVerticalToolStripMenuItem.Size = new System.Drawing.Size(218, 24); - this.tileVerticalToolStripMenuItem.Text = "세로 바둑판식 배열(&V)"; - this.tileVerticalToolStripMenuItem.Click += new System.EventHandler(this.tileVerticalToolStripMenuItem_Click); - // - // tileHorizontalToolStripMenuItem - // - this.tileHorizontalToolStripMenuItem.Name = "tileHorizontalToolStripMenuItem"; - this.tileHorizontalToolStripMenuItem.Size = new System.Drawing.Size(218, 24); - this.tileHorizontalToolStripMenuItem.Text = "가로 바둑판식 배열(&H)"; - this.tileHorizontalToolStripMenuItem.Click += new System.EventHandler(this.tileHorizontalToolStripMenuItem_Click); - // - // closeAllToolStripMenuItem - // - this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem"; - this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(218, 24); - this.closeAllToolStripMenuItem.Text = "모두 닫기(&L)"; - this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click); - // - // arrangeIconsToolStripMenuItem - // - this.arrangeIconsToolStripMenuItem.Name = "arrangeIconsToolStripMenuItem"; - this.arrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(218, 24); - this.arrangeIconsToolStripMenuItem.Text = "아이콘 정렬(&A)"; - this.arrangeIconsToolStripMenuItem.Click += new System.EventHandler(this.arrangeIconsToolStripMenuItem_Click); - // // btDev // this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -551,7 +498,7 @@ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(30, 24); + this.toolStripButton2.Size = new System.Drawing.Size(23, 24); this.toolStripButton2.Text = "구매신청"; this.toolStripButton2.ToolTipText = "파트구매신청서 작성"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); @@ -562,7 +509,7 @@ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(30, 24); + this.toolStripButton3.Size = new System.Drawing.Size(23, 24); this.toolStripButton3.Text = "toolStripButton3"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -572,7 +519,7 @@ this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(30, 24); + this.toolStripButton4.Size = new System.Drawing.Size(23, 24); this.toolStripButton4.Text = "toolStripButton4"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // @@ -582,7 +529,7 @@ this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(30, 24); + this.toolStripButton5.Size = new System.Drawing.Size(23, 24); this.toolStripButton5.Text = "toolStripButton5"; this.toolStripButton5.ToolTipText = "로그인/로그아웃"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); @@ -634,6 +581,13 @@ this.toolStripContainer1.TabIndex = 35; this.toolStripContainer1.Text = "toolStripContainer1"; // + // 패치내역ToolStripMenuItem + // + this.패치내역ToolStripMenuItem.Name = "패치내역ToolStripMenuItem"; + this.패치내역ToolStripMenuItem.Size = new System.Drawing.Size(77, 23); + this.패치내역ToolStripMenuItem.Text = "패치내역"; + this.패치내역ToolStripMenuItem.Click += new System.EventHandler(this.패치내역ToolStripMenuItem_Click); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -701,12 +655,6 @@ private System.Windows.Forms.ToolStripMenuItem dataMoldEOLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem personalInventoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem windowsMenu; - private System.Windows.Forms.ToolStripMenuItem cascadeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem tileVerticalToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem tileHorizontalToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem closeAllToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem arrangeIconsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem holidayToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mailFormToolStripMenuItem; @@ -733,6 +681,7 @@ private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem; private System.Windows.Forms.ToolStripContainer toolStripContainer1; private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripMenuItem 패치내역ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 16ae9a8..487c276 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -490,5 +490,11 @@ namespace Project Func_Login(); } + private void 패치내역ToolStripMenuItem_Click(object sender, EventArgs e) + { + FCM0000.fPatchList f = new FCM0000.fPatchList(); + f.Show(); + } + } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 4c33522..2d9f7cd 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -153,16 +153,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad - +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5 - Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/kzvz/tXX+/3bNrnw39dzrf/3 - T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d - W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/7Ebe/7GzKt4C9UKAUnN - zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV - 3//t93YTNKB+++QfcXNKW6BaEcAtpvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j - 51X+SJhZYQrVhgBJzR2nnLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW - q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q - ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgC1jKF7RfhP4wAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIaSURBVDhPlY9daFJhGMdPdN1tV112G3QTRF0EQ2cX0d1u + 0jx55jm6Flut6fnQ47tQmZme48dppjvqxmiQLWEDkZQaFRUtiBaDICqC7mIfRMTc/HjK+XpEksV+8Ofl + fZ7n9/I+BKU6PlJJNzBseNXGS2cJzBTSH016DKUpQXdau7t0JYXrP7430IbK8h8saWGV5sOXKE76TBBw + 6C6vO6dwho0ldGE3wRq24ny/PuHp+/EYmWrqhO676jhzBOvd0C5Us94bWx9Hw7Xkg3EolRHEAiMNhC42 + CrEbjd/v/LCs0DvT4vmXuYGBw1jrQN4K/vI9SkHqzX2QllPgLUSAXfCDbZYHUmVhZM4FEzkRxPT13bGo + 9ZV5mjVhtQXju70mZhNQ+vbknxS/lCG3tgjpt/MQeZYG02KobspwG1htQXm9c2RYrral0NNkz7MZdWUe + BmeE91htQfn9tA2hWnvIrDp7ns00f0Fm2IdYbWENBI4xggTFr+X/PoCK8YpZdfiw2kFvDNdnX+f3hvZb + 4ebC5M/LqpPGWgcLurMZzGe1wV5Z+lQEY4avXElyp7DWgfIGVvqCvjolj263Y8xyFWOW12JRru4Mzrhl + rHTDcJKd5qUCvh4c2hk+wbCTW1ZBPolLB8cuRl/YXagx5I4Bw8tdsbujQJLR6jWP0nuFJkYBVdT8c7CN + ytu4pLFfT2Po7+skGakOi/EQLml09wjiD5+5oXO84tdnAAAAAElFTkSuQmCC diff --git a/SubProject/FCM0000/Board/fPatchList.Designer.cs b/SubProject/FCM0000/Board/fPatchList.Designer.cs new file mode 100644 index 0000000..50e28f6 --- /dev/null +++ b/SubProject/FCM0000/Board/fPatchList.Designer.cs @@ -0,0 +1,322 @@ +namespace FCM0000 +{ + partial class fPatchList + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPatchList)); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FCM0000.dsMSSQL(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.boardBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.ta = new FCM0000.dsMSSQLTableAdapters.BoardTableAdapter(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.bindingNavigatorAddNewItem, + this.bindingNavigatorDeleteItem, + this.boardBindingNavigatorSaveItem}); + this.bn.Location = new System.Drawing.Point(0, 550); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(1046, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bs + // + this.bs.DataMember = "Board"; + this.bs.DataSource = this.dsMSSQL; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); + this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorAddNewItem + // + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); + this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); + // + // boardBindingNavigatorSaveItem + // + this.boardBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("boardBindingNavigatorSaveItem.Image"))); + this.boardBindingNavigatorSaveItem.Name = "boardBindingNavigatorSaveItem"; + this.boardBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22); + this.boardBindingNavigatorSaveItem.Text = "Save(&S)"; + this.boardBindingNavigatorSaveItem.Click += new System.EventHandler(this.boardBindingNavigatorSaveItem_Click); + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.BoardTableAdapter = this.ta; + this.tam.CommonTableAdapter = null; + this.tam.CustomsTableAdapter = 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.StaffTableAdapter = null; + this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // richTextBox1 + // + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "contents", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Right; + this.richTextBox1.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Location = new System.Drawing.Point(716, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(330, 550); + this.richTextBox1.TabIndex = 3; + this.richTextBox1.Text = ""; + // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 0); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(716, 550); + this.fpSpread1.TabIndex = 4; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 3; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoCalculation = false; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.AutoSortEnhancedContextMenu = true; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구분"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "제목"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청자"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; + this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "title"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "제목"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "url"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청자"; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoHeadings = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.RowMode; + this.fpSpread1_Sheet1.Protect = false; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // + // fPatchList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1046, 575); + this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.richTextBox1); + this.Controls.Add(this.bn); + this.Name = "fPatchList"; + this.Text = "Patch List"; + this.Load += new System.EventHandler(this.fRequestItem_Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private dsMSSQL dsMSSQL; + private System.Windows.Forms.BindingSource bs; + private dsMSSQLTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStripButton boardBindingNavigatorSaveItem; + private dsMSSQLTableAdapters.BoardTableAdapter ta; + private System.Windows.Forms.RichTextBox richTextBox1; + private FarPoint.Win.Spread.FpSpread fpSpread1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/Board/fPatchList.cs b/SubProject/FCM0000/Board/fPatchList.cs new file mode 100644 index 0000000..f0de588 --- /dev/null +++ b/SubProject/FCM0000/Board/fPatchList.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using NetOffice; +using Outlook = NetOffice.OutlookApi; +using NetOffice.OutlookApi.Enums; + +namespace FCM0000 +{ + public partial class fPatchList : FCOMMON.fBase + { + public fPatchList() + { + InitializeComponent(); + this.dsMSSQL.Board.TableNewRow += RequestItem_TableNewRow; + } + + void RequestItem_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["bidx"] = 5; + e.Row["pidx"] = -1; + } + + private void fRequestItem_Load(object sender, EventArgs e) + { + if (FCOMMON.info.Login.level >= 9) + { + bn.Enabled = true; + this.fpSpread1.EditMode = true; + this.fpSpread1.ActiveSheet.Protect = false; + } + else + { + bn.Enabled = false; + this.fpSpread1.EditMode = false; + this.fpSpread1.ActiveSheet.Protect = true; + } + refreshData(); + } + + private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + this.tam.UpdateAll(this.dsMSSQL); + + } + + private void fillToolStripButton_Click(object sender, EventArgs e) + { + + + } + + void refreshData() + { + try + { + this.ta.Fill(this.dsMSSQL.Board,5); + } + catch (System.Exception ex) + { + System.Windows.Forms.MessageBox.Show(ex.Message); + } + } + + private void btSearch_Click(object sender, EventArgs e) + { + refreshData(); + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + this.bs.AddNew(); + //var newdr = this.dsMSSQL.Board.NewBoardRow();//.NewRequestItemRow(); + //fRequestItem_Add f = new fRequestItem_Add(newdr); + //if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) newdr.Delete(); + //else this.dsMSSQL.RequestItem.AddRequestItemRow(newdr); + } + + + } +} diff --git a/SubProject/FCM0000/Board/fPatchList.resx b/SubProject/FCM0000/Board/fPatchList.resx new file mode 100644 index 0000000..3ff5ca9 --- /dev/null +++ b/SubProject/FCM0000/Board/fPatchList.resx @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 259, 17 + + + 122, 17 + + + 17, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + 186, 17 + + + 325, 17 + + + 387, 17 + + \ No newline at end of file diff --git a/SubProject/FCM0000/Board/fRequestItem.Designer.cs b/SubProject/FCM0000/Board/fRequestItem.Designer.cs index a58ac14..e0f3edc 100644 --- a/SubProject/FCM0000/Board/fRequestItem.Designer.cs +++ b/SubProject/FCM0000/Board/fRequestItem.Designer.cs @@ -506,7 +506,9 @@ this.tam.MailDataTableAdapter = null; this.tam.MailFormTableAdapter = null; this.tam.ProjectsTableAdapter = null; + this.tam.PurchaseTableAdapter = null; this.tam.RequestItemTableAdapter = this.ta; + this.tam.StaffTableAdapter = null; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // ta @@ -524,7 +526,7 @@ this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fRequestItem"; - this.Text = "Item Request"; + this.Text = "Patch List"; this.Load += new System.EventHandler(this.fRequestItem_Load); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); diff --git a/SubProject/FCM0000/Board/fRequestItem.resx b/SubProject/FCM0000/Board/fRequestItem.resx index b8669eb..bae88a1 100644 --- a/SubProject/FCM0000/Board/fRequestItem.resx +++ b/SubProject/FCM0000/Board/fRequestItem.resx @@ -198,9 +198,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - True diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index f238998..1f255ca 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -88,6 +88,12 @@ + + Form + + + fPatchList.cs + Form @@ -191,6 +197,9 @@ + + fPatchList.cs + fSendMail.cs diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 80d0c27..7436ed4 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -2824,6 +2824,10 @@ namespace FCM0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columnproject; + + private global::System.Data.DataColumn columnpidx; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public BoardDataTable() { @@ -2945,6 +2949,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn projectColumn { + get { + return this.columnproject; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pidxColumn { + get { + return this.columnpidx; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2982,7 +3002,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public BoardRow AddBoardRow(int bidx, bool header, string cate, string title, string contents, string file, string guid, string url, string wuid, System.DateTime wdate) { + public BoardRow AddBoardRow(int bidx, bool header, string cate, string title, string contents, string file, string guid, string url, string wuid, System.DateTime wdate, int project, int pidx) { BoardRow rowBoardRow = ((BoardRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2995,7 +3015,9 @@ namespace FCM0000 { guid, url, wuid, - wdate}; + wdate, + project, + pidx}; rowBoardRow.ItemArray = columnValuesArray; this.Rows.Add(rowBoardRow); return rowBoardRow; @@ -3036,6 +3058,8 @@ namespace FCM0000 { this.columnurl = base.Columns["url"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columnproject = base.Columns["project"]; + this.columnpidx = base.Columns["pidx"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3063,6 +3087,10 @@ namespace FCM0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columnproject = new global::System.Data.DataColumn("project", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnproject); + this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpidx); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -3071,7 +3099,7 @@ namespace FCM0000 { this.columnidx.AllowDBNull = false; this.columnidx.ReadOnly = true; this.columnidx.Unique = true; - this.columncate.MaxLength = 2; + this.columncate.MaxLength = 10; this.columntitle.MaxLength = 255; this.columncontents.MaxLength = 2147483647; this.columnfile.MaxLength = 200; @@ -7436,6 +7464,38 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int project { + get { + try { + return ((int)(this[this.tableBoard.projectColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Board\' 테이블의 \'project\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableBoard.projectColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int pidx { + get { + if (this.IspidxNull()) { + return -1; + } + else { + return ((int)(this[this.tableBoard.pidxColumn])); + } + } + set { + this[this.tableBoard.pidxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsbidxNull() { @@ -7531,6 +7591,30 @@ namespace FCM0000 { public void SeturlNull() { this[this.tableBoard.urlColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsprojectNull() { + return this.IsNull(this.tableBoard.projectColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetprojectNull() { + this[this.tableBoard.projectColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspidxNull() { + return this.IsNull(this.tableBoard.pidxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpidxNull() { + this[this.tableBoard.pidxColumn] = global::System.Convert.DBNull; + } } /// @@ -13983,10 +14067,12 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, body, selfTo, selfCC, selfBCC tableMapping.ColumnMappings.Add("url", "url"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("project", "project"); + tableMapping.ColumnMappings.Add("pidx", "pidx"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Board] WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Board] WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -14003,10 +14089,14 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, body, selfTo, selfCC, selfBCC this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_guid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "guid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Board] ([bidx], [header], [cate], [title], [contents], [file], [guid], [url], [wuid], [wdate]) VALUES (@bidx, @header, @cate, @title, @contents, @file, @guid, @url, @wuid, @wdate); -SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate FROM Board WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Board] ([bidx], [header], [cate], [title], [contents], [file], [guid], [url], [wuid], [wdate], [project], [pidx]) VALUES (@bidx, @header, @cate, @title, @contents, @file, @guid, @url, @wuid, @wdate, @project, @pidx); +SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx FROM Board WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@header", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "header", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -14018,10 +14108,12 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@url", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "url", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Board] SET [bidx] = @bidx, [header] = @header, [cate] = @cate, [title] = @title, [contents] = @contents, [file] = @file, [guid] = @guid, [url] = @url, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate FROM Board WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Board] SET [bidx] = @bidx, [header] = @header, [cate] = @cate, [title] = @title, [contents] = @contents, [file] = @file, [guid] = @guid, [url] = @url, [wuid] = @wuid, [wdate] = @wdate, [project] = @project, [pidx] = @pidx WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))); +SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx FROM Board WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@header", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "header", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -14033,6 +14125,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@url", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "url", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -14048,6 +14142,10 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_guid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "guid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -14064,8 +14162,9 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate\r" + - "\nFROM Board\r\nWHERE (bidx = @bidx) AND (ISNULL(header, 0) = 0)"; + this._commandCollection[0].CommandText = "SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate," + + " project, pidx\r\nFROM Board\r\nWHERE (bidx = @bidx) AND (ISNULL(header, 0) = 0" + + ")"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -14139,7 +14238,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, global::System.Nullable Original_bidx, global::System.Nullable Original_header, string Original_cate, string Original_title, string Original_file, string Original_guid, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx, global::System.Nullable Original_bidx, global::System.Nullable Original_header, string Original_cate, string Original_title, string Original_file, string Original_guid, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_project, global::System.Nullable Original_pidx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_bidx.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); @@ -14196,6 +14295,22 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this.Adapter.DeleteCommand.Parameters[13].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[14].Value = ((System.DateTime)(Original_wdate)); + if ((Original_project.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[16].Value = ((int)(Original_project.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; + } + if ((Original_pidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[18].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14216,7 +14331,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(global::System.Nullable bidx, global::System.Nullable header, string cate, string title, string contents, string file, string guid, string url, string wuid, System.DateTime wdate) { + public virtual int Insert(global::System.Nullable bidx, global::System.Nullable header, string cate, string title, string contents, string file, string guid, string url, string wuid, System.DateTime wdate, global::System.Nullable project, global::System.Nullable pidx) { if ((bidx.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(bidx.Value)); } @@ -14272,6 +14387,18 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this.Adapter.InsertCommand.Parameters[8].Value = ((string)(wuid)); } this.Adapter.InsertCommand.Parameters[9].Value = ((System.DateTime)(wdate)); + if ((project.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[10].Value = ((int)(project.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; + } + if ((pidx.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[11].Value = ((int)(pidx.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14303,6 +14430,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate string url, string wuid, System.DateTime wdate, + global::System.Nullable project, + global::System.Nullable pidx, int Original_idx, global::System.Nullable Original_bidx, global::System.Nullable Original_header, @@ -14312,6 +14441,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate string Original_guid, string Original_wuid, System.DateTime Original_wdate, + global::System.Nullable Original_project, + global::System.Nullable Original_pidx, int idx) { if ((bidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(bidx.Value)); @@ -14368,63 +14499,91 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(wuid)); } this.Adapter.UpdateCommand.Parameters[9].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx)); - if ((Original_bidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_bidx.Value)); + if ((project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(project.Value)); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } - if ((Original_header.HasValue == true)) { + if ((pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(pidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_idx)); + if ((Original_bidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((bool)(Original_header.Value)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_bidx.Value)); } else { this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } - if ((Original_cate == null)) { + if ((Original_header.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_header.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_cate)); - } - if ((Original_title == null)) { + if ((Original_cate == null)) { this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_title)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_cate)); } - if ((Original_file == null)) { + if ((Original_title == null)) { this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_file)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_title)); } - if ((Original_guid == null)) { + if ((Original_file == null)) { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_guid)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_file)); + } + if ((Original_guid == null)) { + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_guid)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_wdate)); + if ((Original_project.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_project.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + if ((Original_pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + } + 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)) { @@ -14456,6 +14615,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate string url, string wuid, System.DateTime wdate, + global::System.Nullable project, + global::System.Nullable pidx, int Original_idx, global::System.Nullable Original_bidx, global::System.Nullable Original_header, @@ -14464,8 +14625,10 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate string Original_file, string Original_guid, string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(bidx, header, cate, title, contents, file, guid, url, wuid, wdate, Original_idx, Original_bidx, Original_header, Original_cate, Original_title, Original_file, Original_guid, Original_wuid, Original_wdate, Original_idx); + System.DateTime Original_wdate, + global::System.Nullable Original_project, + global::System.Nullable Original_pidx) { + return this.Update(bidx, header, cate, title, contents, file, guid, url, wuid, wdate, project, pidx, Original_idx, Original_bidx, Original_header, Original_cate, Original_title, Original_file, Original_guid, Original_wuid, Original_wdate, Original_project, Original_pidx, Original_idx); } } diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index cd0d6a3..5a1bec8 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -712,7 +712,7 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, body, selfTo, selfCC, selfBCC - DELETE FROM [Board] WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [Board] WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))) @@ -729,13 +729,17 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, body, selfTo, selfCC, selfBCC + + + + - INSERT INTO [Board] ([bidx], [header], [cate], [title], [contents], [file], [guid], [url], [wuid], [wdate]) VALUES (@bidx, @header, @cate, @title, @contents, @file, @guid, @url, @wuid, @wdate); -SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate FROM Board WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [Board] ([bidx], [header], [cate], [title], [contents], [file], [guid], [url], [wuid], [wdate], [project], [pidx]) VALUES (@bidx, @header, @cate, @title, @contents, @file, @guid, @url, @wuid, @wdate, @project, @pidx); +SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx FROM Board WHERE (idx = SCOPE_IDENTITY()) @@ -747,12 +751,14 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate + + - SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate + SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx FROM Board WHERE (bidx = @bidx) AND (ISNULL(header, 0) = 0) @@ -762,8 +768,8 @@ WHERE (bidx = @bidx) AND (ISNULL(header, 0) = 0) - UPDATE [Board] SET [bidx] = @bidx, [header] = @header, [cate] = @cate, [title] = @title, [contents] = @contents, [file] = @file, [guid] = @guid, [url] = @url, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate FROM Board WHERE (idx = @idx) + UPDATE [Board] SET [bidx] = @bidx, [header] = @header, [cate] = @cate, [title] = @title, [contents] = @contents, [file] = @file, [guid] = @guid, [url] = @url, [wuid] = @wuid, [wdate] = @wdate, [project] = @project, [pidx] = @pidx WHERE (([idx] = @Original_idx) AND ((@IsNull_bidx = 1 AND [bidx] IS NULL) OR ([bidx] = @Original_bidx)) AND ((@IsNull_header = 1 AND [header] IS NULL) OR ([header] = @Original_header)) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_file = 1 AND [file] IS NULL) OR ([file] = @Original_file)) AND ((@IsNull_guid = 1 AND [guid] IS NULL) OR ([guid] = @Original_guid)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))); +SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx FROM Board WHERE (idx = @idx) @@ -775,6 +781,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate + + @@ -790,6 +798,10 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate + + + + @@ -808,6 +820,8 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate + + @@ -1570,7 +1584,7 @@ WHERE (supplyidx = @idx) - + @@ -1644,7 +1658,7 @@ WHERE (supplyidx = @idx) - + @@ -1714,7 +1728,7 @@ WHERE (supplyidx = @idx) - + @@ -1785,7 +1799,7 @@ WHERE (supplyidx = @idx) - + @@ -1830,7 +1844,7 @@ WHERE (supplyidx = @idx) - + @@ -1897,7 +1911,7 @@ WHERE (supplyidx = @idx) - + @@ -1906,7 +1920,7 @@ WHERE (supplyidx = @idx) - + @@ -1953,10 +1967,12 @@ WHERE (supplyidx = @idx) + + - + @@ -2020,7 +2036,7 @@ WHERE (supplyidx = @idx) - + @@ -2109,7 +2125,7 @@ WHERE (supplyidx = @idx) - + @@ -2215,7 +2231,7 @@ WHERE (supplyidx = @idx) - + @@ -2273,7 +2289,7 @@ WHERE (supplyidx = @idx) - + diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index b7cf458..038c463 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,29 +30,29 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType154 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType155 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType156 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType157 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType158 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType159 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType160 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType161 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType46 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType162 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType47 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType163 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType48 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType164 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType49 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType165 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType50 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType166 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType167 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType168 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType169 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType170 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType10 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -101,6 +101,7 @@ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.btSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); @@ -108,12 +109,11 @@ this.내가등록한자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripDropDownButton(); + this.집계ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripDropDownButton(); - this.집계ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -529,6 +529,11 @@ this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31); + // // btSearch // this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); @@ -587,6 +592,23 @@ this.btViewDel.Text = "삭제자료표시"; this.btViewDel.Click += new System.EventHandler(this.btViewDel_Click); // + // toolStripButton3 + // + this.toolStripButton3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.집계ToolStripMenuItem}); + this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); + this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.Size = new System.Drawing.Size(68, 28); + this.toolStripButton3.Text = "출력"; + // + // 집계ToolStripMenuItem + // + this.집계ToolStripMenuItem.Name = "집계ToolStripMenuItem"; + this.집계ToolStripMenuItem.Size = new System.Drawing.Size(98, 22); + this.집계ToolStripMenuItem.Text = "집계"; + this.집계ToolStripMenuItem.Click += new System.EventHandler(this.집계ToolStripMenuItem_Click); + // // toolStripButton2 // this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); @@ -617,7 +639,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 24; + this.fpSpread1_Sheet1.ColumnCount = 25; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -639,16 +661,17 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "관련프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "입고예정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "적용장비"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "적용위치"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "입고예정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType154; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -656,7 +679,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType155; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -664,175 +687,159 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType156; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType157; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType158; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType159; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType160; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType161; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType46.DecimalPlaces = 0; - numberCellType46.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType46.MaximumValue = 2147483647D; - numberCellType46.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType46; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType162; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "모델"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F; - numberCellType47.DecimalPlaces = 0; - numberCellType47.NegativeRed = true; - numberCellType47.NullDisplay = "--"; - numberCellType47.Separator = ","; - numberCellType47.ShowSeparator = true; - numberCellType47.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType47; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType163; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 46F; - numberCellType48.DecimalPlaces = 0; - numberCellType48.NegativeRed = true; - numberCellType48.NullDisplay = "--"; - numberCellType48.Separator = ","; - numberCellType48.ShowSeparator = true; - numberCellType48.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType48; + numberCellType3.DecimalPlaces = 0; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType48; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(13).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F; this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType164; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(14).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType49.DecimalPlaces = 0; - numberCellType49.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType49.MaximumValue = 2147483647D; - numberCellType49.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType49; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType165; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(16).Label = "관련프로젝트"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType50.DecimalPlaces = 0; - numberCellType50.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType50.MaximumValue = 2147483647D; - numberCellType50.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType50; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType166; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "자산번호"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "적용장비"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType167; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고예정"; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 38F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType168; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "적용위치"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 34F; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 42F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType169; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 38F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "PO#"; - this.fpSpread1_Sheet1.Columns.Get(21).Width = 23F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType170; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "dept"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(22).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType10; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "삭제됨"; - this.fpSpread1_Sheet1.Columns.Get(23).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 42F; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "PO#"; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 41F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(23).Width = 33F; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(24).Tag = "isdel"; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton3 - // - this.toolStripButton3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.집계ToolStripMenuItem}); - this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(68, 28); - this.toolStripButton3.Text = "출력"; - // - // 집계ToolStripMenuItem - // - this.집계ToolStripMenuItem.Name = "집계ToolStripMenuItem"; - this.집계ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.집계ToolStripMenuItem.Text = "집계"; - this.집계ToolStripMenuItem.Click += new System.EventHandler(this.집계ToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31); - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -919,9 +926,9 @@ private System.Windows.Forms.ToolStripMenuItem deleteDataToolStripMenuItem; private System.Windows.Forms.ToolStripButton btViewDel; private System.Windows.Forms.ToolStripButton toolStripButton2; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripDropDownButton toolStripButton3; private System.Windows.Forms.ToolStripMenuItem 집계ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index dd72191..07f7ca1 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -294,6 +294,22 @@ AMhmkGawjbGxEFuhNoOxjw/cgARrGUwDQE4G2YqiOTQUxYDZriZ4DAD69+umTTg1EzYA5HSQX9E1YzEA axiAnA4KSGwa0Q0IMZbAYgDQVlBAvgZ6BRfu1pfFbcBLU9P/95WV/9+Qlv5/ko8PjnewscExyOk4DSAG 4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJlSURBVGhD7Za9SlxRFIXnBYKMhWRmxCoPkLyDYOUPo6bI + IwxWQiRdCiFYSBDSWQjCEObnBexNk1TJNJbRImIhxCKiEfRk9mXdcDiz7njvzrkbArPgY37uYe21mH25 + U5loopK19+W3K4fbtxhRrvjwf2P/6x3eG5QIh8fg5Oe9XYlweAzOrh/sSoTDYyAFzEqEw2OQFjApEQ6P + gV+g9BLh8BiEBUotEQ6PASsglFIiHB4DFj4leolweAxYcB+/BGLoFQ63BjH0YqaWIIZezNQSxNCLmVqC + GHoxU0sQQy9magli6MVMY9Fqf3eNtV5Cq31KzyCGXsw0FrPrPfdk4TBh9mWfnkEMvZhpLGaa3f+3wPbx + jZt7M3BTSx1XW+u7jY9n9Bxi6MVMs5Cdrq32XH3MTqfMH1y6uZ0fySu7noIYejHTLPydbqzzlRA2j34l + 4Z/tnie/BDuTghh6MdMs/J2eXum6d59Gw73/fOuef7hICrzqX41cD0EMvZgpw9/p6nLX1bcG7sUwaFhC + Qkt4KSFl/GsMxNCLmTL8nZbQEl4++yWkpKyNfC9rFHowEEMvZhrCdpqVyHvj+iCGXszUZ9xOpyVqr7+5 + 6nC1phY7yZo9duP6IIZezNTnsZ2WEtXlzt+be6bZGzkzDsTQi5mm5N3pRo6/DFkghl7MNCXvTstDTUrU + xzxxs0AMvZipPHGfDldBs9NFQQy9mKn/xC2600VBDL2YaZ6/wbFADL2Yqey0lJDwRXe6KIihFzO1BDH0 + YqaWIIZezNQSxNCLmVqCGHoxU0sQQy9magli6MVMLUGMiSYqR5XKHzP/iFmrzyd6AAAAAElFTkSuQmCC @@ -314,20 +330,4 @@ 577, 17 - - - iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJlSURBVGhD7Za9SlxRFIXnBYKMhWRmxCoPkLyDYOUPo6bI - IwxWQiRdCiFYSBDSWQjCEObnBexNk1TJNJbRImIhxCKiEfRk9mXdcDiz7njvzrkbArPgY37uYe21mH25 - U5loopK19+W3K4fbtxhRrvjwf2P/6x3eG5QIh8fg5Oe9XYlweAzOrh/sSoTDYyAFzEqEw2OQFjApEQ6P - gV+g9BLh8BiEBUotEQ6PASsglFIiHB4DFj4leolweAxYcB+/BGLoFQ63BjH0YqaWIIZezNQSxNCLmVqC - GHoxU0sQQy9magli6MVMY9Fqf3eNtV5Cq31KzyCGXsw0FrPrPfdk4TBh9mWfnkEMvZhpLGaa3f+3wPbx - jZt7M3BTSx1XW+u7jY9n9Bxi6MVMs5Cdrq32XH3MTqfMH1y6uZ0fySu7noIYejHTLPydbqzzlRA2j34l - 4Z/tnie/BDuTghh6MdMs/J2eXum6d59Gw73/fOuef7hICrzqX41cD0EMvZgpw9/p6nLX1bcG7sUwaFhC - Qkt4KSFl/GsMxNCLmTL8nZbQEl4++yWkpKyNfC9rFHowEEMvZhrCdpqVyHvj+iCGXszUZ9xOpyVqr7+5 - 6nC1phY7yZo9duP6IIZezNTnsZ2WEtXlzt+be6bZGzkzDsTQi5mm5N3pRo6/DFkghl7MNCXvTstDTUrU - xzxxs0AMvZipPHGfDldBs9NFQQy9mKn/xC2600VBDL2YaZ6/wbFADL2Yqey0lJDwRXe6KIihFzO1BDH0 - YqaWIIZezNQSxNCLmVqCGHoxU0sQQy9magli6MVMLUGMiSYqR5XKHzP/iFmrzyd6AAAAAElFTkSuQmCC - - \ No newline at end of file diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 2bee3fb..2db9531 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -335,6 +335,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnisdel; + private global::System.Data.DataColumn columnbigo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public PurchaseDataTable() { @@ -592,6 +594,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn bigoColumn { + get { + return this.columnbigo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -656,7 +666,8 @@ namespace FEQ0000 { System.DateTime wdate, bool import, int pumidx, - bool isdel) { + bool isdel, + string bigo) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -686,7 +697,8 @@ namespace FEQ0000 { wdate, import, pumidx, - isdel}; + isdel, + bigo}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -744,6 +756,7 @@ namespace FEQ0000 { this.columnimport = base.Columns["import"]; this.columnpumidx = base.Columns["pumidx"]; this.columnisdel = base.Columns["isdel"]; + this.columnbigo = base.Columns["bigo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -805,6 +818,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnpumidx); this.columnisdel = new global::System.Data.DataColumn("isdel", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnisdel); + this.columnbigo = new global::System.Data.DataColumn("bigo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbigo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -833,6 +848,7 @@ namespace FEQ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnbigo.MaxLength = 500; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1406,6 +1422,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string bigo { + get { + if (this.IsbigoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.bigoColumn])); + } + } + set { + this[this.tablePurchase.bigoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IspdateNull() { @@ -1705,6 +1737,18 @@ namespace FEQ0000 { public void SetisdelNull() { this[this.tablePurchase.isdelColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsbigoNull() { + return this.IsNull(this.tablePurchase.bigoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetbigoNull() { + this[this.tablePurchase.bigoColumn] = global::System.Convert.DBNull; + } } /// @@ -1894,6 +1938,7 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("pumidx", "pumidx"); tableMapping.ColumnMappings.Add("isdel", "isdel"); + tableMapping.ColumnMappings.Add("bigo", "bigo"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -1902,8 +1947,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo); +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 = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1932,6 +1977,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [" + @@ -1940,35 +1986,36 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, "mprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supp" + "lyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edat" + "e] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wd" + - "ate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel WHERE ((" + - "[idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] " + - "= @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @" + - "Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] " + - "= @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([rece" + - "ive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Or" + - "iginal_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Or" + - "iginal_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_" + - "sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Origi" + - "nal_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = " + - "@Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] " + - "= @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pum" + - "price] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR " + - "([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR" + - " ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS N" + - "ULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [p" + - "rojectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asse" + - "t = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate =" + - " 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1" + - " AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AN" + - "D [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS N" + - "ULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = " + - "@Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @" + - "Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = " + - "@Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @O" + - "riginal_isdel)));\r\nSELECT idx, pdate, state, process, receive, sc, request, sid," + - " pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, projec" + - "t, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isde" + - "l FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; + "ate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] " + + "= @bigo WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NU" + + "LL) 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 ([s" + + "id] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pu" + + "mscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) " + + "OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NUL" + + "L) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] I" + + "S NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [puma" + + "mt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [sup" + + "ply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND " + + "[supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_proje" + + "ctidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AN" + + "D ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND (" + + "(@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@I" + + "sNull_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)));\r\nSELECT idx, pdate, state, process, receive, sc, requ" + + "est, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyid" + + "x, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pum" + + "idx, 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, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1997,6 +2044,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2046,6 +2094,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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, 0, 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.Current, false, null, "", "", "")); } @@ -2063,7 +2113,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, isdel + wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC"; @@ -2076,7 +2126,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT asset, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC"; + this._commandCollection[2].CommandText = @"SELECT asset, bigo, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2236,7 +2286,8 @@ ORDER BY pdate DESC, idx DESC"; System.DateTime wdate, global::System.Nullable import, global::System.Nullable pumidx, - global::System.Nullable isdel) { + global::System.Nullable isdel, + string bigo) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -2394,6 +2445,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; } + if ((bigo == null)) { + this.Adapter.InsertCommand.Parameters[27].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[27].Value = ((string)(bigo)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -2442,6 +2499,7 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable import, global::System.Nullable pumidx, global::System.Nullable isdel, + string bigo, int Original_idx, string Original_pdate, string Original_state, @@ -2468,6 +2526,7 @@ ORDER BY pdate DESC, idx DESC"; 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; @@ -2626,199 +2685,213 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + if ((bigo == null)) { + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(bigo)); + } + this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_pdate)); } if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_state)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_process)); } if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_receive)); } if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_sc)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_request)); } if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_sid)); } if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_pumscale)); } if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_pumunit)); } if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((int)(Original_pumqty.Value)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((int)(Original_pumqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; } if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((decimal)(Original_pumprice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; } if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((decimal)(Original_pumamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_supply)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_projectidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_asset)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_edate)); } if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_indate)); } if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_po)); } if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[69].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; } if ((Original_pumidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_pumidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[76].Value = ((int)(idx)); + if ((Original_bigo == null)) { + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_bigo)); + } + this.Adapter.UpdateCommand.Parameters[79].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)) { @@ -2867,6 +2940,7 @@ ORDER BY pdate DESC, idx DESC"; global::System.Nullable import, global::System.Nullable pumidx, global::System.Nullable isdel, + string bigo, int Original_idx, string Original_pdate, string Original_state, @@ -2892,8 +2966,9 @@ ORDER BY pdate DESC, idx DESC"; System.DateTime Original_wdate, global::System.Nullable Original_import, global::System.Nullable Original_pumidx, - global::System.Nullable Original_isdel) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_idx); + global::System.Nullable Original_isdel, + string Original_bigo) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 70debf4..914fe2d 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -22,8 +22,8 @@ WHERE (idx = @Original_idx) - INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC + INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo); +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 = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -52,13 +52,14 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, isdel + wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC @@ -67,8 +68,8 @@ ORDER BY pdate DESC, idx DESC - UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel))); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC + 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 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))); +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 @@ -97,6 +98,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -146,6 +148,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + + @@ -181,6 +185,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -204,7 +209,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) - SELECT asset, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC + SELECT asset, bigo, dept, edate, idx, import, indate, isdel, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, request, sc, sid, state, supply, supplyidx, wdate, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) ORDER BY pdate DESC, idx DESC @@ -222,7 +227,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) - + @@ -361,6 +366,13 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) + + + + + + + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 8a66f12..fc09b94 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/SubProject/FEQ0000/dsPurchase.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file