From 7f5d4a2476f2a0e5803ac1a7f2f24ec5645e99aa Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期五, 21 四月 2023 13:42:07 +0800
Subject: [PATCH] 工序流转卡维护添加引出功能：在Sc_ProcessExchangeBillQuery文件中，设计页面的toolstrip控的引出按钮设置visible为true。 车间工序全程跟踪报表添加上级代码是否显示功能：在MES_OrderProcFlowAllReport文件，在设计页面添加复选框决定是否展示上级代码，在编程页面的display()方法中获取复选框内容并添加到存储过程的参数中。
---
WorkM/报表分析/Mes_OrderProcFlowAllReport.designer.cs | 157 +++++++++++++++++++++++++++++-----------------------
1 files changed, 87 insertions(+), 70 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
index a05f3fc..449d355 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
@@ -55,6 +55,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.chkHShowUnFinish = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.txtHOrderProcNo = new System.Windows.Forms.TextBox();
@@ -67,8 +69,7 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdMain = new System.Windows.Forms.DataGridView();
- this.txtHMaterNumber = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.chkShowUpperID = new System.Windows.Forms.CheckBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -110,7 +111,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(1432, 59);
+ this.Tool.Size = new System.Drawing.Size(1611, 71);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -124,7 +125,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(64, 66);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -132,14 +133,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(122, 24);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(163, 34);
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(163, 34);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -175,7 +176,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 71);
this.toolStripSeparator5.Visible = false;
//
// yl
@@ -196,7 +197,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
@@ -232,7 +233,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 71);
//
// ruku
//
@@ -279,7 +280,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
//
@@ -298,13 +299,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
//
@@ -314,7 +315,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;
@@ -324,7 +325,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
//
@@ -334,7 +335,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;
@@ -344,13 +345,14 @@
//
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.chkShowUpperID);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.chkHShowUnFinish);
@@ -363,18 +365,38 @@
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, 71);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1432, 69);
+ this.pPic.Size = new System.Drawing.Size(1611, 83);
this.pPic.TabIndex = 17;
+ //
+ // txtHMaterNumber
+ //
+ this.txtHMaterNumber.Location = new System.Drawing.Point(965, 14);
+ this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.Size = new System.Drawing.Size(249, 28);
+ this.txtHMaterNumber.TabIndex = 98;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.BackColor = System.Drawing.Color.Transparent;
+ this.label9.Location = new System.Drawing.Point(886, 18);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(80, 18);
+ this.label9.TabIndex = 97;
+ this.label9.Text = "鐗╂枡浠ｇ爜";
//
// chkHShowUnFinish
//
this.chkHShowUnFinish.AutoSize = true;
- this.chkHShowUnFinish.Location = new System.Drawing.Point(604, 39);
+ this.chkHShowUnFinish.Location = new System.Drawing.Point(670, 33);
+ this.chkHShowUnFinish.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.chkHShowUnFinish.Name = "chkHShowUnFinish";
- this.chkHShowUnFinish.Size = new System.Drawing.Size(119, 19);
+ this.chkHShowUnFinish.Size = new System.Drawing.Size(142, 22);
this.chkHShowUnFinish.TabIndex = 86;
this.chkHShowUnFinish.Text = "鍙樉绀烘湭瀹屽伐";
this.chkHShowUnFinish.UseVisualStyleBackColor = true;
@@ -382,39 +404,40 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
- this.checkBox1.Location = new System.Drawing.Point(604, 12);
+ this.checkBox1.Location = new System.Drawing.Point(670, 0);
+ this.checkBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.checkBox1.Name = "checkBox1";
- this.checkBox1.Size = new System.Drawing.Size(104, 19);
+ this.checkBox1.Size = new System.Drawing.Size(124, 22);
this.checkBox1.TabIndex = 85;
this.checkBox1.Text = "鏄剧ず涓嶅悎鏍�";
this.checkBox1.UseVisualStyleBackColor = true;
//
// txtHOrderProcNo
//
- this.txtHOrderProcNo.Location = new System.Drawing.Point(384, 10);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNo.Location = new System.Drawing.Point(432, 12);
+ this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
+ this.txtHOrderProcNo.Size = new System.Drawing.Size(180, 28);
this.txtHOrderProcNo.TabIndex = 84;
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(294, 10);
+ this.label8.Location = new System.Drawing.Point(331, 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.Size = new System.Drawing.Size(98, 18);
this.label8.TabIndex = 83;
this.label8.Text = "璁㈠崟璺熻釜鍙�";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(1272, 39);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(1431, 47);
+ this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(165, 28);
this.dtpHEDate.TabIndex = 61;
this.dtpHEDate.Visible = false;
//
@@ -422,10 +445,10 @@
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(1196, 43);
+ this.label3.Location = new System.Drawing.Point(1346, 52);
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 = 60;
this.label3.Text = "缁撴潫鏃ユ湡";
this.label3.Visible = false;
@@ -433,10 +456,10 @@
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(1272, 10);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(1431, 12);
+ this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(165, 28);
this.dtpHBDate.TabIndex = 59;
this.dtpHBDate.Visible = false;
//
@@ -444,10 +467,10 @@
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(1196, 14);
+ this.label4.Location = new System.Drawing.Point(1346, 17);
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 = 58;
this.label4.Text = "寮�濮嬫棩鏈�";
this.label4.Visible = false;
@@ -458,10 +481,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";
//
@@ -477,13 +500,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, 542);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 650);
+ 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(1432, 24);
+ this.grdSum.Size = new System.Drawing.Size(1611, 29);
this.grdSum.TabIndex = 55;
//
// grdMain
@@ -493,55 +517,47 @@
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, 154);
+ 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(1432, 414);
+ this.grdMain.Size = new System.Drawing.Size(1611, 496);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
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.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
//
- // txtHMaterNumber
+ // chkShowUpperID
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(858, 12);
- 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 = 98;
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(788, 15);
- 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 = 97;
- this.label9.Text = "鐗╂枡浠ｇ爜";
+ this.chkShowUpperID.AutoSize = true;
+ this.chkShowUpperID.Location = new System.Drawing.Point(670, 60);
+ this.chkShowUpperID.Name = "chkShowUpperID";
+ this.chkShowUpperID.Size = new System.Drawing.Size(142, 22);
+ this.chkShowUpperID.TabIndex = 99;
+ this.chkShowUpperID.Text = "鏄剧ず涓婄骇浠ｇ爜";
+ this.chkShowUpperID.UseVisualStyleBackColor = true;
//
// Mes_OrderProcFlowAllReport
//
- 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(1432, 566);
+ this.ClientSize = new System.Drawing.Size(1611, 679);
this.Controls.Add(this.grdMain);
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 = "Mes_OrderProcFlowAllReport";
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_OrderProcFlowAllReport_KeyUp);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Mes_OrderProcFlowAllReport_KeyDown);
+ this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Mes_OrderProcFlowAllReport_KeyUp);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.pPic.ResumeLayout(false);
@@ -593,5 +609,6 @@
private System.Windows.Forms.DataGridView grdMain;
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.CheckBox chkShowUpperID;
}
}
\ No newline at end of file
--
Gitblit v1.9.1