diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 88f8cf3..c72a6bc 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("22.01.04.2250")] -[assembly: AssemblyFileVersion("22.01.04.2250")] +[assembly: AssemblyVersion("22.01.05.0840")] +[assembly: AssemblyFileVersion("22.01.05.0840")] diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index 84fb3b0..7b1dadc 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -137,6 +137,12 @@ fSelectMonth.cs + + Form + + + fSelectProcess.cs + @@ -172,6 +178,9 @@ fSelectMonth.cs + + fSelectProcess.cs + diff --git a/SubProject/FCOMMON/fSelectProcess.Designer.cs b/SubProject/FCOMMON/fSelectProcess.Designer.cs new file mode 100644 index 0000000..b26ba43 --- /dev/null +++ b/SubProject/FCOMMON/fSelectProcess.Designer.cs @@ -0,0 +1,127 @@ + +namespace FCOMMON +{ + partial class fSelectProcess + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.cmbProcess = new System.Windows.Forms.CheckedListBox(); + this.button1 = new System.Windows.Forms.Button(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // cmbProcess + // + this.cmbProcess.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.cmbProcess.FormattingEnabled = true; + this.cmbProcess.Location = new System.Drawing.Point(0, 25); + this.cmbProcess.Name = "cmbProcess"; + this.cmbProcess.Size = new System.Drawing.Size(289, 328); + this.cmbProcess.TabIndex = 0; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(0, 353); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(289, 39); + this.button1.TabIndex = 2; + this.button1.Text = "확인"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1, + this.toolStripButton2, + this.toolStripButton3}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(289, 25); + this.toolStrip1.TabIndex = 1; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(75, 22); + this.toolStripButton1.Text = "전체선택"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStripButton2 + // + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(75, 22); + this.toolStripButton2.Text = "선택해제"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripButton3 + // + this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.Size = new System.Drawing.Size(75, 22); + this.toolStripButton3.Text = "선택반전"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + // + // fSelectProcess + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(289, 392); + this.Controls.Add(this.cmbProcess); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.button1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fSelectProcess"; + this.Text = "공정 선택"; + this.Load += new System.EventHandler(this.fSelectProcess_Load); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.CheckedListBox cmbProcess; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; + } +} \ No newline at end of file diff --git a/SubProject/FCOMMON/fSelectProcess.cs b/SubProject/FCOMMON/fSelectProcess.cs new file mode 100644 index 0000000..c92d078 --- /dev/null +++ b/SubProject/FCOMMON/fSelectProcess.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FCOMMON +{ + public partial class fSelectProcess : Form + { + public List values = new List(); + string[] curlist = new string[] { }; + public fSelectProcess(string[] allList,string[] curlist_) + { + InitializeComponent(); + values.AddRange(allList); + curlist = curlist_; + } + + private void fSelectProcess_Load(object sender, EventArgs e) + { + + //공정목록 + cmbProcess.Items.Clear(); + //cmbProcess.Items.Add("--전체--"); + + foreach(var item in values) + { + cmbProcess.Items.Add(item, curlist.Contains(item)); + } + } + + private void button1_Click(object sender, EventArgs e) + { + values.Clear(); + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + if (cmbProcess.GetItemChecked(i)) + { + values.Add(cmbProcess.Items[i].ToString()); + } + } + if(values.Count < 1) + { + FCOMMON.Util.MsgE("공정선택이 필요 합니다"); + return; + } + DialogResult = DialogResult.OK; + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + cmbProcess.SetItemChecked(i, true); + } + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + cmbProcess.SetItemChecked(i, false); + } + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + var cur = cmbProcess.GetItemChecked(i); + cmbProcess.SetItemChecked(i, !cur); + } + } + } +} diff --git a/SubProject/FCOMMON/fSelectProcess.resx b/SubProject/FCOMMON/fSelectProcess.resx new file mode 100644 index 0000000..c2f6c74 --- /dev/null +++ b/SubProject/FCOMMON/fSelectProcess.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs index 293e8d7..838cf5c 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs @@ -50,15 +50,34 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.prb1 = new System.Windows.Forms.ToolStripProgressBar(); this.dv = new System.Windows.Forms.DataGridView(); + this.primaryDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.ingDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.exceptDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.assetDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.flagDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.plantDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grp2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.modelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.linecodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lineTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.linePDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.serialDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.manuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.version = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bsAll = new System.Windows.Forms.BindingSource(this.components); + this.dsEQ = new FEQ0000.dsEQ(); this.label1 = new System.Windows.Forms.Label(); this.cbTeamPart = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); this.cmbLine = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); this.cmbManu = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); this.cmbType = new System.Windows.Forms.ComboBox(); this.label5 = new System.Windows.Forms.Label(); this.tbSearch = new System.Windows.Forms.TextBox(); @@ -87,38 +106,19 @@ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton(); this.장비모델생성공통07ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bsAll = new System.Windows.Forms.BindingSource(this.components); - this.dsEQ = new FEQ0000.dsEQ(); this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager(); this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter(); - this.primaryDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ingDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.exceptDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.assetDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.flagDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.plantDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grp2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.modelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.linecodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lineTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.linePDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.serialDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.manuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.version = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); this.cm1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsAll)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsAll)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit(); this.SuspendLayout(); // // bn @@ -207,6 +207,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -262,6 +263,7 @@ // tbFilter // this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFilter.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFilter.Name = "tbFilter"; this.tbFilter.Size = new System.Drawing.Size(150, 25); this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown); @@ -319,12 +321,120 @@ this.dv.ContextMenuStrip = this.cm1; this.dv.DataSource = this.bsAll; this.dv.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv.Location = new System.Drawing.Point(0, 117); + this.dv.Location = new System.Drawing.Point(0, 120); this.dv.Name = "dv"; this.dv.RowTemplate.Height = 23; - this.dv.Size = new System.Drawing.Size(1105, 479); + this.dv.Size = new System.Drawing.Size(1105, 476); this.dv.TabIndex = 1; // + // primaryDataGridViewCheckBoxColumn + // + this.primaryDataGridViewCheckBoxColumn.DataPropertyName = "primary"; + this.primaryDataGridViewCheckBoxColumn.HeaderText = "primary"; + this.primaryDataGridViewCheckBoxColumn.Name = "primaryDataGridViewCheckBoxColumn"; + // + // ingDataGridViewCheckBoxColumn + // + this.ingDataGridViewCheckBoxColumn.DataPropertyName = "ing"; + this.ingDataGridViewCheckBoxColumn.HeaderText = "잉여"; + this.ingDataGridViewCheckBoxColumn.Name = "ingDataGridViewCheckBoxColumn"; + // + // exceptDataGridViewCheckBoxColumn + // + this.exceptDataGridViewCheckBoxColumn.DataPropertyName = "except"; + this.exceptDataGridViewCheckBoxColumn.HeaderText = "제외"; + this.exceptDataGridViewCheckBoxColumn.Name = "exceptDataGridViewCheckBoxColumn"; + // + // assetDataGridViewTextBoxColumn + // + this.assetDataGridViewTextBoxColumn.DataPropertyName = "asset"; + this.assetDataGridViewTextBoxColumn.HeaderText = "asset"; + this.assetDataGridViewTextBoxColumn.Name = "assetDataGridViewTextBoxColumn"; + // + // grpDataGridViewTextBoxColumn + // + this.grpDataGridViewTextBoxColumn.DataPropertyName = "grp"; + this.grpDataGridViewTextBoxColumn.HeaderText = "grp"; + this.grpDataGridViewTextBoxColumn.Name = "grpDataGridViewTextBoxColumn"; + // + // typeDataGridViewTextBoxColumn + // + this.typeDataGridViewTextBoxColumn.DataPropertyName = "type"; + this.typeDataGridViewTextBoxColumn.HeaderText = "type"; + this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn"; + // + // flagDataGridViewTextBoxColumn + // + this.flagDataGridViewTextBoxColumn.DataPropertyName = "flag"; + this.flagDataGridViewTextBoxColumn.HeaderText = "flag"; + this.flagDataGridViewTextBoxColumn.Name = "flagDataGridViewTextBoxColumn"; + // + // plantDataGridViewTextBoxColumn + // + this.plantDataGridViewTextBoxColumn.DataPropertyName = "plant"; + this.plantDataGridViewTextBoxColumn.HeaderText = "plant"; + this.plantDataGridViewTextBoxColumn.Name = "plantDataGridViewTextBoxColumn"; + // + // grp2DataGridViewTextBoxColumn + // + this.grp2DataGridViewTextBoxColumn.DataPropertyName = "grp2"; + this.grp2DataGridViewTextBoxColumn.HeaderText = "grp2"; + this.grp2DataGridViewTextBoxColumn.Name = "grp2DataGridViewTextBoxColumn"; + // + // modelDataGridViewTextBoxColumn + // + this.modelDataGridViewTextBoxColumn.DataPropertyName = "model"; + this.modelDataGridViewTextBoxColumn.HeaderText = "model"; + this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn"; + // + // linecodeDataGridViewTextBoxColumn + // + this.linecodeDataGridViewTextBoxColumn.DataPropertyName = "linecode"; + this.linecodeDataGridViewTextBoxColumn.HeaderText = "linecode"; + this.linecodeDataGridViewTextBoxColumn.Name = "linecodeDataGridViewTextBoxColumn"; + // + // lineTDataGridViewTextBoxColumn + // + this.lineTDataGridViewTextBoxColumn.DataPropertyName = "lineT"; + this.lineTDataGridViewTextBoxColumn.HeaderText = "lineT"; + this.lineTDataGridViewTextBoxColumn.Name = "lineTDataGridViewTextBoxColumn"; + // + // linePDataGridViewTextBoxColumn + // + this.linePDataGridViewTextBoxColumn.DataPropertyName = "lineP"; + this.linePDataGridViewTextBoxColumn.HeaderText = "lineP"; + this.linePDataGridViewTextBoxColumn.Name = "linePDataGridViewTextBoxColumn"; + // + // serialDataGridViewTextBoxColumn + // + this.serialDataGridViewTextBoxColumn.DataPropertyName = "serial"; + this.serialDataGridViewTextBoxColumn.HeaderText = "serial"; + this.serialDataGridViewTextBoxColumn.Name = "serialDataGridViewTextBoxColumn"; + // + // manuDataGridViewTextBoxColumn + // + this.manuDataGridViewTextBoxColumn.DataPropertyName = "manu"; + this.manuDataGridViewTextBoxColumn.HeaderText = "manu"; + this.manuDataGridViewTextBoxColumn.Name = "manuDataGridViewTextBoxColumn"; + // + // version + // + this.version.DataPropertyName = "version"; + this.version.HeaderText = "version"; + this.version.Name = "version"; + // + // dvc_param + // + this.dvc_param.DataPropertyName = "param1"; + this.dvc_param.HeaderText = "param1"; + this.dvc_param.Name = "dvc_param"; + // + // memoDataGridViewTextBoxColumn + // + this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; + this.memoDataGridViewTextBoxColumn.HeaderText = "memo"; + this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; + // // cm1 // this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -339,10 +449,20 @@ this.autosizeColumnsToolStripMenuItem.Text = "Autosize Columns"; this.autosizeColumnsToolStripMenuItem.Click += new System.EventHandler(this.autosizeColumnsToolStripMenuItem_Click); // + // bsAll + // + this.bsAll.DataMember = "EETGW_Equipment"; + this.bsAll.DataSource = this.dsEQ; + // + // dsEQ + // + this.dsEQ.DataSetName = "dsEQ"; + this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(232, 62); + this.label1.Location = new System.Drawing.Point(228, 38); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(76, 12); this.label1.TabIndex = 0; @@ -353,7 +473,7 @@ this.cbTeamPart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbTeamPart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cbTeamPart.FormattingEnabled = true; - this.cbTeamPart.Location = new System.Drawing.Point(314, 58); + this.cbTeamPart.Location = new System.Drawing.Point(310, 34); this.cbTeamPart.Name = "cbTeamPart"; this.cbTeamPart.Size = new System.Drawing.Size(142, 20); this.cbTeamPart.TabIndex = 1; @@ -380,7 +500,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(32, 61); + this.label3.Location = new System.Drawing.Point(662, 64); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(40, 12); this.label3.TabIndex = 4; @@ -391,29 +511,21 @@ this.cmbManu.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cmbManu.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbManu.FormattingEnabled = true; - this.cmbManu.Location = new System.Drawing.Point(79, 57); + this.cmbManu.Location = new System.Drawing.Point(709, 60); this.cmbManu.Name = "cmbManu"; this.cmbManu.Size = new System.Drawing.Size(142, 20); this.cmbManu.TabIndex = 5; // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(255, 13); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(52, 12); - this.label4.TabIndex = 6; - this.label4.Text = "Process"; - // // cmbType // this.cmbType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cmbType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbType.FormattingEnabled = true; - this.cmbType.Location = new System.Drawing.Point(314, 9); + this.cmbType.Location = new System.Drawing.Point(79, 60); this.cmbType.Name = "cmbType"; - this.cmbType.Size = new System.Drawing.Size(142, 20); + this.cmbType.Size = new System.Drawing.Size(576, 20); this.cmbType.TabIndex = 7; + this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged); // // label5 // @@ -436,7 +548,7 @@ this.groupBox1.Controls.Add(this.radexpy); this.groupBox1.Controls.Add(this.radexpa); this.groupBox1.Controls.Add(this.radexpn); - this.groupBox1.Location = new System.Drawing.Point(469, 15); + this.groupBox1.Location = new System.Drawing.Point(469, 8); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(186, 48); this.groupBox1.TabIndex = 13; @@ -480,6 +592,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.groupBox2); this.panel1.Controls.Add(this.cmbPlant); this.panel1.Controls.Add(this.label6); @@ -487,7 +600,6 @@ this.panel1.Controls.Add(this.tbSearch); this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.cmbType); - this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.cmbManu); this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.cmbLine); @@ -497,7 +609,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 30); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1105, 87); + this.panel1.Size = new System.Drawing.Size(1105, 90); this.panel1.TabIndex = 2; this.panel1.Visible = false; // @@ -506,7 +618,7 @@ this.groupBox2.Controls.Add(this.radioButton1); this.groupBox2.Controls.Add(this.radioButton2); this.groupBox2.Controls.Add(this.radioButton3); - this.groupBox2.Location = new System.Drawing.Point(665, 15); + this.groupBox2.Location = new System.Drawing.Point(665, 8); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(186, 48); this.groupBox2.TabIndex = 14; @@ -551,7 +663,7 @@ this.cmbPlant.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cmbPlant.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbPlant.FormattingEnabled = true; - this.cmbPlant.Location = new System.Drawing.Point(314, 33); + this.cmbPlant.Location = new System.Drawing.Point(310, 9); this.cmbPlant.Name = "cmbPlant"; this.cmbPlant.Size = new System.Drawing.Size(142, 20); this.cmbPlant.TabIndex = 15; @@ -559,7 +671,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(275, 37); + this.label6.Location = new System.Drawing.Point(271, 13); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(33, 12); this.label6.TabIndex = 14; @@ -693,16 +805,6 @@ this.장비모델생성공통07ToolStripMenuItem.Text = "장비모델생성(공통07)"; this.장비모델생성공통07ToolStripMenuItem.Click += new System.EventHandler(this.장비모델생성공통07ToolStripMenuItem_Click); // - // bsAll - // - this.bsAll.DataMember = "EETGW_Equipment"; - this.bsAll.DataSource = this.dsEQ; - // - // dsEQ - // - this.dsEQ.DataSetName = "dsEQ"; - this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // tam // this.tam.BackupDataSetBeforeUpdate = false; @@ -717,113 +819,16 @@ // this.taAll.ClearBeforeFill = true; // - // primaryDataGridViewCheckBoxColumn + // linkLabel1 // - this.primaryDataGridViewCheckBoxColumn.DataPropertyName = "primary"; - this.primaryDataGridViewCheckBoxColumn.HeaderText = "primary"; - this.primaryDataGridViewCheckBoxColumn.Name = "primaryDataGridViewCheckBoxColumn"; - // - // ingDataGridViewCheckBoxColumn - // - this.ingDataGridViewCheckBoxColumn.DataPropertyName = "ing"; - this.ingDataGridViewCheckBoxColumn.HeaderText = "잉여"; - this.ingDataGridViewCheckBoxColumn.Name = "ingDataGridViewCheckBoxColumn"; - // - // exceptDataGridViewCheckBoxColumn - // - this.exceptDataGridViewCheckBoxColumn.DataPropertyName = "except"; - this.exceptDataGridViewCheckBoxColumn.HeaderText = "제외"; - this.exceptDataGridViewCheckBoxColumn.Name = "exceptDataGridViewCheckBoxColumn"; - // - // assetDataGridViewTextBoxColumn - // - this.assetDataGridViewTextBoxColumn.DataPropertyName = "asset"; - this.assetDataGridViewTextBoxColumn.HeaderText = "asset"; - this.assetDataGridViewTextBoxColumn.Name = "assetDataGridViewTextBoxColumn"; - // - // grpDataGridViewTextBoxColumn - // - this.grpDataGridViewTextBoxColumn.DataPropertyName = "grp"; - this.grpDataGridViewTextBoxColumn.HeaderText = "grp"; - this.grpDataGridViewTextBoxColumn.Name = "grpDataGridViewTextBoxColumn"; - // - // typeDataGridViewTextBoxColumn - // - this.typeDataGridViewTextBoxColumn.DataPropertyName = "type"; - this.typeDataGridViewTextBoxColumn.HeaderText = "type"; - this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn"; - // - // flagDataGridViewTextBoxColumn - // - this.flagDataGridViewTextBoxColumn.DataPropertyName = "flag"; - this.flagDataGridViewTextBoxColumn.HeaderText = "flag"; - this.flagDataGridViewTextBoxColumn.Name = "flagDataGridViewTextBoxColumn"; - // - // plantDataGridViewTextBoxColumn - // - this.plantDataGridViewTextBoxColumn.DataPropertyName = "plant"; - this.plantDataGridViewTextBoxColumn.HeaderText = "plant"; - this.plantDataGridViewTextBoxColumn.Name = "plantDataGridViewTextBoxColumn"; - // - // grp2DataGridViewTextBoxColumn - // - this.grp2DataGridViewTextBoxColumn.DataPropertyName = "grp2"; - this.grp2DataGridViewTextBoxColumn.HeaderText = "grp2"; - this.grp2DataGridViewTextBoxColumn.Name = "grp2DataGridViewTextBoxColumn"; - // - // modelDataGridViewTextBoxColumn - // - this.modelDataGridViewTextBoxColumn.DataPropertyName = "model"; - this.modelDataGridViewTextBoxColumn.HeaderText = "model"; - this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn"; - // - // linecodeDataGridViewTextBoxColumn - // - this.linecodeDataGridViewTextBoxColumn.DataPropertyName = "linecode"; - this.linecodeDataGridViewTextBoxColumn.HeaderText = "linecode"; - this.linecodeDataGridViewTextBoxColumn.Name = "linecodeDataGridViewTextBoxColumn"; - // - // lineTDataGridViewTextBoxColumn - // - this.lineTDataGridViewTextBoxColumn.DataPropertyName = "lineT"; - this.lineTDataGridViewTextBoxColumn.HeaderText = "lineT"; - this.lineTDataGridViewTextBoxColumn.Name = "lineTDataGridViewTextBoxColumn"; - // - // linePDataGridViewTextBoxColumn - // - this.linePDataGridViewTextBoxColumn.DataPropertyName = "lineP"; - this.linePDataGridViewTextBoxColumn.HeaderText = "lineP"; - this.linePDataGridViewTextBoxColumn.Name = "linePDataGridViewTextBoxColumn"; - // - // serialDataGridViewTextBoxColumn - // - this.serialDataGridViewTextBoxColumn.DataPropertyName = "serial"; - this.serialDataGridViewTextBoxColumn.HeaderText = "serial"; - this.serialDataGridViewTextBoxColumn.Name = "serialDataGridViewTextBoxColumn"; - // - // manuDataGridViewTextBoxColumn - // - this.manuDataGridViewTextBoxColumn.DataPropertyName = "manu"; - this.manuDataGridViewTextBoxColumn.HeaderText = "manu"; - this.manuDataGridViewTextBoxColumn.Name = "manuDataGridViewTextBoxColumn"; - // - // version - // - this.version.DataPropertyName = "version"; - this.version.HeaderText = "version"; - this.version.Name = "version"; - // - // dvc_param - // - this.dvc_param.DataPropertyName = "param1"; - this.dvc_param.HeaderText = "param1"; - this.dvc_param.Name = "dvc_param"; - // - // memoDataGridViewTextBoxColumn - // - this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; - this.memoDataGridViewTextBoxColumn.HeaderText = "memo"; - this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(21, 64); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(52, 12); + this.linkLabel1.TabIndex = 16; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "Process"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // // fEquipment // @@ -842,6 +847,8 @@ this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); this.cm1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bsAll)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.panel1.ResumeLayout(false); @@ -850,8 +857,6 @@ this.groupBox2.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsAll)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -880,7 +885,6 @@ private System.Windows.Forms.ComboBox cmbLine; private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox cmbManu; - private System.Windows.Forms.Label label4; private System.Windows.Forms.ComboBox cmbType; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox tbSearch; @@ -945,5 +949,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn version; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_param; private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; + private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index adc3059..70e0c16 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -306,7 +306,14 @@ namespace FEQ0000 if (this.cmbType.SelectedIndex != 0 && !cmbType.Text.isEmpty()) { if (!newWhere.isEmpty()) newWhere += " and "; - newWhere += "[type]='" + cmbType.Text + "'"; + + var lists = cmbType.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + if(lists.Length == 1) + newWhere += "[type]='" + cmbType.Text + "'"; + else + { + newWhere += "[type] in ('" + string.Join("','", lists) + "')"; + } } if (!this.tbSearch.Text.isEmpty()) { @@ -495,16 +502,41 @@ namespace FEQ0000 } } } - - FCOMMON.Util.MsgI($"{ucnt} 건의 자료가 변경 되었습니다. 적용하려면 '저장' 버튼을 누르세요"); - } private void groupBox2_Enter(object sender, EventArgs e) { } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var list = new List(); + foreach (string item in cmbType.Items) + { + if (item.StartsWith("--")) continue; + if (string.IsNullOrEmpty(item) == false) list.Add(item); + } + + var curlist = new string[] { }; + if(cmbType.Text.StartsWith("--")==false && cmbType.Text.Length > 0) //뭔가 선택했다 + { + curlist = cmbType.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + } + + var f = new FCOMMON.fSelectProcess(list.ToArray(),curlist); + if (f.ShowDialog() == DialogResult.OK) + { + this.cmbType.Text = string.Join(",", f.values); + btRefresh.PerformClick(); + } + } + + private void cmbType_SelectedIndexChanged(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx index b6ed526..df394db 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.resx +++ b/SubProject/FEQ0000/Equipment/fEquipment.resx @@ -234,6 +234,9 @@ 83, 17 + + 83, 17 + 236, 17 @@ -263,12 +266,12 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZJLS8NAFIVHf2dbzGRt95piMOmirqoi7qxo - pakgUScFdaeuWtNklR8gIy4KRZc+KIy515nSmIfRAwcuc+53hoEheRKCLA3PKubQrW7ALI/LCYBwoDuP - 0eYMHA40p3SJaZrLAVs55ZE9Ey9dAYYZziCTa9lC2EvCiyW+p/VzSyAIL2mfR80UrAwlsJN6Dr6Z6U4R - rAw7Y0Z78xIYxh7tlYGVsSRmsGTkVo1nbn2q8P5mSzTtOs7djiFODhs421YdM7U34XsfD+e1deJfJAtu - r1rCkgVHB4Y47nwXWNaquLtuJQvc2ho+I2C0/frUflPhb4ZdYBBWCpi+PeX771nAojNhpcCjO0UlkMFF - cj1beSUIx5lcK9bPkj/BSiHTdgH8FwyCTzJyKw0//ifzX5cSIV9X/+ikBDsqowAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZJLS8NAFIVHf2dbzGRt95pidOKirqoi7qxo + pakgUScFdaeuWtNklb004kIQXfqgMOZeZ0pjHkYPHLjMud8ZBobkSQgyNzipmAOnugKzPC4nAIK+bt+H + qxNw0Nfs0iWmac77fOF4HLKJeOkIMMxwBplcyxbCbhKeLfFcrZdbAkFwTnvj0ErBylACO6nn4Ju5bhfB + yrAz4rQ7LYFh5NJuGVgZS2IGS4ZO1XiM1j5VeHu1IdatOs6dtiGO9hs4W6yOmdp7inY+7k5ry8Q7SxZc + XzQFkwUHe4Y4bH8XMLYobi6byQKntoTP8DltvT603lT4m2EXGISVfK5vPke771nArDNhJd+lW0UlkMFF + cj1beSUIx5lcK9bPkj/BSgHXtgH8FwyCTzJ0Kg0v/ifTX5cSIV8KkOiKQK+J5QAAAABJRU5ErkJggg== @@ -286,14 +289,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNLwNBHIdLEBGvF4lPIE6+Qr+LRFycRNxM - 0pCqaqsvttaWpdvq0lrdtapsqyF9IbRK6kQ0LsRLuYgQ1bEr07DtRutJfpf5/Z/JTCajqoSWXFdb6G3M - Qm25LMtBgw7zd6Pqb7SYu8PmCweCmbvX0xyEUtKPBcgmL3LiRgQAoA6NliOWtXavEE7d57/F0kROrj+n - l7cwNF6O0cUNxLPZDyW5GD6ZfdAQnh6kyCHYKKMk/U764ROa3IEppMhZDB5GlKTSYGthEily5rk4ryT8 - TlqMhd6xIUWOwRnQHN28KYrFCOeXL1q7V40UOYNmqpXwCU9KohTpdWZogUHjcgAgG/Uks2neSeTt/v3n - 49t3mRzLXOVnVkKhkQm8DSk/AJut2bDE7hFMqDDp8Hr7cbzJ6gmOOvjY5jwXTcyye4zBFehTQViDlB+A - iWw3ObldNnoK9Qu+DVGuR1VlhjBnp5niDrjYGZwiGQGA1QZUVWbMSHVZqY0Un8hA8fiRYZ2jBVXVoSN8 - c/zBOZROIH0gtFw9GruzdxyncekaaOkfqFRfrjaXL4oXSHsAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3 + BqQwK7V8WVtX23JNLW1rt02tzaTwLUrR0FOFnYoy6xJRZE67MZKrS9YDv8v8/s8wwzCKeqjI7SG9ex/T + U36H3hnQqLGdflT9jgpb7zF6g75A5v41XYBQTOqxBJnEZUHYiAAANKHRWoSy0ezhg8mH4rdYnVDy5nPR + 6cfQeC1aBzsazeU+5ORyuEQuryRcA0iRQjBhWk6qTCr/CXXrvgWkSFkNnIbkpOpgW0ESKVJsbJSTEyqT + EqJ3HxiRIkVj9ynPbt9kxXL47NWLyuwZQoqUsSWqk/DyT3KiGPF1TG6eRuNSACBb50l6b/EgVjTvnDyf + 371L5EjmumjaODycnMW7kPIDMBrbNWvMsWWLL81ZPZ4RHG8zuAJTVi6yZ2PDsWXmmNY4fMMKCBuQ8gPQ + kd06O3vEhNNwfsW7K8jNqKrPOGbvXaLYOBu5gAskzQOw2YKq+kxrqT4DtZvkYhkoHD80obZ2oOpvqAmv + hYtnoXgC8QOh5b+jNNsHZ3A3Ll4DLf0DheILn/WXKCs8OcIAAAAASUVORK5CYII= @@ -321,9 +324,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 83, 17 - 163, 17