From 139be092a02b0d622d4ab71efd27519f5f0a84e2 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 17 八月 2021 15:41:57 +0800
Subject: [PATCH] 车间生产汇报统计报表增加工序流转卡，工序，职员，项目号4个查询条件
---
WorkM/报表分析/Sc_StationOutSumReport.resx | 20 ++--
WorkM/报表分析/Sc_StationOutSumReport.cs | 4 +
WorkM/报表分析/Sc_StationOutSumReport.designer.cs | 215 ++++++++++++++++++++++++++++++++++++-----------------
3 files changed, 159 insertions(+), 80 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
index 5c99205..66d0987 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
@@ -180,6 +180,10 @@
sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + " " + dtpHETime.Value.ToShortTimeString() + "'";
sDlgWhere = sDlgWhere + ",'" + txtHOrderProcNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaterNumber.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcExchBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHEmpName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProjectNum.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
index c3e6dd2..8293ab8 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
@@ -71,6 +71,14 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.textHProcName = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.textHProcExchBillNo = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textHEmpName = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textHProjectNum = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -110,7 +118,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(1346, 47);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -124,7 +132,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(53, 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;
@@ -132,14 +140,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ 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(128, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -160,7 +168,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
//
// dc
//
@@ -180,13 +188,13 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator5.Visible = false;
//
// 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
@@ -251,7 +259,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
//
@@ -270,13 +278,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
//
@@ -286,7 +294,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;
@@ -296,7 +304,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
//
@@ -306,7 +314,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;
@@ -316,13 +324,21 @@
//
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.textHProjectNum);
+ this.pPic.Controls.Add(this.label7);
+ this.pPic.Controls.Add(this.textHEmpName);
+ this.pPic.Controls.Add(this.label6);
+ this.pPic.Controls.Add(this.textHProcExchBillNo);
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.textHProcName);
+ this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.txtHOrderProcNo);
@@ -339,74 +355,68 @@
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(1432, 69);
+ this.pPic.Size = new System.Drawing.Size(1346, 97);
this.pPic.TabIndex = 17;
//
// txtHMaterNumber
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(1144, 7);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(858, 6);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(222, 25);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(168, 21);
this.txtHMaterNumber.TabIndex = 96;
//
// label9
//
this.label9.AutoSize = true;
this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(1074, 10);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(806, 8);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
+ this.label9.Size = new System.Drawing.Size(53, 12);
this.label9.TabIndex = 95;
this.label9.Text = "鐗╂枡浠ｇ爜";
//
// txtHOrderProcNo
//
- this.txtHOrderProcNo.Location = new System.Drawing.Point(426, 38);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNo.Location = new System.Drawing.Point(320, 30);
this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
+ this.txtHOrderProcNo.Size = new System.Drawing.Size(121, 21);
this.txtHOrderProcNo.TabIndex = 94;
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(336, 38);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(252, 30);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
+ this.label8.Size = new System.Drawing.Size(65, 12);
this.label8.TabIndex = 93;
this.label8.Text = "璁㈠崟璺熻釜鍙�";
//
// dtpHETime
//
this.dtpHETime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHETime.Location = new System.Drawing.Point(910, 37);
- this.dtpHETime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHETime.Location = new System.Drawing.Point(682, 30);
this.dtpHETime.Name = "dtpHETime";
- this.dtpHETime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHETime.Size = new System.Drawing.Size(111, 21);
this.dtpHETime.TabIndex = 92;
//
// dtpHBTime
//
this.dtpHBTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHBTime.Location = new System.Drawing.Point(910, 5);
- this.dtpHBTime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBTime.Location = new System.Drawing.Point(682, 4);
this.dtpHBTime.Name = "dtpHBTime";
- this.dtpHBTime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBTime.Size = new System.Drawing.Size(111, 21);
this.dtpHBTime.TabIndex = 91;
//
// chkYestoday
//
this.chkYestoday.AutoSize = true;
- this.chkYestoday.Location = new System.Drawing.Point(613, 40);
+ this.chkYestoday.Location = new System.Drawing.Point(460, 32);
+ this.chkYestoday.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkYestoday.Name = "chkYestoday";
- this.chkYestoday.Size = new System.Drawing.Size(59, 19);
+ this.chkYestoday.Size = new System.Drawing.Size(48, 16);
this.chkYestoday.TabIndex = 90;
this.chkYestoday.Text = "鏄ㄦ棩";
this.chkYestoday.UseVisualStyleBackColor = true;
@@ -416,20 +426,18 @@
//
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
this.cmdHCenterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHCenterID.Location = new System.Drawing.Point(568, 4);
- this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHCenterID.Location = new System.Drawing.Point(426, 3);
this.cmdHCenterID.Name = "cmdHCenterID";
- this.cmdHCenterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHCenterID.Size = new System.Drawing.Size(22, 22);
this.cmdHCenterID.TabIndex = 89;
this.cmdHCenterID.UseVisualStyleBackColor = true;
this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(426, 5);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(320, 4);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(143, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(108, 21);
this.txtHCenterID.TabIndex = 88;
this.txtHCenterID.WordWrap = false;
this.txtHCenterID.TextChanged += new System.EventHandler(this.txtHCenterID_TextChanged);
@@ -438,50 +446,45 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(350, 9);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(262, 7);
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 = 87;
this.label2.Text = "宸ヤ綔涓績";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(755, 37);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(566, 30);
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;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(679, 41);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(509, 33);
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 = "缁撴潫鏃ユ湡";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(755, 4);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(566, 3);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(111, 21);
this.dtpHBDate.TabIndex = 59;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(679, 8);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(509, 6);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 58;
this.label4.Text = "寮�濮嬫棩鏈�";
//
@@ -491,10 +494,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";
//
@@ -509,12 +511,11 @@
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, 144);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1432, 414);
+ this.grdMain.Size = new System.Drawing.Size(1346, 290);
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);
@@ -529,26 +530,92 @@
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, 434);
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(1432, 24);
+ this.grdSum.Size = new System.Drawing.Size(1346, 19);
this.grdSum.TabIndex = 55;
+ //
+ // textHProcName
+ //
+ this.textHProcName.Location = new System.Drawing.Point(858, 31);
+ this.textHProcName.Name = "textHProcName";
+ this.textHProcName.Size = new System.Drawing.Size(168, 21);
+ this.textHProcName.TabIndex = 98;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(810, 37);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(29, 12);
+ this.label1.TabIndex = 97;
+ this.label1.Text = "宸ュ簭";
+ //
+ // textHProcExchBillNo
+ //
+ this.textHProcExchBillNo.Location = new System.Drawing.Point(320, 60);
+ this.textHProcExchBillNo.Name = "textHProcExchBillNo";
+ this.textHProcExchBillNo.Size = new System.Drawing.Size(168, 21);
+ this.textHProcExchBillNo.TabIndex = 100;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(253, 64);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.TabIndex = 99;
+ this.label5.Text = "宸ュ簭娴佽浆鍗�";
+ //
+ // textHEmpName
+ //
+ this.textHEmpName.Location = new System.Drawing.Point(566, 60);
+ this.textHEmpName.Name = "textHEmpName";
+ this.textHEmpName.Size = new System.Drawing.Size(168, 21);
+ this.textHEmpName.TabIndex = 102;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(525, 65);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.TabIndex = 101;
+ this.label6.Text = "鑱屽憳";
+ //
+ // textHProjectNum
+ //
+ this.textHProjectNum.Location = new System.Drawing.Point(858, 60);
+ this.textHProjectNum.Name = "textHProjectNum";
+ this.textHProjectNum.Size = new System.Drawing.Size(168, 21);
+ this.textHProjectNum.TabIndex = 104;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(806, 64);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(41, 12);
+ this.label7.TabIndex = 103;
+ this.label7.Text = "椤圭洰鍙�";
//
// Sc_StationOutSumReport
//
- 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(1432, 566);
+ this.ClientSize = new System.Drawing.Size(1346, 453);
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.Name = "Sc_StationOutSumReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -608,5 +675,13 @@
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ public System.Windows.Forms.TextBox textHProjectNum;
+ private System.Windows.Forms.Label label7;
+ public System.Windows.Forms.TextBox textHEmpName;
+ private System.Windows.Forms.Label label6;
+ public System.Windows.Forms.TextBox textHProcExchBillNo;
+ private System.Windows.Forms.Label label5;
+ public System.Windows.Forms.TextBox textHProcName;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
index 9f63122..c623f5e 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
@@ -256,7 +256,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -268,7 +268,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -280,7 +280,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -294,7 +294,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
sbY1hi22Iptt5ecmuQgXxcWvFGojuXDy66AUyo9p9t2wx/f5pC9l+/LU06dP79frET/jCc7B5QvB6Z3R
6vLNwB0IIzi7hC8se/pHJpAp/rFD+f45Ynf7JfiRTmtlvN6IfBndEYtzVEKpt3etnAiFt2Gsa0J1Qwt6
PcHsA10Ojxx4VVJaE8kU3j/SuHuIIXp8Crc/nH3AbOuTA89xBbF48ruvSbyoZcw2x++BqdA8xDTQbemR
@@ -307,7 +307,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -321,7 +321,7 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -334,7 +334,7 @@
<data name="view.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -347,7 +347,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -357,7 +357,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -372,7 +372,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
--
Gitblit v1.9.1