From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/DefectiveDetailedYieldReport.designer.cs | 122 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 48 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
index 39b4f7d..0d563cc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.designer.cs"
@@ -47,6 +47,10 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.label4 = new System.Windows.Forms.Label();
+ this.textHprocName = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textHmaterName = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.txtHProcessExchangeBillNo = new System.Windows.Forms.TextBox();
this.txtHICMOBillNo = new System.Windows.Forms.TextBox();
@@ -57,10 +61,8 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.label2 = new System.Windows.Forms.Label();
- this.textHmaterName = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.textHprocName = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -116,14 +118,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -236,6 +238,8 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.dtpHEDate);
this.pPic.Controls.Add(this.label4);
this.pPic.Controls.Add(this.textHprocName);
this.pPic.Controls.Add(this.label2);
@@ -254,11 +258,49 @@
this.pPic.Size = new System.Drawing.Size(1587, 69);
this.pPic.TabIndex = 17;
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(565, 42);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.TabIndex = 116;
+ this.label4.Text = "宸ュ簭鍚嶇О";
+ //
+ // textHprocName
+ //
+ this.textHprocName.Location = new System.Drawing.Point(657, 37);
+ this.textHprocName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textHprocName.Name = "textHprocName";
+ this.textHprocName.Size = new System.Drawing.Size(189, 25);
+ this.textHprocName.TabIndex = 115;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.BackColor = System.Drawing.Color.Transparent;
+ this.label2.Location = new System.Drawing.Point(265, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.TabIndex = 114;
+ this.label2.Text = "鐗╂枡鍚嶇О";
+ //
+ // textHmaterName
+ //
+ this.textHmaterName.Location = new System.Drawing.Point(357, 37);
+ this.textHmaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textHmaterName.Name = "textHmaterName";
+ this.textHmaterName.Size = new System.Drawing.Size(189, 25);
+ this.textHmaterName.TabIndex = 113;
+ //
// label6
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(871, 11);
+ this.label6.Location = new System.Drawing.Point(1174, 13);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(67, 15);
@@ -267,7 +309,7 @@
//
// txtHProcessExchangeBillNo
//
- this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(966, 4);
+ this.txtHProcessExchangeBillNo.Location = new System.Drawing.Point(1269, 6);
this.txtHProcessExchangeBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcessExchangeBillNo.Name = "txtHProcessExchangeBillNo";
this.txtHProcessExchangeBillNo.Size = new System.Drawing.Size(189, 25);
@@ -275,7 +317,7 @@
//
// txtHICMOBillNo
//
- this.txtHICMOBillNo.Location = new System.Drawing.Point(657, 4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(960, 6);
this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
this.txtHICMOBillNo.Size = new System.Drawing.Size(189, 25);
@@ -285,7 +327,7 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(571, 9);
+ this.label3.Location = new System.Drawing.Point(874, 11);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(52, 15);
@@ -296,12 +338,12 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(279, 9);
+ this.label1.Location = new System.Drawing.Point(265, 9);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(37, 15);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 7;
- this.label1.Text = "鏃ユ湡";
+ this.label1.Text = "寮�濮嬫棩鏈�";
//
// dtpHBDate
//
@@ -309,7 +351,7 @@
this.dtpHBDate.Location = new System.Drawing.Point(357, 4);
this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(141, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(189, 25);
this.dtpHBDate.TabIndex = 9;
//
// lblCaption
@@ -366,43 +408,25 @@
this.grdSum.Size = new System.Drawing.Size(1587, 24);
this.grdSum.TabIndex = 49;
//
- // label2
+ // label5
//
- this.label2.AutoSize = true;
- this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(265, 42);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
- this.label2.TabIndex = 114;
- this.label2.Text = "鐗╂枡鍚嶇О";
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(565, 9);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(67, 15);
+ this.label5.TabIndex = 117;
+ this.label5.Text = "缁撴潫鏃ユ湡";
//
- // textHmaterName
+ // dtpHEDate
//
- this.textHmaterName.Location = new System.Drawing.Point(357, 37);
- this.textHmaterName.Margin = new System.Windows.Forms.Padding(4);
- this.textHmaterName.Name = "textHmaterName";
- this.textHmaterName.Size = new System.Drawing.Size(189, 25);
- this.textHmaterName.TabIndex = 113;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(565, 42);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
- this.label4.TabIndex = 116;
- this.label4.Text = "宸ュ簭鍚嶇О";
- //
- // textHprocName
- //
- this.textHprocName.Location = new System.Drawing.Point(657, 37);
- this.textHprocName.Margin = new System.Windows.Forms.Padding(4);
- this.textHprocName.Name = "textHprocName";
- this.textHprocName.Size = new System.Drawing.Size(189, 25);
- this.textHprocName.TabIndex = 115;
+ this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHEDate.Location = new System.Drawing.Point(657, 6);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Name = "dtpHEDate";
+ this.dtpHEDate.Size = new System.Drawing.Size(189, 25);
+ this.dtpHEDate.TabIndex = 118;
//
// DefectiveDetailedYieldReport
//
@@ -463,5 +487,7 @@
public System.Windows.Forms.TextBox textHmaterName;
private System.Windows.Forms.Label label4;
public System.Windows.Forms.TextBox textHprocName;
+ private System.Windows.Forms.Label label5;
+ public System.Windows.Forms.DateTimePicker dtpHEDate;
}
}
\ No newline at end of file
--
Gitblit v1.9.1