diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 29b8787..feb0b01 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.10.12.1100")] -[assembly: AssemblyFileVersion("21.10.12.1100")] +[assembly: AssemblyVersion("21.10.13.1630")] +[assembly: AssemblyFileVersion("21.10.13.1630")] diff --git a/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs b/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs index d44a4bf..a902c1e 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs +++ b/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs @@ -1,192 +1,206 @@ -namespace FCM0000 -{ - partial class fUserGroupPermission - { - /// - /// 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.c0 = new System.Windows.Forms.CheckBox(); - this.c1 = new System.Windows.Forms.CheckBox(); - this.c2 = new System.Windows.Forms.CheckBox(); - this.c3 = new System.Windows.Forms.CheckBox(); - this.button1 = new System.Windows.Forms.Button(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); - this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.SuspendLayout(); - // - // c0 - // - this.c0.AutoSize = true; - this.c0.Location = new System.Drawing.Point(20, 14); - this.c0.Name = "c0"; - this.c0.Size = new System.Drawing.Size(116, 34); - this.c0.TabIndex = 0; - this.c0.Tag = "0"; - this.c0.Text = "구매신청"; - this.c0.UseVisualStyleBackColor = true; - // - // c1 - // - this.c1.AutoSize = true; - this.c1.Location = new System.Drawing.Point(20, 51); - this.c1.Name = "c1"; - this.c1.Size = new System.Drawing.Size(116, 34); - this.c1.TabIndex = 0; - this.c1.Tag = "1"; - this.c1.Text = "프로젝트"; - this.c1.UseVisualStyleBackColor = true; - // - // c2 - // - this.c2.AutoSize = true; - this.c2.Location = new System.Drawing.Point(20, 88); - this.c2.Name = "c2"; - this.c2.Size = new System.Drawing.Size(116, 34); - this.c2.TabIndex = 0; - this.c2.Tag = "2"; - this.c2.Text = "업무일지"; - this.c2.UseVisualStyleBackColor = true; - // - // c3 - // - this.c3.AutoSize = true; - this.c3.Location = new System.Drawing.Point(20, 125); - this.c3.Name = "c3"; - this.c3.Size = new System.Drawing.Size(116, 34); - this.c3.TabIndex = 0; - this.c3.Tag = "3"; - this.c3.Text = "품목재고"; - this.c3.UseVisualStyleBackColor = true; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(14, 247); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(136, 44); - this.button1.TabIndex = 1; - this.button1.Text = "확인"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_1); - // - // checkBox1 - // - this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(20, 165); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(116, 34); - this.checkBox1.TabIndex = 2; - this.checkBox1.Tag = "4"; - this.checkBox1.Text = "장비목록"; - this.checkBox1.UseVisualStyleBackColor = true; - // - // checkBox2 - // - this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(20, 205); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(116, 34); - this.checkBox2.TabIndex = 3; - this.checkBox2.Tag = "5"; - this.checkBox2.Text = "근태관리"; - this.checkBox2.UseVisualStyleBackColor = true; - // - // checkBox3 - // - this.checkBox3.AutoSize = true; - this.checkBox3.Location = new System.Drawing.Point(142, 14); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(170, 34); - this.checkBox3.TabIndex = 4; - this.checkBox3.Tag = "6"; - this.checkBox3.Text = "(구매)상세입력"; - this.checkBox3.UseVisualStyleBackColor = true; - // - // checkBox4 - // - this.checkBox4.AutoSize = true; - this.checkBox4.Location = new System.Drawing.Point(142, 54); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(74, 34); - this.checkBox4.TabIndex = 5; - this.checkBox4.Tag = "7"; - this.checkBox4.Text = "문서"; - this.checkBox4.UseVisualStyleBackColor = true; - // - // checkBox5 - // - this.checkBox5.AutoSize = true; - this.checkBox5.Location = new System.Drawing.Point(142, 88); - this.checkBox5.Name = "checkBox5"; - this.checkBox5.Size = new System.Drawing.Size(116, 34); - this.checkBox5.TabIndex = 6; - this.checkBox5.Tag = "8"; - this.checkBox5.Text = "운영기록"; - this.checkBox5.UseVisualStyleBackColor = true; - // - // fUserGroupPermission - // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(313, 297); - this.Controls.Add(this.checkBox5); - this.Controls.Add(this.checkBox4); - this.Controls.Add(this.checkBox3); - this.Controls.Add(this.checkBox2); - this.Controls.Add(this.checkBox1); - this.Controls.Add(this.button1); - this.Controls.Add(this.c3); - this.Controls.Add(this.c2); - this.Controls.Add(this.c1); - this.Controls.Add(this.c0); - this.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fUserGroupPermission"; - this.Text = "fUserGroupPermission"; - this.Load += new System.EventHandler(this.fUserGroupPermission_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.CheckBox c0; - private System.Windows.Forms.CheckBox c1; - private System.Windows.Forms.CheckBox c2; - private System.Windows.Forms.CheckBox c3; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; - private System.Windows.Forms.CheckBox checkBox5; - } +namespace FCM0000 +{ + partial class fUserGroupPermission + { + /// + /// 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.c0 = new System.Windows.Forms.CheckBox(); + this.c1 = new System.Windows.Forms.CheckBox(); + this.c2 = new System.Windows.Forms.CheckBox(); + this.c3 = new System.Windows.Forms.CheckBox(); + this.button1 = new System.Windows.Forms.Button(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // c0 + // + this.c0.AutoSize = true; + this.c0.Location = new System.Drawing.Point(20, 14); + this.c0.Name = "c0"; + this.c0.Size = new System.Drawing.Size(116, 34); + this.c0.TabIndex = 0; + this.c0.Tag = "0"; + this.c0.Text = "구매신청"; + this.c0.UseVisualStyleBackColor = true; + // + // c1 + // + this.c1.AutoSize = true; + this.c1.Location = new System.Drawing.Point(20, 51); + this.c1.Name = "c1"; + this.c1.Size = new System.Drawing.Size(116, 34); + this.c1.TabIndex = 0; + this.c1.Tag = "1"; + this.c1.Text = "프로젝트"; + this.c1.UseVisualStyleBackColor = true; + // + // c2 + // + this.c2.AutoSize = true; + this.c2.Location = new System.Drawing.Point(20, 88); + this.c2.Name = "c2"; + this.c2.Size = new System.Drawing.Size(116, 34); + this.c2.TabIndex = 0; + this.c2.Tag = "2"; + this.c2.Text = "업무일지"; + this.c2.UseVisualStyleBackColor = true; + // + // c3 + // + this.c3.AutoSize = true; + this.c3.Location = new System.Drawing.Point(20, 125); + this.c3.Name = "c3"; + this.c3.Size = new System.Drawing.Size(116, 34); + this.c3.TabIndex = 0; + this.c3.Tag = "3"; + this.c3.Text = "품목재고"; + this.c3.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(14, 247); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(136, 44); + this.button1.TabIndex = 1; + this.button1.Text = "확인"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click_1); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(20, 165); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(116, 34); + this.checkBox1.TabIndex = 2; + this.checkBox1.Tag = "4"; + this.checkBox1.Text = "장비목록"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(20, 205); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(116, 34); + this.checkBox2.TabIndex = 3; + this.checkBox2.Tag = "5"; + this.checkBox2.Text = "근태관리"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Location = new System.Drawing.Point(142, 14); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(170, 34); + this.checkBox3.TabIndex = 4; + this.checkBox3.Tag = "6"; + this.checkBox3.Text = "(구매)상세입력"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // checkBox4 + // + this.checkBox4.AutoSize = true; + this.checkBox4.Location = new System.Drawing.Point(142, 54); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(74, 34); + this.checkBox4.TabIndex = 5; + this.checkBox4.Tag = "7"; + this.checkBox4.Text = "문서"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // checkBox5 + // + this.checkBox5.AutoSize = true; + this.checkBox5.Location = new System.Drawing.Point(142, 88); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.Size = new System.Drawing.Size(116, 34); + this.checkBox5.TabIndex = 6; + this.checkBox5.Tag = "8"; + this.checkBox5.Text = "운영기록"; + this.checkBox5.UseVisualStyleBackColor = true; + // + // checkBox6 + // + this.checkBox6.AutoSize = true; + this.checkBox6.Location = new System.Drawing.Point(142, 128); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(188, 34); + this.checkBox6.TabIndex = 7; + this.checkBox6.Tag = "9"; + this.checkBox6.Text = "업무일지-기술료"; + this.checkBox6.UseVisualStyleBackColor = true; + // + // fUserGroupPermission + // + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(344, 297); + this.Controls.Add(this.checkBox6); + this.Controls.Add(this.checkBox5); + this.Controls.Add(this.checkBox4); + this.Controls.Add(this.checkBox3); + this.Controls.Add(this.checkBox2); + this.Controls.Add(this.checkBox1); + this.Controls.Add(this.button1); + this.Controls.Add(this.c3); + this.Controls.Add(this.c2); + this.Controls.Add(this.c1); + this.Controls.Add(this.c0); + this.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fUserGroupPermission"; + this.Text = "fUserGroupPermission"; + this.Load += new System.EventHandler(this.fUserGroupPermission_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.CheckBox c0; + private System.Windows.Forms.CheckBox c1; + private System.Windows.Forms.CheckBox c2; + private System.Windows.Forms.CheckBox c3; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.CheckBox checkBox6; + } } \ No newline at end of file diff --git a/SubProject/FCM0000/User/fUserGroupPermission.cs b/SubProject/FCM0000/User/fUserGroupPermission.cs index 5fdc3fa..25df461 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.cs +++ b/SubProject/FCM0000/User/fUserGroupPermission.cs @@ -1,56 +1,56 @@ -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; - -namespace FCM0000 -{ - public partial class fUserGroupPermission : FCOMMON.fBase - { - public int permission = 0; - public fUserGroupPermission(int permission_) - { - InitializeComponent(); - this.permission = permission_; - } - - private void fUserGroupPermission_Load(object sender, EventArgs e) - { - foreach(var ctl in this.Controls) - { - if(ctl.GetType() == typeof(CheckBox)) - { - var chk = ctl as CheckBox; - if(chk.Tag == null) continue; - int idx = int.Parse(chk.Tag.ToString()); - var bitValue = FCOMMON.Util.getBit( this.permission, idx); - chk.Checked = bitValue; - } - } - } - - private void button1_Click(object sender, EventArgs e) - { - - } - - private void button1_Click_1(object sender, EventArgs e) - { - foreach (var ctl in this.Controls) - { - if (ctl.GetType() == typeof(CheckBox)) - { - var chk = ctl as CheckBox; - if (chk.Tag == null) continue; - int idx = int.Parse(chk.Tag.ToString()); - FCOMMON.Util.setBit(ref this.permission, idx, chk.Checked); - } - } - DialogResult = System.Windows.Forms.DialogResult.OK; - } - } -} +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; + +namespace FCM0000 +{ + public partial class fUserGroupPermission : FCOMMON.fBase + { + public int permission = 0; + public fUserGroupPermission(int permission_) + { + InitializeComponent(); + this.permission = permission_; + } + + private void fUserGroupPermission_Load(object sender, EventArgs e) + { + foreach(var ctl in this.Controls) + { + if(ctl.GetType() == typeof(CheckBox)) + { + var chk = ctl as CheckBox; + if(chk.Tag == null) continue; + int idx = int.Parse(chk.Tag.ToString()); + var bitValue = FCOMMON.Util.getBit( this.permission, idx); + chk.Checked = bitValue; + } + } + } + + private void button1_Click(object sender, EventArgs e) + { + + } + + private void button1_Click_1(object sender, EventArgs e) + { + foreach (var ctl in this.Controls) + { + if (ctl.GetType() == typeof(CheckBox)) + { + var chk = ctl as CheckBox; + if (chk.Tag == null) continue; + int idx = int.Parse(chk.Tag.ToString()); + FCOMMON.Util.setBit(ref this.permission, idx, chk.Checked); + } + } + DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} diff --git a/SubProject/FCM0000/User/fUserGroupPermission.resx b/SubProject/FCM0000/User/fUserGroupPermission.resx index 1af7de1..29dcb1b 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.resx +++ b/SubProject/FCM0000/User/fUserGroupPermission.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + \ No newline at end of file diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index 24cab59..d853ea9 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -28,6 +28,7 @@ namespace FCOMMON purchase_adv, menu_docu, menu_logdata, + jobreport_kisul, } public static class info diff --git a/SubProject/FED0000/Education/fEdulist.Designer.cs b/SubProject/FED0000/Education/fEdulist.Designer.cs index 09a58bd..b4f079c 100644 --- a/SubProject/FED0000/Education/fEdulist.Designer.cs +++ b/SubProject/FED0000/Education/fEdulist.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEdulist)); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -42,10 +43,10 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dsPurchase = new FED0000.EEDataSet(); - this.bs = new System.Windows.Forms.BindingSource(); + this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FED0000.EEDataSetTableAdapters.EETGW_EducationListTableAdapter(); this.tam = new FED0000.EEDataSetTableAdapters.TableAdapterManager(); - this.bn = new System.Windows.Forms.BindingNavigator(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); @@ -64,7 +65,7 @@ this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 232bda3..6b896af 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -30,23 +30,26 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType9 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType10 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -93,7 +96,6 @@ this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); @@ -110,21 +112,22 @@ this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -216,6 +219,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -307,6 +311,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -548,150 +553,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 17; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType49; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; - 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 = textCellType50; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType51; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; - 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(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType52; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType53; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType54; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType55; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType56; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType57; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType58; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType13; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType14; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; - numberCellType15.MaximumValue = 999999999999999D; - numberCellType15.MinimumValue = -999999999999999D; - numberCellType15.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType15; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; - this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType59; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType9.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType9.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType9.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType9.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType9.TimeDefault = new System.DateTime(2021, 9, 30, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType9; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType10.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType10.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType10.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType10.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType10.TimeDefault = new System.DateTime(2021, 9, 30, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType10; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType60; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "tag"; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "#"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - 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.ShowRowSelector = true; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); @@ -729,6 +590,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -752,6 +614,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -777,6 +640,7 @@ // tbProcess // this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbProcess.Name = "tbProcess"; this.tbProcess.Size = new System.Drawing.Size(200, 37); // @@ -834,6 +698,15 @@ this.toolStripButton2.Text = "닫기"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // + // toolStripButton6 + // + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(101, 34); + this.toolStripButton6.Text = "미리보기창"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + // // richTextBox1 // this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; @@ -865,14 +738,172 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // - // toolStripButton6 + // fpSpread1_Sheet1 // - this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); - this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton6.Name = "toolStripButton6"; - this.toolStripButton6.Size = new System.Drawing.Size(101, 34); - this.toolStripButton6.Text = "미리보기창"; - this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 20; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; + 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 = "기술료($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; + 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(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + numberCellType3.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType1.TimeDefault = new System.DateTime(2021, 10, 13, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2021, 10, 13, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "기술분류"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; + 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).Tag = "kisullv"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 2; + numberCellType4.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "기술료($K)"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "#"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + 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.ShowRowSelector = true; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fJobReport // @@ -893,13 +924,13 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -970,8 +1001,8 @@ private System.Windows.Forms.ToolStripButton btImport; private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripButton btOpenFolder; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.ToolStripButton toolStripButton6; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 6525377..5537017 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -67,6 +67,16 @@ namespace FPJ0000 + } + + private bool getKisulInput + { + get + { + return FCOMMON.Util.getBit( + FCOMMON.info.Login.gpermission, + (int)FCOMMON.eGroupPermission.jobreport_kisul); + } } private void __Load(object sender, EventArgs e) { @@ -142,6 +152,7 @@ namespace FPJ0000 col.Locked = true; } + //210930- if (FCOMMON.info.NotShowJobReportview) @@ -284,6 +295,14 @@ namespace FPJ0000 RefreshTime(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); FormattingData(); + + if (getKisulInput == false) + { + fpSpread1.ActiveSheet.Columns["kisuldiv"].Visible = false; + fpSpread1.ActiveSheet.Columns["kisullv"].Visible = false; + fpSpread1.ActiveSheet.Columns["kisulamt"].Visible = false; + } + } void FormattingData() { diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index d77b12a..711d1c2 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -260,20 +260,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALzSURBVDhPhZLdT1JhHMe5qj+hWRddurXSFa1aXVQmhNXW - q6kzSxSRVWouabVVNLL1ojbNiVu1lqt1US17QdTQEpCEBb2avREqIhlKKnDOAc7Bb885UNrW1m/77Ll4 - zvez8/ueI+JHctJUuK3GZtxea/sp1dhocjICdfxpZ7bX9DFbLlr716ktDUuy784TQnMn61yvxR9kJtze - MS4QjiAQmmUiyMPgoy+IU489yKv9RMnKDPOT0cRsvWD1e3x+rm8oBvswC7uHhW2IhXUwCtPXCDoGwoiw - gP4TjVMPh1F8pZ/+SyLVdNDTVBTOEQ6vRlhysngpSKIwuyJ4OkARQRxOHwf7aAzVBg8yTjy7I4Rz6za6 - 92qyZ5S63Shu2oOmzhacfVCHDE0aNhJk1Wsh0a5Cvb5eWCXEsPgxSUFSbmYFQU5Nxv1n79vQ9uU6mmxV - guRA4xZU3S5AeUseFM07UNRcBP3bH2jrD+HJu2lMkZ6k2l5GEMgaZPM3aSo42+ce3HqvxSVTmSAp1G0l - 4Z1QXS2FxRUWVun+QsNIepgMxyA9+yIh4CfrgpmpvCGHw2VFs/0YzncdRW7dJhQ2ZsMxRMFBiuULtnxL - dBIgAol2jmD9aU1s9fHFKGiQwfmtD9U9B6E1VCLvciZaTI/wxsvCQYrtG4zhBcEfjCHjTFKwQp2iFKsX - ofxmPvbpspBfv1mQVBoKoH5QSt4kE/y908PhJf+JCUFSZHqFNSEQqxd4xeqF5KEUiKtSsOtSJg5dk8My - YES18TgO3pNDocuBgwjs5N+wEQETixOBaXaFDRW9jG+KwVsvJ2D+PIojN1QoIUFlcx6O3jz8546HinJE - 0Dor4G0jgVnB/wjzK5TOEaypfE69/jo686+H/8XYeCC+7IA+lIyTIlVd7uFpKvja9T3uHqfh9tNwJRkP - xQT45kMMB+/YRJym6anU/e0fknGRaKWq81C6oqNrudIYSFe2Mn8oSZD2G0Urk6pon1xa1N6dJjcUi0Qi - 0S/wFqClj/a46gAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqioF6WpTQ3s + Zipm3uYUr4kuDLLFNDIvoYkKFaIUvajQLjq1qbnN6YZbZJqpzdvUkdOl7nKO7pz57TlnSw2EfvDhefGc + 74fz+54j4CbkrjLxYrlWEVmh/R0q1VLkpHkquVNHR5YP0OGPNCNnJOrqQ1Gv9/ChnRP2oE9tsdHLRpOZ + tTrWYbVvs2zjoPHDbEPRBxNiK8acwmz5Xm/UMxGlGsvM/C92YMYF3SwDnYmBdoaBZnoDyp/r6Bh1YJ0B + WscoFL2bRcqTEeofSai0g1pzbsAwx+LLHENOBoO8ZAMq4zo+jTqJwA2DmYVuwYUSuQlBd3pe8eGYysCp + 69KoTXHdVaTUXkNtZxOKmysRJPVDIEFYchohshOoaq3iV7HTDBZXnAjJUjG8ILo86G3PcBvaJp6jVlvA + SxJqwlHwMh45TbEQ1V9Ccn0yWocW0TZix8dva1glPYXK+mheIKwW7g2U5rLa8V68GJahTJnNSxLrIkj4 + MtKfpkFtdPCrdE9QUJAeVhwuhBb3ewTchJWq6LyGJOiNGtTrbuNhVz5iKs8jsSYK+hkn9KRYrmD1pKcT + KxGEyHYIzt6Tuk4WHkR8tRCGyQGU9GZAJs9D7ONgNCnf4+s8Az0pdmDahX6CxeZC0H2v4JjERxwgOYCc + xjjcqAtDXNUFXpInj4ekOY28STC4e4OJxSD3iQk2UqR/rsYjCJDsmw+Q7CcP+SCgwAdXyoKR+SwJ6lEF + ShSFyHiTBFFdNPREoCP/hpYIaJebCJTbK5zL7aPNqzSG5lke1fgCbjWkI5UExfWxyG/M2rrjcG6wRNCy + LeBsc9Ztwf9wcCuk7RCcyvvsNIzPbe728G6YF5fcRxJa7d44KTK9a2p2zWkzTCy4p5YoTFkoGL0s2V08 + XPN2moXJbHFTFLXqe7P9uzcuEBxP78z0F3V0HRUrrP7iFnqLVA9+fxG10L6i9pXDye3dfknyFIFAIPgD + rY6gfdVzOrEAAAAASUVORK5CYII= @@ -303,9 +303,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 325, 17 @@ -357,7 +354,7 @@ 561, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -367,7 +364,7 @@ AAD/////AQgAAP////8AAQgAAAs= - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index fa8198c..c3e74fe 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -41,10 +41,11 @@ System.Windows.Forms.Label label2; System.Windows.Forms.Label label7; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add)); + System.Windows.Forms.Label label8; + System.Windows.Forms.Label label9; + System.Windows.Forms.Label label10; this.lbSummary = new System.Windows.Forms.Label(); this.tbHrs = new System.Windows.Forms.TextBox(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsPRJ = new FPJ0000.dsPRJ(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel(); @@ -59,8 +60,6 @@ this.cmbState = new System.Windows.Forms.ComboBox(); this.cmbPackage = new System.Windows.Forms.ComboBox(); this.cmbRequest = new System.Windows.Forms.ComboBox(); - this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); - this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.chkAutoAdd = new System.Windows.Forms.CheckBox(); this.tbProject = new System.Windows.Forms.ComboBox(); this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); @@ -69,6 +68,14 @@ this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.lbTitleTip = new System.Windows.Forms.Label(); this.tbTag = new System.Windows.Forms.TextBox(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.grpkisul = new System.Windows.Forms.GroupBox(); + this.cmb_kisullv = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.cmb_kisuldiv = new System.Windows.Forms.ComboBox(); hrsLabel = new System.Windows.Forms.Label(); typeLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -80,10 +87,14 @@ label6 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); label7 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + label8 = new System.Windows.Forms.Label(); + label9 = new System.Windows.Forms.Label(); + label10 = new System.Windows.Forms.Label(); this.statusStrip1.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + this.grpkisul.SuspendLayout(); this.SuspendLayout(); // // hrsLabel @@ -107,7 +118,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(15, 38); + label1.Location = new System.Drawing.Point(14, 39); label1.Name = "label1"; label1.Size = new System.Drawing.Size(53, 12); label1.TabIndex = 7; @@ -212,16 +223,6 @@ this.tbHrs.Text = "0.0"; this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // bs - // - this.bs.DataMember = "JobReport"; - this.bs.DataSource = this.dsPRJ; - // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -260,7 +261,7 @@ this.btSave.BackColor = System.Drawing.Color.SkyBlue; this.btSave.Location = new System.Drawing.Point(829, 6); this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(133, 115); + this.btSave.Size = new System.Drawing.Size(133, 163); this.btSave.TabIndex = 28; this.btSave.Text = "확인"; this.btSave.UseVisualStyleBackColor = false; @@ -357,40 +358,15 @@ // this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbRequest.FormattingEnabled = true; - this.cmbRequest.Location = new System.Drawing.Point(73, 34); + this.cmbRequest.Location = new System.Drawing.Point(72, 35); this.cmbRequest.Name = "cmbRequest"; this.cmbRequest.Size = new System.Drawing.Size(108, 20); this.cmbRequest.TabIndex = 8; // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.EETGW_JobReport_AutoInputTableAdapter = null; - this.tam.EETGW_JobReport_EBoardTableAdapter = null; - this.tam.EETGW_NoteTableAdapter = null; - this.tam.EETGW_ProjecthistoryDTableAdapter = null; - this.tam.EETGW_ProjectResonTableAdapter = null; - this.tam.EETGW_ProjectsScheduleTableAdapter = null; - this.tam.EETGW_ProjectToDoTableAdapter = null; - this.tam.EETGW_SaveCostTableAdapter = null; - this.tam.JobReportTableAdapter = this.ta; - this.tam.ProjectPartStatusTableAdapter = null; - this.tam.ProjectsHistoryTableAdapter = null; - this.tam.ProjectsIOMapTableAdapter = null; - this.tam.ProjectsMailListTableAdapter = null; - this.tam.ProjectsPartTableAdapter = null; - this.tam.ProjectsTableAdapter = null; - this.tam.SPMasterTableAdapter = null; - this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // // chkAutoAdd // this.chkAutoAdd.AutoSize = true; - this.chkAutoAdd.Location = new System.Drawing.Point(646, 115); + this.chkAutoAdd.Location = new System.Drawing.Point(432, 103); this.chkAutoAdd.Name = "chkAutoAdd"; this.chkAutoAdd.Size = new System.Drawing.Size(176, 16); this.chkAutoAdd.TabIndex = 26; @@ -430,9 +406,12 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.grpkisul); this.panel1.Controls.Add(this.dateTimePicker2); this.panel1.Controls.Add(this.dateTimePicker1); this.panel1.Controls.Add(label7); + this.panel1.Controls.Add(this.cmbRequest); + this.panel1.Controls.Add(label1); this.panel1.Controls.Add(this.dtPdate); this.panel1.Controls.Add(this.tbProject); this.panel1.Controls.Add(projectLabel); @@ -449,8 +428,6 @@ this.panel1.Controls.Add(label6); this.panel1.Controls.Add(this.cmbPackage); this.panel1.Controls.Add(this.btSave); - this.panel1.Controls.Add(this.cmbRequest); - this.panel1.Controls.Add(label1); this.panel1.Controls.Add(this.cmbState); this.panel1.Controls.Add(label3); this.panel1.Controls.Add(stateLabel); @@ -505,6 +482,112 @@ this.tbTag.TabIndex = 60; this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; + this.tam.EETGW_JobReport_EBoardTableAdapter = null; + this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; + this.tam.EETGW_ProjectToDoTableAdapter = null; + this.tam.EETGW_SaveCostTableAdapter = null; + this.tam.JobReportTableAdapter = this.ta; + this.tam.ProjectPartStatusTableAdapter = null; + this.tam.ProjectsHistoryTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; + this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // grpkisul + // + this.grpkisul.Controls.Add(label10); + this.grpkisul.Controls.Add(this.cmb_kisuldiv); + this.grpkisul.Controls.Add(this.textBox1); + this.grpkisul.Controls.Add(label9); + this.grpkisul.Controls.Add(this.cmb_kisullv); + this.grpkisul.Controls.Add(label8); + this.grpkisul.Location = new System.Drawing.Point(615, 87); + this.grpkisul.Name = "grpkisul"; + this.grpkisul.Size = new System.Drawing.Size(207, 82); + this.grpkisul.TabIndex = 29; + this.grpkisul.TabStop = false; + this.grpkisul.Text = "기술료"; + // + // cmb_kisullv + // + this.cmb_kisullv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_kisullv.FormattingEnabled = true; + this.cmb_kisullv.Location = new System.Drawing.Point(77, 34); + this.cmb_kisullv.Name = "cmb_kisullv"; + this.cmb_kisullv.Size = new System.Drawing.Size(108, 20); + this.cmb_kisullv.TabIndex = 10; + // + // label8 + // + label8.AutoSize = true; + label8.Location = new System.Drawing.Point(19, 38); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(53, 12); + label8.TabIndex = 9; + label8.Text = "기술레벨"; + // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kisulamt", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N3")); + this.textBox1.Font = new System.Drawing.Font("굴림", 9F); + this.textBox1.Location = new System.Drawing.Point(77, 55); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(108, 21); + this.textBox1.TabIndex = 22; + this.textBox1.Text = "0.000"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label9 + // + label9.AutoSize = true; + label9.Location = new System.Drawing.Point(7, 59); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(65, 12); + label9.TabIndex = 21; + label9.Text = "기술료($K)"; + // + // cmb_kisuldiv + // + this.cmb_kisuldiv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_kisuldiv.FormattingEnabled = true; + this.cmb_kisuldiv.Location = new System.Drawing.Point(77, 12); + this.cmb_kisuldiv.Name = "cmb_kisuldiv"; + this.cmb_kisuldiv.Size = new System.Drawing.Size(108, 20); + this.cmb_kisuldiv.TabIndex = 23; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new System.Drawing.Point(19, 16); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(53, 12); + label10.TabIndex = 24; + label10.Text = "기술분류"; + // // fJobReport_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -520,12 +603,14 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "업무일지 등록/변경"; this.Load += new System.EventHandler(this.fJobReport_Add_Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + this.grpkisul.ResumeLayout(false); + this.grpkisul.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -561,5 +646,9 @@ private System.Windows.Forms.DateTimePicker dateTimePicker1; private System.Windows.Forms.DateTimePicker dateTimePicker2; private System.Windows.Forms.Label lbTitleTip; + private System.Windows.Forms.GroupBox grpkisul; + private System.Windows.Forms.ComboBox cmb_kisullv; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ComboBox cmb_kisuldiv; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index f3eaa9a..9abffbf 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -36,6 +36,7 @@ namespace FPJ0000.JobReport_ } copyMOde = copy; this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged; + this.grpkisul.Visible = getKisulInput; } void tbProject_SelectedIndexChanged(object sender, EventArgs e) @@ -60,7 +61,15 @@ namespace FPJ0000.JobReport_ } } - + private bool getKisulInput + { + get + { + return FCOMMON.Util.getBit( + FCOMMON.info.Login.gpermission, + (int)FCOMMON.eGroupPermission.jobreport_kisul); + } + } private void fJobReport_Add_Load(object sender, EventArgs e) { //사용자목록 @@ -105,6 +114,21 @@ namespace FPJ0000.JobReport_ this.cmbProcess.ValueMember = "Value"; this.cmbProcess.DataSource = dt_process; + if(getKisulInput) + { + //기술분류 + var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50"); + this.cmb_kisuldiv.DisplayMember = "Value"; + this.cmb_kisuldiv.ValueMember = "Value"; + this.cmb_kisuldiv.DataSource = dt_kisuldiv; + + //기술레벨 + var dt_kisullv = FCOMMON.DBM.getCodeTable("51"); + this.cmb_kisullv.DisplayMember = "Value"; + this.cmb_kisullv.ValueMember = "Value"; + this.cmb_kisullv.DataSource = dt_kisullv; + } + //담당자목록 var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); @@ -123,6 +147,14 @@ namespace FPJ0000.JobReport_ cmbProcess.SelectedValue = dr.process; tbTag.Text = dr.tag; + + if (getKisulInput) + { + cmb_kisuldiv.Text = dr.kisuldiv; + cmb_kisullv.Text = dr.kisullv; + textBox1.Text = dr.kisulamt.ToString(); + } + if (dr.IsotStartNull()) dateTimePicker1.Value = DateTime.Now; else dateTimePicker1.Value = dr.otStart; if (dr.IsotEndNull()) dateTimePicker2.Value = DateTime.Now; @@ -449,6 +481,14 @@ namespace FPJ0000.JobReport_ this.dr.type = cmbType.Text; this.dr.process = cmbProcess.Text; this.dr.tag = tbTag.Text.Trim(); + + if(getKisulInput) + { + this.dr.kisuldiv = cmb_kisuldiv.Text; + this.dr.kisullv = cmb_kisullv.Text; + this.dr.kisulamt = Decimal.Parse(textBox1.Text); + } + if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text); else this.dr.hrs = 0; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index 422f077..6b0952d 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -153,21 +153,9 @@ 100, 17 - - 17, 17 - - - 17, 17 - 299, 17 - - 164, 17 - - - 226, 17 - {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}{\f1\froman\fcharset129 \'b8\'bc\'c0\'ba \'b0\'ed\'b5\'f1;}} {\*\generator Riched20 10.0.19041}\viewkind4\uc1 @@ -175,4 +163,28 @@ } + + False + + + 100, 17 + + + 17, 17 + + + False + + + False + + + 17, 17 + + + 164, 17 + + + 226, 17 + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 9980051..1cef393 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -3581,6 +3581,12 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnautoinput; + private global::System.Data.DataColumn columnkisullv; + + private global::System.Data.DataColumn columnkisuldiv; + + private global::System.Data.DataColumn columnkisulamt; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public JobReportDataTable() { @@ -3830,6 +3836,30 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn kisullvColumn { + get { + return this.columnkisullv; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn kisuldivColumn { + get { + return this.columnkisuldiv; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn kisulamtColumn { + get { + return this.columnkisulamt; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3893,7 +3923,10 @@ namespace FPJ0000 { string svalue, System.DateTime otStart, System.DateTime otEnd, - bool autoinput) { + bool autoinput, + string kisullv, + string kisuldiv, + decimal kisulamt) { JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3922,7 +3955,10 @@ namespace FPJ0000 { svalue, otStart, otEnd, - autoinput}; + autoinput, + kisullv, + kisuldiv, + kisulamt}; rowJobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowJobReportRow); return rowJobReportRow; @@ -3979,6 +4015,9 @@ namespace FPJ0000 { this.columnotStart = base.Columns["otStart"]; this.columnotEnd = base.Columns["otEnd"]; this.columnautoinput = base.Columns["autoinput"]; + this.columnkisullv = base.Columns["kisullv"]; + this.columnkisuldiv = base.Columns["kisuldiv"]; + this.columnkisulamt = base.Columns["kisulamt"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4038,6 +4077,12 @@ namespace FPJ0000 { base.Columns.Add(this.columnotEnd); this.columnautoinput = new global::System.Data.DataColumn("autoinput", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnautoinput); + this.columnkisullv = new global::System.Data.DataColumn("kisullv", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnkisullv); + this.columnkisuldiv = new global::System.Data.DataColumn("kisuldiv", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnkisuldiv); + this.columnkisulamt = new global::System.Data.DataColumn("kisulamt", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnkisulamt); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -4069,6 +4114,8 @@ namespace FPJ0000 { this.columntag.MaxLength = 255; this.columnsvalue.ReadOnly = true; this.columnsvalue.MaxLength = 255; + this.columnkisullv.MaxLength = 10; + this.columnkisuldiv.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13864,6 +13911,54 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string kisullv { + get { + if (this.IskisullvNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobReport.kisullvColumn])); + } + } + set { + this[this.tableJobReport.kisullvColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string kisuldiv { + get { + if (this.IskisuldivNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobReport.kisuldivColumn])); + } + } + set { + this[this.tableJobReport.kisuldivColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal kisulamt { + get { + if (this.IskisulamtNull()) { + return 0m; + } + else { + return ((decimal)(this[this.tableJobReport.kisulamtColumn])); + } + } + set { + this[this.tableJobReport.kisulamtColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -14139,6 +14234,42 @@ namespace FPJ0000 { public void SetautoinputNull() { this[this.tableJobReport.autoinputColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IskisullvNull() { + return this.IsNull(this.tableJobReport.kisullvColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetkisullvNull() { + this[this.tableJobReport.kisullvColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IskisuldivNull() { + return this.IsNull(this.tableJobReport.kisuldivColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetkisuldivNull() { + this[this.tableJobReport.kisuldivColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IskisulamtNull() { + return this.IsNull(this.tableJobReport.kisulamtColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetkisulamtNull() { + this[this.tableJobReport.kisulamtColumn] = global::System.Convert.DBNull; + } } /// @@ -24809,6 +24940,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; tableMapping.ColumnMappings.Add("otStart", "otStart"); tableMapping.ColumnMappings.Add("otEnd", "otEnd"); tableMapping.ColumnMappings.Add("autoinput", "autoinput"); + tableMapping.ColumnMappings.Add("kisullv", "kisullv"); + tableMapping.ColumnMappings.Add("kisuldiv", "kisuldiv"); + tableMapping.ColumnMappings.Add("kisulamt", "kisulamt"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -24872,124 +25006,73 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", 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 [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [gcode], [description2], [tag], [otStart], [otEnd], [autoinput]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @gcode, @description2, @tag, @otStart, @otEnd, @autoinput); + this._adapter.InsertCommand.CommandText = @"INSERT INTO JobReport + (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, kisullv, + kisuldiv, kisulamt) +VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, 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("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, 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("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", 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 [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpa" + - "rt] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [d" + - "escription] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import" + - ", [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [p" + - "rocess] = @process, [gcode] = @gcode, [description2] = @description2, [tag] = @t" + - "ag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput WHERE (([id" + - "x] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Ori" + - "ginal_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Origina" + - "l_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) A" + - "ND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Ori" + - "ginal_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([packag" + - "e] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([sta" + - "tus] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] " + - "= @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] =" + - " @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Origin" + - "al_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original" + - "_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@I" + - "sNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_p" + - "rojectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AN" + - "D ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process" + - ")) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR (" + - "[tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([ot" + - "Start] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([o" + - "tEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) O" + - "R ([autoinput] = @Original_autoinput)));\r\nSELECT idx, pidx, pdate, uid, requestp" + - "art, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.g" + - "etUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, proc" + - "ess, gcode, description2, tag, dbo.getCodeSValue(gcode, \'15\', type) AS svalue, o" + - "tStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC"; + this._adapter.UpdateCommand.CommandText = @"UPDATE JobReport +SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs, + import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, gcode = @gcode, description2 = @description2, tag = @tag, + otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt +WHERE (idx = @Original_idx); +SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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("@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("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", 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_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("@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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, 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("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, 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("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, 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("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -25006,7 +25089,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -25034,7 +25117,11 @@ ORDER BY pdate DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC"; + this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) + AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt +FROM JobReport +WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') +ORDER BY pdate DESC"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].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[3].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, "", "", "")); @@ -25043,7 +25130,7 @@ ORDER BY pdate DESC"; this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; this._commandCollection[4].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -25576,7 +25663,10 @@ ORDER BY projectName"; string tag, global::System.Nullable otStart, global::System.Nullable otEnd, - global::System.Nullable autoinput) { + global::System.Nullable autoinput, + string kisullv, + string kisuldiv, + global::System.Nullable kisulamt) { if ((pidx.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value)); } @@ -25704,6 +25794,24 @@ ORDER BY projectName"; else { this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value; } + if ((kisullv == null)) { + this.Adapter.InsertCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[22].Value = ((string)(kisullv)); + } + if ((kisuldiv == null)) { + this.Adapter.InsertCommand.Parameters[23].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[23].Value = ((string)(kisuldiv)); + } + if ((kisulamt.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[24].Value = ((decimal)(kisulamt.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[24].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)) { @@ -25747,27 +25855,10 @@ ORDER BY projectName"; global::System.Nullable otStart, global::System.Nullable otEnd, global::System.Nullable autoinput, + string kisullv, + string kisuldiv, + global::System.Nullable kisulamt, int Original_idx, - global::System.Nullable Original_pidx, - string Original_pdate, - string Original_uid, - string Original_requestpart, - string Original_package, - string Original_status, - string Original_type, - string Original_remark, - global::System.Nullable Original_hrs, - global::System.Nullable Original_import, - string Original_wuid, - System.DateTime Original_wdate, - string Original_projectName, - global::System.Nullable Original_ot, - string Original_process, - string Original_gcode, - string Original_tag, - global::System.Nullable Original_otStart, - global::System.Nullable Original_otEnd, - global::System.Nullable Original_autoinput, int idx) { if ((pidx.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx.Value)); @@ -25896,157 +25987,26 @@ ORDER BY projectName"; else { this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx)); - if ((Original_pidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_pidx.Value)); + if ((kisullv == null)) { + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(kisullv)); + } + if ((kisuldiv == null)) { + this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(kisuldiv)); + } + if ((kisulamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[24].Value = ((decimal)(kisulamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_pdate)); - } - if ((Original_uid == null)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_uid)); - } - if ((Original_requestpart == 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_requestpart)); - } - if ((Original_package == null)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_package)); - } - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_status)); - } - if ((Original_type == null)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_type)); - } - if ((Original_remark == null)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_remark)); - } - if ((Original_hrs.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((double)(Original_hrs.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; - } - if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[44].Value = ((System.DateTime)(Original_wdate)); - if ((Original_projectName == null)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_projectName)); - } - if ((Original_ot.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((double)(Original_ot.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; - } - if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_process)); - } - if ((Original_gcode == null)) { - throw new global::System.ArgumentNullException("Original_gcode"); - } - else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_gcode)); - } - if ((Original_tag == null)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_tag)); - } - if ((Original_otStart.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((System.DateTime)(Original_otStart.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; - } - if ((Original_otEnd.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((System.DateTime)(Original_otEnd.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; - } - if ((Original_autoinput.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((bool)(Original_autoinput.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[26].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)) { @@ -26063,57 +26023,6 @@ ORDER BY projectName"; } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update( - global::System.Nullable pidx, - string pdate, - string uid, - string requestpart, - string package, - string status, - string type, - string description, - string remark, - global::System.Nullable hrs, - global::System.Nullable import, - string wuid, - System.DateTime wdate, - string projectName, - global::System.Nullable ot, - string process, - string gcode, - string description2, - string tag, - global::System.Nullable otStart, - global::System.Nullable otEnd, - global::System.Nullable autoinput, - int Original_idx, - global::System.Nullable Original_pidx, - string Original_pdate, - string Original_uid, - string Original_requestpart, - string Original_package, - string Original_status, - string Original_type, - string Original_remark, - global::System.Nullable Original_hrs, - global::System.Nullable Original_import, - string Original_wuid, - System.DateTime Original_wdate, - string Original_projectName, - global::System.Nullable Original_ot, - string Original_process, - string Original_gcode, - string Original_tag, - global::System.Nullable Original_otStart, - global::System.Nullable Original_otEnd, - global::System.Nullable Original_autoinput) { - return this.Update(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, Original_idx, Original_pidx, Original_pdate, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_remark, Original_hrs, Original_import, Original_wuid, Original_wdate, Original_projectName, Original_ot, Original_process, Original_gcode, Original_tag, Original_otStart, Original_otEnd, Original_autoinput, Original_idx); - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 6a8f5dc..3737ae8 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -812,39 +812,45 @@ WHERE (Project = @pidx) - - INSERT INTO [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [gcode], [description2], [tag], [otStart], [otEnd], [autoinput]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @gcode, @description2, @tag, @otStart, @otEnd, @autoinput); + + INSERT INTO JobReport + (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, kisullv, + kisuldiv, kisulamt) +VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC @@ -857,71 +863,41 @@ ORDER BY pdate DESC - - UPDATE [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [process] = @process, [gcode] = @gcode, [description2] = @description2, [tag] = @tag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput))); + + UPDATE JobReport +SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs, + import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, gcode = @gcode, description2 = @description2, tag = @tag, + otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt +WHERE (idx = @Original_idx); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -954,6 +930,9 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r + + + @@ -996,7 +975,11 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0) = 1) AND (gcode = @gc - SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC + SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) + AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt +FROM JobReport +WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') +ORDER BY pdate DESC @@ -1010,7 +993,7 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0) = 1) AND (gcode = @gc SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC @@ -3419,6 +3402,21 @@ WHERE (idx = @idx) + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 3261d36..fab46c6 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,18 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - +