parent: b2d325d8 | 补丁 | 提交 | ignore whitespace
jingh
2022-05-13 9084fac6b0907a2d56b7ba012193bce7d48cc2fb 
不良率报表过滤条件调整
3个文件已修改
150 ■■■■■ 已修改文件
WorkM/报表分析/DefectiveDetailedYieldReport.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/报表分析/DefectiveDetailedYieldReport.designer.cs 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/报表分析/DefectiveDetailedYieldReport.resx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WorkM/±¨±í·ÖÎö/DefectiveDetailedYieldReport.cs


@@ -155,9 +155,13 @@


            {


                sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";


            }


            if (dtpHBDate.Value.ToShortDateString() != "")//日期


            if (dtpHBDate.Value.ToShortDateString() != "")//开始日期


            {


                sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHBDate.Value.ToShortDateString() + "'";


                sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";


            }


            if (dtpHEDate.Value.ToShortDateString() != "")//结束日期


            {


                sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";


            }


            //过滤条件


            //string sWhere = "";




 WorkM/±¨±í·ÖÎö/DefectiveDetailedYieldReport.designer.cs


@@ -61,6 +61,8 @@


            this.timer2 = new System.Windows.Forms.Timer(this.components);


            this.grdMain = new System.Windows.Forms.DataGridView();


            this.grdSum = new System.Windows.Forms.DataGridView();


            this.label5 = new System.Windows.Forms.Label();


            this.dtpHEDate = new System.Windows.Forms.DateTimePicker();


            this.Tool.SuspendLayout();


            this.pPic.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();


@@ -94,7 +96,7 @@


            this.Tool.Location = new System.Drawing.Point(0, 0);


            this.Tool.Name = "Tool";


            this.Tool.Padding = new System.Windows.Forms.Padding(0);


            this.Tool.Size = new System.Drawing.Size(1785, 71);


            this.Tool.Size = new System.Drawing.Size(1587, 59);


            this.Tool.Stretch = true;


            this.Tool.TabIndex = 16;


            this.Tool.Text = "toolStrip1";


@@ -108,7 +110,7 @@


            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";


            this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 66);


            this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 56);


            this.toolStripDropDownButton1.Text = "引出";


            this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


@@ -116,14 +118,14 @@


            // eXCELToolStripMenuItem


            // 


            this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";


            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);


            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);


            this.eXCELToolStripMenuItem.Text = "EXCEL";


            this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);


            // 


            // cSVToolStripMenuItem


            // 


            this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";


            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(163, 34);


            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);


            this.cSVToolStripMenuItem.Text = "CSV";


            this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);


            // 


@@ -145,7 +147,7 @@


            // toolStripSeparator4


            // 


            this.toolStripSeparator4.Name = "toolStripSeparator4";


            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);


            // 


            // cx


            // 


@@ -164,7 +166,7 @@


            // toolStripSeparator1


            // 


            this.toolStripSeparator1.Name = "toolStripSeparator1";


            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);


            // 


            // tc


            // 


@@ -183,13 +185,13 @@


            // toolStripSeparator3


            // 


            this.toolStripSeparator3.Name = "toolStripSeparator3";


            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);


            // 


            // toolStripSeparator8


            // 


            this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;


            this.toolStripSeparator8.Name = "toolStripSeparator8";


            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);


            // 


            // mrlk


            // 


@@ -199,7 +201,7 @@


            this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.mrlk.ImageTransparentColor = System.Drawing.Color.White;


            this.mrlk.Name = "mrlk";


            this.mrlk.Size = new System.Drawing.Size(86, 66);


            this.mrlk.Size = new System.Drawing.Size(73, 56);


            this.mrlk.Text = "默认列宽";


            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


@@ -209,7 +211,7 @@


            // 


            this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;


            this.toolStripSeparator7.Name = "toolStripSeparator7";


            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);


            // 


            // bclk


            // 


@@ -219,7 +221,7 @@


            this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.bclk.ImageTransparentColor = System.Drawing.Color.White;


            this.bclk.Name = "bclk";


            this.bclk.Size = new System.Drawing.Size(86, 66);


            this.bclk.Size = new System.Drawing.Size(73, 56);


            this.bclk.Text = "保存列宽";


            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


@@ -229,13 +231,15 @@


            // 


            this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;


            this.toolStripSeparator9.Name = "toolStripSeparator9";


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 71);


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);


            // 


            // pPic


            // 


            this.pPic.BackColor = System.Drawing.Color.White;


            this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));


            this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;


            this.pPic.Controls.Add(this.label5);


            this.pPic.Controls.Add(this.dtpHEDate);


            this.pPic.Controls.Add(this.label4);


            this.pPic.Controls.Add(this.textHprocName);


            this.pPic.Controls.Add(this.label2);


@@ -248,85 +252,85 @@


            this.pPic.Controls.Add(this.dtpHBDate);


            this.pPic.Controls.Add(this.lblCaption);


            this.pPic.Dock = System.Windows.Forms.DockStyle.Top;


            this.pPic.Location = new System.Drawing.Point(0, 71);


            this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.pPic.Location = new System.Drawing.Point(0, 59);


            this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.pPic.Name = "pPic";


            this.pPic.Size = new System.Drawing.Size(1785, 83);


            this.pPic.Size = new System.Drawing.Size(1587, 69);


            this.pPic.TabIndex = 17;


            // 


            // label4


            // 


            this.label4.AutoSize = true;


            this.label4.BackColor = System.Drawing.Color.Transparent;


            this.label4.Location = new System.Drawing.Point(636, 50);


            this.label4.Location = new System.Drawing.Point(565, 42);


            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label4.Name = "label4";


            this.label4.Size = new System.Drawing.Size(80, 18);


            this.label4.Size = new System.Drawing.Size(67, 15);


            this.label4.TabIndex = 116;


            this.label4.Text = "工序名称";


            // 


            // textHprocName


            // 


            this.textHprocName.Location = new System.Drawing.Point(739, 44);


            this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.textHprocName.Location = new System.Drawing.Point(657, 37);


            this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.textHprocName.Name = "textHprocName";


            this.textHprocName.Size = new System.Drawing.Size(212, 28);


            this.textHprocName.Size = new System.Drawing.Size(189, 25);


            this.textHprocName.TabIndex = 115;


            // 


            // label2


            // 


            this.label2.AutoSize = true;


            this.label2.BackColor = System.Drawing.Color.Transparent;


            this.label2.Location = new System.Drawing.Point(298, 50);


            this.label2.Location = new System.Drawing.Point(265, 42);


            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label2.Name = "label2";


            this.label2.Size = new System.Drawing.Size(80, 18);


            this.label2.Size = new System.Drawing.Size(67, 15);


            this.label2.TabIndex = 114;


            this.label2.Text = "物料名称";


            // 


            // textHmaterName


            // 


            this.textHmaterName.Location = new System.Drawing.Point(402, 44);


            this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.textHmaterName.Location = new System.Drawing.Point(357, 37);


            this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.textHmaterName.Name = "textHmaterName";


            this.textHmaterName.Size = new System.Drawing.Size(212, 28);


            this.textHmaterName.Size = new System.Drawing.Size(189, 25);


            this.textHmaterName.TabIndex = 113;


            // 


            // label6


            // 


            this.label6.AutoSize = true;


            this.label6.BackColor = System.Drawing.Color.Transparent;


            this.label6.Location = new System.Drawing.Point(980, 13);


            this.label6.Location = new System.Drawing.Point(1174, 13);


            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label6.Name = "label6";


            this.label6.Size = new System.Drawing.Size(80, 18);


            this.label6.Size = new System.Drawing.Size(67, 15);


            this.label6.TabIndex = 112;


            this.label6.Text = "流转卡号";


            // 


            // txtHProcessExchangeBillNo


            // 


            this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1087, 5);


            this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1269, 6);


            this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtHProcessExchangeBillNo.Name = "txtHProcessExchangeBillNo";


            this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(212, 28);


            this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(189, 25);


            this.txtHProcessExchangeBillNo.TabIndex = 109;


            // 


            // txtHICMOBillNo


            // 


            this.txtHICMOBillNo.Location = new System.Drawing.Point(739, 5);


            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.txtHICMOBillNo.Location = new System.Drawing.Point(960, 6);


            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtHICMOBillNo.Name = "txtHICMOBillNo";


            this.txtHICMOBillNo.Size = new System.Drawing.Size(212, 28);


            this.txtHICMOBillNo.Size = new System.Drawing.Size(189, 25);


            this.txtHICMOBillNo.TabIndex = 35;


            // 


            // label3


            // 


            this.label3.AutoSize = true;


            this.label3.BackColor = System.Drawing.Color.Transparent;


            this.label3.Location = new System.Drawing.Point(642, 11);


            this.label3.Location = new System.Drawing.Point(874, 11);


            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label3.Name = "label3";


            this.label3.Size = new System.Drawing.Size(62, 18);


            this.label3.Size = new System.Drawing.Size(52, 15);


            this.label3.TabIndex = 34;


            this.label3.Text = "工单号";


            // 


@@ -334,20 +338,20 @@


            // 


            this.label1.AutoSize = true;


            this.label1.BackColor = System.Drawing.Color.Transparent;


            this.label1.Location = new System.Drawing.Point(314, 11);


            this.label1.Location = new System.Drawing.Point(265, 9);


            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label1.Name = "label1";


            this.label1.Size = new System.Drawing.Size(44, 18);


            this.label1.Size = new System.Drawing.Size(67, 15);


            this.label1.TabIndex = 7;


            this.label1.Text = "日期";


            this.label1.Text = "开始日期";


            // 


            // dtpHBDate


            // 


            this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;


            this.dtpHBDate.Location = new System.Drawing.Point(402, 5);


            this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.dtpHBDate.Location = new System.Drawing.Point(357, 4);


            this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.dtpHBDate.Name = "dtpHBDate";


            this.dtpHBDate.Size = new System.Drawing.Size(158, 28);


            this.dtpHBDate.Size = new System.Drawing.Size(189, 25);


            this.dtpHBDate.TabIndex = 9;


            // 


            // lblCaption


@@ -356,10 +360,10 @@


            this.lblCaption.BackColor = System.Drawing.Color.Transparent;


            this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;


            this.lblCaption.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));


            this.lblCaption.Location = new System.Drawing.Point(18, 24);


            this.lblCaption.Location = new System.Drawing.Point(16, 20);


            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.lblCaption.Name = "lblCaption";


            this.lblCaption.Size = new System.Drawing.Size(253, 29);


            this.lblCaption.Size = new System.Drawing.Size(210, 24);


            this.lblCaption.TabIndex = 4;


            this.lblCaption.Text = "不良明细良率报表";


            // 


@@ -375,13 +379,13 @@


            this.grdMain.BackgroundColor = System.Drawing.Color.White;


            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdMain.Location = new System.Drawing.Point(0, 154);


            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.grdMain.Location = new System.Drawing.Point(0, 128);


            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.grdMain.Name = "grdMain";


            this.grdMain.ReadOnly = true;


            this.grdMain.RowHeadersWidth = 51;


            this.grdMain.RowTemplate.Height = 23;


            this.grdMain.Size = new System.Drawing.Size(1785, 496);


            this.grdMain.Size = new System.Drawing.Size(1587, 414);


            this.grdMain.TabIndex = 48;


            this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);


            this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);


@@ -394,27 +398,47 @@


            this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;


            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.grdSum.Location = new System.Drawing.Point(0, 650);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.grdSum.Location = new System.Drawing.Point(0, 542);


            this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.grdSum.Name = "grdSum";


            this.grdSum.ReadOnly = true;


            this.grdSum.RowHeadersWidth = 51;


            this.grdSum.RowTemplate.Height = 23;


            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;


            this.grdSum.Size = new System.Drawing.Size(1785, 29);


            this.grdSum.Size = new System.Drawing.Size(1587, 24);


            this.grdSum.TabIndex = 49;


            // 


            // label5


            // 


            this.label5.AutoSize = true;


            this.label5.BackColor = System.Drawing.Color.Transparent;


            this.label5.Location = new System.Drawing.Point(565, 9);


            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.label5.Name = "label5";


            this.label5.Size = new System.Drawing.Size(67, 15);


            this.label5.TabIndex = 117;


            this.label5.Text = "结束日期";


            // 


            // dtpHEDate


            // 


            this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;


            this.dtpHEDate.Location = new System.Drawing.Point(657, 6);


            this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);


            this.dtpHEDate.Name = "dtpHEDate";


            this.dtpHEDate.Size = new System.Drawing.Size(189, 25);


            this.dtpHEDate.TabIndex = 118;


            // 


            // DefectiveDetailedYieldReport


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.ClientSize = new System.Drawing.Size(1785, 679);


            this.ClientSize = new System.Drawing.Size(1587, 566);


            this.Controls.Add(this.grdMain);


            this.Controls.Add(this.grdSum);


            this.Controls.Add(this.pPic);


            this.Controls.Add(this.Tool);


            this.KeyPreview = true;


            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);


            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.Name = "DefectiveDetailedYieldReport";


            this.Text = "不良明细良率报表";


            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;


@@ -463,5 +487,7 @@


        public System.Windows.Forms.TextBox textHmaterName;


        private System.Windows.Forms.Label label4;


        public System.Windows.Forms.TextBox textHprocName;


        private System.Windows.Forms.Label label5;


        public System.Windows.Forms.DateTimePicker dtpHEDate;


    }


}




 WorkM/±¨±í·ÖÎö/DefectiveDetailedYieldReport.resx


@@ -256,7 +256,7 @@


  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/


        7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3


        v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG


        QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/


@@ -268,7 +268,7 @@


  <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu


        ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e


        e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A


        4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe


@@ -282,7 +282,7 @@


  <data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w


        UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO


        F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0


        KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J


@@ -294,7 +294,7 @@


  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7


        bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G


        rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY


        wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg


@@ -304,7 +304,7 @@


  <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN


        oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7


        znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex


        vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF


@@ -319,7 +319,7 @@


  <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW


        /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7


        77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq


        aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI