From f4e89066f9119fac831b64f388516aeb01c7dd60 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 03 十一月 2021 16:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/MES_WIPProcReport.designer.cs | 326 ++++++++++++++++++++++++------------------------------
1 files changed, 144 insertions(+), 182 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.designer.cs"
index 08738af..41f44e4 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.designer.cs"
@@ -50,15 +50,13 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.txtHMaterModel = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.lbljl = new System.Windows.Forms.Label();
this.lbldj = new System.Windows.Forms.Label();
- this.cmdHWorkCenter = new System.Windows.Forms.Button();
- this.cmdHSupName = new System.Windows.Forms.Button();
- this.txtHExProcNo = new System.Windows.Forms.TextBox();
- this.txtHWorkCenter = new System.Windows.Forms.TextBox();
- this.txtHSupName = new System.Windows.Forms.TextBox();
- this.txtHOrderProcNo = new System.Windows.Forms.TextBox();
- this.label8 = new System.Windows.Forms.Label();
+ this.txtHProcName = new System.Windows.Forms.TextBox();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
@@ -77,8 +75,9 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.txtHMaterNumber = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.cmbHType = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.btnClear = new System.Windows.Forms.Button();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -116,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(1400, 59);
+ this.Tool.Size = new System.Drawing.Size(1050, 47);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -130,7 +129,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(45, 44);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -138,14 +137,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(122, 24);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
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(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -167,7 +166,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator4.Visible = false;
//
// dy
@@ -203,7 +202,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
//
// cx
//
@@ -222,7 +221,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 47);
//
// tc
//
@@ -241,13 +240,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
//
// 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, 47);
//
// mrlk
//
@@ -257,7 +256,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(60, 44);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -267,7 +266,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, 47);
//
// bclk
//
@@ -277,7 +276,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(60, 44);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -287,24 +286,23 @@
//
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, 47);
//
// 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.txtHMaterNumber);
+ this.pPic.Controls.Add(this.btnClear);
+ this.pPic.Controls.Add(this.cmbHType);
+ this.pPic.Controls.Add(this.label10);
+ this.pPic.Controls.Add(this.txtHMaterModel);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.lbljl);
this.pPic.Controls.Add(this.lbldj);
- this.pPic.Controls.Add(this.cmdHWorkCenter);
- this.pPic.Controls.Add(this.cmdHSupName);
- this.pPic.Controls.Add(this.txtHExProcNo);
- this.pPic.Controls.Add(this.txtHWorkCenter);
- this.pPic.Controls.Add(this.txtHSupName);
- this.pPic.Controls.Add(this.txtHOrderProcNo);
- this.pPic.Controls.Add(this.label8);
+ this.pPic.Controls.Add(this.txtHProcName);
+ this.pPic.Controls.Add(this.txtHMaterNumber);
+ this.pPic.Controls.Add(this.txtHMaterName);
this.pPic.Controls.Add(this.label7);
this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.label2);
@@ -313,159 +311,121 @@
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, 47);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1400, 69);
+ this.pPic.Size = new System.Drawing.Size(1050, 55);
this.pPic.TabIndex = 17;
+ //
+ // txtHMaterModel
+ //
+ this.txtHMaterModel.Location = new System.Drawing.Point(680, 27);
+ this.txtHMaterModel.Name = "txtHMaterModel";
+ this.txtHMaterModel.Size = new System.Drawing.Size(111, 21);
+ this.txtHMaterModel.TabIndex = 82;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.BackColor = System.Drawing.Color.Transparent;
+ this.label9.Location = new System.Drawing.Point(625, 31);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.TabIndex = 81;
+ this.label9.Text = "瑙勬牸鍨嬪彿";
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(1063, 39);
- this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbljl.Location = new System.Drawing.Point(797, 31);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(15, 15);
+ this.lbljl.Size = new System.Drawing.Size(11, 12);
this.lbljl.TabIndex = 80;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(1063, 16);
- this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbldj.Location = new System.Drawing.Point(797, 13);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 15);
+ this.lbldj.Size = new System.Drawing.Size(0, 12);
this.lbldj.TabIndex = 79;
//
- // cmdHWorkCenter
+ // txtHProcName
//
- this.cmdHWorkCenter.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWorkCenter.Image")));
- this.cmdHWorkCenter.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWorkCenter.Location = new System.Drawing.Point(529, 35);
- this.cmdHWorkCenter.Margin = new System.Windows.Forms.Padding(4);
- this.cmdHWorkCenter.Name = "cmdHWorkCenter";
- this.cmdHWorkCenter.Size = new System.Drawing.Size(29, 28);
- this.cmdHWorkCenter.TabIndex = 78;
- this.cmdHWorkCenter.UseVisualStyleBackColor = true;
- this.cmdHWorkCenter.Click += new System.EventHandler(this.cmdHWorkCenter_Click);
+ this.txtHProcName.Location = new System.Drawing.Point(680, 3);
+ this.txtHProcName.Name = "txtHProcName";
+ this.txtHProcName.Size = new System.Drawing.Size(111, 21);
+ this.txtHProcName.TabIndex = 76;
//
- // cmdHSupName
+ // txtHMaterNumber
//
- this.cmdHSupName.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSupName.Image")));
- this.cmdHSupName.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSupName.Location = new System.Drawing.Point(870, 35);
- this.cmdHSupName.Margin = new System.Windows.Forms.Padding(4);
- this.cmdHSupName.Name = "cmdHSupName";
- this.cmdHSupName.Size = new System.Drawing.Size(29, 28);
- this.cmdHSupName.TabIndex = 77;
- this.cmdHSupName.UseVisualStyleBackColor = true;
- this.cmdHSupName.Click += new System.EventHandler(this.cmdHSupName_Click);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(330, 27);
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.Size = new System.Drawing.Size(111, 21);
+ this.txtHMaterNumber.TabIndex = 75;
//
- // txtHExProcNo
+ // txtHMaterName
//
- this.txtHExProcNo.Location = new System.Drawing.Point(535, 6);
- this.txtHExProcNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHExProcNo.Name = "txtHExProcNo";
- this.txtHExProcNo.Size = new System.Drawing.Size(160, 25);
- this.txtHExProcNo.TabIndex = 76;
- //
- // txtHWorkCenter
- //
- this.txtHWorkCenter.Location = new System.Drawing.Point(294, 36);
- this.txtHWorkCenter.Margin = new System.Windows.Forms.Padding(4);
- this.txtHWorkCenter.Name = "txtHWorkCenter";
- this.txtHWorkCenter.Size = new System.Drawing.Size(232, 25);
- this.txtHWorkCenter.TabIndex = 75;
- //
- // txtHSupName
- //
- this.txtHSupName.Location = new System.Drawing.Point(656, 36);
- this.txtHSupName.Margin = new System.Windows.Forms.Padding(4);
- this.txtHSupName.Name = "txtHSupName";
- this.txtHSupName.Size = new System.Drawing.Size(211, 25);
- this.txtHSupName.TabIndex = 74;
- //
- // txtHOrderProcNo
- //
- this.txtHOrderProcNo.Location = new System.Drawing.Point(294, 8);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
- this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
- this.txtHOrderProcNo.TabIndex = 73;
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(205, 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.TabIndex = 72;
- this.label8.Text = "璁㈠崟璺熻釜鍙�";
+ this.txtHMaterName.Location = new System.Drawing.Point(505, 27);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(111, 21);
+ this.txtHMaterName.TabIndex = 74;
//
// label7
//
this.label7.AutoSize = true;
this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Location = new System.Drawing.Point(463, 11);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(625, 7);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(67, 15);
+ this.label7.Size = new System.Drawing.Size(53, 12);
this.label7.TabIndex = 71;
- this.label7.Text = "娴佽浆鍗″彿";
+ this.label7.Text = "宸ュ簭鍚嶇О";
//
// label5
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(596, 39);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(450, 31);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(52, 15);
+ this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 70;
- this.label5.Text = "渚涘簲鍟�";
+ this.label5.Text = "鐗╂枡鍚嶇О";
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(212, 39);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(275, 31);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 69;
- this.label2.Text = "宸ヤ綔涓績";
+ this.label2.Text = "鐗╂枡浠ｇ爜";
//
// dataGridView1
//
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView1.Location = new System.Drawing.Point(906, 8);
- this.dataGridView1.Margin = new System.Windows.Forms.Padding(4);
+ this.dataGridView1.Location = new System.Drawing.Point(995, 10);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(36, 19);
+ this.dataGridView1.Size = new System.Drawing.Size(27, 15);
this.dataGridView1.TabIndex = 68;
this.dataGridView1.Visible = false;
//
// dtpHFDate
//
this.dtpHFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHFDate.Location = new System.Drawing.Point(751, 6);
- this.dtpHFDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHFDate.Location = new System.Drawing.Point(330, 3);
this.dtpHFDate.Name = "dtpHFDate";
- this.dtpHFDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHFDate.Size = new System.Drawing.Size(111, 21);
this.dtpHFDate.TabIndex = 59;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(704, 11);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(299, 7);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(37, 15);
+ this.label4.Size = new System.Drawing.Size(29, 12);
this.label4.TabIndex = 58;
this.label4.Text = "鏃堕棿";
//
@@ -475,10 +435,9 @@
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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 16);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(179, 24);
+ this.lblCaption.Size = new System.Drawing.Size(152, 19);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "ReportTemplet";
//
@@ -486,10 +445,9 @@
//
this.cmdHEDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEDeptID.Image")));
this.cmdHEDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHEDeptID.Location = new System.Drawing.Point(967, 189);
- this.cmdHEDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHEDeptID.Location = new System.Drawing.Point(725, 151);
this.cmdHEDeptID.Name = "cmdHEDeptID";
- this.cmdHEDeptID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHEDeptID.Size = new System.Drawing.Size(22, 22);
this.cmdHEDeptID.TabIndex = 67;
this.cmdHEDeptID.UseVisualStyleBackColor = true;
this.cmdHEDeptID.Visible = false;
@@ -499,10 +457,9 @@
//
this.cmdHBDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBDeptID.Image")));
this.cmdHBDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBDeptID.Location = new System.Drawing.Point(1026, 230);
- this.cmdHBDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHBDeptID.Location = new System.Drawing.Point(770, 184);
this.cmdHBDeptID.Name = "cmdHBDeptID";
- this.cmdHBDeptID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHBDeptID.Size = new System.Drawing.Size(22, 22);
this.cmdHBDeptID.TabIndex = 66;
this.cmdHBDeptID.UseVisualStyleBackColor = true;
this.cmdHBDeptID.Visible = false;
@@ -512,29 +469,26 @@
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(877, 202);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(658, 162);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(22, 15);
+ this.label6.Size = new System.Drawing.Size(17, 12);
this.label6.TabIndex = 65;
this.label6.Text = "鑷�";
this.label6.Visible = false;
//
// txtHEDeptID
//
- this.txtHEDeptID.Location = new System.Drawing.Point(857, 199);
- this.txtHEDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHEDeptID.Location = new System.Drawing.Point(643, 159);
this.txtHEDeptID.Name = "txtHEDeptID";
- this.txtHEDeptID.Size = new System.Drawing.Size(160, 25);
+ this.txtHEDeptID.Size = new System.Drawing.Size(121, 21);
this.txtHEDeptID.TabIndex = 64;
this.txtHEDeptID.Visible = false;
//
// txtHBDeptID
//
- this.txtHBDeptID.Location = new System.Drawing.Point(820, 199);
- this.txtHBDeptID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBDeptID.Location = new System.Drawing.Point(615, 159);
this.txtHBDeptID.Name = "txtHBDeptID";
- this.txtHBDeptID.Size = new System.Drawing.Size(160, 25);
+ this.txtHBDeptID.Size = new System.Drawing.Size(121, 21);
this.txtHBDeptID.TabIndex = 63;
this.txtHBDeptID.Visible = false;
//
@@ -542,10 +496,9 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(854, 180);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(640, 144);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(61, 15);
+ this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 62;
this.label1.Text = "閮� 闂�";
this.label1.Visible = false;
@@ -553,10 +506,9 @@
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(782, 221);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(586, 177);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(111, 21);
this.dtpHEDate.TabIndex = 61;
this.dtpHEDate.Visible = false;
//
@@ -564,10 +516,9 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(800, 266);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(600, 213);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 60;
this.label3.Text = "缁撴潫鏃ユ湡";
this.label3.Visible = false;
@@ -583,17 +534,16 @@
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, 102);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1400, 520);
+ this.grdMain.Size = new System.Drawing.Size(1050, 417);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
+ 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.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
//
// grdSum
//
@@ -602,39 +552,53 @@
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, 648);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 519);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1400, 24);
+ this.grdSum.Size = new System.Drawing.Size(1050, 19);
this.grdSum.TabIndex = 55;
//
- // txtHMaterNumber
+ // cmbHType
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(980, 36);
- 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 = 82;
+ this.cmbHType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHType.FormattingEnabled = true;
+ this.cmbHType.Items.AddRange(new object[] {
+ "鍏ㄩ儴",
+ "寰呮帴鏀�",
+ "鍦ㄥ埗鍝�"});
+ this.cmbHType.Location = new System.Drawing.Point(505, 3);
+ this.cmbHType.Name = "cmbHType";
+ this.cmbHType.Size = new System.Drawing.Size(111, 20);
+ this.cmbHType.TabIndex = 84;
//
- // label9
+ // label10
//
- this.label9.AutoSize = true;
- this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(910, 39);
- 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 = 81;
- this.label9.Text = "鐗╂枡浠ｇ爜";
+ this.label10.AutoSize = true;
+ this.label10.BackColor = System.Drawing.Color.Transparent;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(474, 7);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(29, 12);
+ this.label10.TabIndex = 83;
+ this.label10.Text = "鐘舵��";
+ //
+ // btnClear
+ //
+ this.btnClear.Location = new System.Drawing.Point(799, 2);
+ this.btnClear.Name = "btnClear";
+ this.btnClear.Size = new System.Drawing.Size(75, 23);
+ this.btnClear.TabIndex = 85;
+ this.btnClear.Text = "娓呯┖";
+ this.btnClear.UseVisualStyleBackColor = true;
+ this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// MES_WIPProcReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1400, 672);
+ this.ClientSize = new System.Drawing.Size(1050, 538);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
@@ -648,13 +612,12 @@
this.Controls.Add(this.dtpHEDate);
this.Controls.Add(this.label3);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MES_WIPProcReport";
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_WIPProcReport_KeyUp);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MES_WIPProcReport_KeyDown);
+ this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MES_WIPProcReport_KeyUp);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.pPic.ResumeLayout(false);
@@ -701,22 +664,21 @@
public System.Windows.Forms.TextBox txtHBDeptID;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridView dataGridView1;
- private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label2;
- public System.Windows.Forms.TextBox txtHExProcNo;
- public System.Windows.Forms.TextBox txtHWorkCenter;
- public System.Windows.Forms.TextBox txtHSupName;
- public System.Windows.Forms.TextBox txtHOrderProcNo;
- private System.Windows.Forms.Button cmdHWorkCenter;
- private System.Windows.Forms.Button cmdHSupName;
+ public System.Windows.Forms.TextBox txtHProcName;
+ public System.Windows.Forms.TextBox txtHMaterNumber;
+ public System.Windows.Forms.TextBox txtHMaterName;
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
- public System.Windows.Forms.TextBox txtHMaterNumber;
+ public System.Windows.Forms.TextBox txtHMaterModel;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.ComboBox cmbHType;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Button btnClear;
}
}
\ No newline at end of file
--
Gitblit v1.9.1