From 8a2f4c5977834d55b889bef3d01e1e02442b735c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 22:00:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/报表分析/Kf_ICInventory_BarCode.designer.cs | 220 +++++++++---------------------------------------------
1 files changed, 37 insertions(+), 183 deletions(-)
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
index 4a9e1f9..55716a2 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
@@ -37,19 +37,10 @@
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.dy2 = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.yc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
- this.sx = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.xz = new System.Windows.Forms.ToolStripButton();
- this.dj = new System.Windows.Forms.ToolStripButton();
- this.sc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.sh = new System.Windows.Forms.ToolStripButton();
- this.qsh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -63,8 +54,6 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.cmbHStatus = new System.Windows.Forms.ComboBox();
- this.label5 = new System.Windows.Forms.Label();
this.txtHSPName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtHWHName = new System.Windows.Forms.TextBox();
@@ -77,6 +66,8 @@
this.label1 = new System.Windows.Forms.Label();
this.btnOK = new System.Windows.Forms.Button();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -91,8 +82,6 @@
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.cmbHStatus);
- this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
@@ -149,19 +138,12 @@
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dy,
- this.dy2,
this.yl,
+ this.toolStripSeparator1,
+ this.dc,
this.yc,
this.toolStripSeparator2,
this.cx,
- this.sx,
- this.toolStripSeparator1,
- this.xz,
- this.dj,
- this.sc,
- this.toolStripSeparator5,
- this.sh,
- this.qsh,
this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
@@ -192,21 +174,6 @@
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Visible = false;
this.dy.Click += new System.EventHandler(this.dy_Click);
- //
- // dy2
- //
- this.dy2.AutoSize = false;
- this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
- this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy2.ImageTransparentColor = System.Drawing.Color.White;
- this.dy2.Name = "dy2";
- this.dy2.Size = new System.Drawing.Size(36, 47);
- this.dy2.Text = "杩炴墦";
- this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy2.Visible = false;
- this.dy2.Click += new System.EventHandler(this.dy2_Click);
//
// yl
//
@@ -256,111 +223,10 @@
this.cx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.cx.Click += new System.EventHandler(this.cx_Click);
//
- // sx
- //
- this.sx.AutoSize = false;
- this.sx.Image = ((System.Drawing.Image)(resources.GetObject("sx.Image")));
- this.sx.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sx.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sx.Name = "sx";
- this.sx.Size = new System.Drawing.Size(36, 47);
- this.sx.Text = "鍒锋柊";
- this.sx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sx.Click += new System.EventHandler(this.sx_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator1.Visible = false;
- //
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(36, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Visible = false;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
- // dj
- //
- this.dj.AutoSize = false;
- this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
- this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dj.ImageTransparentColor = System.Drawing.Color.White;
- this.dj.Name = "dj";
- this.dj.Size = new System.Drawing.Size(36, 47);
- this.dj.Text = "鍗曟嵁";
- this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dj.Visible = false;
- this.dj.Click += new System.EventHandler(this.dj_Click);
- //
- // sc
- //
- this.sc.AutoSize = false;
- this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
- this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sc.Name = "sc";
- this.sc.Size = new System.Drawing.Size(36, 47);
- this.sc.Text = "鍒犻櫎";
- this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sc.Visible = false;
- this.sc.Click += new System.EventHandler(this.sc_Click);
- //
- // toolStripSeparator5
- //
- this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
- //
- // sh
- //
- this.sh.AutoSize = false;
- this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
- this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sh.Name = "sh";
- this.sh.Size = new System.Drawing.Size(40, 47);
- this.sh.Text = "鍙嶄綔搴�";
- this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sh.Visible = false;
- this.sh.Click += new System.EventHandler(this.sh_Click);
- //
- // qsh
- //
- this.qsh.AutoSize = false;
- this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
- this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.qsh.Name = "qsh";
- this.qsh.Size = new System.Drawing.Size(36, 47);
- this.qsh.Text = "浣滃簾";
- this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.qsh.Visible = false;
- this.qsh.Click += new System.EventHandler(this.qsh_Click);
- //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator4.Visible = false;
//
// tc
//
@@ -449,11 +315,10 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1011, 382);
this.grdMain.TabIndex = 19;
- this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdPrint
//
@@ -486,32 +351,9 @@
this.groupBox1.TabIndex = 51;
this.groupBox1.TabStop = false;
//
- // cmbHStatus
- //
- this.cmbHStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHStatus.FormattingEnabled = true;
- this.cmbHStatus.Items.AddRange(new object[] {
- "姝ｅ父",
- "浣滃簾"});
- this.cmbHStatus.Location = new System.Drawing.Point(265, 7);
- this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(68, 20);
- this.cmbHStatus.TabIndex = 20;
- this.cmbHStatus.Visible = false;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(230, 11);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
- this.label5.TabIndex = 19;
- this.label5.Text = "鐘舵�侊細";
- this.label5.Visible = false;
- //
// txtHSPName
//
- this.txtHSPName.Location = new System.Drawing.Point(745, 13);
+ this.txtHSPName.Location = new System.Drawing.Point(743, 14);
this.txtHSPName.Name = "txtHSPName";
this.txtHSPName.Size = new System.Drawing.Size(130, 21);
this.txtHSPName.TabIndex = 18;
@@ -527,7 +369,7 @@
//
// txtHWHName
//
- this.txtHWHName.Location = new System.Drawing.Point(572, 13);
+ this.txtHWHName.Location = new System.Drawing.Point(571, 14);
this.txtHWHName.Name = "txtHWHName";
this.txtHWHName.Size = new System.Drawing.Size(130, 21);
this.txtHWHName.TabIndex = 16;
@@ -535,7 +377,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(530, 18);
+ this.label2.Location = new System.Drawing.Point(531, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(47, 12);
this.label2.TabIndex = 15;
@@ -551,7 +393,7 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(357, 19);
+ this.label6.Location = new System.Drawing.Point(359, 18);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 12);
this.label6.TabIndex = 13;
@@ -567,7 +409,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(13, 19);
+ this.label4.Location = new System.Drawing.Point(15, 18);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(47, 12);
this.label4.TabIndex = 11;
@@ -575,7 +417,7 @@
//
// txtHBatchNo
//
- this.txtHBatchNo.Location = new System.Drawing.Point(227, 13);
+ this.txtHBatchNo.Location = new System.Drawing.Point(227, 14);
this.txtHBatchNo.Name = "txtHBatchNo";
this.txtHBatchNo.Size = new System.Drawing.Size(130, 21);
this.txtHBatchNo.TabIndex = 1;
@@ -583,7 +425,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(187, 19);
+ this.label1.Location = new System.Drawing.Point(187, 18);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 0;
@@ -591,7 +433,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(877, 13);
+ this.btnOK.Location = new System.Drawing.Point(880, 13);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(73, 24);
this.btnOK.TabIndex = 6;
@@ -613,6 +455,27 @@
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.grdSum.Size = new System.Drawing.Size(1011, 19);
this.grdSum.TabIndex = 52;
+ //
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "瀵煎嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.ToolTipText = "瀵煎嚭";
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Visible = false;
//
// Kf_ICInventory_BarCode
//
@@ -652,14 +515,9 @@
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton cx;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
public System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.ToolStripButton sx;
- private System.Windows.Forms.ToolStripButton dj;
- private System.Windows.Forms.ToolStripButton xz;
- private System.Windows.Forms.ToolStripButton sc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
@@ -667,16 +525,12 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
- private System.Windows.Forms.ToolStripButton sh;
- private System.Windows.Forms.ToolStripButton qsh;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
private System.Windows.Forms.DataGridView grdPrint;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStripButton dy2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.TextBox txtHBatchNo;
@@ -689,9 +543,9 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtHWHName;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.ComboBox cmbHStatus;
- private System.Windows.Forms.Label label5;
private System.Windows.Forms.ToolStripButton yc;
private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
}
}
\ No newline at end of file
--
Gitblit v1.9.1