From 9d93f219367a57659c6641319922dee224e68d39 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 09 八月 2022 16:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/报表分析/MES_ICMOBillStatusReport.designer.cs | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
index b8ea027..891f154 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
@@ -32,6 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_ICMOBillStatusReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
@@ -58,9 +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.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -98,6 +100,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ 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(45, 44);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ 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(112, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// yl
//
@@ -208,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.label4);
+ this.pPic.Controls.Add(this.txtHMaterName);
this.pPic.Controls.Add(this.label6);
this.pPic.Controls.Add(this.txtHProcessExchangeBillNo);
this.pPic.Controls.Add(this.cmbHICMOBillStatus);
@@ -249,7 +281,8 @@
this.cmbHICMOBillStatus.Items.AddRange(new object[] {
"鍏ㄩ儴",
"WMS缁撴",
- "鏈粨妗�"});
+ "鏈粨妗�",
+ "K3缁撴"});
this.cmbHICMOBillStatus.Location = new System.Drawing.Point(723, 3);
this.cmbHICMOBillStatus.Name = "cmbHICMOBillStatus";
this.cmbHICMOBillStatus.Size = new System.Drawing.Size(143, 20);
@@ -290,6 +323,7 @@
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
this.dtpHEDate.TabIndex = 10;
+ this.dtpHEDate.Visible = false;
//
// label1
//
@@ -300,6 +334,7 @@
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 7;
this.label1.Text = "寮�濮嬫棩鏈�";
+ this.label1.Visible = false;
//
// label2
//
@@ -310,6 +345,7 @@
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 8;
this.label2.Text = "缁撴潫鏃ユ湡";
+ this.label2.Visible = false;
//
// dtpHBDate
//
@@ -318,6 +354,7 @@
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
this.dtpHBDate.TabIndex = 9;
+ this.dtpHBDate.Visible = false;
//
// lblCaption
//
@@ -368,33 +405,22 @@
this.grdSum.Size = new System.Drawing.Size(1190, 19);
this.grdSum.TabIndex = 49;
//
- // toolStripDropDownButton1
+ // label4
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- 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(45, 44);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(654, 32);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 114;
+ this.label4.Text = "浜у搧鍚嶇О";
//
- // eXCELToolStripMenuItem
+ // txtHMaterName
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 22);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.txtHMaterName.Location = new System.Drawing.Point(723, 28);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(143, 21);
+ this.txtHMaterName.TabIndex = 113;
//
// MES_ICMOBillStatusReport
//
@@ -454,5 +480,7 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.Label label4;
+ public System.Windows.Forms.TextBox txtHMaterName;
}
}
\ No newline at end of file
--
Gitblit v1.9.1