From 7f5d4a2476f2a0e5803ac1a7f2f24ec5645e99aa Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期五, 21 四月 2023 13:42:07 +0800
Subject: [PATCH] 工序流转卡维护添加引出功能：在Sc_ProcessExchangeBillQuery文件中，设计页面的toolstrip控的引出按钮设置visible为true。 车间工序全程跟踪报表添加上级代码是否显示功能：在MES_OrderProcFlowAllReport文件，在设计页面添加复选框决定是否展示上级代码，在编程页面的display()方法中获取复选框内容并添加到存储过程的参数中。
---
WorkM/车间管理/Sc_ProcessExchangeBillQuery.resx | 54 +++---
WorkM/报表分析/Mes_OrderProcFlowAllReport.designer.cs | 157 ++++++++++--------
WorkM/报表分析/Mes_OrderProcFlowAllReport.cs | 8 +
WorkM/车间管理/Sc_ProcessExchangeBillQuery.designer.cs | 198 ++++++++++++------------
WorkM/报表分析/Mes_OrderProcFlowAllReport.resx | 38 ++--
5 files changed, 243 insertions(+), 212 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
index a1a8a7e..15a9949 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
@@ -177,6 +177,14 @@
{
sDlgWhere = sDlgWhere + ",''";
}
+ if (chkShowUpperID.Checked == true)
+ {
+ sDlgWhere = sDlgWhere + ",'Y'";
+ }
+ else
+ {
+ sDlgWhere = sDlgWhere + ",''";
+ }
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
index a05f3fc..449d355 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
@@ -55,6 +55,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.chkHShowUnFinish = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.txtHOrderProcNo = new System.Windows.Forms.TextBox();
@@ -67,8 +69,7 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdMain = new System.Windows.Forms.DataGridView();
- this.txtHMaterNumber = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.chkShowUpperID = new System.Windows.Forms.CheckBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -110,7 +111,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(1432, 59);
+ this.Tool.Size = new System.Drawing.Size(1611, 71);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -124,7 +125,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(52, 56);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 66);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -132,14 +133,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(122, 24);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
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(122, 24);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -175,7 +176,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 71);
this.toolStripSeparator5.Visible = false;
//
// yl
@@ -196,7 +197,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 71);
this.toolStripSeparator4.Visible = false;
//
// dy
@@ -232,7 +233,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 71);
//
// ruku
//
@@ -279,7 +280,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 71);
//
// tc
//
@@ -298,13 +299,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 71);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 71);
//
// mrlk
//
@@ -314,7 +315,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, 56);
+ this.mrlk.Size = new System.Drawing.Size(86, 66);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -324,7 +325,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 71);
//
// bclk
//
@@ -334,7 +335,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, 56);
+ this.bclk.Size = new System.Drawing.Size(86, 66);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -344,13 +345,14 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 71);
//
// 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.chkShowUpperID);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.chkHShowUnFinish);
@@ -363,18 +365,38 @@
this.pPic.Controls.Add(this.label4);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 59);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 71);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1432, 69);
+ this.pPic.Size = new System.Drawing.Size(1611, 83);
this.pPic.TabIndex = 17;
+ //
+ // txtHMaterNumber
+ //
+ this.txtHMaterNumber.Location = new System.Drawing.Point(965, 14);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.Size = new System.Drawing.Size(249, 28);
+ this.txtHMaterNumber.TabIndex = 98;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.BackColor = System.Drawing.Color.Transparent;
+ this.label9.Location = new System.Drawing.Point(886, 18);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(80, 18);
+ this.label9.TabIndex = 97;
+ this.label9.Text = "鐗╂枡浠ｇ爜";
//
// chkHShowUnFinish
//
this.chkHShowUnFinish.AutoSize = true;
- this.chkHShowUnFinish.Location = new System.Drawing.Point(604, 39);
+ this.chkHShowUnFinish.Location = new System.Drawing.Point(670, 33);
+ this.chkHShowUnFinish.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.chkHShowUnFinish.Name = "chkHShowUnFinish";
- this.chkHShowUnFinish.Size = new System.Drawing.Size(119, 19);
+ this.chkHShowUnFinish.Size = new System.Drawing.Size(142, 22);
this.chkHShowUnFinish.TabIndex = 86;
this.chkHShowUnFinish.Text = "鍙樉绀烘湭瀹屽伐";
this.chkHShowUnFinish.UseVisualStyleBackColor = true;
@@ -382,39 +404,40 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
- this.checkBox1.Location = new System.Drawing.Point(604, 12);
+ this.checkBox1.Location = new System.Drawing.Point(670, 0);
+ this.checkBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.checkBox1.Name = "checkBox1";
- this.checkBox1.Size = new System.Drawing.Size(104, 19);
+ this.checkBox1.Size = new System.Drawing.Size(124, 22);
this.checkBox1.TabIndex = 85;
this.checkBox1.Text = "鏄剧ず涓嶅悎鏍�";
this.checkBox1.UseVisualStyleBackColor = true;
//
// txtHOrderProcNo
//
- this.txtHOrderProcNo.Location = new System.Drawing.Point(384, 10);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNo.Location = new System.Drawing.Point(432, 12);
+ this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
+ this.txtHOrderProcNo.Size = new System.Drawing.Size(180, 28);
this.txtHOrderProcNo.TabIndex = 84;
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(294, 10);
+ this.label8.Location = new System.Drawing.Point(331, 12);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
+ this.label8.Size = new System.Drawing.Size(98, 18);
this.label8.TabIndex = 83;
this.label8.Text = "璁㈠崟璺熻釜鍙�";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(1272, 39);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(1431, 47);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(165, 28);
this.dtpHEDate.TabIndex = 61;
this.dtpHEDate.Visible = false;
//
@@ -422,10 +445,10 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(1196, 43);
+ this.label3.Location = new System.Drawing.Point(1346, 52);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.Size = new System.Drawing.Size(80, 18);
this.label3.TabIndex = 60;
this.label3.Text = "缁撴潫鏃ユ湡";
this.label3.Visible = false;
@@ -433,10 +456,10 @@
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(1272, 10);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(1431, 12);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(165, 28);
this.dtpHBDate.TabIndex = 59;
this.dtpHBDate.Visible = false;
//
@@ -444,10 +467,10 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(1196, 14);
+ this.label4.Location = new System.Drawing.Point(1346, 17);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(80, 18);
this.label4.TabIndex = 58;
this.label4.Text = "寮�濮嬫棩鏈�";
this.label4.Visible = false;
@@ -458,10 +481,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(16, 20);
+ this.lblCaption.Location = new System.Drawing.Point(18, 24);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(179, 24);
+ this.lblCaption.Size = new System.Drawing.Size(221, 29);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "ReportTemplet";
//
@@ -477,13 +500,14 @@
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, 542);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 650);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1432, 24);
+ this.grdSum.Size = new System.Drawing.Size(1611, 29);
this.grdSum.TabIndex = 55;
//
// grdMain
@@ -493,55 +517,47 @@
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, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 154);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1432, 414);
+ this.grdMain.Size = new System.Drawing.Size(1611, 496);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
//
- // txtHMaterNumber
+ // chkShowUpperID
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(858, 12);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
- this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(222, 25);
- this.txtHMaterNumber.TabIndex = 98;
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(788, 15);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
- this.label9.TabIndex = 97;
- this.label9.Text = "鐗╂枡浠ｇ爜";
+ this.chkShowUpperID.AutoSize = true;
+ this.chkShowUpperID.Location = new System.Drawing.Point(670, 60);
+ this.chkShowUpperID.Name = "chkShowUpperID";
+ this.chkShowUpperID.Size = new System.Drawing.Size(142, 22);
+ this.chkShowUpperID.TabIndex = 99;
+ this.chkShowUpperID.Text = "鏄剧ず涓婄骇浠ｇ爜";
+ this.chkShowUpperID.UseVisualStyleBackColor = true;
//
// Mes_OrderProcFlowAllReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1432, 566);
+ this.ClientSize = new System.Drawing.Size(1611, 679);
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);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "Mes_OrderProcFlowAllReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.Frm_EasyReport_Load);
- this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Mes_OrderProcFlowAllReport_KeyUp);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Mes_OrderProcFlowAllReport_KeyDown);
+ this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Mes_OrderProcFlowAllReport_KeyUp);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.pPic.ResumeLayout(false);
@@ -593,5 +609,6 @@
private System.Windows.Forms.DataGridView grdMain;
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.CheckBox chkShowUpperID;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.resx"
index 9f884d7..6c436d1 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.resx"
@@ -112,18 +112,18 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>98, 21</value>
</metadata>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>188, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -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
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/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="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -280,7 +280,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -294,7 +294,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -308,7 +308,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
sbY1hi22Iptt5ecmuQgXxcWvFGojuXDy66AUyo9p9t2wx/f5pC9l+/LU06dP79frET/jCc7B5QvB6Z3R
6vLNwB0IIzi7hC8se/pHJpAp/rFD+f45Ynf7JfiRTmtlvN6IfBndEYtzVEKpt3etnAiFt2Gsa0J1Qwt6
PcHsA10Ojxx4VVJaE8kU3j/SuHuIIXp8Crc/nH3AbOuTA89xBbF48ruvSbyoZcw2x++BqdA8xDTQbemR
@@ -321,7 +321,7 @@
<data name="view.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -334,7 +334,7 @@
<data name="ruku.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEiSURBVDhPhZI/SgNBFMankhQi2Nh5BjvJCUzpGYKFeIYQ
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEiSURBVDhPhZI/SgNBFMankhQi2Nh5BjvJCUzpGYKFeIYQ
LHKFFGFvYLM3ELYRu0DwAFulSyWEFFHG/b3Mt87O/smDB/t23vd73xvGpXF7d+Pn2Yv/+T1aUoej4aAR
QSitfl/nfrsr/Wz17EdXF/0giZmslJOv8tMggyABNuVHC/BWrAwyCKLALk37w7eBBJCLOAV6mN6fIOkk
UiDOlvmiddYAENPXx0YTjibFuAZJFK/ZWAPLCBEpr/NLS75xKKGykrXvAYHLnMGW64V9dwEmT+MmgJ80
@@ -345,7 +345,7 @@
<data name="lingliao.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACYSURBVDhPpY+7DYAwEEOzEzvR0bEMQ1DRMAQjILagDvIF
H/kRIvIkK/eJHTAV2Pv8hT2PBQG/QsRMoXfjOmJjrCJq7odZDOwpzORmBr3km7epE3EHYScOD13STCNq
9mHAhFNIzBkBqZ8QFxCbib6I2u+p0hcQu6/jq/wAkIQUfudWGACCENaYu3VCdq7GD3ORJjNpMldizAWG
+xR5VXbRDwAAAABJRU5ErkJggg==
@@ -354,7 +354,7 @@
<data name="taizhang.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -364,7 +364,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -374,7 +374,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
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -389,7 +389,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -3958,10 +3958,10 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>266, 21</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>42</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.designer.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.designer.cs"
index 5ae33d0..f5fd440 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.designer.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.designer.cs"
@@ -101,6 +101,7 @@
((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -115,10 +116,10 @@
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 74);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1415, 46);
+ this.pPic.Size = new System.Drawing.Size(1592, 55);
this.pPic.TabIndex = 15;
//
// panel1
@@ -126,29 +127,29 @@
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(1130, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(1271, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(285, 46);
+ this.panel1.Size = new System.Drawing.Size(321, 55);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(32, 30);
+ this.lbljl.Location = new System.Drawing.Point(36, 36);
this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(17, 18);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(32, 8);
+ this.lbldj.Location = new System.Drawing.Point(36, 10);
this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 18);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -157,10 +158,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(16, 11);
+ this.lblCaption.Location = new System.Drawing.Point(18, 13);
this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(124, 27);
+ this.lblCaption.Size = new System.Drawing.Size(147, 33);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鍗曟嵁鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -209,7 +210,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(1415, 62);
+ this.Tool.Size = new System.Drawing.Size(1592, 74);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -226,13 +227,12 @@
this.dc.Text = "寮曞嚭";
this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dc.Visible = false;
this.dc.Click += new System.EventHandler(this.dc_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator10.Visible = false;
//
// set
@@ -280,7 +280,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 74);
//
// cx
//
@@ -313,7 +313,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 74);
//
// shc
//
@@ -349,7 +349,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator6.Visible = false;
//
// xz
@@ -399,7 +399,7 @@
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 74);
//
// fg
//
@@ -419,7 +419,7 @@
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator12.Visible = false;
//
// gl
@@ -439,7 +439,7 @@
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(6, 74);
//
// cf
//
@@ -459,7 +459,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -495,7 +495,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 74);
this.toolStripSeparator4.Visible = false;
//
// tc
@@ -515,13 +515,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 74);
//
// toolStripSeparator9
//
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, 74);
//
// yc
//
@@ -531,7 +531,7 @@
this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.yc.ImageTransparentColor = System.Drawing.Color.White;
this.yc.Name = "yc";
- this.yc.Size = new System.Drawing.Size(58, 59);
+ this.yc.Size = new System.Drawing.Size(68, 69);
this.yc.Text = "闅愯棌鍒�";
this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -542,7 +542,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 74);
//
// mrlk
//
@@ -552,7 +552,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(86, 69);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -562,7 +562,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, 74);
//
// bclk
//
@@ -572,7 +572,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(86, 69);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -582,7 +582,7 @@
//
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, 74);
//
// timer1
//
@@ -603,26 +603,28 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(0, 0);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1415, 441);
+ this.grdMain.Size = new System.Drawing.Size(1592, 434);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1029, 182);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Location = new System.Drawing.Point(1158, 218);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 62;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(37, 36);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
//
@@ -633,13 +635,14 @@
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, 992);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 1021);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1415, 24);
+ this.grdSum.Size = new System.Drawing.Size(1592, 29);
this.grdSum.TabIndex = 47;
//
// groupBox1
@@ -662,20 +665,21 @@
this.groupBox1.Controls.Add(this.btnOK);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 108);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(0, 129);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1415, 96);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox1.Size = new System.Drawing.Size(1592, 115);
this.groupBox1.TabIndex = 50;
this.groupBox1.TabStop = false;
//
// chkHWWFlag
//
this.chkHWWFlag.AutoSize = true;
- this.chkHWWFlag.Location = new System.Drawing.Point(351, 66);
+ this.chkHWWFlag.Location = new System.Drawing.Point(395, 79);
+ this.chkHWWFlag.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.chkHWWFlag.Name = "chkHWWFlag";
- this.chkHWWFlag.Size = new System.Drawing.Size(104, 19);
+ this.chkHWWFlag.Size = new System.Drawing.Size(124, 22);
this.chkHWWFlag.TabIndex = 19;
this.chkHWWFlag.Text = "鍙樉绀哄澶�";
this.chkHWWFlag.UseVisualStyleBackColor = true;
@@ -683,77 +687,77 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(196, 32);
+ this.label7.Location = new System.Drawing.Point(220, 38);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(97, 15);
+ this.label7.Size = new System.Drawing.Size(116, 18);
this.label7.TabIndex = 17;
this.label7.Text = "璁㈠崟璺熻釜鍙凤細";
//
// txtHOrderProcNO
//
- this.txtHOrderProcNO.Location = new System.Drawing.Point(301, 29);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(339, 35);
+ this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
- this.txtHOrderProcNO.Size = new System.Drawing.Size(154, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(173, 28);
this.txtHOrderProcNO.TabIndex = 18;
this.txtHOrderProcNO.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHOrderProcNO_KeyDown);
//
// txtHDeptName
//
- this.txtHDeptName.Location = new System.Drawing.Point(1244, 15);
- this.txtHDeptName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHDeptName.Location = new System.Drawing.Point(1400, 18);
+ this.txtHDeptName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHDeptName.Name = "txtHDeptName";
- this.txtHDeptName.Size = new System.Drawing.Size(148, 25);
+ this.txtHDeptName.Size = new System.Drawing.Size(166, 28);
this.txtHDeptName.TabIndex = 15;
this.txtHDeptName.Visible = false;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(1184, 18);
+ this.label6.Location = new System.Drawing.Point(1332, 22);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(52, 15);
+ this.label6.Size = new System.Drawing.Size(62, 18);
this.label6.TabIndex = 16;
this.label6.Text = "杞﹂棿锛�";
this.label6.Visible = false;
//
// txtHMaterID
//
- this.txtHMaterID.Location = new System.Drawing.Point(864, 54);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterID.Location = new System.Drawing.Point(972, 65);
+ this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(148, 25);
+ this.txtHMaterID.Size = new System.Drawing.Size(166, 28);
this.txtHMaterID.TabIndex = 13;
this.txtHMaterID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHMaterID_KeyDown);
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(749, 60);
+ this.label4.Location = new System.Drawing.Point(843, 72);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(84, 15);
+ this.label4.Size = new System.Drawing.Size(98, 18);
this.label4.TabIndex = 14;
this.label4.Text = "鐗� 鏂欙細";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(751, 25);
+ this.label1.Location = new System.Drawing.Point(845, 30);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(97, 15);
+ this.label1.Size = new System.Drawing.Size(116, 18);
this.label1.TabIndex = 11;
this.label1.Text = "鐢熶骇璁㈠崟鍙凤細";
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(864, 21);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Location = new System.Drawing.Point(972, 25);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(148, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(166, 28);
this.txtHBillNo.TabIndex = 12;
this.txtHBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBillNo_KeyDown);
//
@@ -765,58 +769,58 @@
"鍏ㄩ儴",
"鏈墦鍗�",
"宸叉墦鍗�"});
- this.cmbHStatus.Location = new System.Drawing.Point(97, 29);
- this.cmbHStatus.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHStatus.Location = new System.Drawing.Point(109, 35);
+ this.cmbHStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(85, 23);
+ this.cmbHStatus.Size = new System.Drawing.Size(95, 26);
this.cmbHStatus.TabIndex = 10;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(8, 32);
+ this.label5.Location = new System.Drawing.Point(9, 38);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(82, 15);
+ this.label5.Size = new System.Drawing.Size(98, 18);
this.label5.TabIndex = 9;
this.label5.Text = "鎵撳嵃鐘舵�侊細";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(571, 20);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(642, 24);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.ShowCheckBox = true;
- this.dtpHBDate.Size = new System.Drawing.Size(161, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(181, 28);
this.dtpHBDate.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(490, 25);
+ this.label2.Location = new System.Drawing.Point(551, 30);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(98, 18);
this.label2.TabIndex = 2;
this.label2.Text = "寮�濮嬫棩鏈燂細";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(571, 54);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(642, 65);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.ShowCheckBox = true;
- this.dtpHEDate.Size = new System.Drawing.Size(161, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(181, 28);
this.dtpHEDate.TabIndex = 5;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(1058, 54);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Location = new System.Drawing.Point(1190, 65);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(144, 31);
+ this.btnOK.Size = new System.Drawing.Size(162, 37);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "蹇�熸煡璇�";
this.btnOK.UseVisualStyleBackColor = true;
@@ -825,18 +829,18 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(489, 58);
+ this.label3.Location = new System.Drawing.Point(550, 70);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(82, 15);
+ this.label3.Size = new System.Drawing.Size(98, 18);
this.label3.TabIndex = 4;
this.label3.Text = "缁撴潫鏃ユ湡锛�";
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 204);
- this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 244);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@@ -847,9 +851,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.grdSub);
- this.splitContainer1.Size = new System.Drawing.Size(1415, 788);
- this.splitContainer1.SplitterDistance = 441;
- this.splitContainer1.SplitterWidth = 5;
+ this.splitContainer1.Size = new System.Drawing.Size(1592, 777);
+ this.splitContainer1.SplitterDistance = 434;
+ this.splitContainer1.SplitterWidth = 6;
this.splitContainer1.TabIndex = 51;
//
// grdSub
@@ -860,19 +864,20 @@
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.Location = new System.Drawing.Point(0, 0);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 62;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1415, 342);
+ this.grdSub.Size = new System.Drawing.Size(1592, 337);
this.grdSub.TabIndex = 20;
this.grdSub.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdSub_CellMouseUp);
//
// Sc_ProcessExchangeBillQuery
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1415, 1016);
+ this.ClientSize = new System.Drawing.Size(1592, 1050);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.grdPrint);
@@ -880,7 +885,7 @@
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "Sc_ProcessExchangeBillQuery";
this.Text = "宸ュ簭娴佽浆鍗″垪琛�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -899,6 +904,7 @@
this.groupBox1.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
this.ResumeLayout(false);
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.resx" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.resx"
index cae4f55..4124170 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.resx"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3917,7 +3917,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
@@ -3927,7 +3927,7 @@
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
@@ -3937,7 +3937,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -3947,7 +3947,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -3960,7 +3960,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -3972,7 +3972,7 @@
<data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -3986,7 +3986,7 @@
<data name="shc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
@@ -3995,7 +3995,7 @@
<data name="xc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -4004,7 +4004,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
@@ -4018,7 +4018,7 @@
<data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4028,7 +4028,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -4042,7 +4042,7 @@
<data name="fg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -4057,7 +4057,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -4072,7 +4072,7 @@
<data name="cf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -4087,7 +4087,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -4100,7 +4100,7 @@
<data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -4113,7 +4113,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -4123,7 +4123,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -4133,7 +4133,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
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -4148,7 +4148,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -4160,13 +4160,13 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.1