From 9a88e997517b37eefc8c409595e463f156b8088c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 13 五月 2022 17:21:46 +0800
Subject: [PATCH] 1
---
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.cs | 8
WorkM/报表分析/DefectiveDetailedYieldReport.designer.cs | 130 +++++++++------
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.Designer.cs | 116 ++++++++------
WorkM/报表分析/DefectiveDetailedYieldReport.resx | 12
LMES/ClsShowMod.cs | 1
WorkM/报表分析/DefectiveDetailedYieldReport.cs | 8
WorkM/车间管理/QC_NoPassProdCheckBill.designer.cs | 2
WebAPI/WebAPI.csproj.user | 2
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.resx | 124 ++++++++-------
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.Designer.cs | 2
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.cs | 2
WorkM/车间管理/QC_NoPassProdCheckBill.cs | 15 +
12 files changed, 249 insertions(+), 173 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
index a8afed8..2e4b36b 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimes
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
index 58c8379..757f566 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
@@ -8,7 +8,7 @@
using System.Text;
using System.Windows.Forms;
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
public partial class Gy_StdWorkTimes : Form
{
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
index 2f5305c..54674e5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimesList
{
@@ -31,7 +31,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_StdWorkTimesList));
- System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.fsh = new System.Windows.Forms.ToolStripButton();
@@ -48,9 +48,9 @@
this.sh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.ToolBar = new System.Windows.Forms.ToolStrip();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.gs = new System.Windows.Forms.ToolStripButton();
this.wl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.xz = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
@@ -64,6 +64,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.jy = new System.Windows.Forms.ToolStripButton();
this.fjy = new System.Windows.Forms.ToolStripButton();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -80,11 +82,10 @@
this.tabPage1.BackColor = System.Drawing.Color.Transparent;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1041, 590);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(779, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -97,13 +98,12 @@
this.grdMain.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1031, 580);
+ this.grdMain.Size = new System.Drawing.Size(771, 461);
this.grdMain.TabIndex = 21;
//
// fsh
@@ -123,7 +123,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -142,7 +142,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// imageList1
//
@@ -158,8 +158,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 62);
- this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 50);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -170,9 +169,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(1249, 619);
- this.splitContainer1.SplitterDistance = 195;
- this.splitContainer1.SplitterWidth = 5;
+ this.splitContainer1.Size = new System.Drawing.Size(937, 495);
+ this.splitContainer1.SplitterDistance = 146;
this.splitContainer1.TabIndex = 18;
//
// tv
@@ -185,18 +183,17 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 24);
- this.tv.Margin = new System.Windows.Forms.Padding(4);
+ this.tv.Location = new System.Drawing.Point(0, 20);
this.tv.Name = "tv";
- treeNode1.ForeColor = System.Drawing.Color.Black;
- treeNode1.Name = "tjbb";
- treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
- treeNode1.Text = "椤圭洰";
+ treeNode2.ForeColor = System.Drawing.Color.Black;
+ treeNode2.Name = "tjbb";
+ treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode2.Text = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode1});
+ treeNode2});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(195, 595);
+ this.tv.Size = new System.Drawing.Size(146, 475);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -206,18 +203,16 @@
this.panel1.Controls.Add(this.lblCaption);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(195, 24);
+ this.panel1.Size = new System.Drawing.Size(146, 20);
this.panel1.TabIndex = 15;
//
// lblCaption
//
this.lblCaption.AutoSize = true;
- this.lblCaption.Location = new System.Drawing.Point(0, 4);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(0, 3);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(37, 15);
+ this.lblCaption.Size = new System.Drawing.Size(29, 12);
this.lblCaption.TabIndex = 0;
this.lblCaption.Text = "璧勬枡";
//
@@ -226,10 +221,9 @@
this.stTab.Controls.Add(this.tabPage1);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
- this.stTab.Margin = new System.Windows.Forms.Padding(4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(1049, 619);
+ this.stTab.Size = new System.Drawing.Size(787, 495);
this.stTab.TabIndex = 15;
//
// sh
@@ -250,7 +244,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// ToolBar
//
@@ -259,6 +253,8 @@
this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dc,
+ this.toolStripSeparator5,
this.gs,
this.wl,
this.toolStripSeparator6,
@@ -279,20 +275,15 @@
this.toolStripSeparator3,
this.jy,
this.fjy,
- this.toolStripSeparator5,
+ this.toolStripSeparator4,
this.tc});
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(1249, 62);
+ this.ToolBar.Size = new System.Drawing.Size(937, 50);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 17;
this.ToolBar.Text = "toolStrip1";
- //
- // toolStripSeparator6
- //
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gs
//
@@ -326,6 +317,11 @@
this.wl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.wl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.wl.Click += new System.EventHandler(this.wl_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -373,7 +369,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -406,13 +402,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -422,7 +418,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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -431,7 +427,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -441,7 +437,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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -474,13 +470,33 @@
this.fjy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.fjy.Click += new System.EventHandler(this.fjy_Click);
//
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.White;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "寮曞嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
// Gy_StdWorkTimesList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1249, 681);
+ this.ClientSize = new System.Drawing.Size(937, 545);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Gy_StdWorkTimesList";
this.Text = "鏍囧噯宸ユ椂";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -534,5 +550,7 @@
private System.Windows.Forms.ToolStripButton wl;
private System.Windows.Forms.ToolStripButton jy;
private System.Windows.Forms.ToolStripButton fjy;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
}
}
\ No newline at end of file
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
index 248b672..50433e7 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.cs"
@@ -7,7 +7,7 @@
using System.Text;
using System.Windows.Forms;
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
public partial class Gy_StdWorkTimesList : Form
{
@@ -523,5 +523,11 @@
Display();
return;
}
+
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
}
}
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
index 97c1fc6..545b962 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
@@ -121,7 +121,7 @@
<data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
yC16obp9KE4DCQVV/ZIVKfb/33Gc/QXPohCNZVnEXZ9iznNZ1/VTB1GGQR7vBDGOY1KEOsjkdzW4kiDO
RJTcdZ1Ya2Wapr0JhLZtkyJKJk8cxT3opO97LwKR8xY5BEUqwlnX9X0yCJ1ViHe79HeEZGOMVFXlRS47
OJKbptlmEs7lVCRFDot1LnxjtGwQWSQKCNrG1aU9VCTqAgF1L8tym7hLRWCBENitMi0hkGo9BYyiZ0Di
@@ -131,7 +131,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -146,51 +146,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAUQBAQFEAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAUwBAQFMAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAT0BigH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQ
- AbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/
- AQgBkAG5Af8DAAn/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
- AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AwAB/wMAAf+AAAT/
- AQABPQGKAf8B0QH2Av8BTwHaAfQB/wFEAdMB8QH/ATkBywHvAf8BLwHEAe0B/wElAb4B6wH/ARsBuAHo
- Af8BDwGwAecB/wEFAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQgBkAG5Af8DAAn/AQABPQGK
- Af8B0QH2Av8BJAG+AesB/wEeAbkB6QH/ARYBtAHnAf8BDgGwAeYB/wEHAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQgBkAG5Af8BAAE9AYoB/wMAAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AVUB3gH1
- Af8BSgHWAfMB/wFAAdAB8QH/ATUByQHuAf8BKwHCAewB/wEgAbwB6gH/ARYBtAHnAf8BCwGtAeUB/wEB
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AS8BxQHuAf8BKQHB
- AesB/wEiAbwB6wH/ARoBtwHoAf8BEwGyAecB/wELAa4B5QH/AQQBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQgBkAG5Af8DAAH/AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYEB4QH3Af8BUQHaAfQB/wFG
- AdQB8gH/ATsBzAHvAf8BMQHGAe4B/wEnAcAB6wH/ARwBuQHpAf8BEgGyAeYB/wEHAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/ATQByAHuAf8BLQHEAewB/wEmAb8B6wH/
- AR8BuwHqAf8BGAG2AegB/wEQAbAB5wH/AQkBrAHlAf8BAgGnAeMB/wEAAaMB4gH/AQABPQGKAf8DAAH/
- AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYYB5QH3Af8BVwHfAfUB/wFMAdgB8wH/AUIB0QHx
- Af8BNwHKAe8B/wEtAcQB7QH/ASMBvQHqAf8BGAG2AegB/wENAa8B5QH/AQIBqAHjAf8BAAGiAeEB/wEI
- AZABuQH/AwAB/wEAAT0BigH/AdEB9gL/AUABzwHxAf8BOQHLAe8B/wExAccB7gH/ASsBwgHsAf8BJAG9
- AeoB/wEcAbkB6QH/ARUBtAHnAf8BDgGwAeYB/wEGAaoB5QH/AQgBkAG5Af8DAAH/AQgBkAG5Af8BCAGQ
- AbkB/wMAAf+AAAT/AQABPQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVMB3AH1Af8BSQHVAfIB/wE9
- Ac4B8AH/ATMByAHuAf8BKQHBAewB/wEfAboB6gH/ARMBswHnAf8BCQGsAeUB/wEAAaYB4wH/AQgBkAG5
- Af8DAAH/AQABPQGKAf8B0QH2Av8BRQHTAfIB/wE9Ac4B8AH/ATYBygHuAf8BLwHFAe0B/wEpAcEB6wH/
- ASEBvAHqAf8BGgG3AegB/wESAbIB5gH/AQsBrgHlAf8BCAGQAbkB/wMAAf8BCAGQAbkB/wEIAZABuQH/
- AwAB/4AABP8BAAE9AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWQHgAfYB/wFPAdkB8wH/AUQB0wHy
- Af8BOQHLAe8B/wEvAcUB7QH/ASUBvgHrAf8BGwG4AekB/wEPAbAB5gH/AQQBqQHkAf8BCAGQAbkB/wMA
- Af8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BCAGQAbkB/wE2AckB7gH/AQgBkAG5
- Af8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVYB3gH1Af8BSgHW
- AfMB/wFAAc8B8QH/ATUByQHvAf8BKwHCAewB/wEhAbsB6QH/ARYBtQHnAf8BCwGtAeYB/wEIAZABuQH/
- AwAF/wEAAT0BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFW
- Ad0B9QH/AVAB2gHzAf8BSgHXAfMB/wFFAdMB8QH/AT8BzwHxAf8BOQHLAe8B/wEIAZABuQH/AwAB/4AA
- BP8BAAE9AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFZAeAB9gH/AVQB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BCAGQAbkB/wMAAf+AAAT/AQABPQGKAf8BGwGoAdMB/wEbAagB0wH/ARsBqAHTAf8BGwGo
- AdMB/wEbAagB0wH/ARsBqAHTAf8BGwGoAdMB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
- AQABPQGKAf8BAAE9AYoJ/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9
- AYoF/4AACP8BAAE9AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT0BigH/AwAh/wEAAT0BigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPQGKHf+AAAz/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BigH/AQABPQGKAf8BAAE9AYoB/wMAKf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
- AT0BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATwBigH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQ
+ AbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/AQcBkAG5Af8BBwGQAbkB/wEHAZABuQH/
+ AQcBkAG5Af8DAAn/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/
+ AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AwAB/wMAAf+AAAT/
+ AQABPAGKAf8B0QH2Av8BTgHaAfQB/wFDAdMB8QH/ATgBywHvAf8BLgHEAe0B/wEkAb4B6wH/ARoBuAHo
+ Af8BDgGwAecB/wEEAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQcBkAG5Af8DAAn/AQABPAGK
+ Af8B0QH2Av8BIwG+AesB/wEdAbkB6QH/ARUBtAHnAf8BDQGwAeYB/wEGAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQcBkAG5Af8BAAE8AYoB/wMAAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AVQB3gH1
+ Af8BSQHWAfMB/wE/AdAB8QH/ATQByQHuAf8BKgHCAewB/wEfAbwB6gH/ARUBtAHnAf8BCgGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/AS4BxQHuAf8BKAHB
+ AesB/wEhAbwB6wH/ARkBtwHoAf8BEgGyAecB/wEKAa4B5QH/AQMBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQcBkAG5Af8DAAH/AQABPAGKAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AYEB4QH3Af8BUAHaAfQB/wFF
+ AdQB8gH/AToBzAHvAf8BMAHGAe4B/wEmAcAB6wH/ARsBuQHpAf8BEQGyAeYB/wEGAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/ATMByAHuAf8BLAHEAewB/wElAb8B6wH/
+ AR4BuwHqAf8BFwG2AegB/wEPAbAB5wH/AQgBrAHlAf8BAQGnAeMB/wEAAaMB4gH/AQABPAGKAf8DAAH/
+ AQABPAGKAf8DAAH/gAAE/wEAATwBigH/AdEB9gL/AYYB5QH3Af8BVgHfAfUB/wFLAdgB8wH/AUEB0QHx
+ Af8BNgHKAe8B/wEsAcQB7QH/ASIBvQHqAf8BFwG2AegB/wEMAa8B5QH/AQEBqAHjAf8BAAGiAeEB/wEH
+ AZABuQH/AwAB/wEAATwBigH/AdEB9gL/AT8BzwHxAf8BOAHLAe8B/wEwAccB7gH/ASoBwgHsAf8BIwG9
+ AeoB/wEbAbkB6QH/ARQBtAHnAf8BDQGwAeYB/wEFAaoB5QH/AQcBkAG5Af8DAAH/AQcBkAG5Af8BBwGQ
+ AbkB/wMAAf+AAAT/AQABPAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVIB3AH1Af8BSAHVAfIB/wE8
+ Ac4B8AH/ATIByAHuAf8BKAHBAewB/wEeAboB6gH/ARIBswHnAf8BCAGsAeUB/wEAAaYB4wH/AQcBkAG5
+ Af8DAAH/AQABPAGKAf8B0QH2Av8BRAHTAfIB/wE8Ac4B8AH/ATUBygHuAf8BLgHFAe0B/wEoAcEB6wH/
+ ASABvAHqAf8BGQG3AegB/wERAbIB5gH/AQoBrgHlAf8BBwGQAbkB/wMAAf8BBwGQAbkB/wEHAZABuQH/
+ AwAB/4AABP8BAAE8AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWAHgAfYB/wFOAdkB8wH/AUMB0wHy
+ Af8BOAHLAe8B/wEuAcUB7QH/ASQBvgHrAf8BGgG4AekB/wEOAbAB5gH/AQMBqQHkAf8BBwGQAbkB/wMA
+ Af8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BBwGQAbkB/wE1AckB7gH/AQcBkAG5
+ Af8DAAH/gAAE/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVUB3gH1Af8BSQHW
+ AfMB/wE/Ac8B8QH/ATQByQHvAf8BKgHCAewB/wEgAbsB6QH/ARUBtQHnAf8BCgGtAeYB/wEHAZABuQH/
+ AwAF/wEAATwBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFV
+ Ad0B9QH/AU8B2gHzAf8BSQHXAfMB/wFEAdMB8QH/AT4BzwHxAf8BOAHLAe8B/wEHAZABuQH/AwAB/4AA
+ BP8BAAE8AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEHAZABuQH/AwAF/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFYAeAB9gH/AVMB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BBwGQAbkB/wMAAf+AAAT/AQABPAGKAf8BGgGoAdMB/wEaAagB0wH/ARoBqAHTAf8BGgGo
+ AdMB/wEaAagB0wH/ARoBqAHTAf8BGgGoAdMB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/
+ AQABPAGKAf8BAAE8AYoJ/wEAATwBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8
+ AYoF/4AACP8BAAE8AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATwBigH/AwAh/wEAATwBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPAGKHf+AAAz/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBigH/AQABPAGKAf8BAAE8AYoB/wMAKf8BAAE8AYoB/wEAATwBigH/AQABPAGKAf8BAAE8AYoB/wEA
+ ATwBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -199,7 +199,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+xR5VXbRDwAAAABJRU5ErkJggg==
@@ -444,10 +444,20 @@
+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
</value>
</data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
+ wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
+ iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
+ /QtOBosOaPWFo3IBwJtvBADwBiAtZRNHCGN5AAAAAElFTkSuQmCC
+</value>
+ </data>
<data name="gs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGcSURBVDhPlZPPK8NxGMefcp92ooYDB+SwkriNcODmD+C4
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGcSURBVDhPlZPPK8NxGMefcp92ooYDB+SwkriNcODmD+C4
i+JgNJIpUQ5jN+GiSQ7aL0JZKSwc/EyNzYXEEPNztlLr7fPjO5ux2d716tP38zzP+3nXpy8lqqOJ8BdK
Ob2URmiL5cmpKJTnvyb6xpzvoVQoPX+LF09nCYElAvySz23CzSLBN0fYHMvC4HWdENogPK5laXAwRThj
zRc2wpWTcGmX3/vsfnUoQ4PDacLJDMHL0vBzbzJDA66GWh22xkngsRA2zJK1YcKSy5V+OCZu4uwlga1H
@@ -460,7 +470,7 @@
<data name="wl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIJSURBVDhPhY/tS1NhGMaffyL8KwrRfEmsT4Xi50QNIsJE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIJSURBVDhPhY/tS1NhGMaffyL8KwrRfEmsT4Xi50QNIsJE
ap2JuXkMN447M5vD7bg2T1CtDNum5mYlhvhBUFBEHa6gD/YCsSK0BUZQFklXz/2cs7HFtAsurnM953ff
5zyM5NXH4AtFERyJI6QnDjS9J454MZiVZ/ghutZlsAADu2U6yB3iHskz73LSAeLNUUMebRT2SQfe7i9j
5XcEEUgI/TgP14cGSJuVsKaqhKWX5eidcoN4c9SQV+O/1Miw8GcSMfjg+NIMy1Y9mlcqcG61KufWVDVY
@@ -475,7 +485,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -489,7 +499,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHoSURBVDhPnZJfSFNhGMY/CESwO/PCey+6iLLsxnXRTQV5
USCIQiyti2iuMYoQS8n+IMLUi/07kq4L03WzLiTvahvVGghtujFashLLzNqEiTCNGfT0ve/OOufICPSB
h3P4zu/3nu98HKHPoNOHYdc4XJ5xuL3G0tqwcwLEqLgxA44x/Cr+hjUCCJesZ1flmj36hxliVU3L3UEn
NvKbsAYLmMqiYm2hLWaIVTUtPfdHkF/PQYwCT1eBttfAoSn5Zrda2oUTzBCralpu9Q8hu/adoa4oUD8t
@@ -503,7 +513,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVDhPjU/rK0NxGD5/gI/+AJ9kPrp8ZT7zlSiF4oNL
ZElChFAstVguc2tsLhshKa0oYRk6yUFu0ayRaXaa1Vwf+/0cZ2fOYZ56Oud5zvs8530ZJVTXt0NKwf4f
SMAXeIOHD1KS96gl0r/9h0LsCzIjCljuLLKEiMenV1y4PDi6dIM9uYb94BTrDg6rmywWbHaYl9ZgmF6G
bmQW2kGTvEDT1IWz80tMTM1h1GTFkHEG+mETevrH0KkzoEXbj+YuPYyWFTR06BTOaOykhp09QSD4jLvH
@@ -516,7 +526,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -528,7 +538,7 @@
<data name="xs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -541,7 +551,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -556,7 +566,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -571,7 +581,7 @@
<data name="jy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+xR5VXbRDwAAAABJRU5ErkJggg==
@@ -580,7 +590,7 @@
<data name="fjy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADhSURBVDhPrZIxDoMwDEU5D/fgBowZ2VjZGBlzBAYGRhbE
yC16obp9KE4DCQVV/ZIVKfb/33Gc/QXPohCNZVnEXZ9iznNZ1/VTB1GGQR7vBDGOY1KEOsjkdzW4kiDO
RJTcdZ1Ya2Wapr0JhLZtkyJKJk8cxT3opO97LwKR8xY5BEUqwlnX9X0yCJ1ViHe79HeEZGOMVFXlRS47
OJKbptlmEs7lVCRFDot1LnxjtGwQWSQKCNrG1aU9VCTqAgF1L8tym7hLRWCBENitMi0hkGo9BYyiZ0Di
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 3c10a04..2fe85ee 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,7 +25,6 @@
using Kanban;
using Demo;
using ProM.委外管理;
-using BaseSet.公用资料.其他基础资料;
namespace LMES
{
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3179f3..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index 673d207..06ff6d5 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/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 = "";
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
index 2040c36..0d563cc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/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;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
index 6a1e7e6..af83a43 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/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
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
index 8aa6b15..5a1499e 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
@@ -1141,6 +1141,19 @@
}
}
+ else
+ {
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇鏁伴噺锛�");
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadPCSQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇PCS鏁伴噺锛�");
+ return false;
+ }
+ }
}
//if (ClsPub.isDoule(txtHBadPNL.Text) != sPNLQty)
//{
@@ -1149,7 +1162,7 @@
//}
if (ClsPub.isDoule(txtHBadQty.Text) != sPCSQty)
{
- MessageBox.Show("鏄庣粏鎶ュ簾PCS鏁颁笉绛変簬鎬绘姤搴烶CS锛屼笉鍏佽淇濆瓨锛�");
+ MessageBox.Show("琛ㄤ綋鏄庣粏涓嶈壇鏁颁笉绛変簬琛ㄥご鎬讳笉鑹暟閲忥紝涓嶅厑璁镐繚瀛橈紒");
return false;
}
}
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
index 746681c..55333bd 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.designer.cs"
@@ -1094,7 +1094,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(377, 136);
+ this.label16.Location = new System.Drawing.Point(390, 136);
this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(67, 15);
--
Gitblit v1.9.1