From cd902327c8efef29af453ce34852ac8e135ddb2f Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 13 Jan 2023 20:05:38 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=B6=94=EA=B0=80=20site/plant/package/package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FCM0000/fCode.Designer.cs | 13 +- SubProject/FCOMMON/DataBaseManager.cs | 13 +- SubProject/FPJ0000/DSComm.Designer.cs | 54 +- SubProject/FPJ0000/DSComm.xsd | 4 +- .../FPJ0000/JobReport_/fJobReport_Add.cs | 23 +- .../OtConfirm/fHolyRequest.Designer.cs | 1167 +++++++++-------- .../FPJ0000/OtConfirm/fHolyRequest.resx | 72 +- .../FPJ0000/Project/fProjectData.Designer.cs | 326 +++-- SubProject/FPJ0000/Project/fProjectData.cs | 88 +- SubProject/FPJ0000/Project/fProjectData.resx | 48 + .../FPJ0000/Project/fProjectList.Designer.cs | 180 +-- SubProject/FPJ0000/Project/fProjectList.cs | 3 +- SubProject/FPJ0000/Project/fProjectList.resx | 23 +- .../Project/fProjectSchedule.Designer.cs | 595 +++++---- .../FPJ0000/Project/fProjectSchedule.cs | 23 + .../FPJ0000/Project/fProjectSchedule.resx | 24 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 961 +++++++++++++- SubProject/FPJ0000/dsPRJ.xsd | 175 ++- SubProject/FPJ0000/dsPRJ.xss | 2 +- 20 files changed, 2555 insertions(+), 1243 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 87a3ecf..073abe7 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("23.01.09.1530")] -[assembly: AssemblyFileVersion("23.01.09.1530")] +[assembly: AssemblyVersion("23.01.12.2330")] +[assembly: AssemblyFileVersion("23.01.12.2330")] diff --git a/SubProject/FCM0000/fCode.Designer.cs b/SubProject/FCM0000/fCode.Designer.cs index ca843a5..5af4ba6 100644 --- a/SubProject/FCM0000/fCode.Designer.cs +++ b/SubProject/FCM0000/fCode.Designer.cs @@ -77,7 +77,7 @@ this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(706, 48); + this.panel1.Size = new System.Drawing.Size(684, 48); this.panel1.TabIndex = 0; // // cmbList @@ -89,7 +89,7 @@ this.cmbList.Location = new System.Drawing.Point(5, 5); this.cmbList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cmbList.Name = "cmbList"; - this.cmbList.Size = new System.Drawing.Size(696, 37); + this.cmbList.Size = new System.Drawing.Size(674, 37); this.cmbList.TabIndex = 0; this.cmbList.SelectedIndexChanged += new System.EventHandler(this.cmbList_SelectedIndexChanged); // @@ -116,14 +116,14 @@ this.commonBindingNavigatorSaveItem, this.toolStripSeparator1, this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 522); + this.bn.Location = new System.Drawing.Point(0, 693); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(706, 25); + this.bn.Size = new System.Drawing.Size(684, 25); this.bn.TabIndex = 1; this.bn.Text = "bindingNavigator1"; // @@ -293,7 +293,7 @@ this.commonDataGridView.Location = new System.Drawing.Point(0, 48); this.commonDataGridView.Name = "commonDataGridView"; this.commonDataGridView.RowTemplate.Height = 23; - this.commonDataGridView.Size = new System.Drawing.Size(706, 474); + this.commonDataGridView.Size = new System.Drawing.Size(684, 645); this.commonDataGridView.TabIndex = 3; // // dataGridViewTextBoxColumn3 @@ -355,12 +355,11 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(706, 547); + this.ClientSize = new System.Drawing.Size(684, 718); this.Controls.Add(this.commonDataGridView); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MaximizeBox = false; this.MinimizeBox = false; diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 8db45e9..1d3e1a4 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -941,7 +941,18 @@ namespace FCOMMON " from common" + " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" + " and isnull(code,'') <> ''" + - " order by isnull(" + sort + ",'')"; + " order by "; + + var sortidx = 0; + var sortlist = sort.Split(','); + foreach(var sortstr in sortlist) + { + if (string.IsNullOrEmpty(sortstr)) continue; + if (sortidx > 0) sql += ","; + sql += "isnull(" + sortstr + ",'')"; + sortidx += 1; + } + var cmd = new SqlCommand(sql, cn); var rdr = cmd.ExecuteReader(); while (rdr.Read()) diff --git a/SubProject/FPJ0000/DSComm.Designer.cs b/SubProject/FPJ0000/DSComm.Designer.cs index f6f00a5..d8c03a8 100644 --- a/SubProject/FPJ0000/DSComm.Designer.cs +++ b/SubProject/FPJ0000/DSComm.Designer.cs @@ -37,7 +37,6 @@ namespace FPJ0000 { base.Tables.CollectionChanged += schemaChangedHandler; base.Relations.CollectionChanged += schemaChangedHandler; this.EndInit(); - this.InitExpressions(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -49,9 +48,6 @@ namespace FPJ0000 { global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); this.Tables.CollectionChanged += schemaChangedHandler1; this.Relations.CollectionChanged += schemaChangedHandler1; - if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) { - this.InitExpressions(); - } return; } string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string)))); @@ -72,7 +68,6 @@ namespace FPJ0000 { } else { this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); - this.InitExpressions(); } this.GetSerializationData(info, context); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); @@ -134,7 +129,6 @@ namespace FPJ0000 { public override global::System.Data.DataSet Clone() { DSComm cln = ((DSComm)(base.Clone())); cln.InitVars(); - cln.InitExpressions(); cln.SchemaSerializationMode = this.SchemaSerializationMode; return cln; } @@ -210,7 +204,7 @@ namespace FPJ0000 { this.Namespace = "http://tempuri.org/DSComm.xsd"; this.EnforceConstraints = true; this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; - this.tableUserList = new UserListDataTable(false); + this.tableUserList = new UserListDataTable(); base.Tables.Add(this.tableUserList); } @@ -275,12 +269,6 @@ namespace FPJ0000 { return type; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitExpressions() { - this.UserList.IDNameColumn.Expression = "\'(\' + ID + \') \' + Name + \' \' + Description"; - } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void UserListRowChangeEventHandler(object sender, UserListRowChangeEvent e); @@ -303,19 +291,10 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public UserListDataTable() : - this(false) { - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public UserListDataTable(bool initExpressions) { + public UserListDataTable() { this.TableName = "UserList"; this.BeginInit(); this.InitClass(); - if ((initExpressions == true)) { - this.InitExpressions(); - } this.EndInit(); } @@ -433,21 +412,6 @@ namespace FPJ0000 { return rowUserListRow; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public UserListRow AddUserListRow(string Name, string ID, string Outdate, string Description) { - UserListRow rowUserListRow = ((UserListRow)(this.NewRow())); - object[] columnValuesArray = new object[] { - Name, - ID, - Outdate, - null, - Description}; - rowUserListRow.ItemArray = columnValuesArray; - this.Rows.Add(rowUserListRow); - return rowUserListRow; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public UserListRow FindByID(string ID) { @@ -518,12 +482,6 @@ namespace FPJ0000 { return typeof(UserListRow); } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private void InitExpressions() { - this.IDNameColumn.Expression = "\'(\' + ID + \') \' + Name + \' \' + Description"; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { @@ -691,11 +649,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string IDName { get { - try { - return ((string)(this[this.tableUserList.IDNameColumn])); + if (this.IsIDNameNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'UserList\' 테이블의 \'IDName\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableUserList.IDNameColumn])); } } set { diff --git a/SubProject/FPJ0000/DSComm.xsd b/SubProject/FPJ0000/DSComm.xsd index 48f181f..14c21ec 100644 --- a/SubProject/FPJ0000/DSComm.xsd +++ b/SubProject/FPJ0000/DSComm.xsd @@ -12,13 +12,13 @@ - + - + diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index ad9817c..afd5ad1 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -102,14 +102,14 @@ namespace FPJ0000.JobReport_ this.cmbPackage.ValueMember = "Value"; this.cmbPackage.DataSource = dt_package; - //타입 - var dt_type = FCOMMON.DBM.getCodeTable("15"); + //업무형태 + var dt_type = FCOMMON.DBM.getCodeTable("15","code,memo,svalue"); this.cmbType.DisplayMember = "Value"; this.cmbType.ValueMember = "Value"; this.cmbType.DataSource = dt_type; - //공정 - var dt_process = FCOMMON.DBM.getCodeTable("16"); + //업무분류 + var dt_process = FCOMMON.DBM.getCodeTable("16", "code,memo,svalue"); this.cmbProcess.DisplayMember = "Value"; this.cmbProcess.ValueMember = "Value"; this.cmbProcess.DataSource = dt_process; @@ -147,6 +147,19 @@ namespace FPJ0000.JobReport_ cmbProcess.SelectedValue = dr.process; tbTag.Text = dr.tag; + if(dr.process.isEmpty() && cmbProcess.SelectedIndex < 0) //기본값을 찾는다 + { + var dts = dt_process.AsEnumerable().Where(t => t.IsNull("SValue") == false).ToList(); + foreach(var dr in dts) + { + if (dr["Svalue"].ToString().Equals("O")) + { + cmbProcess.Text = dr["Value"].ToString(); + break; + } + } + } + if (dr.ot > 0) { @@ -450,7 +463,7 @@ namespace FPJ0000.JobReport_ } if (cmbProcess.Text.Trim() == "") { - FCOMMON.Util.MsgE("공정을 선택하세요"); + FCOMMON.Util.MsgE("업무분류를 선택하세요"); cmbProcess.Focus(); return; } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index 610102f..c04eadf 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -28,86 +28,87 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyRequest)); - this.bn = new System.Windows.Forms.BindingNavigator(); - this.bs = new System.Windows.Forms.BindingSource(); - this.dSKuntae = new FPJ0000.DSKuntae(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - this.tbFind = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.lbStt = new System.Windows.Forms.ToolStripLabel(); - this.dtSD = new System.Windows.Forms.ToolStripTextBox(); - this.lbEnd = new System.Windows.Forms.ToolStripLabel(); - this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); - this.dtED = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.sbday = new System.Windows.Forms.ToolStripLabel(); - this.sbtime = new System.Windows.Forms.ToolStripLabel(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.dv1 = new arCtl.arDatagridView(); - this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HolyDays = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); - this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); - this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.btFind = new System.Windows.Forms.ToolStripButton(); - this.btSave = new System.Windows.Forms.ToolStripButton(); - this.btAdd = new System.Windows.Forms.ToolStripButton(); - this.btEdit = new System.Windows.Forms.ToolStripButton(); - this.btDel = new System.Windows.Forms.ToolStripButton(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).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.dv1)).BeginInit(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyRequest)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSKuntae = new FPJ0000.DSKuntae(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btSave = new System.Windows.Forms.ToolStripButton(); + this.btAdd = new System.Windows.Forms.ToolStripButton(); + this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.btDel = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.dtSD = new System.Windows.Forms.ToolStripTextBox(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.sbday = new System.Windows.Forms.ToolStripLabel(); + this.sbtime = new System.Windows.Forms.ToolStripLabel(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.dv1 = new arCtl.arDatagridView(); + this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); + this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HolyDays = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).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.dv1)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, this.bindingNavigatorSeparator, @@ -125,83 +126,166 @@ this.btAdd, this.btEdit, this.btDel}); - this.bn.Location = new System.Drawing.Point(0, 608); - this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bn.Name = "bn"; - this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1213, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bs - // - this.bs.DataMember = "EETGW_HolydayRequest"; - this.bs.DataSource = this.dSKuntae; - this.bs.Sort = ""; - // - // dSKuntae - // - this.dSKuntae.DataSetName = "DSKuntae"; - this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - 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"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel2.Text = "검색"; - // - // 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); - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStrip1 - // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bn.Location = new System.Drawing.Point(0, 608); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(1213, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bs + // + this.bs.DataMember = "EETGW_HolydayRequest"; + this.bs.DataSource = this.dSKuntae; + this.bs.Sort = ""; + // + // dSKuntae + // + this.dSKuntae.DataSetName = "DSKuntae"; + this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Text = "검색"; + // + // 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); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 22); + this.btFind.Text = "toolStripButton2"; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // btSave + // + this.btSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); + this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(66, 22); + this.btSave.Text = "저장(&S)"; + this.btSave.Click += new System.EventHandler(this.btEdit_Click); + // + // btAdd + // + this.btAdd.Image = global::FPJ0000.Properties.Resources.add; + this.btAdd.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btAdd.Name = "btAdd"; + this.btAdd.Size = new System.Drawing.Size(67, 22); + this.btAdd.Text = "추가(&A)"; + this.btAdd.Click += new System.EventHandler(this.btAdd_Click); + // + // btEdit + // + this.btEdit.Image = global::FPJ0000.Properties.Resources.accept; + this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btEdit.Name = "btEdit"; + this.btEdit.Size = new System.Drawing.Size(80, 22); + this.btEdit.Text = "편집/승인"; + this.btEdit.Click += new System.EventHandler(this.btEdit_Click_1); + // + // btDel + // + this.btDel.Image = global::FPJ0000.Properties.Resources.action_stop; + this.btDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btDel.Name = "btDel"; + this.btDel.Size = new System.Drawing.Size(68, 22); + this.btDel.Text = "삭제(&D)"; + this.btDel.Click += new System.EventHandler(this.btDel_Click); + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton8, this.lbStt, this.dtSD, @@ -215,441 +299,358 @@ this.toolStripSeparator3, this.sbday, this.sbtime}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1213, 37); - this.toolStrip1.TabIndex = 4; - this.toolStrip1.Text = "toolStrip1"; - // - // lbStt - // - this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbStt.ForeColor = System.Drawing.Color.Blue; - this.lbStt.Name = "lbStt"; - this.lbStt.Size = new System.Drawing.Size(43, 34); - this.lbStt.Text = "시작일"; - this.lbStt.Click += new System.EventHandler(this.lbStt_Click); - // - // 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"; - this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // lbEnd - // - this.lbEnd.Name = "lbEnd"; - this.lbEnd.Size = new System.Drawing.Size(15, 34); - this.lbEnd.Text = "~"; - // - // toolStripLabel4 - // - this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; - this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(31, 34); - this.toolStripLabel4.Text = "선택"; - this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); - // - // 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"; - this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); - // - // sbday - // - this.sbday.Name = "sbday"; - this.sbday.Size = new System.Drawing.Size(51, 34); - this.sbday.Text = "합계(일)"; - // - // sbtime - // - this.sbtime.Name = "sbtime"; - this.sbtime.Size = new System.Drawing.Size(63, 34); - this.sbtime.Text = "합계(시간)"; - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; - this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Response", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(0, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1213, 74); - this.richTextBox1.TabIndex = 5; - this.richTextBox1.Text = ""; - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 37); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.dv1); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); - this.splitContainer1.Size = new System.Drawing.Size(1213, 571); - this.splitContainer1.SplitterDistance = 487; - this.splitContainer1.SplitterWidth = 10; - this.splitContainer1.TabIndex = 6; - // - // dv1 - // - this.dv1.A_DelCurrentCell = true; - this.dv1.A_EnterToTab = true; - this.dv1.A_KoreanField = null; - this.dv1.A_UpperField = null; - this.dv1.A_ViewRownumOnHeader = true; - this.dv1.AllowUserToAddRows = false; - this.dv1.AllowUserToDeleteRows = false; - this.dv1.AutoGenerateColumns = false; - this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(5); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; - this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1213, 37); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(43, 34); + this.lbStt.Text = "시작일"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + // + // 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"; + this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lbEnd + // + this.lbEnd.Name = "lbEnd"; + this.lbEnd.Size = new System.Drawing.Size(15, 34); + this.lbEnd.Text = "~"; + // + // toolStripLabel4 + // + this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel4.Text = "선택"; + this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); + // + // 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"; + this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripButton7 + // + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // btSearch + // + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(92, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick); + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); + // + // sbday + // + this.sbday.Name = "sbday"; + this.sbday.Size = new System.Drawing.Size(51, 34); + this.sbday.Text = "합계(일)"; + // + // sbtime + // + this.sbtime.Name = "sbtime"; + this.sbtime.Size = new System.Drawing.Size(63, 34); + this.sbtime.Text = "합계(시간)"; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Response", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(1213, 74); + this.richTextBox1.TabIndex = 5; + this.richTextBox1.Text = ""; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 37); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.dv1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); + this.splitContainer1.Size = new System.Drawing.Size(1213, 571); + this.splitContainer1.SplitterDistance = 487; + this.splitContainer1.SplitterWidth = 10; + this.splitContainer1.TabIndex = 6; + // + // dv1 + // + this.dv1.A_DelCurrentCell = true; + this.dv1.A_EnterToTab = true; + this.dv1.A_KoreanField = null; + this.dv1.A_UpperField = null; + this.dv1.A_ViewRownumOnHeader = true; + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(5); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.uidDataGridViewTextBoxColumn, this.nameDataGridViewTextBoxColumn, this.cateDataGridViewTextBoxColumn, this.sdateDataGridViewTextBoxColumn, this.edateDataGridViewTextBoxColumn, + this.HolyDays, + this.HolyTimes, this.HolyReason, this.HolyLocation, this.telDataGridViewTextBoxColumn, this.processsDataGridViewTextBoxColumn, this.cmbCf, this.Response, - this.HolyDays, - this.HolyTimes, this.HolyBackup, this.remarkDataGridViewTextBoxColumn}); - this.dv1.DataSource = this.bs; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(3); - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle6; - this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.Location = new System.Drawing.Point(0, 0); - this.dv1.Name = "dv1"; - this.dv1.RowTemplate.Height = 30; - this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(1213, 487); - this.dv1.TabIndex = 3; - this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); - // - // uidDataGridViewTextBoxColumn - // - this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid"; - this.uidDataGridViewTextBoxColumn.HeaderText = "사원번호"; - this.uidDataGridViewTextBoxColumn.Name = "uidDataGridViewTextBoxColumn"; - this.uidDataGridViewTextBoxColumn.Width = 88; - // - // nameDataGridViewTextBoxColumn - // - this.nameDataGridViewTextBoxColumn.DataPropertyName = "name"; - this.nameDataGridViewTextBoxColumn.HeaderText = "성명"; - this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; - this.nameDataGridViewTextBoxColumn.Width = 64; - // - // cateDataGridViewTextBoxColumn - // - this.cateDataGridViewTextBoxColumn.DataPropertyName = "cate"; - this.cateDataGridViewTextBoxColumn.HeaderText = "구분"; - this.cateDataGridViewTextBoxColumn.Name = "cateDataGridViewTextBoxColumn"; - this.cateDataGridViewTextBoxColumn.Width = 64; - // - // sdateDataGridViewTextBoxColumn - // - this.sdateDataGridViewTextBoxColumn.DataPropertyName = "sdate"; - this.sdateDataGridViewTextBoxColumn.HeaderText = "시작일"; - this.sdateDataGridViewTextBoxColumn.Name = "sdateDataGridViewTextBoxColumn"; - this.sdateDataGridViewTextBoxColumn.Width = 76; - // - // edateDataGridViewTextBoxColumn - // - this.edateDataGridViewTextBoxColumn.DataPropertyName = "edate"; - this.edateDataGridViewTextBoxColumn.HeaderText = "종료일"; - this.edateDataGridViewTextBoxColumn.Name = "edateDataGridViewTextBoxColumn"; - this.edateDataGridViewTextBoxColumn.Width = 76; - // - // HolyReason - // - this.HolyReason.DataPropertyName = "HolyReason"; - this.HolyReason.HeaderText = "사유"; - this.HolyReason.Name = "HolyReason"; - this.HolyReason.Width = 64; - // - // HolyLocation - // - this.HolyLocation.DataPropertyName = "HolyLocation"; - this.HolyLocation.HeaderText = "행선지"; - this.HolyLocation.Name = "HolyLocation"; - this.HolyLocation.Width = 76; - // - // telDataGridViewTextBoxColumn - // - this.telDataGridViewTextBoxColumn.DataPropertyName = "tel"; - this.telDataGridViewTextBoxColumn.HeaderText = "내선"; - this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn"; - this.telDataGridViewTextBoxColumn.Width = 64; - // - // processsDataGridViewTextBoxColumn - // - this.processsDataGridViewTextBoxColumn.DataPropertyName = "processs"; - this.processsDataGridViewTextBoxColumn.HeaderText = "공정"; - this.processsDataGridViewTextBoxColumn.Name = "processsDataGridViewTextBoxColumn"; - this.processsDataGridViewTextBoxColumn.ReadOnly = true; - this.processsDataGridViewTextBoxColumn.Width = 64; - // - // cmbCf - // - this.cmbCf.DataPropertyName = "conf"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cmbCf.DefaultCellStyle = dataGridViewCellStyle2; - this.cmbCf.HeaderText = "관리자 승인"; - this.cmbCf.Items.AddRange(new object[] { + this.dv1.DataSource = this.bs; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(3); + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle6; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.RowTemplate.Height = 30; + this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dv1.Size = new System.Drawing.Size(1213, 487); + this.dv1.TabIndex = 3; + this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // uidDataGridViewTextBoxColumn + // + this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid"; + this.uidDataGridViewTextBoxColumn.HeaderText = "사원번호"; + this.uidDataGridViewTextBoxColumn.Name = "uidDataGridViewTextBoxColumn"; + this.uidDataGridViewTextBoxColumn.Width = 88; + // + // nameDataGridViewTextBoxColumn + // + this.nameDataGridViewTextBoxColumn.DataPropertyName = "name"; + this.nameDataGridViewTextBoxColumn.HeaderText = "성명"; + this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; + this.nameDataGridViewTextBoxColumn.Width = 64; + // + // cateDataGridViewTextBoxColumn + // + this.cateDataGridViewTextBoxColumn.DataPropertyName = "cate"; + this.cateDataGridViewTextBoxColumn.HeaderText = "구분"; + this.cateDataGridViewTextBoxColumn.Name = "cateDataGridViewTextBoxColumn"; + this.cateDataGridViewTextBoxColumn.Width = 64; + // + // sdateDataGridViewTextBoxColumn + // + this.sdateDataGridViewTextBoxColumn.DataPropertyName = "sdate"; + this.sdateDataGridViewTextBoxColumn.HeaderText = "시작일"; + this.sdateDataGridViewTextBoxColumn.Name = "sdateDataGridViewTextBoxColumn"; + this.sdateDataGridViewTextBoxColumn.Width = 76; + // + // edateDataGridViewTextBoxColumn + // + this.edateDataGridViewTextBoxColumn.DataPropertyName = "edate"; + this.edateDataGridViewTextBoxColumn.HeaderText = "종료일"; + this.edateDataGridViewTextBoxColumn.Name = "edateDataGridViewTextBoxColumn"; + this.edateDataGridViewTextBoxColumn.Width = 76; + // + // HolyDays + // + this.HolyDays.DataPropertyName = "HolyDays"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.HolyDays.DefaultCellStyle = dataGridViewCellStyle2; + this.HolyDays.HeaderText = "사용일"; + this.HolyDays.Name = "HolyDays"; + this.HolyDays.Width = 76; + // + // HolyTimes + // + this.HolyTimes.DataPropertyName = "HolyTimes"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); + this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle3; + this.HolyTimes.HeaderText = "대체시간"; + this.HolyTimes.Name = "HolyTimes"; + this.HolyTimes.Width = 88; + // + // HolyReason + // + this.HolyReason.DataPropertyName = "HolyReason"; + this.HolyReason.HeaderText = "사유"; + this.HolyReason.Name = "HolyReason"; + this.HolyReason.Width = 64; + // + // HolyLocation + // + this.HolyLocation.DataPropertyName = "HolyLocation"; + this.HolyLocation.HeaderText = "행선지"; + this.HolyLocation.Name = "HolyLocation"; + this.HolyLocation.Width = 76; + // + // telDataGridViewTextBoxColumn + // + this.telDataGridViewTextBoxColumn.DataPropertyName = "tel"; + this.telDataGridViewTextBoxColumn.HeaderText = "내선"; + this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn"; + this.telDataGridViewTextBoxColumn.Width = 64; + // + // processsDataGridViewTextBoxColumn + // + this.processsDataGridViewTextBoxColumn.DataPropertyName = "processs"; + this.processsDataGridViewTextBoxColumn.HeaderText = "공정"; + this.processsDataGridViewTextBoxColumn.Name = "processsDataGridViewTextBoxColumn"; + this.processsDataGridViewTextBoxColumn.ReadOnly = true; + this.processsDataGridViewTextBoxColumn.Width = 64; + // + // cmbCf + // + this.cmbCf.DataPropertyName = "conf"; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cmbCf.DefaultCellStyle = dataGridViewCellStyle4; + this.cmbCf.HeaderText = "관리자 승인"; + this.cmbCf.Items.AddRange(new object[] { "선택안함", "승인", "거절"}); - this.cmbCf.Name = "cmbCf"; - this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.cmbCf.Width = 85; - // - // Response - // - this.Response.DataPropertyName = "Response"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Response.DefaultCellStyle = dataGridViewCellStyle3; - this.Response.HeaderText = "관리자 비고"; - this.Response.Name = "Response"; - this.Response.Width = 104; - // - // HolyDays - // - this.HolyDays.DataPropertyName = "HolyDays"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4; - this.HolyDays.HeaderText = "사용일"; - this.HolyDays.Name = "HolyDays"; - this.HolyDays.Width = 76; - // - // HolyTimes - // - this.HolyTimes.DataPropertyName = "HolyTimes"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); - this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle5; - this.HolyTimes.HeaderText = "대체시간"; - this.HolyTimes.Name = "HolyTimes"; - this.HolyTimes.Width = 88; - // - // HolyBackup - // - this.HolyBackup.DataPropertyName = "HolyBackup"; - this.HolyBackup.HeaderText = "백업"; - this.HolyBackup.Name = "HolyBackup"; - this.HolyBackup.Width = 64; - // - // remarkDataGridViewTextBoxColumn - // - this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark"; - this.remarkDataGridViewTextBoxColumn.HeaderText = "비고"; - this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; - this.remarkDataGridViewTextBoxColumn.Width = 64; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // toolStripButton8 - // - this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); - this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(34, 34); - this.toolStripButton8.Text = "toolStripButton7"; - this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); - // - // toolStripButton7 - // - this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); - this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton7.Name = "toolStripButton7"; - this.toolStripButton7.Size = new System.Drawing.Size(34, 34); - this.toolStripButton7.Text = "toolStripButton7"; - this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); - // - // btSearch - // - this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); - this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(92, 34); - this.btSearch.Text = "조회(&R)"; - this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick); - this.btSearch.Click += new System.EventHandler(this.btSearch_Click); - // - // toolStripButton2 - // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(65, 34); - this.toolStripButton2.Text = "닫기"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // btFind - // - this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); - this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btFind.Name = "btFind"; - this.btFind.Size = new System.Drawing.Size(23, 22); - this.btFind.Text = "toolStripButton2"; - this.btFind.Click += new System.EventHandler(this.btFind_Click); - // - // btSave - // - this.btSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); - this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(66, 22); - this.btSave.Text = "저장(&S)"; - this.btSave.Click += new System.EventHandler(this.btEdit_Click); - // - // btAdd - // - this.btAdd.Image = global::FPJ0000.Properties.Resources.add; - this.btAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btAdd.Name = "btAdd"; - this.btAdd.Size = new System.Drawing.Size(67, 22); - this.btAdd.Text = "추가(&A)"; - this.btAdd.Click += new System.EventHandler(this.btAdd_Click); - // - // btEdit - // - this.btEdit.Image = global::FPJ0000.Properties.Resources.accept; - this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btEdit.Name = "btEdit"; - this.btEdit.Size = new System.Drawing.Size(80, 22); - this.btEdit.Text = "편집/승인"; - this.btEdit.Click += new System.EventHandler(this.btEdit_Click_1); - // - // btDel - // - this.btDel.Image = global::FPJ0000.Properties.Resources.action_stop; - this.btDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btDel.Name = "btDel"; - this.btDel.Size = new System.Drawing.Size(68, 22); - this.btDel.Text = "삭제(&D)"; - this.btDel.Click += new System.EventHandler(this.btDel_Click); - // - // fHolyRequest - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1213, 633); - this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.bn); - this.Name = "fHolyRequest"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "휴가 신청"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).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.dv1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.cmbCf.Name = "cmbCf"; + this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.cmbCf.Width = 85; + // + // Response + // + this.Response.DataPropertyName = "Response"; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Response.DefaultCellStyle = dataGridViewCellStyle5; + this.Response.HeaderText = "관리자 비고"; + this.Response.Name = "Response"; + this.Response.Width = 104; + // + // HolyBackup + // + this.HolyBackup.DataPropertyName = "HolyBackup"; + this.HolyBackup.HeaderText = "백업"; + this.HolyBackup.Name = "HolyBackup"; + this.HolyBackup.Width = 64; + // + // remarkDataGridViewTextBoxColumn + // + this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark"; + this.remarkDataGridViewTextBoxColumn.HeaderText = "비고"; + this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; + this.remarkDataGridViewTextBoxColumn.Width = 64; + // + // fHolyRequest + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1213, 633); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "fHolyRequest"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "휴가 신청"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).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.dv1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -687,25 +688,25 @@ private System.Windows.Forms.ToolStripButton btAdd; private System.Windows.Forms.ToolStripButton btEdit; private System.Windows.Forms.ToolStripButton btDel; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripLabel sbday; + private System.Windows.Forms.ToolStripLabel sbtime; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripButton toolStripButton7; private System.Windows.Forms.DataGridViewTextBoxColumn uidDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn sdateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn edateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn HolyDays; + private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes; private System.Windows.Forms.DataGridViewTextBoxColumn HolyReason; private System.Windows.Forms.DataGridViewTextBoxColumn HolyLocation; private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn processsDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf; private System.Windows.Forms.DataGridViewTextBoxColumn Response; - private System.Windows.Forms.DataGridViewTextBoxColumn HolyDays; - private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes; private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup; private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripLabel sbday; - private System.Windows.Forms.ToolStripLabel sbtime; - private System.Windows.Forms.ToolStripButton toolStripButton8; - private System.Windows.Forms.ToolStripButton toolStripButton7; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx index abfb849..aaefc00 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx @@ -195,41 +195,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djXT1NRHAdw/gjj3ogsZUPLUsQFzmhMTIz/ - gC+ixhgRhCLKaqG0bBBUhkrijBVKN6VUVvEJNQE1EowaMcqSKV/PTW8T6gM955LgS7/JeT6f3Hu/53dz - PNxxxx0BeXj89YUHxzrG7x/tRcMRsg7bUH/IhrrEHtQm9ODewW7cPdCNO/vJ2teFmr1dqI7vxO09naiK - 60Dl7g5U7HqF8liyYqwoi7aiNMqKksh2FIvbUSSyQBlBVngbFGFtKAw1jxeEmJL47V1nmXGQh5iRF2we - 47d3neXGFQSbkR/UCn571/kfOFkgC3AJuLKYdigjjcgXaVAoMqBIbKHCyQJM9MClPDlFlB69jz9iZnIO - 3Y0fIAvTUeGkOxmAQnHck2urfIeFKU7QU+HydhjpgUJwxVFmPLrUhfk/8zwN+Dk0AWmEmgqX688AZMWV - RltQdcqEqbEZngbMTs+h5mwr5KGtVLgcPwM9kA1HShGnx/f3ozzNnheSXuSHGqhx2b4MQFocd5TIxTq8 - 1X3mWfZ0NgyQg1fLhMvyYQFS4hRiI8wVzqUY7B0m310LMy7LW08PpMEVRZJSXHQuxciX31DEa8l3Z2LG - 3drOAHSFK4niSzE+y9Pspag+0woy9AXhbnrp6IGL4bjxJY8wYMDylafZ8yzVBlmIXjAucxsDcDEcN1sL - wg3ob3MGPk3pgTRYLxh3w1NLD1wMxw1+pciM8hNG51c8NYfK0wQUaBSEy9jKAFwM5xj88jAjGpM6nUry - i5REFtsCaYCBGSfZoqEHusI5Zqs0RAdj6RueZ88n2zCyApuYcembWYAUOMc5lx2oRp9miOfZY63tR6Zf - MxMufVMLPZAWxxVCFmRCrkiNbwMjPM+eJ8ndyPRpocalbWQA0uIcbeW+OWWiDpOjC34WSGlKTxKUt5YK - d30DA5AF52hrtr8W9efanUrzY3AMEl8VFS51vZoeyIpzFCLTVw2dso/n2ZMT2UyFS1nHABSCcxRC4vMS - HeRvZnpiFta6fqR5qqhw19Y20wOF4hyFkHg1I9XzOcE1IcNTQ4VLXsMCXAKOthD/4pJXN9ED/wfu6ioG - IMGNLzfu8koV/dUHd5HD3ZUsJ+7KCtV5fnt33HGHPh4efwGK4T31pTiJAAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM + X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J + dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi + pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5 + jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz + 6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX + HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D + O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm + 3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1 + L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek + v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3 + UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq + 3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr + dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM + QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji - g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6etQCnbkwQSBBJFEjGSSIksynGGmUaJSXvvmOBLT3Kf7y9z - 58x3MwH++OOPhDw+3HWu9lCr+9HBTjw8wK2kDtQkdqB6fzse7GtH1d423N/Thnu7ubXLhbs7XbizoxWV - Ca24He9ExXYnbsW14GYst1TNKI9pRll0M25sa0Lp1iaURL1FsZJbWxzQRzpQFGF3Xw9nz4rb+84846AL - t0OrsI+J2/vOfOOuK+wolNsgbu87/wNXEEYDJMTdTnCiLM4GvcqMUhWL8thmybiCUJYcSPrkSmNZdD4b - wNT3H+iqG0RxDCMZlx9CASQ+1iMs/oyjogf6rVZJOG2wlRxI+s6VxDMYHRoXecDMzxk8Pe+CPspGjcvb - TAEkLUSZqglVJx2zR+zJpHsaFcdY6JV2KlxuUCM5kATnaWtJtA0vUztFnpAvg2PQxZlQFGknxuXIKICk - OE8hdMpGuGrfizwhvewwtOFGYpwmkAZIgfMUoiDKiAHXiMgTYi3rRp7cQoTTbGLIgbQ4vhB6JfeuxZsw - +vGP0swAT845kRtq8YnL3kgBpMV52qqLsKHyBIvpid+lmRibQkmSBdqQRq849QYLOVAKztPWfAWDFynt - Ik9Ir20Y6iCDV1zWegqgVBxfCK2cQV3yXGCP9RMHNHrFZa4zkwOl4grkLG4dt/51xPr9ZuQEMV5xGWsp - gFJwhQob8lUGfP3gFmlCSWpPt0AtM/rEpa8xkQNpcfx3TiNvQL/rs0gTwhS/Q5bMQIRLW00DpMTlhJrQ - UtMnsoR0M0PIDHpNjEtbZSQH0uDywix4fqlNZAkZ6f8GTWQDNDKGGHdtJQWQFJcfZkX5Ueucy8IEd1ko - TjRT41JXUABJcPz4ylG8mVsK7rpVfaoJ6kATNe7qcgM5kATHz1ZdgkmkCeFLkRlokIS7sowCSILjZ2v2 - ZgNaH/Vhcnwazod9yJC9loxLWfqGHEiC4wd/XnDj7IRID3z1T0+OxyUvoQES4HwNflpc8uIGcuD/wF1e - RAHkcO75xl1YWE/+64P/kcP/K5lP3MUF9WfE7f3xxx/yBAT8AiicPppMUuJ9AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH + 331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO + fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt + QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6 + pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH + T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS + FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q + elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U + 0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC + Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS + cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01 + AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs + tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm + QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK + IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg== @@ -253,6 +253,12 @@ UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + + True + + + True + True @@ -262,12 +268,6 @@ True - - True - - - True - True diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index d0216f6..55ef01a 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -51,14 +51,18 @@ System.Windows.Forms.Label label5; System.Windows.Forms.Label label11; System.Windows.Forms.Label label12; + System.Windows.Forms.Label label13; + System.Windows.Forms.Label label14; + System.Windows.Forms.Label label15; + System.Windows.Forms.Label label16; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); this.nameTextBox = new System.Windows.Forms.TextBox(); - this.reqstaffTextBox = new System.Windows.Forms.TextBox(); + this.txReqUserName = new System.Windows.Forms.TextBox(); this.tbSdate = new System.Windows.Forms.TextBox(); this.tbEdate = new System.Windows.Forms.TextBox(); this.usermainTextBox = new System.Windows.Forms.TextBox(); @@ -93,11 +97,15 @@ this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.bsHistWeek = new System.Windows.Forms.BindingSource(this.components); - this.cmbProcess = new System.Windows.Forms.ComboBox(); + this.cmbReqProcess = new System.Windows.Forms.ComboBox(); this.cmbState = new System.Windows.Forms.ComboBox(); this.tbODate = new System.Windows.Forms.TextBox(); this.panel7 = new System.Windows.Forms.Panel(); - this.cmbPart = new System.Windows.Forms.ComboBox(); + this.cmbReqPlant = new System.Windows.Forms.ComboBox(); + this.cmbReqPackage = new System.Windows.Forms.ComboBox(); + this.cmbReqSite = new System.Windows.Forms.ComboBox(); + this.cmbReqLine = new System.Windows.Forms.ComboBox(); + this.cmbReqTeam = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); this.textBox6 = new System.Windows.Forms.TextBox(); @@ -222,6 +230,10 @@ label5 = new System.Windows.Forms.Label(); label11 = new System.Windows.Forms.Label(); label12 = new System.Windows.Forms.Label(); + label13 = new System.Windows.Forms.Label(); + label14 = new System.Windows.Forms.Label(); + label15 = new System.Windows.Forms.Label(); + label16 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -274,17 +286,17 @@ // reqstaffLabel // reqstaffLabel.AutoSize = true; - reqstaffLabel.Location = new System.Drawing.Point(378, 36); + reqstaffLabel.Location = new System.Drawing.Point(370, 32); reqstaffLabel.Name = "reqstaffLabel"; reqstaffLabel.Size = new System.Drawing.Size(41, 12); reqstaffLabel.TabIndex = 8; - reqstaffLabel.Text = "담당자"; + reqstaffLabel.Text = "요청자"; // // usermainLabel // usermainLabel.AutoSize = true; usermainLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); - usermainLabel.Location = new System.Drawing.Point(33, 66); + usermainLabel.Location = new System.Drawing.Point(33, 58); usermainLabel.Name = "usermainLabel"; usermainLabel.Size = new System.Drawing.Size(60, 21); usermainLabel.TabIndex = 24; @@ -294,7 +306,7 @@ // usersubLabel.AutoSize = true; usersubLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); - usersubLabel.Location = new System.Drawing.Point(53, 161); + usersubLabel.Location = new System.Drawing.Point(53, 141); usersubLabel.Name = "usersubLabel"; usersubLabel.Size = new System.Drawing.Size(40, 21); usersubLabel.TabIndex = 26; @@ -304,7 +316,7 @@ // userManagerLabel.AutoSize = true; userManagerLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); - userManagerLabel.Location = new System.Drawing.Point(9, 33); + userManagerLabel.Location = new System.Drawing.Point(9, 31); userManagerLabel.Name = "userManagerLabel"; userManagerLabel.Size = new System.Drawing.Size(84, 21); userManagerLabel.TabIndex = 32; @@ -358,12 +370,12 @@ // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(205, 36); + label1.Location = new System.Drawing.Point(170, 32); label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(29, 12); + label1.Size = new System.Drawing.Size(52, 12); label1.TabIndex = 67; - label1.Text = "공정"; + label1.Text = "Process"; // // label2 // @@ -397,18 +409,18 @@ // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(56, 36); + label6.Location = new System.Drawing.Point(9, 32); label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label6.Name = "label6"; - label6.Size = new System.Drawing.Size(29, 12); + label6.Size = new System.Drawing.Size(68, 12); label6.TabIndex = 87; - label6.Text = "파트"; + label6.Text = "Req Team."; // // label8 // label8.AutoSize = true; label8.Font = new System.Drawing.Font("맑은 고딕", 12F); - label8.Location = new System.Drawing.Point(35, 129); + label8.Location = new System.Drawing.Point(35, 113); label8.Name = "label8"; label8.Size = new System.Drawing.Size(58, 21); label8.TabIndex = 87; @@ -428,7 +440,7 @@ // label7.AutoSize = true; label7.Font = new System.Drawing.Font("맑은 고딕", 12F); - label7.Location = new System.Drawing.Point(13, 99); + label7.Location = new System.Drawing.Point(13, 87); label7.Name = "label7"; label7.Size = new System.Drawing.Size(80, 21); label7.TabIndex = 89; @@ -474,6 +486,46 @@ label12.TabIndex = 96; label12.Text = "공정"; // + // label13 + // + label13.AutoSize = true; + label13.Location = new System.Drawing.Point(48, 55); + label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label13.Name = "label13"; + label13.Size = new System.Drawing.Size(29, 12); + label13.TabIndex = 89; + label13.Text = "Line"; + // + // label14 + // + label14.AutoSize = true; + label14.Location = new System.Drawing.Point(196, 56); + label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label14.Name = "label14"; + label14.Size = new System.Drawing.Size(26, 12); + label14.TabIndex = 91; + label14.Text = "Site"; + // + // label15 + // + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(357, 56); + label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(54, 12); + label15.TabIndex = 93; + label15.Text = "Package"; + // + // label16 + // + label16.AutoSize = true; + label16.Location = new System.Drawing.Point(44, 78); + label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label16.Name = "label16"; + label16.Size = new System.Drawing.Size(33, 12); + label16.TabIndex = 95; + label16.Text = "Plant"; + // // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); @@ -504,14 +556,14 @@ this.nameTextBox.Size = new System.Drawing.Size(447, 21); this.nameTextBox.TabIndex = 1; // - // reqstaffTextBox + // txReqUserName // - this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true)); - this.reqstaffTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.reqstaffTextBox.Location = new System.Drawing.Point(425, 32); - this.reqstaffTextBox.Name = "reqstaffTextBox"; - this.reqstaffTextBox.Size = new System.Drawing.Size(113, 21); - this.reqstaffTextBox.TabIndex = 9; + this.txReqUserName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true)); + this.txReqUserName.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.txReqUserName.Location = new System.Drawing.Point(412, 28); + this.txReqUserName.Name = "txReqUserName"; + this.txReqUserName.Size = new System.Drawing.Size(128, 21); + this.txReqUserName.TabIndex = 9; // // tbSdate // @@ -534,31 +586,31 @@ // usermainTextBox // this.usermainTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true)); - this.usermainTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.usermainTextBox.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.usermainTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usermainTextBox.Location = new System.Drawing.Point(353, 63); + this.usermainTextBox.Location = new System.Drawing.Point(353, 55); this.usermainTextBox.Name = "usermainTextBox"; - this.usermainTextBox.Size = new System.Drawing.Size(185, 29); + this.usermainTextBox.Size = new System.Drawing.Size(185, 25); this.usermainTextBox.TabIndex = 25; // // usersubTextBox // this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true)); - this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usersubTextBox.Location = new System.Drawing.Point(353, 158); + this.usersubTextBox.Location = new System.Drawing.Point(353, 138); this.usersubTextBox.Name = "usersubTextBox"; - this.usersubTextBox.Size = new System.Drawing.Size(185, 29); + this.usersubTextBox.Size = new System.Drawing.Size(185, 25); this.usersubTextBox.TabIndex = 27; // // userManagerTextBox // this.userManagerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true)); - this.userManagerTextBox.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.userManagerTextBox.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.userManagerTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.userManagerTextBox.Location = new System.Drawing.Point(353, 30); + this.userManagerTextBox.Location = new System.Drawing.Point(353, 28); this.userManagerTextBox.Name = "userManagerTextBox"; - this.userManagerTextBox.Size = new System.Drawing.Size(185, 29); + this.userManagerTextBox.Size = new System.Drawing.Size(185, 25); this.userManagerTextBox.TabIndex = 33; // // costoTextBox @@ -608,7 +660,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(485, 322); + this.remark_reqTextBox.Size = new System.Drawing.Size(485, 327); this.remark_reqTextBox.TabIndex = 49; // // tbXdate @@ -651,7 +703,7 @@ this.btMailAddr, this.btPath, this.btSendMail}); - this.bn.Location = new System.Drawing.Point(0, 721); + this.bn.Location = new System.Drawing.Point(0, 726); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -754,8 +806,8 @@ this.btIO.Image = ((System.Drawing.Image)(resources.GetObject("btIO.Image"))); this.btIO.ImageTransparentColor = System.Drawing.Color.Magenta; this.btIO.Name = "btIO"; - this.btIO.Size = new System.Drawing.Size(60, 22); - this.btIO.Text = "I/O 맵"; + this.btIO.Size = new System.Drawing.Size(70, 22); + this.btIO.Text = "I/O LIST"; this.btIO.Click += new System.EventHandler(this.btIO_Click); // // btMailAddr @@ -838,8 +890,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -857,18 +909,17 @@ this.bsHistWeek.DataMember = "ProjectsHistory"; this.bsHistWeek.DataSource = this.dsPRJ; // - // cmbProcess + // cmbReqProcess // - this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cmbProcess.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.cmbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbProcess.FormattingEnabled = true; - this.cmbProcess.Location = new System.Drawing.Point(242, 32); - this.cmbProcess.Margin = new System.Windows.Forms.Padding(4); - this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(128, 20); - this.cmbProcess.TabIndex = 68; + this.cmbReqProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqProcess.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqProcess.FormattingEnabled = true; + this.cmbReqProcess.Location = new System.Drawing.Point(224, 28); + this.cmbReqProcess.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqProcess.Name = "cmbReqProcess"; + this.cmbReqProcess.Size = new System.Drawing.Size(128, 20); + this.cmbReqProcess.TabIndex = 68; // // cmbState // @@ -895,30 +946,85 @@ // panel7 // this.panel7.BackColor = System.Drawing.Color.Gainsboro; - this.panel7.Controls.Add(this.cmbPart); + this.panel7.Controls.Add(this.cmbReqPlant); + this.panel7.Controls.Add(label16); + this.panel7.Controls.Add(this.cmbReqPackage); + this.panel7.Controls.Add(label15); + this.panel7.Controls.Add(this.cmbReqSite); + this.panel7.Controls.Add(label14); + this.panel7.Controls.Add(this.cmbReqLine); + this.panel7.Controls.Add(label13); + this.panel7.Controls.Add(this.cmbReqTeam); this.panel7.Controls.Add(label6); this.panel7.Controls.Add(this.arLabel1); - this.panel7.Controls.Add(this.reqstaffTextBox); + this.panel7.Controls.Add(this.txReqUserName); this.panel7.Controls.Add(reqstaffLabel); - this.panel7.Controls.Add(this.cmbProcess); + this.panel7.Controls.Add(this.cmbReqProcess); this.panel7.Controls.Add(label1); this.panel7.Location = new System.Drawing.Point(6, 204); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(547, 64); + this.panel7.Size = new System.Drawing.Size(547, 99); this.panel7.TabIndex = 85; // - // cmbPart + // cmbReqPlant // - this.cmbPart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cmbPart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.cmbPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.cmbPart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbPart.FormattingEnabled = true; - this.cmbPart.Location = new System.Drawing.Point(93, 32); - this.cmbPart.Margin = new System.Windows.Forms.Padding(4); - this.cmbPart.Name = "cmbPart"; - this.cmbPart.Size = new System.Drawing.Size(102, 20); - this.cmbPart.TabIndex = 88; + this.cmbReqPlant.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqPlant.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqPlant.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqPlant.FormattingEnabled = true; + this.cmbReqPlant.Location = new System.Drawing.Point(80, 74); + this.cmbReqPlant.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqPlant.Name = "cmbReqPlant"; + this.cmbReqPlant.Size = new System.Drawing.Size(83, 20); + this.cmbReqPlant.TabIndex = 96; + // + // cmbReqPackage + // + this.cmbReqPackage.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqPackage.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqPackage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqPackage.FormattingEnabled = true; + this.cmbReqPackage.Location = new System.Drawing.Point(412, 52); + this.cmbReqPackage.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqPackage.Name = "cmbReqPackage"; + this.cmbReqPackage.Size = new System.Drawing.Size(128, 20); + this.cmbReqPackage.TabIndex = 94; + // + // cmbReqSite + // + this.cmbReqSite.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqSite.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqSite.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqSite.FormattingEnabled = true; + this.cmbReqSite.Location = new System.Drawing.Point(224, 52); + this.cmbReqSite.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqSite.Name = "cmbReqSite"; + this.cmbReqSite.Size = new System.Drawing.Size(128, 20); + this.cmbReqSite.TabIndex = 92; + // + // cmbReqLine + // + this.cmbReqLine.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqLine.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqLine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqLine.FormattingEnabled = true; + this.cmbReqLine.Location = new System.Drawing.Point(80, 51); + this.cmbReqLine.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqLine.Name = "cmbReqLine"; + this.cmbReqLine.Size = new System.Drawing.Size(83, 20); + this.cmbReqLine.TabIndex = 90; + // + // cmbReqTeam + // + this.cmbReqTeam.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbReqTeam.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReqTeam.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbReqTeam.FormattingEnabled = true; + this.cmbReqTeam.Location = new System.Drawing.Point(80, 28); + this.cmbReqTeam.Margin = new System.Windows.Forms.Padding(4); + this.cmbReqTeam.Name = "cmbReqTeam"; + this.cmbReqTeam.Size = new System.Drawing.Size(83, 20); + this.cmbReqTeam.TabIndex = 88; // // arLabel1 // @@ -959,7 +1065,7 @@ this.arLabel1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); this.arLabel1.Size = new System.Drawing.Size(547, 23); this.arLabel1.TabIndex = 86; - this.arLabel1.Text = "요청자"; + this.arLabel1.Text = "Basic info"; this.arLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.arLabel1.TextShadow = true; this.arLabel1.TextVisible = true; @@ -1143,19 +1249,19 @@ this.panel5.Controls.Add(this.usermainTextBox); this.panel5.Controls.Add(userManagerLabel); this.panel5.Controls.Add(this.userManagerTextBox); - this.panel5.Location = new System.Drawing.Point(6, 274); + this.panel5.Location = new System.Drawing.Point(6, 309); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(547, 194); + this.panel5.Size = new System.Drawing.Size(547, 168); this.panel5.TabIndex = 85; // // textBox10 // this.textBox10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userAssembly", true)); - this.textBox10.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.textBox10.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.textBox10.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox10.Location = new System.Drawing.Point(353, 95); + this.textBox10.Location = new System.Drawing.Point(353, 83); this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(185, 29); + this.textBox10.Size = new System.Drawing.Size(185, 25); this.textBox10.TabIndex = 96; // // cmbSW @@ -1167,12 +1273,12 @@ this.cmbSW.DataSource = this.bsSW; this.cmbSW.DisplayMember = "IDName"; this.cmbSW.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbSW.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.cmbSW.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbSW.FormattingEnabled = true; - this.cmbSW.Location = new System.Drawing.Point(101, 158); + this.cmbSW.Location = new System.Drawing.Point(101, 138); this.cmbSW.Margin = new System.Windows.Forms.Padding(4); this.cmbSW.Name = "cmbSW"; - this.cmbSW.Size = new System.Drawing.Size(249, 29); + this.cmbSW.Size = new System.Drawing.Size(249, 25); this.cmbSW.TabIndex = 95; this.cmbSW.ValueMember = "ID"; // @@ -1195,12 +1301,12 @@ this.cmbEpanel.DataSource = this.bsEPanel; this.cmbEpanel.DisplayMember = "IDName"; this.cmbEpanel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbEpanel.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.cmbEpanel.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbEpanel.FormattingEnabled = true; - this.cmbEpanel.Location = new System.Drawing.Point(101, 126); + this.cmbEpanel.Location = new System.Drawing.Point(101, 110); this.cmbEpanel.Margin = new System.Windows.Forms.Padding(4); this.cmbEpanel.Name = "cmbEpanel"; - this.cmbEpanel.Size = new System.Drawing.Size(249, 29); + this.cmbEpanel.Size = new System.Drawing.Size(249, 25); this.cmbEpanel.TabIndex = 94; this.cmbEpanel.ValueMember = "ID"; // @@ -1218,12 +1324,12 @@ this.cmbAssembly.DataSource = this.bsAssembly; this.cmbAssembly.DisplayMember = "IDName"; this.cmbAssembly.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbAssembly.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.cmbAssembly.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbAssembly.FormattingEnabled = true; - this.cmbAssembly.Location = new System.Drawing.Point(101, 94); + this.cmbAssembly.Location = new System.Drawing.Point(101, 82); this.cmbAssembly.Margin = new System.Windows.Forms.Padding(4); this.cmbAssembly.Name = "cmbAssembly"; - this.cmbAssembly.Size = new System.Drawing.Size(249, 29); + this.cmbAssembly.Size = new System.Drawing.Size(249, 25); this.cmbAssembly.TabIndex = 93; this.cmbAssembly.ValueMember = "ID"; // @@ -1241,12 +1347,12 @@ this.cmbDesign.DataSource = this.bsDesignID; this.cmbDesign.DisplayMember = "IDName"; this.cmbDesign.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbDesign.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.cmbDesign.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbDesign.FormattingEnabled = true; - this.cmbDesign.Location = new System.Drawing.Point(101, 63); + this.cmbDesign.Location = new System.Drawing.Point(101, 55); this.cmbDesign.Margin = new System.Windows.Forms.Padding(4); this.cmbDesign.Name = "cmbDesign"; - this.cmbDesign.Size = new System.Drawing.Size(249, 29); + this.cmbDesign.Size = new System.Drawing.Size(249, 25); this.cmbDesign.TabIndex = 92; this.cmbDesign.ValueMember = "ID"; // @@ -1264,12 +1370,12 @@ this.cmbChampion.DataSource = this.bsChampionID; this.cmbChampion.DisplayMember = "IDName"; this.cmbChampion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbChampion.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.cmbChampion.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbChampion.FormattingEnabled = true; - this.cmbChampion.Location = new System.Drawing.Point(101, 30); + this.cmbChampion.Location = new System.Drawing.Point(101, 28); this.cmbChampion.Margin = new System.Windows.Forms.Padding(4); this.cmbChampion.Name = "cmbChampion"; - this.cmbChampion.Size = new System.Drawing.Size(249, 29); + this.cmbChampion.Size = new System.Drawing.Size(249, 25); this.cmbChampion.TabIndex = 91; this.cmbChampion.ValueMember = "ID"; // @@ -1281,11 +1387,11 @@ // textBox3 // this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true)); - this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox3.Location = new System.Drawing.Point(353, 126); + this.textBox3.Location = new System.Drawing.Point(353, 110); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(185, 29); + this.textBox3.Size = new System.Drawing.Size(185, 25); this.textBox3.TabIndex = 88; // // arLabel3 @@ -1350,7 +1456,7 @@ this.panel2.Controls.Add(this.tbXdate); this.panel2.Controls.Add(this.tbEdate); this.panel2.Controls.Add(this.tbODate); - this.panel2.Location = new System.Drawing.Point(6, 473); + this.panel2.Location = new System.Drawing.Point(6, 481); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(547, 126); this.panel2.TabIndex = 86; @@ -1515,7 +1621,7 @@ this.panel3.Controls.Add(costnLabel); this.panel3.Controls.Add(this.costoTextBox); this.panel3.Controls.Add(costoLabel); - this.panel3.Location = new System.Drawing.Point(6, 605); + this.panel3.Location = new System.Drawing.Point(6, 611); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(546, 86); this.panel3.TabIndex = 86; @@ -1634,7 +1740,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(487, 347); + this.arPanel1.Size = new System.Drawing.Size(487, 352); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1806,7 +1912,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 257); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(516, 397); + this.panel4.Size = new System.Drawing.Size(516, 402); this.panel4.TabIndex = 90; // // rtBef @@ -1815,7 +1921,7 @@ this.rtBef.Location = new System.Drawing.Point(0, 23); this.rtBef.Name = "rtBef"; this.rtBef.ReadOnly = true; - this.rtBef.Size = new System.Drawing.Size(516, 374); + this.rtBef.Size = new System.Drawing.Size(516, 379); this.rtBef.TabIndex = 87; this.rtBef.Text = ""; this.rtBef.Click += new System.EventHandler(this.rtBack_Click); @@ -1880,7 +1986,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 254F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1044, 657); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1044, 662); this.tableLayoutPanel1.TabIndex = 91; // // panel8 @@ -2045,7 +2151,7 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(525, 257); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(516, 397); + this.panel6.Size = new System.Drawing.Size(516, 402); this.panel6.TabIndex = 90; // // rtAft @@ -2054,7 +2160,7 @@ this.rtAft.Location = new System.Drawing.Point(0, 23); this.rtAft.Name = "rtAft"; this.rtAft.ReadOnly = true; - this.rtAft.Size = new System.Drawing.Size(516, 374); + this.rtAft.Size = new System.Drawing.Size(516, 379); this.rtAft.TabIndex = 87; this.rtAft.Text = ""; this.rtAft.Click += new System.EventHandler(this.rtBack_Click); @@ -2112,7 +2218,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1058, 721); + this.tabControl1.Size = new System.Drawing.Size(1058, 726); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -2127,7 +2233,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1050, 695); + this.tabPage1.Size = new System.Drawing.Size(1050, 700); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; @@ -2138,7 +2244,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); - this.tabControl2.Location = new System.Drawing.Point(559, 360); + this.tabControl2.Location = new System.Drawing.Point(559, 365); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; this.tabControl2.Size = new System.Drawing.Size(488, 329); @@ -2244,8 +2350,8 @@ // this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn5.DataPropertyName = "remark"; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewTextBoxColumn5.HeaderText = "비고"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; @@ -2388,7 +2494,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1050, 695); + this.tabPage2.Size = new System.Drawing.Size(1050, 700); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "완료내역"; this.tabPage2.UseVisualStyleBackColor = true; @@ -2484,7 +2590,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1058, 746); + this.ClientSize = new System.Drawing.Size(1058, 751); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.MinimizeBox = false; @@ -2553,7 +2659,7 @@ private dsPRJTableAdapters.TableAdapterManager tam; private System.Windows.Forms.TextBox tbIdx; private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.TextBox reqstaffTextBox; + private System.Windows.Forms.TextBox txReqUserName; private System.Windows.Forms.TextBox tbSdate; private System.Windows.Forms.TextBox tbEdate; private System.Windows.Forms.TextBox usermainTextBox; @@ -2582,7 +2688,7 @@ private System.Windows.Forms.BindingSource bsHistWeek; private System.Windows.Forms.ToolStripButton btPart; private System.Windows.Forms.ToolStripButton btIO; - private System.Windows.Forms.ComboBox cmbProcess; + private System.Windows.Forms.ComboBox cmbReqProcess; private System.Windows.Forms.ComboBox cmbState; private System.Windows.Forms.TextBox tbODate; private System.Windows.Forms.Panel panel7; @@ -2619,7 +2725,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; private System.Windows.Forms.ToolStripButton btSendMail; - private System.Windows.Forms.ComboBox cmbPart; + private System.Windows.Forms.ComboBox cmbReqTeam; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.ToolStripButton btwEdit; private System.Windows.Forms.TextBox textBox4; @@ -2693,5 +2799,9 @@ private System.Windows.Forms.BindingSource bsAssembly; private System.Windows.Forms.BindingSource bsDesignID; private System.Windows.Forms.TextBox textBox10; + private System.Windows.Forms.ComboBox cmbReqPackage; + private System.Windows.Forms.ComboBox cmbReqSite; + private System.Windows.Forms.ComboBox cmbReqLine; + private System.Windows.Forms.ComboBox cmbReqPlant; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index f9578f1..00edc37 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -32,11 +32,35 @@ namespace FPJ0000 //사용자목록업데이트 UpdateUserList(); - //상태 + //공정 var dt_eetproc = FCOMMON.DBM.getCodeTable("10"); - this.cmbProcess.DisplayMember = "Value"; - this.cmbProcess.ValueMember = "Value"; - this.cmbProcess.DataSource = dt_eetproc; + this.cmbReqProcess.DisplayMember = "Value"; + this.cmbReqProcess.ValueMember = "Value"; + this.cmbReqProcess.DataSource = dt_eetproc; + + //line + var dt_line = FCOMMON.DBM.getCodeTable("19"); + this.cmbReqLine.DisplayMember = "Value"; + this.cmbReqLine.ValueMember = "Value"; + this.cmbReqLine.DataSource = dt_line; + + //site + var dt_site = FCOMMON.DBM.getCodeTable("23"); + this.cmbReqSite.DisplayMember = "Value"; + this.cmbReqSite.ValueMember = "Value"; + this.cmbReqSite.DataSource = dt_site; + + //plant + var dt_plant = FCOMMON.DBM.getCodeTable("24"); + this.cmbReqPlant.DisplayMember = "Value"; + this.cmbReqPlant.ValueMember = "Value"; + this.cmbReqPlant.DataSource = dt_plant; + + //plant + var dt_package = FCOMMON.DBM.getCodeTable("14"); + this.cmbReqPackage.DisplayMember = "Value"; + this.cmbReqPackage.ValueMember = "Value"; + this.cmbReqPackage.DataSource = dt_package; //분류 - 190903 - -제거 210329(박성민) //var dt_cate = FCOMMON.DBM.getCodeTable("20", "code"); @@ -44,7 +68,7 @@ namespace FPJ0000 //this.cmbCate.ValueMember = "Value"; //this.cmbCate.DataSource = dt_cate; - //공정 + //상태 var dt_status = FCOMMON.DBM.getCodeTable("01"); this.cmbState.DisplayMember = "Value"; this.cmbState.ValueMember = "Value"; @@ -52,9 +76,9 @@ namespace FPJ0000 //파트 var dt_part = FCOMMON.DBM.getCodeTable("11"); - this.cmbPart.DisplayMember = "Value"; - this.cmbPart.ValueMember = "Value"; - this.cmbPart.DataSource = dt_part; + this.cmbReqTeam.DisplayMember = "Value"; + this.cmbReqTeam.ValueMember = "Value"; + this.cmbReqTeam.DataSource = dt_part; this.bs.DataSource = dr; // this.cmbUser.SelectedValue = dr.championid; @@ -77,12 +101,18 @@ namespace FPJ0000 System.Windows.Forms.MessageBox.Show(ex.Message); } - this.cmbProcess.Text = dr.process; + this.cmbReqProcess.Text = dr.process; this.cmbState.Text = dr.status; - this.cmbPart.Text = dr.part; + this.cmbReqTeam.Text = dr.part; //this.cmbCate.Text = dr.category; this.tbDue.Text = dr.crdue; + this.cmbReqSite.Text = dr.ReqSite; + this.cmbReqPlant.Text = dr.ReqPlant; + this.cmbReqPackage.Text = dr.ReqPackage; + this.cmbReqLine.Text = dr.ReqLine; + + rtAft.Text = string.Empty; rtBef.Text = string.Empty; rtDesc.Text = string.Empty; @@ -141,13 +171,14 @@ namespace FPJ0000 var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); var processStr = "%"; var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); - var newdrnone = dSComm.UserList.NewUserListRow(); + var newdrnone = dSComm.UserList.NewUserListRow(); newdrnone.ID = string.Empty; newdrnone.Name = "(없음)"; + newdrnone.IDName = "(없음)"; newdrnone.Outdate = null; newdrnone.Description = string.Empty; dSComm.UserList.AddUserListRow(newdrnone); - + foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.outdate)) { @@ -159,6 +190,7 @@ namespace FPJ0000 var newdr = this.dSComm.UserList.NewUserListRow(); newdr.ID = dr.id; newdr.Name = dr.name; + newdr.IDName = $"({dr.id}) {dr.name}"; newdr.Outdate = dr.outdate; if (dr.outdate.isEmpty()) newdr.Description = string.Empty; else newdr.Description = $"퇴사({dr.outdate})"; @@ -197,11 +229,16 @@ namespace FPJ0000 string oldsta = string.Empty; private void btSave_Click(object sender, EventArgs e) { - + this.Validate(); oldsta = dr.status; - this.dr.process = cmbProcess.Text; + this.dr.process = cmbReqProcess.Text; this.dr.status = cmbState.Text; - this.dr.part = cmbPart.Text; + this.dr.part = cmbReqTeam.Text; + + this.dr.ReqLine = cmbReqLine.Text; + this.dr.ReqSite = cmbReqSite.Text; + this.dr.ReqPackage = cmbReqPackage.Text; + this.dr.ReqPlant = cmbReqPlant.Text; //날짜박스의 날짜데이터 검증 if (checkDateValue() == false) return; @@ -215,6 +252,23 @@ namespace FPJ0000 this.dr.CMP_Before = rtBef.Rtf; this.dr.CMP_Description = rtDesc.Rtf; this.dr.CMP_Background = rtBack.Rtf; + + var s = "dbo.getUserName2(championid,usermanager) as name_champion," + + "dbo.getUserName2(designid,usermain) as name_design," + + "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + + "dbo.getUserName2(epanelid,userhw2) as name_epanel," + + "dbo.getUserName2(softwareid,usersub) as name_software"; + + if (cmbChampion.SelectedIndex < 1) + { + if (dr.userManager.isEmpty() == false) dr.name_champion = $"({dr.userManager})"; + } + else dr.name_champion = cmbChampion.Text.Substring(cmbChampion.Text.IndexOf("(") + 1); + //dr.name_champion = dr.championid.isEmpty() ? "(" + dr.userManager + ")" : FCOMMON.DBM.use + + + + //} //else //{ @@ -224,9 +278,9 @@ namespace FPJ0000 //} this.dr.crdue = tbDue.Text.Trim(); + this.dr.EndEdit(); - this.Validate(); this.bs.EndEdit(); this.bsHistWeek.EndEdit(); this.bsHistDay.EndEdit(); @@ -444,7 +498,7 @@ namespace FPJ0000 else tbPath.Text = "\\" + tbPath.Text; } var datapath = FCOMMON.DBM.getCodeSavlue("55", "01"); - var serverpath = System.IO.Path.Combine( "Data", "Project"); + var serverpath = System.IO.Path.Combine("Data", "Project"); if (System.IO.Directory.Exists(serverpath) == false) { FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 229c628..7acce47 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -183,9 +183,27 @@ False + + False + + + False + + + False + + + False + 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -326,24 +344,48 @@ 449, 17 + + 449, 17 + 676, 56 + + 676, 56 + + + 17, 56 + 17, 56 537, 56 + + 537, 56 + + + 398, 56 + 398, 56 259, 56 + + 259, 56 + 120, 56 + + 120, 56 + + + 566, 17 + 566, 17 @@ -426,6 +468,12 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + 922, 17 + + + 722, 17 + 722, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 369698c..5332386 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,30 +30,34 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.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 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.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = 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(); @@ -369,8 +373,8 @@ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(56, 22); - this.toolStripButton3.Text = "I/O맵"; + this.toolStripButton3.Size = new System.Drawing.Size(70, 22); + this.toolStripButton3.Text = "I/O LIST"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // toolStripButton4 @@ -519,7 +523,7 @@ // this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem"; this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(298, 36); - this.iOMapToolStripMenuItem.Text = "I/O 맵"; + this.iOMapToolStripMenuItem.Text = "I/O LIST"; this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click); // // 공유폴더ToolStripMenuItem @@ -623,6 +627,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1585, 520); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; + this.fpSpread1.SetViewportLeftColumn(0, 0, 4); // // toolStrip1 // @@ -1376,7 +1381,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 24; + this.fpSpread1_Sheet1.ColumnCount = 28; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -1423,7 +1428,15 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "담당자\r\n공정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "Site"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "Plant"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Line"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Package"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Design"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asmb"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "E-Panel"; @@ -1432,11 +1445,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "SCR/CF"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -1444,148 +1457,169 @@ this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name_assembly"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asmb"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "E-Panel"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name_software"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType11.MaximumValue = 2147483647D; - numberCellType11.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType11; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - numberCellType12.MaximumValue = 999999999999999D; - numberCellType12.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType12; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - numberCellType13.MaximumValue = 999999999999999D; - numberCellType13.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType13; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType14; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(20).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "SCR/CF"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Width = 65F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "userprocess"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Width = 58F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType34; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(23).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "ReqSite"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "ReqPlant"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "ReqLine"; + this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "ReqPackage"; + this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(27).Width = 63F; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 86109df..6e521da 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -178,7 +178,8 @@ namespace FPJ0000 "dbo.getUserName2(designid,usermain) as name_design," + "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + "dbo.getUserName2(epanelid,userhw2) as name_epanel," + - "dbo.getUserName2(softwareid,usersub) as name_software" + + "dbo.getUserName2(softwareid,usersub) as name_software," + + "ReqLine,ReqSite,ReqPackage,ReqPlant" + " FROM Projects"; //string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects"; string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and "; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 9a94fc5..8b9cba5 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigprrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 + SKESs3bThpqMioqVrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 qf/G6PyI9ltBGGzvoe+fx8m+N9Ayrx6LYwm9IzFdz/DiQs+jKCzuCLoeRkAl07+Qq3raxIkZCYwn9j3X S532tcDg1UE/rMUJdyP5WWd+BjEjodvzlcz75q6ACVyGZeYiKOQgGA5dml2zwDwUIfNsKKs3jGwJhoMX - /JKCKqtCVcHsQplJDnWXQuKnbGMhsStDJJGG5uzkSkGVtVSlpEu45qEmtI00o/zcDhIU6B8NZQocE2E4 - xkNwTYXw9ssS9naMkwJ1b6lKQW/ntPfqscdcjuJTBZC3bsGALwyboDH27w1ef0qgotUHFbOzsoyWc42u - OsjoQq6IzttmvL2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7C5B9fV9OOo8jM30Bm4jvX6rsFGb/QPiyWU4 - J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgItA++w+O0n7vozGzyY4Q/JNc0iW2qTErL2QhTp - 85B/fN1KWEB3Y54UDPJBIUwKbvIPkc2LYBwao2/NO9Bee4kYX+B+GiFeT4AvEAK52tTh+S1mJDQwzxFd - +gE2nsbnaApBNglqt8GLXMka7jvEjIRjlrnR2s5AsrZzFtXn/dh/ZvVe/hGK+gO6eiydWJyRuQAAAABJ + /JKCKqtCVcHsQlmnHOouhcRP2cZCYleGSCINzdnJlYIqa6lKSZdwzUNNaBtpRvm5HSQo0D8ayhQ4JsJw + jIfgmgrh7Zcl7O0YJwXq3lKVgt7Oae/VY4+5HMWnCiBv3YIBXxg2QWPs3xu8/pRARasPKmZnZRkt5xpd + dZDRhVwRnbfNeHsBidQy7BMs8Tr4LykgW/Ab2HnV2A5A2V2C6uv7cNR5GJvpDdxGev1WYaM2+wfEk8tw + TrK4M5URNfiExVJq9WU1Vyuh92hxxFGDYrqAy2/KhAVaBt5h8dtP3PVnNngwwx+Sa5pFttSdSsjaC1Gk + z0P+8XUrYQHdjXlSMMgHhTApuMk/RDYvgnFojL4170B77SVifIH7aYR4PQG+QAjkalOH57eYkdDAPEd0 + 6QfYeBqfoykE2SSo3QYvciVruO8QMxKOWeZGa02BZK1pFtXn/dh/ZvVe/hGK+gOwFSyayM1+LgAAAABJ RU5ErkJggg== @@ -275,9 +275,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 387, 17 @@ -335,18 +332,12 @@ 561, 17 - - 561, 17 - 731, 17 647, 17 - - 731, 17 - 828, 17 diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs index e230fb1..ec3ab05 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs @@ -29,33 +29,26 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.Label statusLabel; - System.Windows.Forms.Label odateLabel; - System.Windows.Forms.Label edateLabel; - System.Windows.Forms.Label label1; - System.Windows.Forms.Label sdateLabel; System.Windows.Forms.Label reqstaffLabel; System.Windows.Forms.Label requestLabel; - System.Windows.Forms.Label pdateLabel; - System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectSchedule)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsPRJ = new FPJ0000.dsPRJ(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter(); @@ -78,6 +71,8 @@ this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); this.chkapp2 = new System.Windows.Forms.ToolStripButton(); this.chkapp1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton19 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -122,18 +117,11 @@ this.button1 = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); - this.textBox3 = new System.Windows.Forms.TextBox(); this.bsPrjinfo = new System.Windows.Forms.BindingSource(this.components); this.requestTextBox = new System.Windows.Forms.TextBox(); - this.statusTextBox = new System.Windows.Forms.TextBox(); - this.odateTextBox = new System.Windows.Forms.TextBox(); - this.edateTextBox = new System.Windows.Forms.TextBox(); - this.sdateTextBox = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); this.reqstaffTextBox = new System.Windows.Forms.TextBox(); this.tbIdx = new System.Windows.Forms.TextBox(); this.nameTextBox = new System.Windows.Forms.TextBox(); - this.pdateTextBox = new System.Windows.Forms.TextBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.taProjectInfo = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.panel4 = new System.Windows.Forms.Panel(); @@ -158,17 +146,25 @@ this.toolStripButton17 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton18 = new System.Windows.Forms.ToolStripButton(); this.taReason = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectResonTableAdapter(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton19 = new System.Windows.Forms.ToolStripButton(); - statusLabel = new System.Windows.Forms.Label(); - odateLabel = new System.Windows.Forms.Label(); - edateLabel = new System.Windows.Forms.Label(); - label1 = new System.Windows.Forms.Label(); - sdateLabel = new System.Windows.Forms.Label(); + this.panel5 = new System.Windows.Forms.Panel(); + this.textBox9 = new System.Windows.Forms.TextBox(); + this.textBox8 = new System.Windows.Forms.TextBox(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.arLabel4 = new arCtl.arLabel(); + this.tbSdate = new System.Windows.Forms.TextBox(); + this.tbXdate = new System.Windows.Forms.TextBox(); + this.tbEdate = new System.Windows.Forms.TextBox(); + this.tbODate = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); reqstaffLabel = new System.Windows.Forms.Label(); requestLabel = new System.Windows.Forms.Label(); - pdateLabel = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -195,57 +191,13 @@ ((System.ComponentModel.ISupportInitialize)(this.bsReason)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bnReason)).BeginInit(); this.bnReason.SuspendLayout(); + this.panel5.SuspendLayout(); this.SuspendLayout(); // - // statusLabel - // - statusLabel.AutoSize = true; - statusLabel.Location = new System.Drawing.Point(37, 147); - statusLabel.Name = "statusLabel"; - statusLabel.Size = new System.Drawing.Size(29, 12); - statusLabel.TabIndex = 22; - statusLabel.Text = "상태"; - // - // odateLabel - // - odateLabel.AutoSize = true; - odateLabel.Location = new System.Drawing.Point(37, 66); - odateLabel.Name = "odateLabel"; - odateLabel.Size = new System.Drawing.Size(29, 12); - odateLabel.TabIndex = 14; - odateLabel.Text = "출고"; - // - // edateLabel - // - edateLabel.AutoSize = true; - edateLabel.Location = new System.Drawing.Point(183, 66); - edateLabel.Name = "edateLabel"; - edateLabel.Size = new System.Drawing.Size(41, 12); - edateLabel.TabIndex = 12; - edateLabel.Text = "완료일"; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(22, 175); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(44, 12); - label1.TabIndex = 24; - label1.Text = "CR/CF"; - // - // sdateLabel - // - sdateLabel.AutoSize = true; - sdateLabel.Location = new System.Drawing.Point(183, 39); - sdateLabel.Name = "sdateLabel"; - sdateLabel.Size = new System.Drawing.Size(41, 12); - sdateLabel.TabIndex = 10; - sdateLabel.Text = "시작일"; - // // reqstaffLabel // reqstaffLabel.AutoSize = true; - reqstaffLabel.Location = new System.Drawing.Point(13, 120); + reqstaffLabel.Location = new System.Drawing.Point(13, 57); reqstaffLabel.Name = "reqstaffLabel"; reqstaffLabel.Size = new System.Drawing.Size(53, 12); reqstaffLabel.TabIndex = 8; @@ -254,30 +206,12 @@ // requestLabel // requestLabel.AutoSize = true; - requestLabel.Location = new System.Drawing.Point(13, 93); + requestLabel.Location = new System.Drawing.Point(13, 34); requestLabel.Name = "requestLabel"; requestLabel.Size = new System.Drawing.Size(53, 12); requestLabel.TabIndex = 6; requestLabel.Text = "요청부서"; // - // pdateLabel - // - pdateLabel.AutoSize = true; - pdateLabel.Location = new System.Drawing.Point(25, 40); - pdateLabel.Name = "pdateLabel"; - pdateLabel.Size = new System.Drawing.Size(41, 12); - pdateLabel.TabIndex = 4; - pdateLabel.Text = "기표일"; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(37, 202); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(29, 12); - label2.TabIndex = 26; - label2.Text = "담당"; - // // dsPRJ // this.dsPRJ.DataSetName = "dsPRJ"; @@ -345,7 +279,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1014, 25); + this.bn.Size = new System.Drawing.Size(1015, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -493,6 +427,20 @@ this.chkapp1.Text = "승인1"; this.chkapp1.Click += new System.EventHandler(this.chkapp1_Click); // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton19 + // + this.toolStripButton19.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton19.Image"))); + this.toolStripButton19.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton19.Name = "toolStripButton19"; + this.toolStripButton19.Size = new System.Drawing.Size(119, 22); + this.toolStripButton19.Text = "변경 스케쥴 추가"; + this.toolStripButton19.Click += new System.EventHandler(this.toolStripButton19_Click); + // // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; @@ -503,7 +451,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1014, 229); + this.fpSpread1.Size = new System.Drawing.Size(1015, 229); this.fpSpread1.TabIndex = 1; // // cm1 @@ -604,65 +552,65 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "완료"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "%"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 21F; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType4; + numberCellType22.DecimalPlaces = 0; + numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType22.MaximumValue = 2147483647D; + numberCellType22.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType22; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "seq"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType85; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 74F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType86; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "title"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType87; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sw"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "시작"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType88; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ew"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "완료"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType89; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "swa"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "시작"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType90; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ewa"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "완료"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 77F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType5; + numberCellType23.DecimalPlaces = 0; + numberCellType23.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType23.MaximumValue = 2147483647D; + numberCellType23.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType23; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "progress"; 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 = 77F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType91; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType92; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -677,10 +625,10 @@ this.groupBox1.Controls.Add(this.fpSpread1); this.groupBox1.Controls.Add(this.bn); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(332, 28); + this.groupBox1.Location = new System.Drawing.Point(331, 28); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(5); - this.groupBox1.Size = new System.Drawing.Size(1024, 278); + this.groupBox1.Size = new System.Drawing.Size(1025, 278); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "Schedule"; @@ -816,27 +764,27 @@ this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일"; this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행"; this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType21; + this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType93; this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort"; this.fpSpread2_Sheet1.Columns.Get(0).Label = "No"; this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F; - this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType22; + this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType94; this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title"; this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목"; this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType23; + this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType95; this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일"; this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F; - this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType24; + this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType96; this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate"; this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일"; this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F; - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType6; + numberCellType24.DecimalPlaces = 0; + numberCellType24.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType24.MaximumValue = 2147483647D; + numberCellType24.MinimumValue = -2147483648D; + this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType24; this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process"; this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행"; this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F; @@ -1038,41 +986,20 @@ // panel3 // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.panel3.Controls.Add(label2); - this.panel3.Controls.Add(this.textBox3); + this.panel3.Controls.Add(this.button2); + this.panel3.Controls.Add(this.panel5); this.panel3.Controls.Add(this.requestTextBox); - this.panel3.Controls.Add(this.statusTextBox); - this.panel3.Controls.Add(statusLabel); - this.panel3.Controls.Add(this.odateTextBox); - this.panel3.Controls.Add(odateLabel); - this.panel3.Controls.Add(this.edateTextBox); - this.panel3.Controls.Add(edateLabel); - this.panel3.Controls.Add(this.sdateTextBox); - this.panel3.Controls.Add(label1); - this.panel3.Controls.Add(sdateLabel); - this.panel3.Controls.Add(this.textBox2); this.panel3.Controls.Add(this.reqstaffTextBox); this.panel3.Controls.Add(this.tbIdx); this.panel3.Controls.Add(reqstaffLabel); this.panel3.Controls.Add(this.nameTextBox); this.panel3.Controls.Add(requestLabel); - this.panel3.Controls.Add(pdateLabel); - this.panel3.Controls.Add(this.pdateTextBox); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 28); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(332, 278); + this.panel3.Size = new System.Drawing.Size(331, 278); this.panel3.TabIndex = 36; // - // textBox3 - // - this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "userManager", true)); - this.textBox3.Location = new System.Drawing.Point(75, 198); - this.textBox3.Name = "textBox3"; - this.textBox3.ReadOnly = true; - this.textBox3.Size = new System.Drawing.Size(246, 21); - this.textBox3.TabIndex = 27; - // // bsPrjinfo // this.bsPrjinfo.DataMember = "Projects"; @@ -1081,65 +1008,16 @@ // requestTextBox // this.requestTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "process", true)); - this.requestTextBox.Location = new System.Drawing.Point(75, 90); + this.requestTextBox.Location = new System.Drawing.Point(75, 31); this.requestTextBox.Name = "requestTextBox"; this.requestTextBox.ReadOnly = true; this.requestTextBox.Size = new System.Drawing.Size(246, 21); this.requestTextBox.TabIndex = 7; // - // statusTextBox - // - this.statusTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "status", true)); - this.statusTextBox.Location = new System.Drawing.Point(75, 144); - this.statusTextBox.Name = "statusTextBox"; - this.statusTextBox.ReadOnly = true; - this.statusTextBox.Size = new System.Drawing.Size(246, 21); - this.statusTextBox.TabIndex = 23; - this.statusTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // odateTextBox - // - this.odateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "odate", true)); - this.odateTextBox.Location = new System.Drawing.Point(75, 63); - this.odateTextBox.Name = "odateTextBox"; - this.odateTextBox.ReadOnly = true; - this.odateTextBox.Size = new System.Drawing.Size(92, 21); - this.odateTextBox.TabIndex = 15; - this.odateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // edateTextBox - // - this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "edate", true)); - this.edateTextBox.Location = new System.Drawing.Point(229, 63); - this.edateTextBox.Name = "edateTextBox"; - this.edateTextBox.ReadOnly = true; - this.edateTextBox.Size = new System.Drawing.Size(92, 21); - this.edateTextBox.TabIndex = 13; - this.edateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // sdateTextBox - // - this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "sdate", true)); - this.sdateTextBox.Location = new System.Drawing.Point(229, 36); - this.sdateTextBox.Name = "sdateTextBox"; - this.sdateTextBox.ReadOnly = true; - this.sdateTextBox.Size = new System.Drawing.Size(92, 21); - this.sdateTextBox.TabIndex = 11; - this.sdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // textBox2 - // - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "orderno", true)); - this.textBox2.Location = new System.Drawing.Point(75, 171); - this.textBox2.Name = "textBox2"; - this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(246, 21); - this.textBox2.TabIndex = 25; - // // reqstaffTextBox // this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "reqstaff", true)); - this.reqstaffTextBox.Location = new System.Drawing.Point(75, 117); + this.reqstaffTextBox.Location = new System.Drawing.Point(75, 54); this.reqstaffTextBox.Name = "reqstaffTextBox"; this.reqstaffTextBox.ReadOnly = true; this.reqstaffTextBox.Size = new System.Drawing.Size(246, 21); @@ -1148,7 +1026,7 @@ // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "idx", true)); - this.tbIdx.Location = new System.Drawing.Point(15, 9); + this.tbIdx.Location = new System.Drawing.Point(15, 7); this.tbIdx.Name = "tbIdx"; this.tbIdx.ReadOnly = true; this.tbIdx.Size = new System.Drawing.Size(51, 21); @@ -1157,22 +1035,12 @@ // nameTextBox // this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "name", true)); - this.nameTextBox.Location = new System.Drawing.Point(75, 9); + this.nameTextBox.Location = new System.Drawing.Point(75, 7); this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.ReadOnly = true; this.nameTextBox.Size = new System.Drawing.Size(246, 21); this.nameTextBox.TabIndex = 3; // - // pdateTextBox - // - this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "pdate", true)); - this.pdateTextBox.Location = new System.Drawing.Point(75, 36); - this.pdateTextBox.Name = "pdateTextBox"; - this.pdateTextBox.ReadOnly = true; - this.pdateTextBox.Size = new System.Drawing.Size(92, 21); - this.pdateTextBox.TabIndex = 5; - this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // comboBox1 // this.comboBox1.Dock = System.Windows.Forms.DockStyle.Top; @@ -1225,15 +1093,15 @@ this.pdateDataGridViewTextBoxColumn, this.remarkDataGridViewTextBoxColumn}); this.dataGridView1.DataSource = this.bsReason; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(1, 2, 1, 2); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle16.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle16.Padding = new System.Windows.Forms.Padding(1, 2, 1, 2); + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle16; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(10, 24); this.dataGridView1.Name = "dataGridView1"; @@ -1254,8 +1122,8 @@ // this.remarkDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.remarkDataGridViewTextBoxColumn.DataPropertyName = "remark"; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.remarkDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.remarkDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15; this.remarkDataGridViewTextBoxColumn.HeaderText = "사유"; this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; // @@ -1418,19 +1286,232 @@ // this.taReason.ClearBeforeFill = true; // - // toolStripSeparator8 + // panel5 // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); + this.panel5.BackColor = System.Drawing.Color.Gainsboro; + this.panel5.Controls.Add(this.label6); + this.panel5.Controls.Add(this.label5); + this.panel5.Controls.Add(this.label2); + this.panel5.Controls.Add(this.label8); + this.panel5.Controls.Add(this.label7); + this.panel5.Controls.Add(this.label4); + this.panel5.Controls.Add(this.label1); + this.panel5.Controls.Add(this.textBox9); + this.panel5.Controls.Add(this.textBox8); + this.panel5.Controls.Add(this.textBox7); + this.panel5.Controls.Add(this.arLabel4); + this.panel5.Controls.Add(this.tbSdate); + this.panel5.Controls.Add(this.tbXdate); + this.panel5.Controls.Add(this.tbEdate); + this.panel5.Controls.Add(this.tbODate); + this.panel5.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel5.Location = new System.Drawing.Point(0, 152); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(331, 126); + this.panel5.TabIndex = 87; // - // toolStripButton19 + // textBox9 // - this.toolStripButton19.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton19.Image"))); - this.toolStripButton19.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton19.Name = "toolStripButton19"; - this.toolStripButton19.Size = new System.Drawing.Size(119, 22); - this.toolStripButton19.Text = "변경 스케쥴 추가"; - this.toolStripButton19.Click += new System.EventHandler(this.toolStripButton19_Click); + this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "cdate", true)); + this.textBox9.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox9.Location = new System.Drawing.Point(232, 78); + this.textBox9.Name = "textBox9"; + this.textBox9.ReadOnly = true; + this.textBox9.Size = new System.Drawing.Size(75, 21); + this.textBox9.TabIndex = 95; + this.textBox9.Text = "2022-01-01"; + this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox8 + // + this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "qdate", true)); + this.textBox8.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox8.Location = new System.Drawing.Point(69, 76); + this.textBox8.Name = "textBox8"; + this.textBox8.ReadOnly = true; + this.textBox8.Size = new System.Drawing.Size(75, 21); + this.textBox8.TabIndex = 93; + this.textBox8.Text = "2022-01-01"; + this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox7 + // + this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "bdate", true)); + this.textBox7.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox7.Location = new System.Drawing.Point(69, 52); + this.textBox7.Name = "textBox7"; + this.textBox7.ReadOnly = true; + this.textBox7.Size = new System.Drawing.Size(75, 21); + this.textBox7.TabIndex = 91; + this.textBox7.Text = "2022-01-01"; + this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // arLabel4 + // + this.arLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); + this.arLabel4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(209)))), ((int)(((byte)(207)))), ((int)(((byte)(209))))); + this.arLabel4.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.arLabel4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel4.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194))))); + this.arLabel4.BorderSize = new System.Windows.Forms.Padding(1); + this.arLabel4.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.arLabel4.Cursor = System.Windows.Forms.Cursors.Arrow; + this.arLabel4.Dock = System.Windows.Forms.DockStyle.Top; + this.arLabel4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.arLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel4.GradientEnable = true; + this.arLabel4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + this.arLabel4.GradientRepeatBG = false; + this.arLabel4.isButton = false; + this.arLabel4.Location = new System.Drawing.Point(0, 0); + this.arLabel4.MouseDownColor = System.Drawing.Color.Yellow; + this.arLabel4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.arLabel4.msg = null; + this.arLabel4.Name = "arLabel4"; + this.arLabel4.ProgressBorderColor = System.Drawing.Color.Black; + this.arLabel4.ProgressColor1 = System.Drawing.Color.LightSkyBlue; + this.arLabel4.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; + this.arLabel4.ProgressEnable = false; + this.arLabel4.ProgressFont = new System.Drawing.Font("Consolas", 10F); + this.arLabel4.ProgressForeColor = System.Drawing.Color.Black; + this.arLabel4.ProgressMax = 100F; + this.arLabel4.ProgressMin = 0F; + this.arLabel4.ProgressPadding = new System.Windows.Forms.Padding(0); + this.arLabel4.ProgressValue = 0F; + this.arLabel4.ShadowColor = System.Drawing.Color.WhiteSmoke; + this.arLabel4.Sign = ""; + this.arLabel4.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.arLabel4.SignColor = System.Drawing.Color.Yellow; + this.arLabel4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.arLabel4.Size = new System.Drawing.Size(331, 23); + this.arLabel4.TabIndex = 86; + this.arLabel4.Text = "일정"; + this.arLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.arLabel4.TextShadow = true; + this.arLabel4.TextVisible = true; + // + // tbSdate + // + this.tbSdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "sdate", true)); + this.tbSdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbSdate.Location = new System.Drawing.Point(69, 28); + this.tbSdate.Name = "tbSdate"; + this.tbSdate.ReadOnly = true; + this.tbSdate.Size = new System.Drawing.Size(75, 21); + this.tbSdate.TabIndex = 11; + this.tbSdate.Text = "2022-01-01"; + this.tbSdate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbXdate + // + this.tbXdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "ddate", true)); + this.tbXdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbXdate.Location = new System.Drawing.Point(232, 28); + this.tbXdate.Name = "tbXdate"; + this.tbXdate.ReadOnly = true; + this.tbXdate.Size = new System.Drawing.Size(75, 21); + this.tbXdate.TabIndex = 53; + this.tbXdate.Text = "2022-01-01"; + this.tbXdate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbEdate + // + this.tbEdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "edate", true)); + this.tbEdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbEdate.Location = new System.Drawing.Point(69, 100); + this.tbEdate.Name = "tbEdate"; + this.tbEdate.ReadOnly = true; + this.tbEdate.Size = new System.Drawing.Size(75, 21); + this.tbEdate.TabIndex = 13; + this.tbEdate.Text = "2022-01-01"; + this.tbEdate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbODate + // + this.tbODate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPrjinfo, "odate", true)); + this.tbODate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbODate.Location = new System.Drawing.Point(232, 53); + this.tbODate.Name = "tbODate"; + this.tbODate.ReadOnly = true; + this.tbODate.Size = new System.Drawing.Size(75, 21); + this.tbODate.TabIndex = 79; + this.tbODate.Text = "2022-01-01"; + this.tbODate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(20, 31); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 97; + this.label1.Text = "시작일"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(186, 31); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 12); + this.label2.TabIndex = 97; + this.label2.Text = "만료일"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(18, 55); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(43, 12); + this.label4.TabIndex = 97; + this.label4.Text = "buy off"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(156, 57); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(71, 12); + this.label5.TabIndex = 97; + this.label5.Text = "출고/설치일"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(174, 82); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(53, 12); + this.label6.TabIndex = 97; + this.label6.Text = "고객승인"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(30, 79); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(31, 12); + this.label7.TabIndex = 97; + this.label7.Text = "Qual"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(20, 104); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(41, 12); + this.label8.TabIndex = 97; + this.label8.Text = "완료일"; + // + // button2 + // + this.button2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button2.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button2.Location = new System.Drawing.Point(0, 81); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(331, 71); + this.button2.TabIndex = 88; + this.button2.Text = "프로젝트 편집"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // // fProjectSchedule // @@ -1480,6 +1561,8 @@ ((System.ComponentModel.ISupportInitialize)(this.bnReason)).EndInit(); this.bnReason.ResumeLayout(false); this.bnReason.PerformLayout(); + this.panel5.ResumeLayout(false); + this.panel5.PerformLayout(); this.ResumeLayout(false); } @@ -1550,18 +1633,11 @@ private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.TextBox requestTextBox; - private System.Windows.Forms.TextBox statusTextBox; - private System.Windows.Forms.TextBox odateTextBox; - private System.Windows.Forms.TextBox edateTextBox; - private System.Windows.Forms.TextBox sdateTextBox; - private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox reqstaffTextBox; private System.Windows.Forms.TextBox tbIdx; private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.TextBox pdateTextBox; private System.Windows.Forms.BindingSource bsPrjinfo; private dsPRJTableAdapters.ProjectsTableAdapter taProjectInfo; - private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.ToolStripButton chkapp1; private System.Windows.Forms.ToolStripButton chkapp2; @@ -1590,5 +1666,22 @@ private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripButton toolStripButton19; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.TextBox textBox8; + private System.Windows.Forms.TextBox textBox7; + private arCtl.arLabel arLabel4; + private System.Windows.Forms.TextBox tbSdate; + private System.Windows.Forms.TextBox tbXdate; + private System.Windows.Forms.TextBox tbEdate; + private System.Windows.Forms.TextBox tbODate; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button button2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index 5bba44a..57f87e2 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -905,5 +905,28 @@ namespace FPJ0000 this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 1; } + + private void button2_Click(object sender, EventArgs e) + { + var drv = this.bsPrjinfo.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + var f = new fProjectData(dr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.Validate(); + this.bsPrjinfo.EndEdit(); + try + { + var ta = new dsPRJTableAdapters.ProjectsTableAdapter(); +var cnt = ta.Update(this.dsPRJ.Projects);//.UpdateAll(this.dsMSSQL.Projects); + dsPRJ.Projects.AcceptChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + } } } diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.resx b/SubProject/FPJ0000/Project/fProjectSchedule.resx index 959f107..7e68668 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.resx +++ b/SubProject/FPJ0000/Project/fProjectSchedule.resx @@ -117,33 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - False - - - False - - - False - - - False - False False - - False - - - False - 17, 17 @@ -556,4 +535,7 @@ 550, 56 + + 1098, 17 + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 11f10c6..774fcfa 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1023,6 +1023,14 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnuserAssembly; + private global::System.Data.DataColumn columnReqLine; + + private global::System.Data.DataColumn columnReqSite; + + private global::System.Data.DataColumn columnReqPackage; + + private global::System.Data.DataColumn columnReqPlant; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1609,6 +1617,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ReqLineColumn { + get { + return this.columnReqLine; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ReqSiteColumn { + get { + return this.columnReqSite; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ReqPackageColumn { + get { + return this.columnReqPackage; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ReqPlantColumn { + get { + return this.columnReqPlant; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1713,7 +1753,11 @@ namespace FPJ0000 { string name_assembly, string name_epanel, string name_software, - string userAssembly) { + string userAssembly, + string ReqLine, + string ReqSite, + string ReqPackage, + string ReqPlant) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1783,7 +1827,11 @@ namespace FPJ0000 { name_assembly, name_epanel, name_software, - userAssembly}; + userAssembly, + ReqLine, + ReqSite, + ReqPackage, + ReqPlant}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1857,7 +1905,11 @@ namespace FPJ0000 { string name_assembly, string name_epanel, string name_software, - string userAssembly) { + string userAssembly, + string ReqLine, + string ReqSite, + string ReqPackage, + string ReqPlant) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1927,7 +1979,11 @@ namespace FPJ0000 { name_assembly, name_epanel, name_software, - userAssembly}; + userAssembly, + ReqLine, + ReqSite, + ReqPackage, + ReqPlant}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2025,6 +2081,10 @@ namespace FPJ0000 { this.columnname_epanel = base.Columns["name_epanel"]; this.columnname_software = base.Columns["name_software"]; this.columnuserAssembly = base.Columns["userAssembly"]; + this.columnReqLine = base.Columns["ReqLine"]; + this.columnReqSite = base.Columns["ReqSite"]; + this.columnReqPackage = base.Columns["ReqPackage"]; + this.columnReqPlant = base.Columns["ReqPlant"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2166,6 +2226,14 @@ namespace FPJ0000 { base.Columns.Add(this.columnname_software); this.columnuserAssembly = new global::System.Data.DataColumn("userAssembly", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuserAssembly); + this.columnReqLine = new global::System.Data.DataColumn("ReqLine", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnReqLine); + this.columnReqSite = new global::System.Data.DataColumn("ReqSite", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnReqSite); + this.columnReqPackage = new global::System.Data.DataColumn("ReqPackage", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnReqPackage); + this.columnReqPlant = new global::System.Data.DataColumn("ReqPlant", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnReqPlant); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2230,17 +2298,16 @@ namespace FPJ0000 { this.columnassemblyid.MaxLength = 20; this.columnepanelid.MaxLength = 20; this.columnsoftwareid.MaxLength = 20; - this.columnname_champion.ReadOnly = true; this.columnname_champion.MaxLength = 200; - this.columnname_design.ReadOnly = true; this.columnname_design.MaxLength = 200; - this.columnname_assembly.ReadOnly = true; this.columnname_assembly.MaxLength = 200; - this.columnname_epanel.ReadOnly = true; this.columnname_epanel.MaxLength = 200; - this.columnname_software.ReadOnly = true; this.columnname_software.MaxLength = 200; this.columnuserAssembly.MaxLength = 50; + this.columnReqLine.MaxLength = 50; + this.columnReqSite.MaxLength = 50; + this.columnReqPackage.MaxLength = 50; + this.columnReqPlant.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12795,6 +12862,70 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ReqLine { + get { + if (this.IsReqLineNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.ReqLineColumn])); + } + } + set { + this[this.tableProjects.ReqLineColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ReqSite { + get { + if (this.IsReqSiteNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.ReqSiteColumn])); + } + } + set { + this[this.tableProjects.ReqSiteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ReqPackage { + get { + if (this.IsReqPackageNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.ReqPackageColumn])); + } + } + set { + this[this.tableProjects.ReqPackageColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ReqPlant { + get { + if (this.IsReqPlantNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.ReqPlantColumn])); + } + } + set { + this[this.tableProjects.ReqPlantColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -13562,6 +13693,54 @@ namespace FPJ0000 { public void SetuserAssemblyNull() { this[this.tableProjects.userAssemblyColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsReqLineNull() { + return this.IsNull(this.tableProjects.ReqLineColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetReqLineNull() { + this[this.tableProjects.ReqLineColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsReqSiteNull() { + return this.IsNull(this.tableProjects.ReqSiteColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetReqSiteNull() { + this[this.tableProjects.ReqSiteColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsReqPackageNull() { + return this.IsNull(this.tableProjects.ReqPackageColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetReqPackageNull() { + this[this.tableProjects.ReqPackageColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsReqPlantNull() { + return this.IsNull(this.tableProjects.ReqPlantColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetReqPlantNull() { + this[this.tableProjects.ReqPlantColumn] = global::System.Convert.DBNull; + } } /// @@ -22804,12 +22983,166 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("name_epanel", "name_epanel"); tableMapping.ColumnMappings.Add("name_software", "name_software"); tableMapping.ColumnMappings.Add("userAssembly", "userAssembly"); + tableMapping.ColumnMappings.Add("ReqLine", "ReqLine"); + tableMapping.ColumnMappings.Add("ReqSite", "ReqSite"); + tableMapping.ColumnMappings.Add("ReqPackage", "ReqPackage"); + tableMapping.ColumnMappings.Add("ReqPlant", "ReqPlant"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM Projects\r\nWHERE (idx = @Original_idx)"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AN" + + "D [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AN" + + "D [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [n" + + "ame] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [user" + + "main] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 A" + + "ND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff" + + " = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull" + + "_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_ed" + + "ate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate" + + " = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1" + + " AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid)" + + " AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([r" + + "ev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @O" + + "riginal_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([use" + + "rManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL)" + + " OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR (" + + "[part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([" + + "process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR (" + + "[costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([co" + + "stn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @O" + + "riginal_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Origin" + + "al_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @" + + "Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] " + + "= @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = " + + "@Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Or" + + "iginal_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original" + + "_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL) OR ([userhw2] = @Origin" + + "al_userhw2)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @O" + + "riginal_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_category = 1 AND" + + " [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_userpro" + + "cess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) " + + "AND ((@IsNull_bCost = 1 AND [bCost] IS NULL) OR ([bCost] = @Original_bCost)) AND" + + " ((@IsNull_bFanOut = 1 AND [bFanOut] IS NULL) OR ([bFanOut] = @Original_bFanOut)" + + ") AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@Is" + + "Null_crdue = 1 AND [crdue] IS NULL) OR ([crdue] = @Original_crdue)) AND ((@IsNul" + + "l_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_s" + + "erial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_" + + "bdate = 1 AND [bdate] IS NULL) OR ([bdate] = @Original_bdate)) AND ((@IsNull_qda" + + "te = 1 AND [qdate] IS NULL) OR ([qdate] = @Original_qdate)) AND ((@IsNull_cdate " + + "= 1 AND [cdate] IS NULL) OR ([cdate] = @Original_cdate)) AND ((@IsNull_championi" + + "d = 1 AND [championid] IS NULL) OR ([championid] = @Original_championid)) AND ((" + + "@IsNull_designid = 1 AND [designid] IS NULL) OR ([designid] = @Original_designid" + + ")) AND ((@IsNull_assemblyid = 1 AND [assemblyid] IS NULL) OR ([assemblyid] = @Or" + + "iginal_assemblyid)) AND ((@IsNull_epanelid = 1 AND [epanelid] IS NULL) OR ([epan" + + "elid] = @Original_epanelid)) AND ((@IsNull_softwareid = 1 AND [softwareid] IS NU" + + "LL) OR ([softwareid] = @Original_softwareid)) AND ((@IsNull_userAssembly = 1 AND" + + " [userAssembly] IS NULL) OR ([userAssembly] = @Original_userAssembly)) AND ((@Is" + + "Null_ReqLine = 1 AND [ReqLine] IS NULL) OR ([ReqLine] = @Original_ReqLine)) AND " + + "((@IsNull_ReqSite = 1 AND [ReqSite] IS NULL) OR ([ReqSite] = @Original_ReqSite))" + + " AND ((@IsNull_ReqPackage = 1 AND [ReqPackage] IS NULL) OR ([ReqPackage] = @Orig" + + "inal_ReqPackage)) AND ((@IsNull_ReqPlant = 1 AND [ReqPlant] IS NULL) OR ([ReqPla" + + "nt] = @Original_ReqPlant)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.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.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usermain", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usermain", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usersub", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usersub", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqstaff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_odate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userManager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_part", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costo", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costn", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costn", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ddate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userhw2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_orderno", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_orderno", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_category", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_category", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userprocess", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userprocess", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bCost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bCost", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bFanOut", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bFanOut", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_div", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_crdue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_crdue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_model", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_model", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_serial", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_serial", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_qdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_qdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_championid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_championid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_designid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_designid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_assemblyid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_assemblyid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_epanelid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_epanelid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_softwareid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_softwareid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userAssembly", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userAssembly", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ReqLine", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ReqLine", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ReqSite", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ReqSite", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ReqPackage", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ReqPlant", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = "INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqsta" + @@ -22819,27 +23152,29 @@ namespace FPJ0000.dsPRJTableAdapters { "erno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], " + "[CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial]" + ", [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid]," + - " [softwareid], [userAssembly]) VALUES (@status, @pdate, @name, @usermain, @users" + - "ub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userM" + - "anager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans," + - " @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, " + - "@category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_Af" + - "ter, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @c" + - "hampionid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly);\r\nSELE" + - "CT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, m" + - "emo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cn" + - "t, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2," + - " orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, " + - "CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crd" + - "ue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS ww" + - "e, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFini" + - "shRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, db" + - "o.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_de" + - "sign, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS" + - " name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Pr" + - "ojects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'" + - "0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status" + - "] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; + " [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant]) V" + + "ALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @" + + "odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process," + + " @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @as" + + "set, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Ba" + + "ckground, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @cr" + + "due, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyi" + + "d, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqP" + + "lant);\r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, eda" + + "te, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, cost" + + "o, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, pa" + + "th, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, u" + + "serprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanO" + + "ut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS w" + + "wo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.ge" + + "tProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, so" + + "ftwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid" + + ") AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(" + + "epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAsse" + + "mbly, ReqLine, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (idx = SCOPE_ID" + + "ENTITY()) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') TH" + + "EN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([st" + + "atus] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -22894,6 +23229,10 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE Projects\r\nSET status = @status, pdate = @pdate, name = @name, userm" + @@ -22910,21 +23249,23 @@ namespace FPJ0000.dsPRJTableAdapters { " = @crdue, model = @model, serial = @serial, bdate = @bdate, \r\n qd" + "ate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, as" + "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, \r\n " + - " userAssembly = @userAssembly\r\nWHERE (idx = @Original_idx); \r\nSELECT id" + - "x, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, " + - "wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, re" + - "mark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orde" + - "rno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_B" + - "ackground, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, d" + - "bo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\'" + - " AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRat" + - "e(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.get" + - "UserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design," + - " dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name" + - "_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Project" + - "s WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status]" + - " = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3" + - "\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; + " userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, R" + + "eqPackage = @ReqPackage, ReqPlant = @ReqPlant\r\nWHERE (idx = @Original_idx); \r\nS" + + "ELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate" + + ", memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn," + + " cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userh" + + "w2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userproces" + + "s, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, " + + "crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS" + + " wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectF" + + "inishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid," + + " dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name" + + "_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid)" + + " AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, Req" + + "Line, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (idx = @idx) ORDER BY (C" + + "ASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status]" + + " = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9" + + "\' ELSE \'5\' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -22979,6 +23320,10 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", 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, "", "", "")); } @@ -23000,7 +23345,8 @@ namespace FPJ0000.dsPRJTableAdapters { progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) - AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, + ReqLine, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -23022,7 +23368,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, + ReqPackage, ReqPlant FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -23033,7 +23380,8 @@ WHERE (idx = @idx)"; progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, + ReqPackage, ReqPlant FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -23218,8 +23566,457 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = [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.Delete, true)] - public virtual int Delete(int Original_idx) { + public virtual int Delete( + int Original_idx, + string Original_status, + string Original_pdate, + string Original_name, + string Original_usermain, + string Original_usersub, + string Original_reqstaff, + string Original_sdate, + string Original_edate, + string Original_odate, + string Original_memo, + string Original_wuid, + System.DateTime Original_wdate, + global::System.Nullable Original_rev, + global::System.Nullable Original_pidx, + string Original_userManager, + global::System.Nullable Original_level, + string Original_part, + string Original_process, + global::System.Nullable Original_costo, + global::System.Nullable Original_costn, + global::System.Nullable Original_cnt, + string Original_ddate, + global::System.Nullable Original_progress, + global::System.Nullable Original_import, + string Original_asset, + global::System.Nullable Original_isdel, + string Original_path, + string Original_userhw2, + string Original_orderno, + string Original_gcode, + string Original_category, + string Original_userprocess, + global::System.Nullable Original_bCost, + global::System.Nullable Original_bFanOut, + string Original_div, + string Original_crdue, + string Original_model, + string Original_serial, + string Original_bdate, + string Original_qdate, + string Original_cdate, + string Original_championid, + string Original_designid, + string Original_assemblyid, + string Original_epanelid, + string Original_softwareid, + string Original_userAssembly, + string Original_ReqLine, + string Original_ReqSite, + string Original_ReqPackage, + string Original_ReqPlant) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); + if ((Original_status == null)) { + this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_status)); + } + if ((Original_pdate == null)) { + this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_pdate)); + } + if ((Original_name == null)) { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_name)); + } + if ((Original_usermain == null)) { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_usermain)); + } + if ((Original_usersub == null)) { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_usersub)); + } + if ((Original_reqstaff == null)) { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_reqstaff)); + } + if ((Original_sdate == null)) { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_sdate)); + } + if ((Original_edate == null)) { + this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_edate)); + } + if ((Original_odate == null)) { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_odate)); + } + if ((Original_memo == null)) { + this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[20].Value = ((string)(Original_memo)); + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.DeleteCommand.Parameters[21].Value = ((string)(Original_wuid)); + } + this.Adapter.DeleteCommand.Parameters[22].Value = ((System.DateTime)(Original_wdate)); + if ((Original_rev.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[24].Value = ((int)(Original_rev.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; + } + if ((Original_pidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[26].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; + } + if ((Original_userManager == null)) { + this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_userManager)); + } + if ((Original_level.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[30].Value = ((int)(Original_level.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value; + } + if ((Original_part == null)) { + this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[32].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[32].Value = ((string)(Original_part)); + } + if ((Original_process == null)) { + this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[34].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[34].Value = ((string)(Original_process)); + } + if ((Original_costo.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[36].Value = ((double)(Original_costo.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[36].Value = global::System.DBNull.Value; + } + if ((Original_costn.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[38].Value = ((double)(Original_costn.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[38].Value = global::System.DBNull.Value; + } + if ((Original_cnt.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[40].Value = ((int)(Original_cnt.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[40].Value = global::System.DBNull.Value; + } + if ((Original_ddate == null)) { + this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[42].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[42].Value = ((string)(Original_ddate)); + } + if ((Original_progress.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[44].Value = ((int)(Original_progress.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[44].Value = global::System.DBNull.Value; + } + if ((Original_import.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[46].Value = ((bool)(Original_import.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[46].Value = global::System.DBNull.Value; + } + if ((Original_asset == null)) { + this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[48].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[48].Value = ((string)(Original_asset)); + } + if ((Original_isdel.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[50].Value = ((bool)(Original_isdel.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[50].Value = global::System.DBNull.Value; + } + if ((Original_path == null)) { + this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[52].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[52].Value = ((string)(Original_path)); + } + if ((Original_userhw2 == null)) { + this.Adapter.DeleteCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[54].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[54].Value = ((string)(Original_userhw2)); + } + if ((Original_orderno == null)) { + this.Adapter.DeleteCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[56].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[56].Value = ((string)(Original_orderno)); + } + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.DeleteCommand.Parameters[57].Value = ((string)(Original_gcode)); + } + if ((Original_category == null)) { + this.Adapter.DeleteCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[59].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[59].Value = ((string)(Original_category)); + } + if ((Original_userprocess == null)) { + this.Adapter.DeleteCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[61].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[61].Value = ((string)(Original_userprocess)); + } + if ((Original_bCost.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[63].Value = ((bool)(Original_bCost.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[63].Value = global::System.DBNull.Value; + } + if ((Original_bFanOut.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[65].Value = ((bool)(Original_bFanOut.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[65].Value = global::System.DBNull.Value; + } + if ((Original_div == null)) { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[67].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[67].Value = ((string)(Original_div)); + } + if ((Original_crdue == null)) { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[69].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[69].Value = ((string)(Original_crdue)); + } + if ((Original_model == null)) { + this.Adapter.DeleteCommand.Parameters[70].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[71].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[71].Value = ((string)(Original_model)); + } + if ((Original_serial == null)) { + this.Adapter.DeleteCommand.Parameters[72].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[73].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[73].Value = ((string)(Original_serial)); + } + if ((Original_bdate == null)) { + this.Adapter.DeleteCommand.Parameters[74].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[75].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[74].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[75].Value = ((string)(Original_bdate)); + } + if ((Original_qdate == null)) { + this.Adapter.DeleteCommand.Parameters[76].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[77].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[77].Value = ((string)(Original_qdate)); + } + if ((Original_cdate == null)) { + this.Adapter.DeleteCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[79].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[79].Value = ((string)(Original_cdate)); + } + if ((Original_championid == null)) { + this.Adapter.DeleteCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[81].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[81].Value = ((string)(Original_championid)); + } + if ((Original_designid == null)) { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[83].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[83].Value = ((string)(Original_designid)); + } + if ((Original_assemblyid == null)) { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[85].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[85].Value = ((string)(Original_assemblyid)); + } + if ((Original_epanelid == null)) { + this.Adapter.DeleteCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[87].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[87].Value = ((string)(Original_epanelid)); + } + if ((Original_softwareid == null)) { + this.Adapter.DeleteCommand.Parameters[88].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[89].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[88].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[89].Value = ((string)(Original_softwareid)); + } + if ((Original_userAssembly == null)) { + this.Adapter.DeleteCommand.Parameters[90].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[91].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[90].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[91].Value = ((string)(Original_userAssembly)); + } + if ((Original_ReqLine == null)) { + this.Adapter.DeleteCommand.Parameters[92].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[93].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[92].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[93].Value = ((string)(Original_ReqLine)); + } + if ((Original_ReqSite == null)) { + this.Adapter.DeleteCommand.Parameters[94].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[95].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[94].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[95].Value = ((string)(Original_ReqSite)); + } + if ((Original_ReqPackage == null)) { + this.Adapter.DeleteCommand.Parameters[96].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[97].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[96].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[97].Value = ((string)(Original_ReqPackage)); + } + if ((Original_ReqPlant == null)) { + this.Adapter.DeleteCommand.Parameters[98].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[99].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[98].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[99].Value = ((string)(Original_ReqPlant)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -23293,7 +24090,11 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string assemblyid, string epanelid, string softwareid, - string userAssembly) { + string userAssembly, + string ReqLine, + string ReqSite, + string ReqPackage, + string ReqPlant) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -23607,6 +24408,30 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.InsertCommand.Parameters[52].Value = ((string)(userAssembly)); } + if ((ReqLine == null)) { + this.Adapter.InsertCommand.Parameters[53].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[53].Value = ((string)(ReqLine)); + } + if ((ReqSite == null)) { + this.Adapter.InsertCommand.Parameters[54].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[54].Value = ((string)(ReqSite)); + } + if ((ReqPackage == null)) { + this.Adapter.InsertCommand.Parameters[55].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[55].Value = ((string)(ReqPackage)); + } + if ((ReqPlant == null)) { + this.Adapter.InsertCommand.Parameters[56].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[56].Value = ((string)(ReqPlant)); + } 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)) { @@ -23681,6 +24506,10 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string epanelid, string softwareid, string userAssembly, + string ReqLine, + string ReqSite, + string ReqPackage, + string ReqPlant, int Original_idx, int idx) { if ((status == null)) { @@ -23996,8 +24825,32 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(userAssembly)); } - this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(idx)); + if ((ReqLine == null)) { + this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(ReqLine)); + } + if ((ReqSite == null)) { + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(ReqSite)); + } + if ((ReqPackage == null)) { + this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(ReqPackage)); + } + if ((ReqPlant == null)) { + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(ReqPlant)); + } + this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index d067b61..332e318 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -11,18 +11,116 @@ - - DELETE FROM Projects -WHERE (idx = @Original_idx) + + DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL) OR ([userhw2] = @Original_userhw2)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_bCost = 1 AND [bCost] IS NULL) OR ([bCost] = @Original_bCost)) AND ((@IsNull_bFanOut = 1 AND [bFanOut] IS NULL) OR ([bFanOut] = @Original_bFanOut)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@IsNull_crdue = 1 AND [crdue] IS NULL) OR ([crdue] = @Original_crdue)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_bdate = 1 AND [bdate] IS NULL) OR ([bdate] = @Original_bdate)) AND ((@IsNull_qdate = 1 AND [qdate] IS NULL) OR ([qdate] = @Original_qdate)) AND ((@IsNull_cdate = 1 AND [cdate] IS NULL) OR ([cdate] = @Original_cdate)) AND ((@IsNull_championid = 1 AND [championid] IS NULL) OR ([championid] = @Original_championid)) AND ((@IsNull_designid = 1 AND [designid] IS NULL) OR ([designid] = @Original_designid)) AND ((@IsNull_assemblyid = 1 AND [assemblyid] IS NULL) OR ([assemblyid] = @Original_assemblyid)) AND ((@IsNull_epanelid = 1 AND [epanelid] IS NULL) OR ([epanelid] = @Original_epanelid)) AND ((@IsNull_softwareid = 1 AND [softwareid] IS NULL) OR ([softwareid] = @Original_softwareid)) AND ((@IsNull_userAssembly = 1 AND [userAssembly] IS NULL) OR ([userAssembly] = @Original_userAssembly)) AND ((@IsNull_ReqLine = 1 AND [ReqLine] IS NULL) OR ([ReqLine] = @Original_ReqLine)) AND ((@IsNull_ReqSite = 1 AND [ReqSite] IS NULL) OR ([ReqSite] = @Original_ReqSite)) AND ((@IsNull_ReqPackage = 1 AND [ReqPackage] IS NULL) OR ([ReqPackage] = @Original_ReqPackage)) AND ((@IsNull_ReqPlant = 1 AND [ReqPlant] IS NULL) OR ([ReqPlant] = @Original_ReqPlant))) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly); -SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) + INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant); +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -77,6 +175,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + @@ -86,7 +188,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) - AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, + ReqLine, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -109,9 +212,9 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, - userAssembly = @userAssembly + userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant WHERE (idx = @Original_idx); -SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -166,6 +269,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + @@ -240,6 +347,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + @@ -266,7 +377,8 @@ WHERE (import = 1) AND (gcode = @gcode) userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, + ReqPackage, ReqPlant FROM Projects WHERE (idx = @idx) @@ -282,7 +394,8 @@ WHERE (idx = @idx) progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, + ReqPackage, ReqPlant FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -3329,42 +3442,70 @@ WHERE (idx = @idx) - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 8dd52bd..4e0f6b4 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +