年度各工序月产量

DK.Client/ReportModule/R03/M01/F_RPT_030118.Designer.cs

@@ -29,22 +29,22 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         /// </summary>
         private void InitializeComponent()
         {
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle97 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle98 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle112 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle99 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle100 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle101 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle102 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle103 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle104 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle105 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle106 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle107 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle108 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle109 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle110 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle111 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -62,6 +62,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.m11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.msum = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+			this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+			this.comboBox1 = new System.Windows.Forms.ComboBox();
+			this.TXTMonth = new Dongke.WinForm.Controls.TxtMoney();
+			this.lblMonth = new Dongke.WinForm.Controls.LblLabel();
 			this.dtpYear1 = new Dongke.WinForm.Controls.DtpYear();
 			this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
 			this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
@@ -70,10 +74,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
 			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-			this.lblMonth = new Dongke.WinForm.Controls.LblLabel();
-			this.TXTMonth = new Dongke.WinForm.Controls.TxtMoney();
-			this.comboBox1 = new System.Windows.Forms.ComboBox();
-			this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+			this.lblLabel3 = new Dongke.WinForm.Controls.LblLabel();
+			this.lblLabel4 = new Dongke.WinForm.Controls.LblLabel();
+			this.txtMonth1 = new Dongke.WinForm.Controls.TxtMoney();
+			this.txtMonth2 = new Dongke.WinForm.Controls.TxtMoney();
 			((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
 			this.grpCollapsible1.SuspendLayout();
 			this.tsrToolStrip1.SuspendLayout();
@@ -85,8 +89,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dgvSum.AllowUserToDeleteRows = false;
 			this.dgvSum.AllowUserToModifyRows = true;
 			this.dgvSum.AllowUserToOrderColumns = true;
-			dataGridViewCellStyle97.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle97;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
 			this.dgvSum.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
@@ -97,14 +101,14 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dgvSum.ChildNodeColumnText = null;
 			this.dgvSum.ColumnDeep = 1;
 			this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle98.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle98.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle98.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle98.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle98.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle98.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle98;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
 			this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.goodstypename,
@@ -147,8 +151,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dgvSum.RefreshAtHscroll = false;
 			this.dgvSum.RowHeadersWidth = 50;
 			this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle112.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle112;
+			dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle16;
 			this.dgvSum.RowTemplate.Height = 21;
 			this.dgvSum.Size = new System.Drawing.Size(1431, 641);
 			this.dgvSum.SortOrderColumnName = null;
@@ -175,9 +179,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m12
 			// 
 			this.m12.DataPropertyName = "m12";
-			dataGridViewCellStyle99.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle99.Format = "N0";
-			this.m12.DefaultCellStyle = dataGridViewCellStyle99;
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle3.Format = "N0";
+			this.m12.DefaultCellStyle = dataGridViewCellStyle3;
 			this.m12.HeaderText = "12月份";
 			this.m12.Name = "m12";
 			this.m12.ReadOnly = true;
@@ -185,9 +189,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m01
 			// 
 			this.m01.DataPropertyName = "m01";
-			dataGridViewCellStyle100.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle100.Format = "N0";
-			this.m01.DefaultCellStyle = dataGridViewCellStyle100;
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle4.Format = "N0";
+			this.m01.DefaultCellStyle = dataGridViewCellStyle4;
 			this.m01.HeaderText = "1月份";
 			this.m01.Name = "m01";
 			this.m01.ReadOnly = true;
@@ -195,9 +199,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m02
 			// 
 			this.m02.DataPropertyName = "m02";
-			dataGridViewCellStyle101.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle101.Format = "N0";
-			this.m02.DefaultCellStyle = dataGridViewCellStyle101;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle5.Format = "N0";
+			this.m02.DefaultCellStyle = dataGridViewCellStyle5;
 			this.m02.HeaderText = "2月份";
 			this.m02.Name = "m02";
 			this.m02.ReadOnly = true;
@@ -205,9 +209,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m03
 			// 
 			this.m03.DataPropertyName = "m03";
-			dataGridViewCellStyle102.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle102.Format = "N0";
-			this.m03.DefaultCellStyle = dataGridViewCellStyle102;
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle6.Format = "N0";
+			this.m03.DefaultCellStyle = dataGridViewCellStyle6;
 			this.m03.HeaderText = "3月份";
 			this.m03.Name = "m03";
 			this.m03.ReadOnly = true;
@@ -215,9 +219,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m04
 			// 
 			this.m04.DataPropertyName = "m04";
-			dataGridViewCellStyle103.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle103.Format = "N0";
-			this.m04.DefaultCellStyle = dataGridViewCellStyle103;
+			dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle7.Format = "N0";
+			this.m04.DefaultCellStyle = dataGridViewCellStyle7;
 			this.m04.HeaderText = "4月份";
 			this.m04.Name = "m04";
 			this.m04.ReadOnly = true;
@@ -225,9 +229,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m05
 			// 
 			this.m05.DataPropertyName = "m05";
-			dataGridViewCellStyle104.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle104.Format = "N0";
-			this.m05.DefaultCellStyle = dataGridViewCellStyle104;
+			dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle8.Format = "N0";
+			this.m05.DefaultCellStyle = dataGridViewCellStyle8;
 			this.m05.HeaderText = "5月份";
 			this.m05.Name = "m05";
 			this.m05.ReadOnly = true;
@@ -235,9 +239,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m06
 			// 
 			this.m06.DataPropertyName = "m06";
-			dataGridViewCellStyle105.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle105.Format = "N0";
-			this.m06.DefaultCellStyle = dataGridViewCellStyle105;
+			dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle9.Format = "N0";
+			this.m06.DefaultCellStyle = dataGridViewCellStyle9;
 			this.m06.HeaderText = "6月份";
 			this.m06.Name = "m06";
 			this.m06.ReadOnly = true;
@@ -245,9 +249,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m07
 			// 
 			this.m07.DataPropertyName = "m07";
-			dataGridViewCellStyle106.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle106.Format = "N0";
-			this.m07.DefaultCellStyle = dataGridViewCellStyle106;
+			dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle10.Format = "N0";
+			this.m07.DefaultCellStyle = dataGridViewCellStyle10;
 			this.m07.HeaderText = "7月份";
 			this.m07.Name = "m07";
 			this.m07.ReadOnly = true;
@@ -255,9 +259,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m08
 			// 
 			this.m08.DataPropertyName = "m08";
-			dataGridViewCellStyle107.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle107.Format = "N0";
-			this.m08.DefaultCellStyle = dataGridViewCellStyle107;
+			dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle11.Format = "N0";
+			this.m08.DefaultCellStyle = dataGridViewCellStyle11;
 			this.m08.HeaderText = "8月份";
 			this.m08.Name = "m08";
 			this.m08.ReadOnly = true;
@@ -265,9 +269,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m09
 			// 
 			this.m09.DataPropertyName = "m09";
-			dataGridViewCellStyle108.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle108.Format = "N0";
-			this.m09.DefaultCellStyle = dataGridViewCellStyle108;
+			dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle12.Format = "N0";
+			this.m09.DefaultCellStyle = dataGridViewCellStyle12;
 			this.m09.HeaderText = "9月份";
 			this.m09.Name = "m09";
 			this.m09.ReadOnly = true;
@@ -275,9 +279,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m10
 			// 
 			this.m10.DataPropertyName = "m10";
-			dataGridViewCellStyle109.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle109.Format = "N0";
-			this.m10.DefaultCellStyle = dataGridViewCellStyle109;
+			dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle13.Format = "N0";
+			this.m10.DefaultCellStyle = dataGridViewCellStyle13;
 			this.m10.HeaderText = "10月份";
 			this.m10.Name = "m10";
 			this.m10.ReadOnly = true;
@@ -285,9 +289,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// m11
 			// 
 			this.m11.DataPropertyName = "m11";
-			dataGridViewCellStyle110.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle110.Format = "N0";
-			this.m11.DefaultCellStyle = dataGridViewCellStyle110;
+			dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle14.Format = "N0";
+			this.m11.DefaultCellStyle = dataGridViewCellStyle14;
 			this.m11.HeaderText = "11月份";
 			this.m11.Name = "m11";
 			this.m11.ReadOnly = true;
@@ -295,9 +299,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// msum
 			// 
 			this.msum.DataPropertyName = "msum";
-			dataGridViewCellStyle111.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle111.Format = "N0";
-			this.msum.DefaultCellStyle = dataGridViewCellStyle111;
+			dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle15.Format = "N0";
+			this.msum.DefaultCellStyle = dataGridViewCellStyle15;
 			this.msum.HeaderText = "合计";
 			this.msum.Name = "msum";
 			this.msum.ReadOnly = true;
@@ -306,6 +310,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			// 
 			this.grpCollapsible1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.grpCollapsible1.Controls.Add(this.txtMonth2);
+			this.grpCollapsible1.Controls.Add(this.txtMonth1);
+			this.grpCollapsible1.Controls.Add(this.lblLabel4);
+			this.grpCollapsible1.Controls.Add(this.lblLabel3);
 			this.grpCollapsible1.Controls.Add(this.lblLabel2);
 			this.grpCollapsible1.Controls.Add(this.comboBox1);
 			this.grpCollapsible1.Controls.Add(this.TXTMonth);
@@ -319,6 +327,52 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.grpCollapsible1.TabStop = false;
 			this.grpCollapsible1.Text = "查询条件";
 			// 
+			// lblLabel2
+			// 
+			this.lblLabel2.Location = new System.Drawing.Point(222, 24);
+			this.lblLabel2.Name = "lblLabel2";
+			this.lblLabel2.Size = new System.Drawing.Size(29, 12);
+			this.lblLabel2.TabIndex = 8;
+			this.lblLabel2.Text = "车间";
+			// 
+			// comboBox1
+			// 
+			this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.comboBox1.FormattingEnabled = true;
+			this.comboBox1.Items.AddRange(new object[] {
+            "",
+            "1&2车间",
+            "3车间"});
+			this.comboBox1.Location = new System.Drawing.Point(257, 20);
+			this.comboBox1.Name = "comboBox1";
+			this.comboBox1.Size = new System.Drawing.Size(121, 20);
+			this.comboBox1.TabIndex = 7;
+			// 
+			// TXTMonth
+			// 
+			this.TXTMonth.Location = new System.Drawing.Point(172, 20);
+			this.TXTMonth.MaxValue = new decimal(new int[] {
+            12,
+            0,
+            0,
+            0});
+			this.TXTMonth.MinValue = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.TXTMonth.Name = "TXTMonth";
+			this.TXTMonth.Size = new System.Drawing.Size(44, 21);
+			this.TXTMonth.TabIndex = 6;
+			// 
+			// lblMonth
+			// 
+			this.lblMonth.Location = new System.Drawing.Point(137, 23);
+			this.lblMonth.Name = "lblMonth";
+			this.lblMonth.Size = new System.Drawing.Size(29, 12);
+			this.lblMonth.TabIndex = 4;
+			this.lblMonth.Text = "月份";
+			// 
 			// dtpYear1
 			// 
 			this.dtpYear1.AllowNull = false;
@@ -400,51 +454,55 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.tsbtnClose.Text = "关闭(&X)";
 			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
 			// 
-			// lblMonth
+			// lblLabel3
 			// 
-			this.lblMonth.Location = new System.Drawing.Point(150, 23);
-			this.lblMonth.Name = "lblMonth";
-			this.lblMonth.Size = new System.Drawing.Size(29, 12);
-			this.lblMonth.TabIndex = 4;
-			this.lblMonth.Text = "月份";
+			this.lblLabel3.Location = new System.Drawing.Point(384, 23);
+			this.lblLabel3.Name = "lblLabel3";
+			this.lblLabel3.Size = new System.Drawing.Size(53, 12);
+			this.lblLabel3.TabIndex = 11;
+			this.lblLabel3.Text = "月份区间";
 			// 
-			// TXTMonth
+			// lblLabel4
 			// 
-			this.TXTMonth.Location = new System.Drawing.Point(185, 20);
-			this.TXTMonth.MaxValue = new decimal(new int[] {
+			this.lblLabel4.Location = new System.Drawing.Point(493, 24);
+			this.lblLabel4.Name = "lblLabel4";
+			this.lblLabel4.Size = new System.Drawing.Size(17, 12);
+			this.lblLabel4.TabIndex = 12;
+			this.lblLabel4.Text = "至";
+			// 
+			// txtMonth1
+			// 
+			this.txtMonth1.Location = new System.Drawing.Point(443, 19);
+			this.txtMonth1.MaxValue = new decimal(new int[] {
             12,
             0,
             0,
             0});
-			this.TXTMonth.MinValue = new decimal(new int[] {
+			this.txtMonth1.MinValue = new decimal(new int[] {
             1,
             0,
             0,
             0});
-			this.TXTMonth.Name = "TXTMonth";
-			this.TXTMonth.Size = new System.Drawing.Size(44, 21);
-			this.TXTMonth.TabIndex = 6;
-			// 
-			// comboBox1
-			// 
-			this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.comboBox1.FormattingEnabled = true;
-			this.comboBox1.Items.AddRange(new object[] {
-            "",
-            "1&2车间",
-            "3车间"});
-			this.comboBox1.Location = new System.Drawing.Point(279, 20);
-			this.comboBox1.Name = "comboBox1";
-			this.comboBox1.Size = new System.Drawing.Size(121, 20);
-			this.comboBox1.TabIndex = 7;
+			this.txtMonth1.Name = "txtMonth1";
+			this.txtMonth1.Size = new System.Drawing.Size(44, 21);
+			this.txtMonth1.TabIndex = 13;
 			// 
-			// lblLabel2
+			// txtMonth2
 			// 
-			this.lblLabel2.Location = new System.Drawing.Point(244, 23);
-			this.lblLabel2.Name = "lblLabel2";
-			this.lblLabel2.Size = new System.Drawing.Size(29, 12);
-			this.lblLabel2.TabIndex = 8;
-			this.lblLabel2.Text = "车间";
+			this.txtMonth2.Location = new System.Drawing.Point(516, 19);
+			this.txtMonth2.MaxValue = new decimal(new int[] {
+            12,
+            0,
+            0,
+            0});
+			this.txtMonth2.MinValue = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.txtMonth2.Name = "txtMonth2";
+			this.txtMonth2.Size = new System.Drawing.Size(44, 21);
+			this.txtMonth2.TabIndex = 14;
 			// 
 			// F_RPT_030118
 			// 
@@ -498,5 +556,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		private WinForm.Controls.TxtMoney TXTMonth;
 		private WinForm.Controls.LblLabel lblLabel2;
 		private System.Windows.Forms.ComboBox comboBox1;
+		private WinForm.Controls.LblLabel lblLabel4;
+		private WinForm.Controls.LblLabel lblLabel3;
+		private WinForm.Controls.TxtMoney txtMonth2;
+		private WinForm.Controls.TxtMoney txtMonth1;
 	}
 }

DK.Client/ReportModule/R03/M01/F_RPT_030118.cs

@@ -86,7 +86,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			try
             {
                 this.dtpYear1.Value = DateTime.Now;
-            }
+				this.txtMonth1.Text = DateTime.Now.Month.ToString();
+				this.txtMonth2.Text = DateTime.Now.Month.ToString();
+
+			}
 			catch (Exception ex)
 			{
 				// 对异常进行共通处理
@@ -123,6 +126,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		private void tsbtnClearCondition_Click(object sender, EventArgs e)
 		{
 			this.dtpYear1.Value = DateTime.Now;
+			this.txtMonth1.Text = DateTime.Now.Month.ToString();
+			this.txtMonth2.Text = DateTime.Now.Month.ToString();
 			this.TXTMonth.Text = null;
 			this.comboBox1.Text = null;
 			this.comboBox1.SelectedIndex = 0;
@@ -164,8 +169,21 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				cre.Name = "R030118Data";
 
                 int y = this.dtpYear1.Value.Value.Year;
+				int month1 = 0;
+				int month2 = 0;
+				if (!string.IsNullOrWhiteSpace(this.txtMonth1.Text) && !string.IsNullOrWhiteSpace(this.txtMonth2.Text))
+				{
+					month1 = Convert.ToInt32(this.txtMonth1.Text);
+					month2 = Convert.ToInt32(this.txtMonth2.Text);
+				}
+				
 				string month = this.TXTMonth.Text;
-				if (month == null || month == "")
+				if (month1 > 0 && month2 > 0)
+				{
+					cre.Properties["DateBegin"] = new DateTime(y, month1, 1);
+					cre.Properties["DateEnd"] = new DateTime(y, month2+1, 1);
+				}
+				else if((month == null || month == ""))
 				{
 					cre.Properties["DateBegin"] = new DateTime(y - 1, 12, 1);
 					cre.Properties["DateEnd"] = new DateTime(y, 12, 1);