Sfoglia il codice sorgente

配置fqc和回收产品汇总表新增用户

李士越 1 anno fa
parent
commit
f7ba77d0df

+ 260 - 250
DK.Client/ReportModule/R03/M01/F_RPT_030121.Designer.cs

@@ -29,263 +29,272 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-			this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.产品分级 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.部门 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.产量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.合格率 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
-			this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
-			this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
-			this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
-			this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
-			this.tsbtnSearch = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnClearCondition = new System.Windows.Forms.ToolStripButton();
-			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-			((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
-			this.grpCollapsible1.SuspendLayout();
-			this.tsrToolStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// dgvSum
-			// 
-			this.dgvSum.AllowUserToAddRows = false;
-			this.dgvSum.AllowUserToDeleteRows = false;
-			this.dgvSum.AllowUserToModifyRows = true;
-			this.dgvSum.AllowUserToOrderColumns = true;
-			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.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+            this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
+            this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
+            this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
+            this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
+            this.tsbtnSearch = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClearCondition = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.产品分级 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.部门 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.用户 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.产量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.合格率 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
+            this.grpCollapsible1.SuspendLayout();
+            this.tsrToolStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dgvSum
+            // 
+            this.dgvSum.AllowUserToAddRows = false;
+            this.dgvSum.AllowUserToDeleteRows = false;
+            this.dgvSum.AllowUserToModifyRows = true;
+            this.dgvSum.AllowUserToOrderColumns = true;
+            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)));
-			this.dgvSum.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-			this.dgvSum.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-			this.dgvSum.CellHeight = 23;
-			this.dgvSum.ChildNodeColumnName = null;
-			this.dgvSum.ChildNodeColumnText = null;
-			this.dgvSum.ColumnDeep = 1;
-			this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			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.dgvSum.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvSum.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvSum.CellHeight = 23;
+            this.dgvSum.ChildNodeColumnName = null;
+            this.dgvSum.ChildNodeColumnText = null;
+            this.dgvSum.ColumnDeep = 1;
+            this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            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.产品分级,
             this.部门,
+            this.用户,
             this.产量,
             this.合格率});
-			this.dgvSum.ColumnTreeView = new System.Windows.Forms.TreeView[0];
-			this.dgvSum.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-			this.dgvSum.DynamicColumnName = "";
-			this.dgvSum.EnableHeadersVisualStyles = false;
-			this.dgvSum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.dgvSum.FormatQuantityColumns = null;
-			this.dgvSum.HasNode = false;
-			this.dgvSum.HorizontalMergeColumn = null;
-			this.dgvSum.IsAutoCountSum = true;
-			this.dgvSum.IsAutoResizeColumns = false;
-			this.dgvSum.IsClickF12 = false;
-			this.dgvSum.IsOpenMergeCellFlag = false;
-			this.dgvSum.IsSubTotalFlag = false;
-			this.dgvSum.IsTopDeep = false;
-			this.dgvSum.Location = new System.Drawing.Point(0, 96);
-			this.dgvSum.MergeColumnNames = null;
-			this.dgvSum.MergeDetailColumnNames = null;
-			this.dgvSum.MergeDetailOnlyColumn = null;
-			this.dgvSum.MergeOnlyColumn = null;
-			this.dgvSum.MultiSelect = false;
-			this.dgvSum.Name = "dgvSum";
-			this.dgvSum.ReadOnly = true;
-			this.dgvSum.RefreshAtHscroll = false;
-			this.dgvSum.RowHeadersWidth = 50;
-			this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle3;
-			this.dgvSum.RowTemplate.Height = 21;
-			this.dgvSum.Size = new System.Drawing.Size(1061, 261);
-			this.dgvSum.SortOrderColumnName = null;
-			this.dgvSum.TabIndex = 0;
-			this.dgvSum.Tag = "";
-			this.dgvSum.TotalSumColumns = null;
-			this.dgvSum.ViewRowFilter = "";
-			this.dgvSum.VirtualNodes = false;
-			// 
-			// 产品分级
-			// 
-			this.产品分级.DataPropertyName = "产品分级";
-			this.产品分级.HeaderText = "产品分级";
-			this.产品分级.Name = "产品分级";
-			this.产品分级.ReadOnly = true;
-			// 
-			// 部门
-			// 
-			this.部门.DataPropertyName = "部门";
-			this.部门.HeaderText = "部门";
-			this.部门.Name = "部门";
-			this.部门.ReadOnly = true;
-			// 
-			// 产量
-			// 
-			this.产量.DataPropertyName = "产量";
-			this.产量.HeaderText = "产量";
-			this.产量.Name = "产量";
-			this.产量.ReadOnly = true;
-			// 
-			// 合格率
-			// 
-			this.合格率.DataPropertyName = "合格率";
-			this.合格率.HeaderText = "占比率";
-			this.合格率.Name = "合格率";
-			this.合格率.ReadOnly = true;
-			// 
-			// grpCollapsible1
-			// 
-			this.grpCollapsible1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.dgvSum.ColumnTreeView = new System.Windows.Forms.TreeView[0];
+            this.dgvSum.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvSum.DynamicColumnName = "";
+            this.dgvSum.EnableHeadersVisualStyles = false;
+            this.dgvSum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvSum.FormatQuantityColumns = null;
+            this.dgvSum.HasNode = false;
+            this.dgvSum.HorizontalMergeColumn = null;
+            this.dgvSum.IsAutoCountSum = true;
+            this.dgvSum.IsAutoResizeColumns = false;
+            this.dgvSum.IsClickF12 = false;
+            this.dgvSum.IsOpenMergeCellFlag = false;
+            this.dgvSum.IsSubTotalFlag = false;
+            this.dgvSum.IsTopDeep = false;
+            this.dgvSum.Location = new System.Drawing.Point(0, 96);
+            this.dgvSum.MergeColumnNames = null;
+            this.dgvSum.MergeDetailColumnNames = null;
+            this.dgvSum.MergeDetailOnlyColumn = null;
+            this.dgvSum.MergeOnlyColumn = null;
+            this.dgvSum.MultiSelect = false;
+            this.dgvSum.Name = "dgvSum";
+            this.dgvSum.ReadOnly = true;
+            this.dgvSum.RefreshAtHscroll = false;
+            this.dgvSum.RowHeadersWidth = 50;
+            this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvSum.RowTemplate.Height = 21;
+            this.dgvSum.Size = new System.Drawing.Size(1061, 261);
+            this.dgvSum.SortOrderColumnName = null;
+            this.dgvSum.TabIndex = 0;
+            this.dgvSum.Tag = "";
+            this.dgvSum.TotalSumColumns = null;
+            this.dgvSum.ViewRowFilter = "";
+            this.dgvSum.VirtualNodes = false;
+            // 
+            // grpCollapsible1
+            // 
+            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.lblAccountDateEnd);
-			this.grpCollapsible1.Controls.Add(this.dtpEndTime);
-			this.grpCollapsible1.Controls.Add(this.dtpStartTime);
-			this.grpCollapsible1.Controls.Add(this.lblLabel1);
-			this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
-			this.grpCollapsible1.Name = "grpCollapsible1";
-			this.grpCollapsible1.Size = new System.Drawing.Size(1061, 52);
-			this.grpCollapsible1.TabIndex = 1;
-			this.grpCollapsible1.TabStop = false;
-			this.grpCollapsible1.Text = "查询条件";
-			// 
-			// lblAccountDateEnd
-			// 
-			this.lblAccountDateEnd.AutoSize = true;
-			this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
-			this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblAccountDateEnd.Location = new System.Drawing.Point(235, 26);
-			this.lblAccountDateEnd.Name = "lblAccountDateEnd";
-			this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
-			this.lblAccountDateEnd.TabIndex = 9;
-			this.lblAccountDateEnd.Text = "至";
-			// 
-			// dtpEndTime
-			// 
-			this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-			this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpEndTime.Location = new System.Drawing.Point(258, 20);
-			this.dtpEndTime.Name = "dtpEndTime";
-			this.dtpEndTime.Size = new System.Drawing.Size(155, 21);
-			this.dtpEndTime.TabIndex = 10;
-			this.dtpEndTime.Value = new System.DateTime(2014, 9, 23, 0, 0, 0, 0);
-			// 
-			// dtpStartTime
-			// 
-			this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-			this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpStartTime.Location = new System.Drawing.Point(69, 20);
-			this.dtpStartTime.Name = "dtpStartTime";
-			this.dtpStartTime.Size = new System.Drawing.Size(160, 21);
-			this.dtpStartTime.TabIndex = 8;
-			this.dtpStartTime.Value = new System.DateTime(2014, 9, 24, 0, 0, 0, 0);
-			// 
-			// lblLabel1
-			// 
-			this.lblLabel1.Location = new System.Drawing.Point(12, 24);
-			this.lblLabel1.Name = "lblLabel1";
-			this.lblLabel1.Size = new System.Drawing.Size(53, 12);
-			this.lblLabel1.TabIndex = 0;
-			this.lblLabel1.Text = "回收日期";
-			// 
-			// tsrToolStrip1
-			// 
-			this.tsrToolStrip1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsrToolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.grpCollapsible1.Controls.Add(this.lblAccountDateEnd);
+            this.grpCollapsible1.Controls.Add(this.dtpEndTime);
+            this.grpCollapsible1.Controls.Add(this.dtpStartTime);
+            this.grpCollapsible1.Controls.Add(this.lblLabel1);
+            this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
+            this.grpCollapsible1.Name = "grpCollapsible1";
+            this.grpCollapsible1.Size = new System.Drawing.Size(1061, 52);
+            this.grpCollapsible1.TabIndex = 1;
+            this.grpCollapsible1.TabStop = false;
+            this.grpCollapsible1.Text = "查询条件";
+            // 
+            // lblAccountDateEnd
+            // 
+            this.lblAccountDateEnd.AutoSize = true;
+            this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
+            this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblAccountDateEnd.Location = new System.Drawing.Point(235, 26);
+            this.lblAccountDateEnd.Name = "lblAccountDateEnd";
+            this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
+            this.lblAccountDateEnd.TabIndex = 9;
+            this.lblAccountDateEnd.Text = "至";
+            // 
+            // dtpEndTime
+            // 
+            this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpEndTime.Location = new System.Drawing.Point(258, 20);
+            this.dtpEndTime.Name = "dtpEndTime";
+            this.dtpEndTime.Size = new System.Drawing.Size(155, 21);
+            this.dtpEndTime.TabIndex = 10;
+            this.dtpEndTime.Value = new System.DateTime(2014, 9, 23, 0, 0, 0, 0);
+            // 
+            // dtpStartTime
+            // 
+            this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpStartTime.Location = new System.Drawing.Point(69, 20);
+            this.dtpStartTime.Name = "dtpStartTime";
+            this.dtpStartTime.Size = new System.Drawing.Size(160, 21);
+            this.dtpStartTime.TabIndex = 8;
+            this.dtpStartTime.Value = new System.DateTime(2014, 9, 24, 0, 0, 0, 0);
+            // 
+            // lblLabel1
+            // 
+            this.lblLabel1.Location = new System.Drawing.Point(12, 24);
+            this.lblLabel1.Name = "lblLabel1";
+            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
+            this.lblLabel1.TabIndex = 0;
+            this.lblLabel1.Text = "回收日期";
+            // 
+            // tsrToolStrip1
+            // 
+            this.tsrToolStrip1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrToolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnSearch,
             this.tsbtnClearCondition,
             this.toolStripSeparator4,
             this.tsbtnAdaptive,
             this.tsbtnClose});
-			this.tsrToolStrip1.Location = new System.Drawing.Point(0, 0);
-			this.tsrToolStrip1.Name = "tsrToolStrip1";
-			this.tsrToolStrip1.Size = new System.Drawing.Size(1073, 35);
-			this.tsrToolStrip1.TabIndex = 0;
-			// 
-			// tsbtnSearch
-			// 
-			this.tsbtnSearch.AutoSize = false;
-			this.tsbtnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnSearch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnSearch.Name = "tsbtnSearch";
-			this.tsbtnSearch.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnSearch.Text = "查询(&Q)";
-			this.tsbtnSearch.Click += new System.EventHandler(this.tsbtnSearch_Click);
-			// 
-			// tsbtnClearCondition
-			// 
-			this.tsbtnClearCondition.AutoSize = false;
-			this.tsbtnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnClearCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnClearCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnClearCondition.Name = "tsbtnClearCondition";
-			this.tsbtnClearCondition.Size = new System.Drawing.Size(80, 25);
-			this.tsbtnClearCondition.Text = "清空条件(&C)";
-			this.tsbtnClearCondition.Click += new System.EventHandler(this.tsbtnClearCondition_Click);
-			// 
-			// toolStripSeparator4
-			// 
-			this.toolStripSeparator4.AutoSize = false;
-			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
-			// 
-			// tsbtnAdaptive
-			// 
-			this.tsbtnAdaptive.AutoSize = false;
-			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-			// 
-			// tsbtnClose
-			// 
-			this.tsbtnClose.AutoSize = false;
-			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnClose.Name = "tsbtnClose";
-			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnClose.Text = "关闭(&X)";
-			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-			// 
-			// F_RPT_030121
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1073, 357);
-			this.Controls.Add(this.dgvSum);
-			this.Controls.Add(this.grpCollapsible1);
-			this.Controls.Add(this.tsrToolStrip1);
-			this.Name = "F_RPT_030121";
-			this.Text = "废弃产品汇总表";
-			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PC_1001_FormClosed);
-			this.Load += new System.EventHandler(this.F_PC_1001_Load);
-			((System.ComponentModel.ISupportInitialize)(this.dgvSum)).EndInit();
-			this.grpCollapsible1.ResumeLayout(false);
-			this.grpCollapsible1.PerformLayout();
-			this.tsrToolStrip1.ResumeLayout(false);
-			this.tsrToolStrip1.PerformLayout();
-			this.ResumeLayout(false);
+            this.tsrToolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.tsrToolStrip1.Name = "tsrToolStrip1";
+            this.tsrToolStrip1.Size = new System.Drawing.Size(1073, 35);
+            this.tsrToolStrip1.TabIndex = 0;
+            // 
+            // tsbtnSearch
+            // 
+            this.tsbtnSearch.AutoSize = false;
+            this.tsbtnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnSearch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnSearch.Name = "tsbtnSearch";
+            this.tsbtnSearch.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnSearch.Text = "查询(&Q)";
+            this.tsbtnSearch.Click += new System.EventHandler(this.tsbtnSearch_Click);
+            // 
+            // tsbtnClearCondition
+            // 
+            this.tsbtnClearCondition.AutoSize = false;
+            this.tsbtnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClearCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClearCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClearCondition.Name = "tsbtnClearCondition";
+            this.tsbtnClearCondition.Size = new System.Drawing.Size(80, 25);
+            this.tsbtnClearCondition.Text = "清空条件(&C)";
+            this.tsbtnClearCondition.Click += new System.EventHandler(this.tsbtnClearCondition_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.AutoSize = false;
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
+            // 
+            // tsbtnAdaptive
+            // 
+            this.tsbtnAdaptive.AutoSize = false;
+            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+            // 
+            // tsbtnClose
+            // 
+            this.tsbtnClose.AutoSize = false;
+            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClose.Name = "tsbtnClose";
+            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClose.Text = "关闭(&X)";
+            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+            // 
+            // 产品分级
+            // 
+            this.产品分级.DataPropertyName = "产品分级";
+            this.产品分级.HeaderText = "产品分级";
+            this.产品分级.Name = "产品分级";
+            this.产品分级.ReadOnly = true;
+            // 
+            // 部门
+            // 
+            this.部门.DataPropertyName = "部门";
+            this.部门.HeaderText = "部门";
+            this.部门.Name = "部门";
+            this.部门.ReadOnly = true;
+            // 
+            // 用户
+            // 
+            this.用户.DataPropertyName = "用户";
+            this.用户.HeaderText = "用户";
+            this.用户.Name = "用户";
+            this.用户.ReadOnly = true;
+            // 
+            // 产量
+            // 
+            this.产量.DataPropertyName = "产量";
+            this.产量.HeaderText = "产量";
+            this.产量.Name = "产量";
+            this.产量.ReadOnly = true;
+            // 
+            // 合格率
+            // 
+            this.合格率.DataPropertyName = "合格率";
+            this.合格率.HeaderText = "占比率";
+            this.合格率.Name = "合格率";
+            this.合格率.ReadOnly = true;
+            // 
+            // F_RPT_030121
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1073, 357);
+            this.Controls.Add(this.dgvSum);
+            this.Controls.Add(this.grpCollapsible1);
+            this.Controls.Add(this.tsrToolStrip1);
+            this.Name = "F_RPT_030121";
+            this.Text = "废弃产品汇总表";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PC_1001_FormClosed);
+            this.Load += new System.EventHandler(this.F_PC_1001_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).EndInit();
+            this.grpCollapsible1.ResumeLayout(false);
+            this.grpCollapsible1.PerformLayout();
+            this.tsrToolStrip1.ResumeLayout(false);
+            this.tsrToolStrip1.PerformLayout();
+            this.ResumeLayout(false);
 
 		}
 
@@ -303,9 +312,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		private Basics.BaseControls.C_Label lblAccountDateEnd;
 		private System.Windows.Forms.DateTimePicker dtpEndTime;
 		private System.Windows.Forms.DateTimePicker dtpStartTime;
-		private System.Windows.Forms.DataGridViewTextBoxColumn 产品分级;
-		private System.Windows.Forms.DataGridViewTextBoxColumn 部门;
-		private System.Windows.Forms.DataGridViewTextBoxColumn 产量;
-		private System.Windows.Forms.DataGridViewTextBoxColumn 合格率;
-	}
+        private System.Windows.Forms.DataGridViewTextBoxColumn 产品分级;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 部门;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 用户;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 产量;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 合格率;
+    }
 }

+ 3 - 0
DK.Client/ReportModule/R03/M01/F_RPT_030121.resx

@@ -123,6 +123,9 @@
   <metadata name="部门.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="用户.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="产量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

File diff suppressed because it is too large
+ 1026 - 1024
DK.Client/SystemModule/F_MST_0501.Designer.cs


+ 26 - 8
DK.Client/SystemModule/F_MST_0501.cs

@@ -362,7 +362,26 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
 			}
 		}
-
+		private void tsbtnSetQC_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				DataTable data = this.dgvGoods.DataSource as DataTable;
+				if (data == null || data.Rows.Count == 0)
+				{
+					return;
+				}
+				data = data.Copy();
+				F_MST_0504 fMST0503 = new F_MST_0504(1, data);
+				fMST0503.ShowDialog();
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
 		/// <summary>
 		/// 撤销产品工序设置
 		/// </summary>
@@ -561,7 +580,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				this.tsbtnEdit.Enabled = false;
 				this.tsbtnAttachment.Enabled = false;
 				this.tsEditPlateLimitNum.Enabled = false;
-				this.tsbtnSet.Enabled = false;
+				this.tsbtnSetQC.Enabled = false;
 				this.tsbtnUndo.Enabled = false;
 				for (int i = 0; i < sre.Data.Tables[0].Rows.Count; i++)
 				{
@@ -569,21 +588,21 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 					if (sre.Data.Tables[0].Rows[i]["FUNCTIONCODE"].ToString() == "01030305")
 					{
 						this.tsbtnAttachment.Enabled = true;
-						this.tsbtnSet.Enabled = true;
+						this.tsbtnSetQC.Enabled = true;
 						this.tsbtnUndo.Enabled = true;
 					}
 					//新建
 					else if (sre.Data.Tables[0].Rows[i]["FUNCTIONCODE"].ToString() == "01030301")
 					{
 						this.tsbtnAdd.Enabled = true;
-						this.tsbtnSet.Enabled = true;
+						this.tsbtnSetQC.Enabled = true;
 						this.tsbtnUndo.Enabled = true;
 					}
 					//编辑
 					else if (sre.Data.Tables[0].Rows[i]["FUNCTIONCODE"].ToString() == "01030302")
 					{
 						this.tsbtnEdit.Enabled = true;
-						this.tsbtnSet.Enabled = true;
+						this.tsbtnSetQC.Enabled = true;
 						this.tsbtnUndo.Enabled = true;
 						_Edit = true;
 					}
@@ -596,7 +615,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				}
 			}
 		}
-		#endregion
-
-	}
+        #endregion
+    }
 }

+ 1 - 1
DK.Client/SystemModule/F_MST_0501.resx

@@ -465,6 +465,6 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>49</value>
+    <value>25</value>
   </metadata>
 </root>

+ 584 - 0
DK.Client/SystemModule/F_MST_0504.Designer.cs

@@ -0,0 +1,584 @@
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{
+    partial class F_MST_0504
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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 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();
+            this.dgvGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.Sel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsModel = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.glazeTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MudWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GlazeWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LusterwareWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProductionCycle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UnitPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colStartingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PlateLimitNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AutoLossCycle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DeliverLimitCycle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PackageNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OutletDistance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MaterialCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MaterialRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.printcopies = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CeaseFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AccountID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.valueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnSave = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbtnAllCheck = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnUnCheck = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnNoCheck = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.longdingList = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pnlBack.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvGoods)).BeginInit();
+            this.tsrOperate.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pnlBack
+            // 
+            this.pnlBack.Controls.Add(this.label1);
+            this.pnlBack.Controls.Add(this.longdingList);
+            this.pnlBack.Controls.Add(this.dgvGoods);
+            this.pnlBack.Location = new System.Drawing.Point(0, 35);
+            this.pnlBack.Size = new System.Drawing.Size(812, 392);
+            // 
+            // dgvGoods
+            // 
+            this.dgvGoods.AllowUserToAddRows = false;
+            this.dgvGoods.AllowUserToDeleteRows = false;
+            this.dgvGoods.AllowUserToModifyRows = true;
+            this.dgvGoods.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGoods.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvGoods.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)));
+            this.dgvGoods.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvGoods.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvGoods.CellHeight = 23;
+            this.dgvGoods.ChildNodeColumnName = null;
+            this.dgvGoods.ChildNodeColumnText = null;
+            this.dgvGoods.ColumnDeep = 1;
+            this.dgvGoods.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            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.dgvGoods.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvGoods.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvGoods.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Sel,
+            this.GoodsID,
+            this.GoodsCode,
+            this.GoodsName,
+            this.GoodsSpecification,
+            this.GoodsModel,
+            this.GoodsTypeName,
+            this.glazeTypeName,
+            this.MudWeight,
+            this.GlazeWeight,
+            this.LusterwareWeight,
+            this.ProductionCycle,
+            this.UnitPrice,
+            this.colStartingDate,
+            this.PlateLimitNum,
+            this.AutoLossCycle,
+            this.DeliverLimitCycle,
+            this.PackageNum,
+            this.OutletDistance,
+            this.MaterialCode,
+            this.MaterialRemark,
+            this.printcopies,
+            this.CeaseFlag,
+            this.Remarks,
+            this.AccountID,
+            this.valueFlag});
+            this.dgvGoods.ColumnTreeView = null;
+            this.dgvGoods.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGoods.DefaultCellStyle = dataGridViewCellStyle13;
+            this.dgvGoods.DynamicColumnName = "";
+            this.dgvGoods.EnableHeadersVisualStyles = false;
+            this.dgvGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvGoods.FormatQuantityColumns = null;
+            this.dgvGoods.HasNode = false;
+            this.dgvGoods.HorizontalMergeColumn = null;
+            this.dgvGoods.IsAutoCountSum = true;
+            this.dgvGoods.IsAutoResizeColumns = false;
+            this.dgvGoods.IsClickF12 = false;
+            this.dgvGoods.IsOpenMergeCellFlag = false;
+            this.dgvGoods.IsSubTotalFlag = false;
+            this.dgvGoods.IsTopDeep = false;
+            this.dgvGoods.Location = new System.Drawing.Point(12, 42);
+            this.dgvGoods.MergeColumnNames = null;
+            this.dgvGoods.MergeDetailColumnNames = null;
+            this.dgvGoods.MergeDetailOnlyColumn = null;
+            this.dgvGoods.MergeOnlyColumn = null;
+            this.dgvGoods.Name = "dgvGoods";
+            this.dgvGoods.RefreshAtHscroll = false;
+            this.dgvGoods.RowHeadersWidth = 50;
+            this.dgvGoods.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle14;
+            this.dgvGoods.RowTemplate.Height = 21;
+            this.dgvGoods.Size = new System.Drawing.Size(788, 347);
+            this.dgvGoods.SortOrderColumnName = null;
+            this.dgvGoods.TabIndex = 13;
+            this.dgvGoods.Tag = true;
+            this.dgvGoods.TotalSumColumns = null;
+            this.dgvGoods.ViewRowFilter = "";
+            this.dgvGoods.VirtualMode = true;
+            this.dgvGoods.VirtualNodes = false;
+            // 
+            // Sel
+            // 
+            this.Sel.DataPropertyName = "Sel";
+            this.Sel.FalseValue = "0";
+            this.Sel.HeaderText = "选择";
+            this.Sel.Name = "Sel";
+            this.Sel.TrueValue = "1";
+            // 
+            // GoodsID
+            // 
+            this.GoodsID.DataPropertyName = "GoodsID";
+            this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.Name = "GoodsID";
+            this.GoodsID.Visible = false;
+            // 
+            // GoodsCode
+            // 
+            this.GoodsCode.DataPropertyName = "GoodsCode";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.Name = "GoodsCode";
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.Name = "GoodsName";
+            // 
+            // GoodsSpecification
+            // 
+            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
+            this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.Name = "GoodsSpecification";
+            // 
+            // GoodsModel
+            // 
+            this.GoodsModel.DataPropertyName = "GoodsModel";
+            this.GoodsModel.HeaderText = "产品型号";
+            this.GoodsModel.Name = "GoodsModel";
+            // 
+            // GoodsTypeName
+            // 
+            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
+            this.GoodsTypeName.HeaderText = "产品类别";
+            this.GoodsTypeName.Name = "GoodsTypeName";
+            // 
+            // glazeTypeName
+            // 
+            this.glazeTypeName.DataPropertyName = "glazeTypeName";
+            this.glazeTypeName.HeaderText = "釉料类别";
+            this.glazeTypeName.Name = "glazeTypeName";
+            // 
+            // MudWeight
+            // 
+            this.MudWeight.DataPropertyName = "MudWeight";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.Format = "N2";
+            this.MudWeight.DefaultCellStyle = dataGridViewCellStyle3;
+            this.MudWeight.HeaderText = "泥浆用量(KG)";
+            this.MudWeight.Name = "MudWeight";
+            // 
+            // GlazeWeight
+            // 
+            this.GlazeWeight.DataPropertyName = "GlazeWeight";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Format = "N2";
+            this.GlazeWeight.DefaultCellStyle = dataGridViewCellStyle4;
+            this.GlazeWeight.HeaderText = "釉浆用量(KG)";
+            this.GlazeWeight.Name = "GlazeWeight";
+            // 
+            // LusterwareWeight
+            // 
+            this.LusterwareWeight.DataPropertyName = "LusterwareWeight";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.Format = "N2";
+            this.LusterwareWeight.DefaultCellStyle = dataGridViewCellStyle5;
+            this.LusterwareWeight.HeaderText = "光瓷重量(KG)";
+            this.LusterwareWeight.Name = "LusterwareWeight";
+            // 
+            // ProductionCycle
+            // 
+            this.ProductionCycle.DataPropertyName = "ProductionCycle";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Format = "N0";
+            this.ProductionCycle.DefaultCellStyle = dataGridViewCellStyle6;
+            this.ProductionCycle.HeaderText = "生产周期(天)";
+            this.ProductionCycle.Name = "ProductionCycle";
+            // 
+            // UnitPrice
+            // 
+            this.UnitPrice.DataPropertyName = "UnitPrice";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Format = "N2";
+            this.UnitPrice.DefaultCellStyle = dataGridViewCellStyle7;
+            this.UnitPrice.HeaderText = "单值";
+            this.UnitPrice.Name = "UnitPrice";
+            // 
+            // colStartingDate
+            // 
+            this.colStartingDate.DataPropertyName = "StartingDate";
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colStartingDate.DefaultCellStyle = dataGridViewCellStyle8;
+            this.colStartingDate.HeaderText = "投产日期";
+            this.colStartingDate.Name = "colStartingDate";
+            // 
+            // PlateLimitNum
+            // 
+            this.PlateLimitNum.DataPropertyName = "PlateLimitNum";
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.Format = "N0";
+            this.PlateLimitNum.DefaultCellStyle = dataGridViewCellStyle9;
+            this.PlateLimitNum.HeaderText = "装板限制数量";
+            this.PlateLimitNum.Name = "PlateLimitNum";
+            // 
+            // AutoLossCycle
+            // 
+            this.AutoLossCycle.DataPropertyName = "AutoLossCycle";
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Format = "N0";
+            this.AutoLossCycle.DefaultCellStyle = dataGridViewCellStyle10;
+            this.AutoLossCycle.HeaderText = "未交坯自动报损周期(天)";
+            this.AutoLossCycle.Name = "AutoLossCycle";
+            // 
+            // DeliverLimitCycle
+            // 
+            this.DeliverLimitCycle.DataPropertyName = "DeliverLimitCycle";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Format = "N0";
+            this.DeliverLimitCycle.DefaultCellStyle = dataGridViewCellStyle11;
+            this.DeliverLimitCycle.HeaderText = "交坯限制周期(天)";
+            this.DeliverLimitCycle.Name = "DeliverLimitCycle";
+            // 
+            // PackageNum
+            // 
+            this.PackageNum.DataPropertyName = "PackageNum";
+            this.PackageNum.HeaderText = "包装数量";
+            this.PackageNum.Name = "PackageNum";
+            // 
+            // OutletDistance
+            // 
+            this.OutletDistance.DataPropertyName = "OutletDistance";
+            this.OutletDistance.HeaderText = "出水距";
+            this.OutletDistance.Name = "OutletDistance";
+            // 
+            // MaterialCode
+            // 
+            this.MaterialCode.DataPropertyName = "MaterialCode";
+            this.MaterialCode.HeaderText = "物料编码";
+            this.MaterialCode.Name = "MaterialCode";
+            // 
+            // MaterialRemark
+            // 
+            this.MaterialRemark.DataPropertyName = "MaterialRemark";
+            this.MaterialRemark.HeaderText = "物料描述";
+            this.MaterialRemark.Name = "MaterialRemark";
+            // 
+            // printcopies
+            // 
+            this.printcopies.DataPropertyName = "printcopies";
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle12.Format = "N0";
+            this.printcopies.DefaultCellStyle = dataGridViewCellStyle12;
+            this.printcopies.HeaderText = "打印份数";
+            this.printcopies.Name = "printcopies";
+            this.printcopies.Visible = false;
+            // 
+            // CeaseFlag
+            // 
+            this.CeaseFlag.DataPropertyName = "CeaseFlag";
+            this.CeaseFlag.FalseValue = "0";
+            this.CeaseFlag.HeaderText = "正常生产";
+            this.CeaseFlag.IndeterminateValue = "";
+            this.CeaseFlag.Name = "CeaseFlag";
+            this.CeaseFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CeaseFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CeaseFlag.TrueValue = "1";
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.Name = "Remarks";
+            // 
+            // AccountID
+            // 
+            this.AccountID.DataPropertyName = "AccountID";
+            this.AccountID.HeaderText = "帐套ID";
+            this.AccountID.Name = "AccountID";
+            this.AccountID.Visible = false;
+            // 
+            // valueFlag
+            // 
+            this.valueFlag.DataPropertyName = "valueFlag";
+            this.valueFlag.FalseValue = "0";
+            this.valueFlag.HeaderText = "正常使用";
+            this.valueFlag.IndeterminateValue = "";
+            this.valueFlag.Name = "valueFlag";
+            this.valueFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.valueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.valueFlag.TrueValue = "1";
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.SystemColors.Control;
+            this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.SystemModule.Resource1.functionbackground;
+            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnSave,
+            this.toolStripSeparator1,
+            this.tsbtnAllCheck,
+            this.tsbtnUnCheck,
+            this.tsbtnNoCheck,
+            this.toolStripSeparator3,
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+            this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+            this.tsrOperate.ShowItemToolTips = false;
+            this.tsrOperate.Size = new System.Drawing.Size(812, 35);
+            this.tsrOperate.TabIndex = 1000;
+            // 
+            // tsbtnSave
+            // 
+            this.tsbtnSave.AutoSize = false;
+            this.tsbtnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnSave.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnSave.Name = "tsbtnSave";
+            this.tsbtnSave.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnSave.Text = "保存(&S)";
+            this.tsbtnSave.Click += new System.EventHandler(this.tsbtnSave_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.AutoSize = false;
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // tsbtnAllCheck
+            // 
+            this.tsbtnAllCheck.AutoSize = false;
+            this.tsbtnAllCheck.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAllCheck.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAllCheck.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAllCheck.Name = "tsbtnAllCheck";
+            this.tsbtnAllCheck.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnAllCheck.Text = "全选(&C)";
+            this.tsbtnAllCheck.Click += new System.EventHandler(this.tsbtnAllCheck_Click);
+            // 
+            // tsbtnUnCheck
+            // 
+            this.tsbtnUnCheck.AutoSize = false;
+            this.tsbtnUnCheck.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnUnCheck.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnUnCheck.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnUnCheck.Name = "tsbtnUnCheck";
+            this.tsbtnUnCheck.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnUnCheck.Text = "反选(&U)";
+            this.tsbtnUnCheck.Click += new System.EventHandler(this.tsbtnUnCheck_Click);
+            // 
+            // tsbtnNoCheck
+            // 
+            this.tsbtnNoCheck.AutoSize = false;
+            this.tsbtnNoCheck.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnNoCheck.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnNoCheck.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnNoCheck.Name = "tsbtnNoCheck";
+            this.tsbtnNoCheck.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnNoCheck.Text = "不选(&N)";
+            this.tsbtnNoCheck.Click += new System.EventHandler(this.tsbtnNoCheck_Click);
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.AutoSize = false;
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+            // 
+            // tsbtnAdaptive
+            // 
+            this.tsbtnAdaptive.AutoSize = false;
+            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+            // 
+            // tsbtnClose
+            // 
+            this.tsbtnClose.AutoSize = false;
+            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClose.Name = "tsbtnClose";
+            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClose.Text = "关闭(&X)";
+            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+            // 
+            // longdingList
+            // 
+            this.longdingList.BackColor = System.Drawing.SystemColors.Window;
+            this.longdingList.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.longdingList.DataSource = null;
+            this.longdingList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.longdingList.FormattingEnabled = true;
+            // 
+            // 
+            // 
+            this.longdingList.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.longdingList.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.longdingList.ListBox.Location = new System.Drawing.Point(0, 0);
+            this.longdingList.ListBox.Name = "";
+            this.longdingList.ListBox.Size = new System.Drawing.Size(118, 136);
+            this.longdingList.ListBox.TabIndex = 0;
+            this.longdingList.Location = new System.Drawing.Point(104, 10);
+            this.longdingList.Name = "longdingList";
+            this.longdingList.Size = new System.Drawing.Size(120, 20);
+            this.longdingList.TabIndex = 14;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(21, 13);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(77, 12);
+            this.label1.TabIndex = 15;
+            this.label1.Text = "检验标准名称";
+            // 
+            // F_MST_0504
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(812, 449);
+            this.Controls.Add(this.tsrOperate);
+            this.Name = "F_MST_0504";
+            this.Text = "配置QC项目产品";
+            this.Load += new System.EventHandler(this.F_MST_0504_Load);
+            this.Controls.SetChildIndex(this.tsrOperate, 0);
+            this.Controls.SetChildIndex(this.pnlBack, 0);
+            this.pnlBack.ResumeLayout(false);
+            this.pnlBack.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvGoods)).EndInit();
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private Basics.BaseControls.C_DataGridView dgvGoods;
+        private Basics.BaseControls.C_ToolStrip tsrOperate;
+        private System.Windows.Forms.ToolStripButton tsbtnSave;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripButton tsbtnAllCheck;
+        private System.Windows.Forms.ToolStripButton tsbtnNoCheck;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+        private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private System.Windows.Forms.ToolStripButton tsbtnUnCheck;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Sel;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsSpecification;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsModel;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn glazeTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MudWeight;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GlazeWeight;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LusterwareWeight;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ProductionCycle;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UnitPrice;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colStartingDate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PlateLimitNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn AutoLossCycle;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DeliverLimitCycle;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PackageNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OutletDistance;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MaterialCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MaterialRemark;
+        private System.Windows.Forms.DataGridViewTextBoxColumn printcopies;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CeaseFlag;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+        private System.Windows.Forms.DataGridViewTextBoxColumn AccountID;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn valueFlag;
+        private System.Windows.Forms.Label label1;
+        private Basics.BaseControls.DKListBoxComboBox longdingList;
+    }
+}

+ 285 - 0
DK.Client/SystemModule/F_MST_0504.cs

@@ -0,0 +1,285 @@
+/*******************************************************************************
+ * Copyright(c) 2014 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_MST_0504.cs
+ *      2.功能描述:配置QC项目产品
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      李士越          2024/06/24          1.00            新建
+ *******************************************************************************/
+ 
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+using Dongke.WinForm.Controls;
+using System.Linq; 
+
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{ 
+    /// <summary>
+    /// 配置QC项目产品
+    /// </summary>
+    public partial class F_MST_0504 :  FormBase
+    {
+        #region 成员变量 
+        /// <summary>
+        ///  配置QC项目产品
+        /// </summary>
+        private int _formStatus;
+        #endregion
+
+        #region 构造函数
+        /// <summary>
+        /// 配置或撤销产品工序配置
+        /// </summary>
+        /// <param name="formStatus">1:配置到工序;2:从工序撤销</param>
+        /// <param name="goods">产品列表</param>
+        public F_MST_0504(int formStatus, DataTable goods)
+        {
+            InitializeComponent();
+            this.dgvGoods.AutoGenerateColumns = false;
+            if (goods.Columns.Contains("Sel"))
+            {
+                goods.Columns.Remove("Sel");
+            }
+            goods.Columns.Add("Sel", typeof(string));
+            this.dgvGoods.DataSource = goods;
+            this._formStatus = formStatus;
+            this.Text = "配置QC项目产品";
+            GetlongdingList();
+        }
+        #endregion
+
+        #region 事件
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnClose_Click(object sender, System.EventArgs e)
+        {
+            this.Close();
+        }
+
+        /// <summary>
+        /// 自适应列宽
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnAdaptive_Click(object sender, System.EventArgs e)
+        {
+            this.dgvGoods.AutoResizeColumns();
+        }
+
+        /// <summary>
+        /// 画面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void F_MST_0504_Load(object sender, System.EventArgs e)
+        {
+            try
+            {
+                foreach (DataGridViewColumn item in this.dgvGoods.Columns)
+                {
+                    if ("Sel" != item.Name)
+                    {
+                        item.ReadOnly = true;
+                    }
+                }
+                this.dgvGoods.IsSetInputColumnsColor = true;
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 全选
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnAllCheck_Click(object sender, System.EventArgs e)
+        {
+            try
+            {
+                this.dgvGoods.CommitEdit(DataGridViewDataErrorContexts.Commit); 
+                foreach (DataGridViewRow item in dgvGoods.Rows)
+                {
+                    DataRowView row = item.DataBoundItem as DataRowView;
+                    if (row != null)
+                    {
+                        row["Sel"] = "1";
+                        row.EndEdit();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 反选
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnUnCheck_Click(object sender, System.EventArgs e)
+        {
+            try
+            {
+                this.dgvGoods.CommitEdit(DataGridViewDataErrorContexts.Commit);
+                foreach (DataGridViewRow item in dgvGoods.Rows)
+                {
+                    DataRowView row = item.DataBoundItem as DataRowView;
+                    if (row != null)
+                    {
+                        int c = int.Parse(row["Sel"].ToString()!="" ? row["Sel"].ToString():"0");
+                        row["Sel"] = (c == 1 ? 0 : 1).ToString();
+                        row.EndEdit();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 全不选
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnNoCheck_Click(object sender, System.EventArgs e)
+        {
+            try
+            {
+                this.dgvGoods.CommitEdit(DataGridViewDataErrorContexts.Commit);
+
+                foreach (DataGridViewRow item in dgvGoods.Rows)
+                {
+                    DataRowView row = item.DataBoundItem as DataRowView;
+                    if (row != null)
+                    {
+                        row["Sel"] = "0";
+                        row.EndEdit();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnSave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.longdingList.Text=="") {
+                    MessageBox.Show("没有选择检验标准", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return;
+                }
+
+                this.dgvGoods.CommitEdit(DataGridViewDataErrorContexts.Commit);
+                this.dgvGoods.EndEdit(); 
+                DataTable goods = this.dgvGoods.DataSource as DataTable;
+                List<string> goodsIDList = new List<string>();
+                List<string> goodsCodeList = new List<string>();
+                //筛选Sel为1的进行循环 
+                foreach (DataRow item in goods.AsEnumerable().Where(ex => ex.Field<string>("Sel") == "1"))
+                {
+                    item.EndEdit();
+                    if ("1" == item["Sel"].ToString())
+                    {
+                        goodsIDList.Add(item["GoodsID"].ToString());
+                        goodsCodeList.Add(item["GoodsCode"].ToString());
+                    }
+                }
+
+                if (goodsIDList.Count == 0)
+                {
+                    MessageBox.Show("没有选择任何产品", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return;
+                }
+
+                if (string.IsNullOrWhiteSpace(this.longdingList.Text))
+                {
+                    DialogResult dr = MessageBox.Show("确定保存?", this.Text, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+                    if (dr != DialogResult.OK)
+                    {
+                        return;
+                    }
+                }
+
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "F_MST_0504";
+                cre.Name = "Insert_T_P_Fqcitemsgoods";  
+                cre.Properties["GoodsIDs"] = string.Join(",", goodsIDList);
+                cre.Properties["GoodsCodes"] = string.Join(",", goodsCodeList);
+                cre.Properties["ITEMSID"] = this.longdingList.SelectedValue; 
+                ServiceResultEntity sre = CommonModuleProxy.Service.DoRequest(cre);
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    MessageBox.Show(string.Format(Messages.MSG_CMN_I001, "产品", "配置"),
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show(string.Format(Messages.MSG_CMN_W001, "产品工序", (_formStatus == 1 ? "配置" : "撤销")),
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+        #endregion
+
+        #region 获取检验标准名称
+        /// <summary>
+        /// 获取检验标准名称
+        /// </summary>
+        public void GetlongdingList()
+        {
+            ServiceResultEntity sre = CommonModuleProxy.Service.DoRequest(new ClientRequestEntity()
+            {
+                NameSpace = "F_MST_0504",
+                Name = "GetlongdingList"
+            });
+            if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+            {
+                longdingList.DisplayMember = "INSPECTNAME";
+                longdingList.ValueMember = "ITEMSID";
+                longdingList.DataSource = sre.Data.Tables[0];
+                longdingList.SelectedText = "";
+                longdingList.Text = "";
+            }
+        }
+        #endregion
+    }
+}

+ 159 - 0
DK.Client/SystemModule/F_MST_0504.resx

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="Sel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UnitPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colStartingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PlateLimitNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="AutoLossCycle.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DeliverLimitCycle.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PackageNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="OutletDistance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MaterialCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MaterialRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="printcopies.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>81</value>
+  </metadata>
+</root>

+ 9 - 0
DK.Client/SystemModule/SystemModule.csproj

@@ -134,6 +134,12 @@
     <Compile Include="F_MST_0412.Designer.cs">
       <DependentUpon>F_MST_0412.cs</DependentUpon>
     </Compile>
+    <Compile Include="F_MST_0504.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_MST_0504.Designer.cs">
+      <DependentUpon>F_MST_0504.cs</DependentUpon>
+    </Compile>
     <Compile Include="F_MST_0503.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -477,6 +483,9 @@
     <EmbeddedResource Include="F_MST_0412.resx">
       <DependentUpon>F_MST_0412.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="F_MST_0504.resx">
+      <DependentUpon>F_MST_0504.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="F_MST_0503.resx">
       <DependentUpon>F_MST_0503.cs</DependentUpon>
     </EmbeddedResource>

+ 241 - 198
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -16359,204 +16359,247 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 ServiceResultEntity sre = new ServiceResultEntity();
 
                 string sqlString = @"SELECT
-                                    TT2.产品分级,
-																		TT2.部门,
-                                    TT2.count 产量,
-                                    TO_CHAR((TT2.count/TT2.sumcount)* 100,'9,990.00') || '%' AS 合格率
-                                    FROM(
-                                    SELECT
-                                    T1.id,
-                                    T1.产品分级,
-																		T1.部门,
-                                    T1.count count,
-                                    TT.count sumcount
-                                    FROM(
-                                    SELECT
-                                    ROWNUM id,
-                                    T.产品分级,
-																		T.部门,
-                                    T.count
-                                    FROM(
-                                    SELECT
-                                    CASE
-	                                    WHEN
-		                                    TPGD.GOODSLEVELTYPEID = 4 THEN
-			                                    '正品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 5 THEN
-			                                    '副品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 6 THEN
-			                                    '重烧' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 7 THEN
-			                                    '次品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 16 THEN
-			                                    '冷补' 
-			                                    ELSE '损坯'
-		                                    END 产品分级,
-																				CASE WHEN  SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'C' THEN '三部'
-																				WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'B' THEN '二部' ELSE '一部' END 部门,
-	                                     COUNT( DISTINCT TPGD.BARCODE ) count
-                                    FROM
-	                                    TP_PM_GROUTINGDAILYDETAIL TPGD
-	                                    LEFT JOIN (SELECT BARCODE, CREATETIME FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 80 AND VALUEFLAG = 1 ) TPPD ON TPGD.BARCODE = TPPD.																				BARCODE 
-                                    WHERE
-	                                    TPGD.RECYCLINGFLAG = 1 
-	                                    AND TPPD.CREATETIME >= :DateBegin
-                                        AND TPPD.CREATETIME <= :DateEnd
-                                    GROUP BY
-	                                    TPGD.GOODSLEVELTYPEID,SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 )) T )T1
-	                                    FULL JOIN(
-	                                    SELECT
-	                                    ROWNUM id,
-	                                    T2.count
-	                                    FROM(
-	                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-		                                    UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-		                                    UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-		                                    UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-		                                    UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-																				UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd
-		                                    UNION ALL
-		                                    SELECT
-		                                    COUNT(DISTINCT BARCODE) count
-	                                    FROM
-		                                    TP_PM_PRODUCTIONDATA TPPD 
-	                                    WHERE
-		                                    TPPD.PROCEDUREID IN (80) 
-		                                    AND TPPD.VALUEFLAG = 1
-		                                    AND TPPD.CREATETIME >= :DateBegin
-                                            AND TPPD.CREATETIME <= :DateEnd) T2 WHERE 
-		                                    ROWNUM <= (SELECT COUNT(*) FROM(
-		                                    SELECT
-                                    CASE
-	                                    WHEN
-		                                    TPGD.GOODSLEVELTYPEID = 4 THEN
-			                                    '正品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 5 THEN
-			                                    '副品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 6 THEN
-			                                    '重烧' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 7 THEN
-			                                    '次品' 
-			                                    WHEN TPGD.GOODSLEVELTYPEID = 16 THEN
-			                                    '冷补' 
-			                                    ELSE '损坯'
-		                                    END 产品分级,
-																				CASE WHEN  SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'C' THEN '三部'
-																				WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'B' THEN '二部' ELSE '一部' END 部门,
-	                                     COUNT( DISTINCT TPGD.BARCODE ) count
-                                    FROM
-	                                    TP_PM_GROUTINGDAILYDETAIL TPGD
-	                                    LEFT JOIN (SELECT BARCODE, CREATETIME FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 80 AND VALUEFLAG = 1 ) TPPD ON TPGD.BARCODE = TPPD.BARCODE 
-                                    WHERE
-	                                    TPGD.RECYCLINGFLAG = 1 
-	                                    AND TPPD.CREATETIME >= :DateBegin
-                                        AND TPPD.CREATETIME <= :DateEnd
-                                    GROUP BY
-	                                    TPGD.GOODSLEVELTYPEID,SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 )) A)
-		                                    ) TT ON TT.id = T1.id )TT2 ORDER BY TT2.产品分级 DESC";
+	TT2.产品分级,
+	TT2.部门,
+	TT2.用户,
+	TT2.count 产量,
+	TO_CHAR( ( TT2.count / TT2.sumcount ) * 100, '9,990.00' ) || '%' AS 合格率 
+FROM
+	(
+	SELECT
+		T1.id,
+		T1.产品分级,
+		T1.部门,
+		T1.用户,
+		T1.count count,
+		TT.count sumcount 
+	FROM
+		(
+		SELECT ROWNUM
+			id,
+			T.产品分级,
+			T.部门,
+			T.用户,
+			T.count 
+		FROM
+			(
+			SELECT
+			CASE
+					
+				WHEN
+					TPGD.GOODSLEVELTYPEID = 4 THEN
+						'正品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 5 THEN
+						'副品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 6 THEN
+						'重烧' 
+						WHEN TPGD.GOODSLEVELTYPEID = 7 THEN
+						'次品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 16 THEN
+						'冷补' ELSE '损坯' 
+					END 产品分级,
+CASE
+	
+	WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'C' THEN
+	'三部' 
+	WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'B' THEN
+	'二部' ELSE '一部' 
+	END 部门,
+	tppd.CREATEUSERID AS 用户 ,
+	COUNT( DISTINCT TPGD.BARCODE ) count 
+FROM
+	TP_PM_GROUTINGDAILYDETAIL TPGD
+	LEFT JOIN ( SELECT BARCODE, CREATETIME, CREATEUSERID FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 80 AND VALUEFLAG = 1 ) TPPD ON TPGD.BARCODE = TPPD.BARCODE 
+WHERE
+	TPGD.RECYCLINGFLAG = 1 
+	AND TPPD.CREATETIME >= :DateBegin 
+	AND TPPD.CREATETIME <= :DateEnd 
+GROUP BY
+	TPGD.GOODSLEVELTYPEID,
+	tppd.CREATEUSERID,
+	SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) 
+	) T 
+	) T1
+	FULL JOIN (
+	SELECT ROWNUM
+		id,
+		T2.count 
+	FROM
+		(
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+			SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+			SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd UNION ALL
+		SELECT
+			COUNT( DISTINCT BARCODE ) count 
+		FROM
+			TP_PM_PRODUCTIONDATA TPPD 
+		WHERE
+			TPPD.PROCEDUREID IN ( 80 ) 
+			AND TPPD.VALUEFLAG = 1 
+			AND TPPD.CREATETIME >= :DateBegin 
+			AND TPPD.CREATETIME <= :DateEnd 
+		) T2 
+	WHERE
+		ROWNUM <= (
+		SELECT
+			COUNT( * ) 
+		FROM
+			(
+			SELECT
+			CASE
+					
+				WHEN
+					TPGD.GOODSLEVELTYPEID = 4 THEN
+						'正品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 5 THEN
+						'副品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 6 THEN
+						'重烧' 
+						WHEN TPGD.GOODSLEVELTYPEID = 7 THEN
+						'次品' 
+						WHEN TPGD.GOODSLEVELTYPEID = 16 THEN
+						'冷补' ELSE '损坯' 
+					END 产品分级,
+CASE
+	
+	WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'C' THEN
+	'三部' 
+	WHEN SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ) = 'B' THEN
+	'二部' ELSE '一部' 
+	END 部门,
+	tppd.CREATEUSERID AS 用户 ,
+	COUNT( DISTINCT TPGD.BARCODE ) count 
+FROM
+	TP_PM_GROUTINGDAILYDETAIL TPGD
+	LEFT JOIN ( SELECT BARCODE, CREATETIME, CREATEUSERID FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 80 AND VALUEFLAG = 1 ) TPPD ON TPGD.BARCODE = TPPD.BARCODE 
+WHERE
+	TPGD.RECYCLINGFLAG = 1 
+	AND TPPD.CREATETIME >= :DateBegin 
+	AND TPPD.CREATETIME <= :DateEnd 
+GROUP BY
+	TPGD.GOODSLEVELTYPEID,
+	SUBSTR( TPGD.GROUTINGLINENAME, 1, 1 ),
+	tppd.CREATEUSERID 
+	) A 
+	) 
+	) TT ON TT.id = T1.id 
+	) TT2 
+ORDER BY
+	TT2.产品分级 DESC";
 
                 OracleParameter[] oracleParameter = new OracleParameter[]
                 {

+ 84 - 2
DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -11,7 +11,8 @@
 using System;
 using System.Text;
 using System.Data;
-
+using System.Linq;
+using System.Collections.Generic;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.Library;
@@ -6439,7 +6440,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             }
             return sre;
         }
-        #endregion
+        #endregion 
 
         #region 成型报损原因
         /// <summary>
@@ -6554,5 +6555,86 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             }
         }
         #endregion
+
+        #region 获取检验标准名称
+        /// <summary>
+        /// 获取检验标准名称
+        /// </summary>
+        /// <param name="sUserInfo"></param>
+        /// <param name="cre"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetlongdingList(ClientRequestEntity cre, SUserInfo user)
+        {
+            ServiceResultEntity sre = new ServiceResultEntity();
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            try
+            {
+                string strSql = "SELECT ITEMSID, INSPECTNAME FROM TP_PM_FQCITEMS WHERE VALUEFLAG=1";
+
+                oracleConn.Open();
+                DataSet result = oracleConn.GetSqlResultToDs(strSql);
+                oracleConn.Close();
+                sre.Data = result;
+                sre.Status = Constant.ServiceResultStatus.Success;
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                if (oracleConn.ConnState == ConnectionState.Open)
+                {
+                    oracleConn.Close();
+                }
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 向tp_pm_fqcitemsgoods中添加数据
+        /// <summary>
+        /// 向tp_pm_fqcitemsgoods中添加数据
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity Insert_T_P_Fqcitemsgoods(ClientRequestEntity cre, SUserInfo user)
+        {
+            IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+            ServiceResultEntity sre = new ServiceResultEntity();
+            try
+            {
+                var GoodsIDs = cre.Properties["GoodsIDs"].ToString().Split(',').ToList();
+                var GoodsCodes = cre.Properties["GoodsCodes"].ToString().Split(',').ToList();
+                oracleTrConn.Connect();
+
+                for (int i = 0; i < GoodsIDs.Count; i++)
+                {
+                    string sqlString = "INSERT INTO TP_PM_FQCITEMSGOODS(ITEMSID ,GOODSID ,GOODSCODE ,ACCOUNTID ,VALUEFLAG ,CREATEUSERID,UPDATEUSERID) VALUES " +
+                        "('" + cre.Properties["ITEMSID"].ToString() + "','" + GoodsIDs[i] + "','" + GoodsCodes[i] + "','" + user.AccountID + "',1,'" + user.UserID + "','" + user.UserID + "' )";
+                    //执行插入SQL语句
+                    int returnRows = oracleTrConn.ExecuteNonQuery(sqlString);
+                }
+                oracleTrConn.Commit();
+                oracleTrConn.Disconnect();
+            }
+            catch (Exception ex)
+            {
+                if (oracleTrConn.ConnState == System.Data.ConnectionState.Open)
+                {
+                    oracleTrConn.Rollback();
+                    oracleTrConn.Disconnect();
+                }
+                throw ex;
+            }
+            finally
+            {
+                if (oracleTrConn.ConnState == ConnectionState.Open)
+                {
+                    oracleTrConn.Disconnect();
+                }
+            }
+            return sre;
+        }
+
+        #endregion
     }
 }

+ 21 - 1
WCF.Service/WCF.Services/CommonModuleService.cs

@@ -228,9 +228,10 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 						ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
 							() => SystemModuleDAL.SetGoodsToProcedure(cre, SUserInfo));
 						return result;
-					}
+					} 
 					return null;
 				}
+
 				#endregion
 
 				#region 系统设置
@@ -399,6 +400,25 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				}
 
 				#endregion
+
+				#region 获取检验标准名称
+				if (cre.NameSpace== "F_MST_0504" )
+				{
+					if (cre.Name == "GetlongdingList")
+					{
+						ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+							() => SystemModuleDAL.GetlongdingList(cre, SUserInfo));
+						return result;
+					}
+					if (cre.Name == "Insert_T_P_Fqcitemsgoods")
+					{
+						ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+							() => SystemModuleDAL.Insert_T_P_Fqcitemsgoods(cre, SUserInfo));
+						return result;
+					}
+					return null;
+				}
+				#endregion
 				return null;
 			}
 			catch (Exception ex)

+ 3 - 4
WCF.Service/WCF.Services/SystemModuleService.cs

@@ -12,8 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.ServiceModel;
-using System.ServiceModel.Activation;
-
+using System.ServiceModel.Activation; 
 using Dongke.IBOSS.PRD.Service.CommonModuleLogic;
 using Dongke.IBOSS.PRD.Service.SystemModuleLogic;
 using Dongke.IBOSS.PRD.WCF.Contracts;
@@ -2744,7 +2743,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                                 () => SystemModuleLogic.huizhong(SUserInfo, cre));
                         return result;
-                    }else
+                    } else
                     //QC检验计划分析明细汇总表 
                     if ("mingxi" == cre.Name)
                     {
@@ -2752,7 +2751,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                                 () => SystemModuleLogic.mingxi(SUserInfo, cre));
                         return result;
                     }
-                }
+                }  
                 return null;
             }
             catch (Exception ex)

Some files were not shown because too many files changed in this diff