From 34556e3916c073bb830662a0ffd6168c966f9d4a Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期三, 19 四月 2023 11:52:24 +0800
Subject: [PATCH] 配套表、发料清单： 查询可显示该查询条件下的打印次数和最新打印人、最新打印时间； 打印时记录查询条件、打印人、打印时间、打印的时配套表还是发料表； 添加内容：在Sc_ICMOWorkCompleteSet.cs文件添加方法Sub_PrintRecord();在查询和打印按钮绑定的方法处调用该方法
---
WorkM/报表分析/Sc_ICMOWorkCompleteSet.resx | 28 ++--
WorkM/报表分析/Sc_ICMOWorkCompleteSet.cs | 79 +++++++++++++
WorkM/报表分析/Sc_ICMOWorkCompleteSet.designer.cs | 233 +++++++++++++++++++++++---------------
3 files changed, 233 insertions(+), 107 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
index a75b88a..1b9a969 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.cs"
@@ -56,6 +56,7 @@
//{
timer1.Enabled = true;
//}
+ Sub_PrintRecord(1);
}
//璁剧疆鎶ヨ〃鍚嶇О
private void SetFormCaption()
@@ -121,6 +122,7 @@
//
Sub_SetReport(oFrm.sOpenTmp);
Report.Print(true);
+ Sub_PrintRecord(2);
}
//Sub_SetReport();
//Report.Print(true);
@@ -403,9 +405,86 @@
{
BLL.ClsPub_BLL.Sub_ClearText(txtHCenterID);
}
+
+ //閰嶅琛ㄣ�佸彂鏂欐竻鍗曟煡璇㈡椂鏄剧ず鎵撳嵃娆℃暟鍜屾渶鏂版墦鍗拌褰�
+ private void Sub_PrintRecord(int iOperationIndex)
+ {
+ if (iOperationIndex == 1) { //鏌ヨ鏃舵樉绀烘墦鍗版鏁板拰鎵撳嵃璁板綍
+ ClsCN SubCn = new ClsCN();
+ DataSet DSet;
+ //鏌ヨ鏉′欢
+ string sHICMOInterID;
+ string sHCenterID;
+ string sHSearchCondition;
+ string sHPrintType;
+ //瀛樺偍杩囩▼浼犻�掔殑鍙傛暟
+ string sWhere;
+ //闇�瑕佹樉绀虹殑鏁版嵁
+ string sPrintCount;
+ string sHPrinterName;
+ string sHPrintTime;
+ //缁欓渶瑕佷紶閫掔殑鍙傛暟璧嬪��
+ sHICMOInterID = txtHICMOInterID.Text;
+ sHCenterID = txtHCenterID.Text;
+ sHSearchCondition = sHICMOInterID + "," + sHCenterID;
+ sHPrintType = tabControl1.SelectedTab.Text;
+ //鎷兼帴闇�瑕佷紶閫掔殑鍙傛暟
+ sWhere = "'" + sHSearchCondition + "','" + sHPrintType + "'";
+ //璋冪敤瀛樺偍杩囩▼鏌ヨ鏁版嵁
+ DSet = SubCn.RunProcReturn("exec h_p_Sc_SearchPrintRecord " + sWhere, "Sc_PrintRecord_PtFl");
+ if (DSet == null)
+ {
+ lblHPrintTimes.Text = lblHPrintTimes.Text.Substring(0, 5);
+ lblHPrinterName.Text = lblHPrinterName.Text.Substring(0, 4);
+ lblHPrintTime.Text = lblHPrintTime.Text.Substring(0, 7);
+ return;
+ }
+ //鏇存柊绐楀彛鐨勫睍绀烘暟鎹�
+ if (DSet.Tables[0].Rows.Count != 0)
+ {
+ lblHPrintTimes.Text = lblHPrintTimes.Text.Substring(0,5) + DSet.Tables[1].Rows[0]["鎵撳嵃娆℃暟"].ToString();
+ lblHPrinterName.Text = lblHPrinterName.Text.Substring(0, 4) + DSet.Tables[0].Rows[0]["鎵撳嵃浜�"].ToString();
+ lblHPrintTime.Text = lblHPrintTime.Text.Substring(0, 7) + DSet.Tables[0].Rows[0]["鎵撳嵃鏃堕棿"].ToString();
+ }
+ else
+ {
+ lblHPrintTimes.Text = lblHPrintTimes.Text.Substring(0, 5)+"0";
+ lblHPrinterName.Text = lblHPrinterName.Text.Substring(0, 4);
+ lblHPrintTime.Text = lblHPrintTime.Text.Substring(0, 7);
+ }
+ }else if (iOperationIndex == 2)
+ {
+ ClsCN SubCn = new ClsCN();
+ //鏌ヨ鏉′欢
+ string sHICMOInterID;
+ string sHCenterID;
+ string sHSearchCondition;
+ string sHPrinterName;
+ string sHPrintTime;
+ string sHPrintType;
+ //瀛樺偍杩囩▼浼犻�掔殑鍙傛暟
+ string sWhere;
+ //缁欓渶瑕佷紶閫掔殑鍙傛暟璧嬪��
+ sHICMOInterID = txtHICMOInterID.Text;
+ sHCenterID = txtHCenterID.Text;
+ sHSearchCondition = sHICMOInterID + "," + sHCenterID;
+ sHPrinterName = DBUtility.ClsPub.CurUserName;
+ sHPrintTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ sHPrintType = tabControl1.SelectedTab.Text;
+ //鎷兼帴闇�瑕佷紶閫掔殑鍙傛暟
+ sWhere = "'" + sHSearchCondition + "','" + sHPrinterName + "','" + sHPrintTime + "','" + sHPrintType + "'";
+ SubCn.RunProcReturn("exec h_p_Sc_SavePrintRecord " + sWhere, "Sc_PrintRecord_PtFl");
+ Sub_PrintRecord(1);
+ }
+
+ }
+ private void label8_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.designer.cs"
index fae8f42..e9a8c99 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.designer.cs"
@@ -47,6 +47,9 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.lblHPrintTimes = new System.Windows.Forms.Label();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
this.txtHDate = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.chkHShowPPBom = new System.Windows.Forms.CheckBox();
@@ -71,8 +74,8 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdSub = new System.Windows.Forms.DataGridView();
- this.txtHMaterNumber = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
+ this.lblHPrinterName = new System.Windows.Forms.Label();
+ this.lblHPrintTime = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -112,7 +115,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(1667, 59);
+ this.Tool.Size = new System.Drawing.Size(1875, 71);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -134,7 +137,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
@@ -168,7 +171,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 71);
//
// cx
//
@@ -187,7 +190,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
//
@@ -206,13 +209,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
//
@@ -222,7 +225,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;
@@ -232,7 +235,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
//
@@ -242,7 +245,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;
@@ -252,13 +255,16 @@
//
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.lblHPrintTime);
+ this.pPic.Controls.Add(this.lblHPrinterName);
+ this.pPic.Controls.Add(this.lblHPrintTimes);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label7);
this.pPic.Controls.Add(this.txtHDate);
@@ -279,30 +285,61 @@
this.pPic.Controls.Add(this.label1);
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(1667, 81);
+ this.pPic.Size = new System.Drawing.Size(1875, 97);
this.pPic.TabIndex = 17;
+ //
+ // lblHPrintTimes
+ //
+ this.lblHPrintTimes.AutoSize = true;
+ this.lblHPrintTimes.Location = new System.Drawing.Point(267, 75);
+ this.lblHPrintTimes.Name = "lblHPrintTimes";
+ this.lblHPrintTimes.Size = new System.Drawing.Size(98, 18);
+ this.lblHPrintTimes.TabIndex = 55;
+ this.lblHPrintTimes.Text = "鎵撳嵃娆℃暟锛�";
+ this.lblHPrintTimes.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.lblHPrintTimes.Click += new System.EventHandler(this.label8_Click);
+ //
+ // txtHMaterNumber
+ //
+ this.txtHMaterNumber.Location = new System.Drawing.Point(863, 14);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHMaterNumber.Multiline = true;
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.Size = new System.Drawing.Size(308, 69);
+ this.txtHMaterNumber.TabIndex = 87;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(762, 18);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(80, 18);
+ this.label7.TabIndex = 86;
+ this.label7.Text = "鐗╂枡浠ｇ爜";
//
// txtHDate
//
this.txtHDate.Enabled = false;
- this.txtHDate.Location = new System.Drawing.Point(1413, 8);
- this.txtHDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHDate.Location = new System.Drawing.Point(1590, 10);
+ this.txtHDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHDate.Name = "txtHDate";
this.txtHDate.ReadOnly = true;
- this.txtHDate.Size = new System.Drawing.Size(122, 25);
+ this.txtHDate.Size = new System.Drawing.Size(137, 28);
this.txtHDate.TabIndex = 84;
//
// label6
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(1343, 12);
+ this.label6.Location = new System.Drawing.Point(1511, 14);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.Size = new System.Drawing.Size(80, 18);
this.label6.TabIndex = 83;
this.label6.Text = "瀹屽伐鏃ユ湡";
//
@@ -310,9 +347,10 @@
//
this.chkHShowPPBom.AutoSize = true;
this.chkHShowPPBom.BackColor = System.Drawing.Color.Transparent;
- this.chkHShowPPBom.Location = new System.Drawing.Point(516, 47);
+ this.chkHShowPPBom.Location = new System.Drawing.Point(580, 56);
+ this.chkHShowPPBom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.chkHShowPPBom.Name = "chkHShowPPBom";
- this.chkHShowPPBom.Size = new System.Drawing.Size(149, 19);
+ this.chkHShowPPBom.Size = new System.Drawing.Size(178, 22);
this.chkHShowPPBom.TabIndex = 82;
this.chkHShowPPBom.Text = "鏄惁鏄剧ず鎶曟枡娓呭崟";
this.chkHShowPPBom.UseVisualStyleBackColor = false;
@@ -321,9 +359,10 @@
//
this.chkHSupFlag.AutoSize = true;
this.chkHSupFlag.BackColor = System.Drawing.Color.Transparent;
- this.chkHSupFlag.Location = new System.Drawing.Point(516, 10);
+ this.chkHSupFlag.Location = new System.Drawing.Point(580, 12);
+ this.chkHSupFlag.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.chkHSupFlag.Name = "chkHSupFlag";
- this.chkHSupFlag.Size = new System.Drawing.Size(89, 19);
+ this.chkHSupFlag.Size = new System.Drawing.Size(106, 22);
this.chkHSupFlag.TabIndex = 81;
this.chkHSupFlag.Text = "濮斿宸ュ簭";
this.chkHSupFlag.UseVisualStyleBackColor = false;
@@ -331,63 +370,63 @@
// txtcpQty
//
this.txtcpQty.Enabled = false;
- this.txtcpQty.Location = new System.Drawing.Point(1413, 43);
- this.txtcpQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txtcpQty.Location = new System.Drawing.Point(1590, 52);
+ this.txtcpQty.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtcpQty.Name = "txtcpQty";
this.txtcpQty.ReadOnly = true;
- this.txtcpQty.Size = new System.Drawing.Size(122, 25);
+ this.txtcpQty.Size = new System.Drawing.Size(137, 28);
this.txtcpQty.TabIndex = 80;
//
// label5
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(1343, 47);
+ this.label5.Location = new System.Drawing.Point(1511, 56);
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.Size = new System.Drawing.Size(80, 18);
this.label5.TabIndex = 79;
this.label5.Text = "鎴愬搧鏁伴噺";
//
// txtcpName
//
this.txtcpName.Enabled = false;
- this.txtcpName.Location = new System.Drawing.Point(1158, 44);
- this.txtcpName.Margin = new System.Windows.Forms.Padding(4);
+ this.txtcpName.Location = new System.Drawing.Point(1303, 53);
+ this.txtcpName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtcpName.Name = "txtcpName";
this.txtcpName.ReadOnly = true;
- this.txtcpName.Size = new System.Drawing.Size(159, 25);
+ this.txtcpName.Size = new System.Drawing.Size(178, 28);
this.txtcpName.TabIndex = 78;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(1083, 46);
+ this.label4.Location = new System.Drawing.Point(1218, 55);
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 = 77;
this.label4.Text = "鎴愬搧鍚嶇О";
//
// txtcpNumber
//
this.txtcpNumber.Enabled = false;
- this.txtcpNumber.Location = new System.Drawing.Point(1158, 11);
- this.txtcpNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtcpNumber.Location = new System.Drawing.Point(1303, 13);
+ this.txtcpNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtcpNumber.Name = "txtcpNumber";
this.txtcpNumber.ReadOnly = true;
- this.txtcpNumber.Size = new System.Drawing.Size(159, 25);
+ this.txtcpNumber.Size = new System.Drawing.Size(178, 28);
this.txtcpNumber.TabIndex = 76;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(1083, 13);
+ this.label3.Location = new System.Drawing.Point(1218, 16);
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 = 75;
this.label3.Text = "鎴愬搧浠ｇ爜";
//
@@ -395,20 +434,20 @@
//
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
this.cmdHCenterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHCenterID.Location = new System.Drawing.Point(469, 43);
- this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHCenterID.Location = new System.Drawing.Point(528, 44);
+ this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdHCenterID.Name = "cmdHCenterID";
- this.cmdHCenterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHCenterID.Size = new System.Drawing.Size(33, 34);
this.cmdHCenterID.TabIndex = 74;
this.cmdHCenterID.UseVisualStyleBackColor = true;
this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
//
// cmdcx
//
- this.cmdcx.Location = new System.Drawing.Point(1570, 20);
- this.cmdcx.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdcx.Location = new System.Drawing.Point(1766, 24);
+ this.cmdcx.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cmdcx.Name = "cmdcx";
- this.cmdcx.Size = new System.Drawing.Size(84, 42);
+ this.cmdcx.Size = new System.Drawing.Size(94, 50);
this.cmdcx.TabIndex = 73;
this.cmdcx.Text = "蹇�熸煡璇�";
this.cmdcx.UseVisualStyleBackColor = true;
@@ -417,10 +456,10 @@
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(327, 44);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(368, 45);
+ this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(143, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(160, 28);
this.txtHCenterID.TabIndex = 72;
this.txtHCenterID.WordWrap = false;
this.txtHCenterID.TextChanged += new System.EventHandler(this.txtHCenterID_TextChanged);
@@ -429,29 +468,29 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(251, 48);
+ this.label2.Location = new System.Drawing.Point(282, 50);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(80, 18);
this.label2.TabIndex = 71;
this.label2.Text = "宸ヤ綔涓績";
//
// txtHICMOInterID
//
- this.txtHICMOInterID.Location = new System.Drawing.Point(327, 8);
- this.txtHICMOInterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHICMOInterID.Location = new System.Drawing.Point(368, 10);
+ this.txtHICMOInterID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHICMOInterID.Name = "txtHICMOInterID";
- this.txtHICMOInterID.Size = new System.Drawing.Size(143, 25);
+ this.txtHICMOInterID.Size = new System.Drawing.Size(160, 28);
this.txtHICMOInterID.TabIndex = 63;
//
// label1
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(237, 11);
+ this.label1.Location = new System.Drawing.Point(267, 13);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(98, 18);
this.label1.TabIndex = 62;
this.label1.Text = "璁㈠崟璺熻釜鍙�";
//
@@ -461,10 +500,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";
//
@@ -479,16 +518,17 @@
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(3, 3);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(3, 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(1653, 648);
+ this.grdMain.Size = new System.Drawing.Size(1861, 779);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdSum
//
@@ -497,13 +537,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, 823);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 987);
+ 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(1667, 24);
+ this.grdSum.Size = new System.Drawing.Size(1875, 29);
this.grdSum.TabIndex = 55;
//
// tabControl1
@@ -511,19 +552,21 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 140);
+ this.tabControl1.Location = new System.Drawing.Point(0, 168);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1667, 683);
+ this.tabControl1.Size = new System.Drawing.Size(1875, 819);
this.tabControl1.TabIndex = 56;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Location = new System.Drawing.Point(4, 28);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1659, 654);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1867, 787);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "閰嶅琛�";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -531,10 +574,11 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Location = new System.Drawing.Point(4, 28);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(1659, 654);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tabPage2.Size = new System.Drawing.Size(1867, 787);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍙戞枡娓呭崟";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -543,43 +587,43 @@
//
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdSub.Location = new System.Drawing.Point(3, 3);
+ this.grdSub.Location = new System.Drawing.Point(3, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.grdSub.Name = "grdSub";
+ this.grdSub.RowHeadersWidth = 62;
this.grdSub.RowTemplate.Height = 27;
- this.grdSub.Size = new System.Drawing.Size(1653, 648);
+ this.grdSub.Size = new System.Drawing.Size(1861, 779);
this.grdSub.TabIndex = 0;
//
- // txtHMaterNumber
+ // lblHPrinterName
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(767, 12);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
- this.txtHMaterNumber.Multiline = true;
- this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(274, 58);
- this.txtHMaterNumber.TabIndex = 87;
+ this.lblHPrinterName.AutoSize = true;
+ this.lblHPrinterName.Location = new System.Drawing.Point(418, 75);
+ this.lblHPrinterName.Name = "lblHPrinterName";
+ this.lblHPrinterName.Size = new System.Drawing.Size(80, 18);
+ this.lblHPrinterName.TabIndex = 88;
+ this.lblHPrinterName.Text = "鎵撳嵃浜猴細";
//
- // label7
+ // lblHPrintTime
//
- this.label7.AutoSize = true;
- this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Location = new System.Drawing.Point(677, 15);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(67, 15);
- this.label7.TabIndex = 86;
- this.label7.Text = "鐗╂枡浠ｇ爜";
+ this.lblHPrintTime.AutoSize = true;
+ this.lblHPrintTime.Location = new System.Drawing.Point(553, 75);
+ this.lblHPrintTime.Name = "lblHPrintTime";
+ this.lblHPrintTime.Size = new System.Drawing.Size(134, 18);
+ this.lblHPrintTime.TabIndex = 89;
+ this.lblHPrintTime.Text = "鏈�鏂版墦鍗版椂闂达細";
//
// Sc_ICMOWorkCompleteSet
//
- 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(1667, 847);
+ this.ClientSize = new System.Drawing.Size(1875, 1016);
this.Controls.Add(this.tabControl1);
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 = "Sc_ICMOWorkCompleteSet";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -643,5 +687,8 @@
private System.Windows.Forms.Label label6;
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label lblHPrintTimes;
+ private System.Windows.Forms.Label lblHPrinterName;
+ private System.Windows.Forms.Label lblHPrintTime;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.resx"
index aa5f7e8..a13b220 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ICMOWorkCompleteSet.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="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
@@ -270,7 +270,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
@@ -283,7 +283,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
@@ -296,7 +296,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
@@ -308,7 +308,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
@@ -318,7 +318,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
@@ -333,7 +333,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
@@ -3917,10 +3917,10 @@
FIYcEAA7
</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
--
Gitblit v1.9.1