장비목록 그룹별 분리

This commit is contained in:
chi
2023-01-09 09:37:52 +09:00
parent a1332a2720
commit 32b5059af8
15 changed files with 830 additions and 383 deletions

View File

@@ -33,7 +33,7 @@ namespace FEQ0000
try
{
ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype);
ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype, FCOMMON.info.Login.gcode);
//필터목록을 미리 가져온다.
//var fn = "eqfilter.xml";

View File

@@ -26,13 +26,14 @@ namespace FEQ0000
e.Row["type"] = this.divtype;
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["gcode"] = FCOMMON.info.Login.gcode;
}
private void EQfilter_Load(object sender, EventArgs e)
{
try
{
ta.Fill(this.dsEQ.EquipmentFilter, divtype);
ta.Fill(this.dsEQ.EquipmentFilter, divtype, FCOMMON.info.Login.gcode);
}
catch (Exception ex)
{

View File

@@ -86,6 +86,7 @@
this.radexpa = new System.Windows.Forms.RadioButton();
this.radexpn = new System.Windows.Forms.RadioButton();
this.panel1 = new System.Windows.Forms.Panel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
@@ -108,7 +109,6 @@
this.07ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager();
this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
@@ -164,6 +164,7 @@
this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22);
this.bindingNavigatorAddNewItem.Text = "Add(&A)";
this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
//
// bindingNavigatorCountItem
//
@@ -613,6 +614,17 @@
this.panel1.TabIndex = 2;
this.panel1.Visible = false;
//
// linkLabel1
//
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);
//
// groupBox2
//
this.groupBox2.Controls.Add(this.radioButton1);
@@ -735,7 +747,7 @@
// applyToolStripMenuItem
//
this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
this.applyToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.applyToolStripMenuItem.Text = "Apply";
this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click);
//
@@ -819,17 +831,6 @@
//
this.taAll.ClearBeforeFill = true;
//
// linkLabel1
//
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

View File

@@ -100,8 +100,8 @@ namespace FEQ0000
var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
DataTable dtList = null;
if (dataType == eTabletype.ALL) dtList = taDateList.GetData();
else dtList = taDateList.GetData();
if (dataType == eTabletype.ALL) dtList = taDateList.GetData(FCOMMON.info.Login.gcode);
else dtList = taDateList.GetData(FCOMMON.info.Login.gcode);
this.cmbDate.Items.Clear();
if (dtList != null)
@@ -483,7 +483,7 @@ namespace FEQ0000
var ucnt = 0;
var taLIne = new dsEQTableAdapters.LineCodeTableAdapter();
var dtLineCode = taLIne.GetData();
var dtLineCode = taLIne.GetData(FCOMMON.info.Login.gcode);
this.prb1.Maximum = this.dsEQ.EETGW_Equipment.Count;
@@ -540,6 +540,11 @@ namespace FEQ0000
{
}
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
{
}
}
}

View File

@@ -234,9 +234,6 @@
<metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>236, 17</value>
</metadata>
@@ -247,6 +244,17 @@
IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95pidOqirqoi7mzR
SlNBok4K6k5dtabJKmspERcF0aUPCmPudaY05mH0wIHLnPudYWBIloQgC4PTkjmwy2swy+NiAsDv69ZD
YE7Bfl+zCpeYprno8aWTcbAxFS8dAYYZziCTa+lC2InD8yWuo/UySyDwL2hvHLAErAwlsJN4Dr6Z61Ye
rAw7I067sxIYRg7tFoGVsSRisGRol42ncP1ThXfXW2KzXsW50zLEcbuGc51VMVN7k3Dv4/6sskrc83jB
zWVDMFlweGCIo9Z3AWPL4vaqES+wKyv4DI/T5utj802Fvxl2gUFYyeP69nO4/54GzDsVVvIcupNXAhlc
JNfTlVWCcJTJtXz9LPkTrORzbRfAf8Eg+CRDu1Rzo38y+3UJEfIFvRLocMoRAWoAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -261,17 +269,6 @@
qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
AOn3LwMH9jJlAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZJLS8NAFIVHf2dbzGRt95pidOKirqoi7qxo
pakgUScFdaeuWtNklb004kIQXfqgMOZeZ0pjHkYPHLjMud8ZBobkSQgyNzipmAOnugKzPC4nAIK+bt+H
qxNw0Nfs0iWmac77fOF4HLKJeOkIMMxwBplcyxbCbhKeLfFcrZdbAkFwTnvj0ErBylACO6nn4Ju5bhfB
yrAz4rQ7LYFh5NJuGVgZS2IGS4ZO1XiM1j5VeHu1IdatOs6dtiGO9hs4W6yOmdp7inY+7k5ry8Q7SxZc
XzQFkwUHe4Y4bH8XMLYobi6byQKntoTP8DltvT603lT4m2EXGISVfK5vPke771nArDNhJd+lW0UlkMFF
cj1beSUIx5lcK9bPkj/BSgHXtgH8FwyCTzJ0Kg0v/ifTX5cSIV8KkOiKQK+J5QAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -289,14 +286,14 @@
<data name="btRefresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
BqQwK7V8WVtX23JNLW1rt02tzaTwLUrR0FOFnYoy6xJRZE67MZKrS9YDv8v8/s8wwzCKeqjI7SG9ex/T
U36H3hnQqLGdflT9jgpb7zF6g75A5v41XYBQTOqxBJnEZUHYiAAANKHRWoSy0ezhg8mH4rdYnVDy5nPR
6cfQeC1aBzsazeU+5ORyuEQuryRcA0iRQjBhWk6qTCr/CXXrvgWkSFkNnIbkpOpgW0ESKVJsbJSTEyqT
EqJ3HxiRIkVj9ynPbt9kxXL47NWLyuwZQoqUsSWqk/DyT3KiGPF1TG6eRuNSACBb50l6b/EgVjTvnDyf
371L5EjmumjaODycnMW7kPIDMBrbNWvMsWWLL81ZPZ4RHG8zuAJTVi6yZ2PDsWXmmNY4fMMKCBuQ8gPQ
kd06O3vEhNNwfsW7K8jNqKrPOGbvXaLYOBu5gAskzQOw2YKq+kxrqT4DtZvkYhkoHD80obZ2oOpvqAmv
hYtnoXgC8QOh5b+jNNsHZ3A3Ll4DLf0DheILn/WXKCs8OcIAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV/C7BNGlU0S3
BqQwy5c0W9tW23JNLbetXdeXXE0KTaMUDT0leCt6v0QUWdNujNjakvXA7zK//zPMMIyqEVpyV23x7mMW
KuSyuMMGHbY3iKrf0WKbfVY6FgwXrp/z9xBKyd19QDZzcS9uRAAAWtDoT8Sy2eYTYtmbypdYn3im/L7o
DmFo/CdGFzd2XC6/KcnV8JnyrYbwDCFFDsEmGCXpe3K379C0GdQjRc56+CSuJNUH24mRSJHj4I55JeF7
cmIs3ogVKXIMzqDm9PJFUaxGKJaetDafGilyxs1UN0ELD0qiFOl1lr0Cg8blAEC2L5BMwBRJVWx7R49n
V68yOVkoVZa3otGpObwHKTWA1dpp2GAPcTryMW/3+UZxvGPJE56288mAg0ukVthDxuAKjqggbEJKDWAi
e01O7oBN5OHCGu0X5VZUNWYCc/abKS7NJc+hnmQEALbbUNWYGSM1sET5s3yqAMXjxyd19i5U/Q0dQa/y
6SKUTiB9ILT8dzQ25/As7sWla6Clf6BSfQKRtJchBF/ltgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -196,7 +196,7 @@ namespace FEQ0000
private void button2_Click(object sender, EventArgs e)
{
var ta = new dsEQTableAdapters.LineCodeTableAdapter();
var lineTd = ta.GetData();
var lineTd = ta.GetData(FCOMMON.info.Login.gcode);
lineTd.AcceptChanges();
//12,13
foreach (DataRow dr in dt.Rows)
@@ -255,7 +255,7 @@ namespace FEQ0000
//라인코드를 읽어서 값을 기록해준다.
var taLine = new dsEQTableAdapters.LineCodeTableAdapter();
var lineTd = taLine.GetData();
var lineTd = taLine.GetData(FCOMMON.info.Login.gcode);
lineTd.AcceptChanges();
dt.Clear();
@@ -270,7 +270,7 @@ namespace FEQ0000
if (dlg == DialogResult.Yes)
{
var taE = new dsEQTableAdapters.EETGW_EquipmentTableAdapter();
taE.DeleteData(dateStr);
taE.DeleteData(dateStr, FCOMMON.info.Login.gcode);
}
//12,13
@@ -327,6 +327,7 @@ namespace FEQ0000
//신규추가한다.
var newli = lineTd.NewLineCodeRow();
newli.code = linecode;
newli.gcode = FCOMMON.info.Login.gcode;
newli.team = lineT;
newli.part = lineP;
newli.memo = linedesc;
@@ -364,6 +365,7 @@ namespace FEQ0000
newdr["memo"] = string.Empty;
newdr["flag"] = rcsflag; //rcs flag 210325
newdr["version"] = version; //210810
newdr["gcode"] = FCOMMON.info.Login.gcode;
if (grp2.ToUpper() == "BUMP") newdr["param1"] = "8\"";
else newdr["param1"] = string.Empty;

View File

@@ -67,6 +67,7 @@ namespace FEQ0000
newdr.Remark = dr.memo;
newdr.plant = dr.plant;
newdr.grp2 = dr.grp2;
newdr.gcode = FCOMMON.info.Login.gcode;
dtSum.AddvEquStockAllRow(newdr);
}
}