장비목록에 필터기능 업데이트 및 매크로 일괄 적용기능확인

This commit is contained in:
chikyun.kim
2018-10-05 08:19:19 +09:00
parent 340a6fd3ef
commit 7c5391a5e6
9 changed files with 383 additions and 328 deletions

View File

@@ -30,11 +30,11 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bsB = new System.Windows.Forms.BindingSource(this.components);
this.dsEQ = new dsEQ();
this.dsEQ = new FEQ0000.dsEQ();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -49,7 +49,7 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tbFilter = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.btFind = new System.Windows.Forms.ToolStripButton();
this.dv = new System.Windows.Forms.DataGridView();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -86,21 +86,21 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton();
this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
this.cmbDate = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton();
this.taB = new dsEQTableAdapters.EquipmentBTableAdapter();
this.taB = new FEQ0000.dsEQTableAdapters.EquipmentBTableAdapter();
this.bsF = new System.Windows.Forms.BindingSource(this.components);
this.taF = new dsEQTableAdapters.EquipmentFTableAdapter();
this.tam = new dsEQTableAdapters.TableAdapterManager();
this.taME = new dsEQTableAdapters.EquipmentMETableAdapter();
this.taF = new FEQ0000.dsEQTableAdapters.EquipmentFTableAdapter();
this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager();
this.taME = new FEQ0000.dsEQTableAdapters.EquipmentMETableAdapter();
this.bsME = new System.Windows.Forms.BindingSource(this.components);
this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton();
this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
@@ -137,7 +137,7 @@
this.toolStripSeparator1,
this.toolStripLabel1,
this.tbFilter,
this.toolStripButton1});
this.btFind});
this.bn.Location = new System.Drawing.Point(0, 604);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -266,15 +266,16 @@
this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFilter.Name = "tbFilter";
this.tbFilter.Size = new System.Drawing.Size(150, 25);
this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown);
//
// toolStripButton1
// btFind
//
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(64, 22);
this.toolStripButton1.Text = "Find(&F)";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
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(64, 22);
this.btFind.Text = "Find(&F)";
this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// dv
//
@@ -310,9 +311,9 @@
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn1.HeaderText = "idx";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
@@ -619,6 +620,34 @@
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 30);
//
// toolStripButton2
//
this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton7,
this.applyToolStripMenuItem});
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(99, 27);
this.toolStripButton2.Text = "Data Macro";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton7
//
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(112, 20);
this.toolStripButton7.Text = "Macro Manager";
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
//
// applyToolStripMenuItem
//
this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
this.applyToolStripMenuItem.Text = "Apply";
this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click);
//
// toolStripButton4
//
this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -688,7 +717,8 @@
this.tam.EquipmentFilterTableAdapter = null;
this.tam.EquipmentFTableAdapter = this.taF;
this.tam.EquipmentMETableAdapter = this.taME;
this.tam.UpdateOrder = dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
this.tam.LineCodeTableAdapter = null;
this.tam.UpdateOrder = FEQ0000.dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// taME
//
@@ -699,34 +729,6 @@
this.bsME.DataMember = "EquipmentME";
this.bsME.DataSource = this.dsEQ;
//
// toolStripButton2
//
this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton7,
this.applyToolStripMenuItem});
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(99, 27);
this.toolStripButton2.Text = "Data Macro";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// applyToolStripMenuItem
//
this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
this.applyToolStripMenuItem.Text = "Apply";
this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click);
//
// toolStripButton7
//
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(112, 20);
this.toolStripButton7.Text = "Macro Manager";
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
//
// fEquipment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -801,7 +803,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbFilter;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;

View File

@@ -152,9 +152,13 @@ namespace FEQ0000
try
{
var dRows = this.dsEQ.EquipmentB.Select(filter);
DataRow[] dRows = null;
if(dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter);
else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter);
else dRows = this.dsEQ.EquipmentF.Select(filter);
int cnt = 0;
foreach(dsEQ.EquipmentBRow dr in dRows)
foreach(DataRow dr in dRows)
{
var appList = apply.Split(';');
foreach (var item in appList)
@@ -181,9 +185,29 @@ namespace FEQ0000
{
try
{
this.bsB.Filter = tbFilter.Text;
if (tbFilter.Text.isEmpty()) tbFilter.BackColor = Color.White;
else tbFilter.BackColor = Color.Lime;
string key = tbFilter.Text.Trim();
string filter = "";
if(!key.isEmpty())
{
filter = "asset like @ or type like @ or manu like @ or model like @ or linecode like @ or serial like @";
filter = filter.Replace("@", "'%" + key.Replace("'","''") + "%'");
}
try
{
if (dataType == eTabletype.MOLD) this.bsME.Filter = filter;
else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter;
else this.bsF.Filter = filter;
if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
else this.tbFilter.BackColor = Color.Lime;
}
catch(Exception ex)
{
tbFilter.BackColor = Color.HotPink;
FCOMMON.Util.MsgE("filter error\n" + ex.Message);
}
tbFilter.Focus();
tbFilter.SelectAll();
}
catch (Exception ex)
{
@@ -362,5 +386,10 @@ namespace FEQ0000
else FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 변경되었습니다.");
}
}
private void tbFilter_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter) btFind.PerformClick();
}
}
}

View File

@@ -198,7 +198,7 @@
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
@@ -213,9 +213,6 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>147, 17</value>
</metadata>
<metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -247,9 +244,20 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/
IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXfjZcmCmy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXv9ZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAIZdC8OlikQBAAAAAElFTkSuQmCC
xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHrxC70VkWh8AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEZHn7MtJlnbvaYYSF3UlRqrOyta
aSpI1ElB3amr1jR5BNG4F5Iu/KEw5htnSmPSGPzgwmXuPWcYGLIojJGl4XnFGDrVDfTiuFwABAPNjp6s
KSoYKHZpiWEYyz5dOZs8t6fsrctQ6HGGmVjLD4fdNDwv8Vylv1CCQXCl9icv+xlYFiTYyTyHv5lqdhEs
CztjqvZmEjRjV+2VgWVxScJwycip6nG49yWHD7dbbLNZ5323o7PTowbvm2adz+ReHLY/Hy9q68S7TAvu
rlvMFILjQ52ddH4EprnK7m9aaYFTW+PP8Km6Hb1a73L4V2EXDIdlfKrtROHBRx4wX7mwjO+qu0USzHCR
WM8PJHGOhMPJTKwV57cEfWlYJqCKBfBfMIJPMnIqDS/5J7Nflwkh38ze61wJP6KjAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -258,37 +266,37 @@
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYyAVhNavYovtOtwX03m0F8SGCqOC0s45vGU9
s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
/oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjl1//ByEtxy+GcQQ23N4YufW
d/+7t3/437Du6Z+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
IC+0zli9rr6+ngksiQVEdxwNKZx/42nx3GtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
/oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjl5//ByEtxy+GcQQ23N4YufW
d/+7t3/4X7/uyZ+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
IC+0zli9rr6+ngksiQVEdxwNKZh/42nxnKtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
AEawLzDtVjl5AAAAAElFTkSuQmCC
ADT1LyccReKxAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYyAVxC0olI6fXWEcO7tMEypEGkhaVi9VvqHz
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYyAVxC0olI6fXWEcO7tMEypEGkhaVi9VtqHj
UdOWSaegQoRB7NwSl9Ap9Tzx8+s54uaU5kfNLfbMWta4HiqNG4A0AZ1aHT+rzCJ+dmla7NyygqQ5pbwg
Ofv6ehawImSQNrOeK25OWUnc7LJEkCaQZpAhUGn8IG5GiTLQeTUgG8A2A50NlUIB8TMrNRq3TThdvq5z
NVSIgSFmTmkA0LYoKBcvAMXAikvr/3funHYYKsTAkDi3QgnKxAAVazuPgjCUi90AGAA5D6QAFBZQIYaJ
NVSIgSFmTmkA0LYoKBcvAMXAikvr/3fumHYYKsTAkDi3QgnKxAAVazuPgjCUi90AGAA5D6QAFBZQIYaJ
++c8BOGSte259VsmLMleVl+A0wCQ32adWPIfZAhUCG4ASPOuB3v/FyxvnotiAMg2kAaQ7SBBkGTmovoZ
IE2la9uWEjQApBlkK8h2mAHZSxvmghSDNBFlAExgiBoQO7NcrmZT76rSdZ3dIAxiZy6tSwRpAEUdKCBB
GBaNWcvqk2DqGRgYGAD9VmvDO19iHAAAAABJRU5ErkJggg==
GBaNWcvqk2DqGRgYGADjf2uwh5UJoAAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGmSURBVDhPlZNbLwNBGIZLEBHHG4lfIK78Bf9FIm5cibgz
SUOqeqKHrbWtpdtqaW3b7fZAW6f0QNC0oi6JC4SqQ4gQZezKSLu10XqS92be75nMZDKSSshId5/WsYZp
qaBVuxRSyTFPN6r+RobZOvSuaCBycv2SyUPIJ337CX2Hp3luIwIAUIdGf8OVtUZnOJq6KXyL5UmcP31M
LwUxNP4btZUZTJw9vovJP2EPz3JSwt6DFCGEN0aLSaVJ5z6gxhZQIkXIQmhvU0wqD7YaJZEixMwkWDGh
NGkuWse6HilCVJaAdP/yVVT8STh78SwzOvuQImRohmol3Ft3YiIf/nUMjjCNxoUAQDYqSNpPrScLuGfn
/uDqTSDHTx8KhuVIZHQSb0NKEaDXN6sWvdurW6nPKZPTOYDjTTp7aMzExv1mJpac9W7TKmugXwJhDVKK
AA3ZrrEwG95YBirmXT5OrkdVZYYxS+cMxewy8SOoJOkwACsNqKrMuJrq0lnZFJs8htzxN0fkphZUVYec
cM2xu1nIn4D/QGi5eqRGS+8E7sD5a6ClfyCRfAFeg5fwGarR/AAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNbSwJBGIYtKiI63gT9guiqv+B/CaKbriK6
a0AKszyU2tq21taumqVtua6HXE0KD0UZFnkZdhFF54iIIm3ajRFdXdIeeG/m/Z5hhmEU1VCTW0qjcwcz
0gGb0RHUabDtXlT9jRqzd5ndET+fuX0/fYRQTPrhG7Kpi0dhIwIA0IBGKxHKeouLj5zc5X7F8sQvX/Oz
jgCGxivR29ihRPblS04uhEtl71XEWh9SpBCeGCMnlSZ9n4cGu1+LFCkrwcOonFQebDNCIkXKEpvg5ITS
pIUYnSEzUqToKL/q6PpDViyEz1y9qS0uJVKkDM/R7QQTfZITxYivM+/kGTQuBQCyeYZkfFQomVvY3n8+
vvmUyPGL59z8ejg8NoV3IKUIMJtbdauePXc09T1tdbkGcbzFtBYct3Jx3xIbSy549hidzT+ggLAOKUWA
gew0UOyuJ3YKZ5bdXkFuRFV1RjCqe45mD9j4GdSSDA/ARhOqqjOhp3tMtPeES55D4fjRUY21DVW1oSHc
i9xBBoonED8QWq4dlYXqn8SduHgNtPQPFIofMIGX3CipRQgAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -319,16 +327,4 @@
<metadata name="bsME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>500, 17</value>
</metadata>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPnZJNS8NAFEVHf2dbTLK2e01pIHVRV37Udmel
VpoKEnVSUHfqqjVN/oIY9y6Sgh8UxtxxpjQmjcELDx7z3jnDwJBVYYysjS9Kxtgu19GL42IB4I80K3xu
zVH+SLEKSwzDWPfoxvnspT1nb32GQo8zzMRadjjsJOFliesow5USDPxrdTgLOilYFiTYST2Hv5lqVh4s
CztTqg4WEjRTRx0UgWVxScxwycQu61Fw9CWHj3e7bKdR5X2/q7OzkxrvG2aVz+ReFLQ/ny4r28S9Sgru
b5rMFILesc5Ouz8C09xkD7fNpMCubPFneFTdC19b73L4V2EXDIdlPKrth0HnIwtYrkxYxnPUgzwJZrhI
rGcHkihDwuF4Jtby81uCvjAs41PlEOC/YASfZGKXam78Txa/LhVCvgFb1OuXLMuHwQAAAABJRU5ErkJg
gg==
</value>
</data>
</root>

View File

@@ -35,18 +35,18 @@ namespace FEQ0000
switch (imptype)
{
case fEquipment.eTabletype.FOL:
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportF.rdlc";
case fEquipment.eTabletype.FOL:
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc";
taF.Fill(this.dsEQ.vEquStockF, this.pdate);
DsEQ.Value = this.dsEQ.vEquStockF;
break;
case fEquipment.eTabletype.BUMP:
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportB.rdlc";
taB.Fill(this.dsEQ.vEquStockB, this.pdate);
DsEQ.Value = this.dsEQ.vEquStockB;
break;
case fEquipment.eTabletype.MOLD:
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportE.rdlc";
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportE.rdlc";
taE.Fill(this.dsEQ.vEquStockME, this.pdate);
DsEQ.Value = this.dsEQ.vEquStockME;
break;