Ver código fonte

潮州报表

chenxy 6 anos atrás
pai
commit
b932cf24d1
23 arquivos alterados com 3676 adições e 58 exclusões
  1. 583 0
      DK.Client/ReportModule/R08/F_RPT_080109-1.Designer.cs
  2. 481 0
      DK.Client/ReportModule/R08/F_RPT_080109-1.cs
  3. 230 0
      DK.Client/ReportModule/R08/F_RPT_080109-1.resx
  4. 1151 0
      DK.Client/ReportModule/R08/F_RPT_080109.Designer.cs
  5. 339 0
      DK.Client/ReportModule/R08/F_RPT_080109.cs
  6. 311 0
      DK.Client/ReportModule/R08/F_RPT_080109.resx
  7. 9 0
      DK.Client/ReportModule/ReportModule.csproj
  8. 347 0
      DK.Service/ReportModuleLogic/ReportDetailedLogic.cs
  9. 4 3
      DK.Service/ReportModuleLogic/ReportModuleLogic.cs
  10. 7 0
      DK.Service/ReportModuleLogic/ReportModuleLogic.csproj
  11. 7 6
      IBOSS.PRD/F_SYS_0202.cs
  12. 10 0
      WCF.Client/WCF.Proxys/ReportModuleProxy.cs
  13. 56 0
      WCF.Client/WCF.Proxys/Service References/ReportModuleService/Reference.cs
  14. 9 0
      WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService2.wsdl
  15. 39 25
      WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService2.xsd
  16. 10 0
      WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService21.wsdl
  17. 1 0
      WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService8.xsd
  18. 9 0
      WCF.Service/WCF.Contracts/IReportModule.cs
  19. 37 9
      WCF.Service/WCF.Hosting/ConfigMain.cs
  20. 4 0
      WCF.Service/WCF.Hosting/WCF.Hosting.csproj
  21. 25 15
      WCF.Service/WCF.Services/ReportModuleService.cs
  22. 3 0
      WCF.Service/WCF.WebHosting/Global.asax.cs
  23. 4 0
      WCF.Service/WCF.WebHosting/WCF.WebHosting.csproj

+ 583 - 0
DK.Client/ReportModule/R08/F_RPT_080109-1.Designer.cs

@@ -0,0 +1,583 @@
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+    partial class F_RPT_080109
+    {
+        /// <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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_080109));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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();
+            this.gbSelect = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.dgvSemiCheck = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.CProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SemiCheckID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LevelGoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SemiCheckUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SemiCheckTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.RProcedure = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BackOutFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.BackOutUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BackOutTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.logoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectPositionCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CurrProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.gbSelect.SuspendLayout();
+            this.tsrOperate.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSemiCheck)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gbSelect
+            // 
+            this.gbSelect.BackColor = System.Drawing.Color.Transparent;
+            this.gbSelect.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbSelect.BackgroundImage")));
+            this.gbSelect.Controls.Add(this.btnClearCondition);
+            this.gbSelect.Controls.Add(this.btnSearch);
+            this.gbSelect.Dock = System.Windows.Forms.DockStyle.Top;
+            this.gbSelect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbSelect.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.gbSelect.IsMustInput = false;
+            this.gbSelect.Location = new System.Drawing.Point(0, 35);
+            this.gbSelect.Name = "gbSelect";
+            this.gbSelect.OriginalHeight = -1;
+            this.gbSelect.Size = new System.Drawing.Size(1028, 190);
+            this.gbSelect.TabIndex = 1;
+            this.gbSelect.TabStop = false;
+            this.gbSelect.Text = "查询条件 ▼";
+            // 
+            // btnClearCondition
+            // 
+            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClearCondition.BackColor = System.Drawing.Color.Gray;
+            this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+            this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+            this.btnClearCondition.Location = new System.Drawing.Point(931, 151);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnClearCondition.Name = "btnClearCondition";
+            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.TabIndex = 41;
+            this.btnClearCondition.Text = "清空条件(&C)";
+            this.btnClearCondition.UseVisualStyleBackColor = false;
+            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.Gray;
+            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(839, 151);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.TabIndex = 40;
+            this.btnSearch.Text = "查询(&Q)";
+            this.btnSearch.UseVisualStyleBackColor = false;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.SystemColors.Control;
+            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            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(1028, 35);
+            this.tsrOperate.TabIndex = 0;
+            // 
+            // 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);
+            // 
+            // dgvSemiCheck
+            // 
+            this.dgvSemiCheck.AllowUserToAddRows = false;
+            this.dgvSemiCheck.AllowUserToDeleteRows = false;
+            this.dgvSemiCheck.AllowUserToModifyRows = true;
+            this.dgvSemiCheck.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvSemiCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvSemiCheck.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvSemiCheck.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvSemiCheck.CellHeight = 23;
+            this.dgvSemiCheck.ChildNodeColumnName = null;
+            this.dgvSemiCheck.ChildNodeColumnText = null;
+            this.dgvSemiCheck.ColumnDeep = 1;
+            this.dgvSemiCheck.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.dgvSemiCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvSemiCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvSemiCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.CProcedureName,
+            this.SemiCheckID,
+            this.ProcedureTime,
+            this.UserCode,
+            this.LevelGoodsTypeName,
+            this.GoodsTypeName,
+            this.GoodsCode,
+            this.GoodsName,
+            this.BarCode,
+            this.SemiCheckUserCode,
+            this.SemiCheckTime,
+            this.RProcedure,
+            this.BackOutFlag,
+            this.BackOutUserCode,
+            this.BackOutTime,
+            this.GroutingUserCode,
+            this.GroutingLineCode,
+            this.GroutingMouldCode,
+            this.GroutingDate,
+            this.DeliverTime,
+            this.logoName,
+            this.DefectCode,
+            this.DefectName,
+            this.DefectPositionCode,
+            this.DefectPositionName,
+            this.ProcedureName,
+            this.DefectUser,
+            this.CurrProcedureName});
+            this.dgvSemiCheck.ColumnTreeView = null;
+            this.dgvSemiCheck.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.dgvSemiCheck.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvSemiCheck.DynamicColumnName = "";
+            this.dgvSemiCheck.EnableHeadersVisualStyles = false;
+            this.dgvSemiCheck.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvSemiCheck.FormatQuantityColumns = null;
+            this.dgvSemiCheck.HorizontalMergeColumn = null;
+            this.dgvSemiCheck.IsAutoCountSum = true;
+            this.dgvSemiCheck.IsAutoResizeColumns = false;
+            this.dgvSemiCheck.IsClickF12 = false;
+            this.dgvSemiCheck.IsOpenMergeCellFlag = false;
+            this.dgvSemiCheck.IsSubTotalFlag = false;
+            this.dgvSemiCheck.IsTopDeep = false;
+            this.dgvSemiCheck.Location = new System.Drawing.Point(0, 225);
+            this.dgvSemiCheck.Margin = new System.Windows.Forms.Padding(0);
+            this.dgvSemiCheck.MergeColumnNames = null;
+            this.dgvSemiCheck.MergeDetailColumnNames = null;
+            this.dgvSemiCheck.MergeDetailOnlyColumn = null;
+            this.dgvSemiCheck.MergeOnlyColumn = null;
+            this.dgvSemiCheck.MultiSelect = false;
+            this.dgvSemiCheck.Name = "dgvSemiCheck";
+            this.dgvSemiCheck.ReadOnly = true;
+            this.dgvSemiCheck.RefreshAtHscroll = false;
+            this.dgvSemiCheck.RowHeadersWidth = 50;
+            this.dgvSemiCheck.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvSemiCheck.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            this.dgvSemiCheck.RowTemplate.Height = 21;
+            this.dgvSemiCheck.Size = new System.Drawing.Size(1028, 352);
+            this.dgvSemiCheck.SortOrderColumnName = null;
+            this.dgvSemiCheck.TabIndex = 2;
+            this.dgvSemiCheck.Tag = "";
+            this.dgvSemiCheck.TotalSumColumns = null;
+            this.dgvSemiCheck.ViewRowFilter = "";
+            // 
+            // CProcedureName
+            // 
+            this.CProcedureName.DataPropertyName = "PROCEDURENAME";
+            this.CProcedureName.HeaderText = "完成工序";
+            this.CProcedureName.MinimumWidth = 6;
+            this.CProcedureName.Name = "CProcedureName";
+            this.CProcedureName.ReadOnly = true;
+            this.CProcedureName.Width = 125;
+            // 
+            // SemiCheckID
+            // 
+            this.SemiCheckID.DataPropertyName = "SEMIREWORKID";
+            this.SemiCheckID.HeaderText = "SEMIREWORKID";
+            this.SemiCheckID.MinimumWidth = 6;
+            this.SemiCheckID.Name = "SemiCheckID";
+            this.SemiCheckID.ReadOnly = true;
+            this.SemiCheckID.Visible = false;
+            this.SemiCheckID.Width = 125;
+            // 
+            // ProcedureTime
+            // 
+            this.ProcedureTime.DataPropertyName = "PROCEDURETIME";
+            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
+            this.ProcedureTime.DefaultCellStyle = dataGridViewCellStyle3;
+            this.ProcedureTime.HeaderText = "完成时间";
+            this.ProcedureTime.MinimumWidth = 6;
+            this.ProcedureTime.Name = "ProcedureTime";
+            this.ProcedureTime.ReadOnly = true;
+            this.ProcedureTime.Width = 125;
+            // 
+            // UserCode
+            // 
+            this.UserCode.DataPropertyName = "USERCODE";
+            this.UserCode.HeaderText = "完成工号";
+            this.UserCode.MinimumWidth = 6;
+            this.UserCode.Name = "UserCode";
+            this.UserCode.ReadOnly = true;
+            this.UserCode.Width = 125;
+            // 
+            // LevelGoodsTypeName
+            // 
+            this.LevelGoodsTypeName.DataPropertyName = "GOODSTYPENAME2";
+            this.LevelGoodsTypeName.HeaderText = "产品二级类别";
+            this.LevelGoodsTypeName.MinimumWidth = 6;
+            this.LevelGoodsTypeName.Name = "LevelGoodsTypeName";
+            this.LevelGoodsTypeName.ReadOnly = true;
+            this.LevelGoodsTypeName.Width = 125;
+            // 
+            // GoodsTypeName
+            // 
+            this.GoodsTypeName.DataPropertyName = "GOODSTYPENAME";
+            this.GoodsTypeName.HeaderText = "产品类别";
+            this.GoodsTypeName.MinimumWidth = 6;
+            this.GoodsTypeName.Name = "GoodsTypeName";
+            this.GoodsTypeName.ReadOnly = true;
+            this.GoodsTypeName.Width = 125;
+            // 
+            // GoodsCode
+            // 
+            this.GoodsCode.DataPropertyName = "GOODSCODE";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.MinimumWidth = 6;
+            this.GoodsCode.Name = "GoodsCode";
+            this.GoodsCode.ReadOnly = true;
+            this.GoodsCode.Width = 125;
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.MinimumWidth = 6;
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
+            this.GoodsName.Width = 125;
+            // 
+            // BarCode
+            // 
+            this.BarCode.DataPropertyName = "BARCODE";
+            this.BarCode.HeaderText = "产品条码";
+            this.BarCode.MinimumWidth = 6;
+            this.BarCode.Name = "BarCode";
+            this.BarCode.ReadOnly = true;
+            this.BarCode.Width = 125;
+            // 
+            // SemiCheckUserCode
+            // 
+            this.SemiCheckUserCode.DataPropertyName = "SEMIREWORKUSERCODE";
+            this.SemiCheckUserCode.HeaderText = "半检工号";
+            this.SemiCheckUserCode.MinimumWidth = 6;
+            this.SemiCheckUserCode.Name = "SemiCheckUserCode";
+            this.SemiCheckUserCode.ReadOnly = true;
+            this.SemiCheckUserCode.Width = 125;
+            // 
+            // SemiCheckTime
+            // 
+            this.SemiCheckTime.DataPropertyName = "SEMIREWORKTIME";
+            dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
+            this.SemiCheckTime.DefaultCellStyle = dataGridViewCellStyle4;
+            this.SemiCheckTime.HeaderText = "半检时间";
+            this.SemiCheckTime.MinimumWidth = 6;
+            this.SemiCheckTime.Name = "SemiCheckTime";
+            this.SemiCheckTime.ReadOnly = true;
+            this.SemiCheckTime.Width = 125;
+            // 
+            // RProcedure
+            // 
+            this.RProcedure.DataPropertyName = "REWORKPNAME";
+            this.RProcedure.HeaderText = "返修工序";
+            this.RProcedure.MinimumWidth = 6;
+            this.RProcedure.Name = "RProcedure";
+            this.RProcedure.ReadOnly = true;
+            this.RProcedure.Width = 125;
+            // 
+            // BackOutFlag
+            // 
+            this.BackOutFlag.DataPropertyName = "BACKOUTFLAG";
+            this.BackOutFlag.FalseValue = "0";
+            this.BackOutFlag.HeaderText = "撤销标识";
+            this.BackOutFlag.MinimumWidth = 6;
+            this.BackOutFlag.Name = "BackOutFlag";
+            this.BackOutFlag.ReadOnly = true;
+            this.BackOutFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.BackOutFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.BackOutFlag.TrueValue = "1";
+            this.BackOutFlag.Width = 125;
+            // 
+            // BackOutUserCode
+            // 
+            this.BackOutUserCode.DataPropertyName = "BACKOUTUSERCODE";
+            this.BackOutUserCode.HeaderText = "撤销工号";
+            this.BackOutUserCode.MinimumWidth = 6;
+            this.BackOutUserCode.Name = "BackOutUserCode";
+            this.BackOutUserCode.ReadOnly = true;
+            this.BackOutUserCode.Width = 125;
+            // 
+            // BackOutTime
+            // 
+            this.BackOutTime.DataPropertyName = "BACKOUTTIME";
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
+            this.BackOutTime.DefaultCellStyle = dataGridViewCellStyle5;
+            this.BackOutTime.HeaderText = "撤销时间";
+            this.BackOutTime.MinimumWidth = 6;
+            this.BackOutTime.Name = "BackOutTime";
+            this.BackOutTime.ReadOnly = true;
+            this.BackOutTime.Width = 125;
+            // 
+            // GroutingUserCode
+            // 
+            this.GroutingUserCode.DataPropertyName = "GROUTINGUSERCODE";
+            this.GroutingUserCode.HeaderText = "成型工号";
+            this.GroutingUserCode.MinimumWidth = 6;
+            this.GroutingUserCode.Name = "GroutingUserCode";
+            this.GroutingUserCode.ReadOnly = true;
+            this.GroutingUserCode.Width = 125;
+            // 
+            // GroutingLineCode
+            // 
+            this.GroutingLineCode.DataPropertyName = "GROUTINGLINECODE";
+            this.GroutingLineCode.HeaderText = "成型线编码";
+            this.GroutingLineCode.MinimumWidth = 6;
+            this.GroutingLineCode.Name = "GroutingLineCode";
+            this.GroutingLineCode.ReadOnly = true;
+            this.GroutingLineCode.Width = 125;
+            // 
+            // GroutingMouldCode
+            // 
+            this.GroutingMouldCode.DataPropertyName = "GROUTINGMOULDCODE";
+            this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.MinimumWidth = 6;
+            this.GroutingMouldCode.Name = "GroutingMouldCode";
+            this.GroutingMouldCode.ReadOnly = true;
+            this.GroutingMouldCode.Width = 125;
+            // 
+            // GroutingDate
+            // 
+            this.GroutingDate.DataPropertyName = "GROUTINGDATE";
+            dataGridViewCellStyle6.Format = "yyyy-MM-dd";
+            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle6;
+            this.GroutingDate.HeaderText = "注浆时间";
+            this.GroutingDate.MinimumWidth = 6;
+            this.GroutingDate.Name = "GroutingDate";
+            this.GroutingDate.ReadOnly = true;
+            this.GroutingDate.Width = 125;
+            // 
+            // DeliverTime
+            // 
+            this.DeliverTime.DataPropertyName = "DELIVERTIME";
+            dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
+            this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle7;
+            this.DeliverTime.HeaderText = "交坯时间";
+            this.DeliverTime.MinimumWidth = 6;
+            this.DeliverTime.Name = "DeliverTime";
+            this.DeliverTime.ReadOnly = true;
+            this.DeliverTime.Width = 125;
+            // 
+            // logoName
+            // 
+            this.logoName.DataPropertyName = "LOGONAME";
+            this.logoName.HeaderText = "商标";
+            this.logoName.MinimumWidth = 6;
+            this.logoName.Name = "logoName";
+            this.logoName.ReadOnly = true;
+            this.logoName.Width = 125;
+            // 
+            // DefectCode
+            // 
+            this.DefectCode.DataPropertyName = "DEFECTCODE";
+            this.DefectCode.HeaderText = "缺陷编码";
+            this.DefectCode.MinimumWidth = 6;
+            this.DefectCode.Name = "DefectCode";
+            this.DefectCode.ReadOnly = true;
+            this.DefectCode.Width = 125;
+            // 
+            // DefectName
+            // 
+            this.DefectName.DataPropertyName = "DEFECTNAME";
+            this.DefectName.HeaderText = "缺陷名称";
+            this.DefectName.MinimumWidth = 6;
+            this.DefectName.Name = "DefectName";
+            this.DefectName.ReadOnly = true;
+            this.DefectName.Width = 125;
+            // 
+            // DefectPositionCode
+            // 
+            this.DefectPositionCode.DataPropertyName = "DEFECTPOSITIONCODE";
+            this.DefectPositionCode.HeaderText = "位置编码";
+            this.DefectPositionCode.MinimumWidth = 6;
+            this.DefectPositionCode.Name = "DefectPositionCode";
+            this.DefectPositionCode.ReadOnly = true;
+            this.DefectPositionCode.Width = 125;
+            // 
+            // DefectPositionName
+            // 
+            this.DefectPositionName.DataPropertyName = "DEFECTPOSITIONNAME";
+            this.DefectPositionName.HeaderText = "缺陷位置";
+            this.DefectPositionName.MinimumWidth = 6;
+            this.DefectPositionName.Name = "DefectPositionName";
+            this.DefectPositionName.ReadOnly = true;
+            this.DefectPositionName.Width = 125;
+            // 
+            // ProcedureName
+            // 
+            this.ProcedureName.DataPropertyName = "DEFECTPNAME";
+            this.ProcedureName.HeaderText = "责任工序";
+            this.ProcedureName.MinimumWidth = 6;
+            this.ProcedureName.Name = "ProcedureName";
+            this.ProcedureName.ReadOnly = true;
+            this.ProcedureName.Width = 125;
+            // 
+            // DefectUser
+            // 
+            this.DefectUser.DataPropertyName = "DEFECTUSERCODE";
+            this.DefectUser.HeaderText = "责任工号";
+            this.DefectUser.MinimumWidth = 6;
+            this.DefectUser.Name = "DefectUser";
+            this.DefectUser.ReadOnly = true;
+            this.DefectUser.Width = 125;
+            // 
+            // CurrProcedureName
+            // 
+            this.CurrProcedureName.DataPropertyName = "CurrProcedureName";
+            this.CurrProcedureName.HeaderText = "当前工序";
+            this.CurrProcedureName.MinimumWidth = 6;
+            this.CurrProcedureName.Name = "CurrProcedureName";
+            this.CurrProcedureName.ReadOnly = true;
+            this.CurrProcedureName.Width = 125;
+            // 
+            // F_RPT_080109
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1028, 577);
+            this.Controls.Add(this.dgvSemiCheck);
+            this.Controls.Add(this.gbSelect);
+            this.Controls.Add(this.tsrOperate);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "F_RPT_080109";
+            this.Text = "半检返修登记明细表";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PM_2201_FormClosed);
+            this.Load += new System.EventHandler(this.F_PM_2201_Load);
+            this.gbSelect.ResumeLayout(false);
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSemiCheck)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Basics.BaseControls.C_GroupBox gbSelect;
+        private Basics.BaseControls.C_Button btnClearCondition;
+        private Basics.BaseControls.C_Button btnSearch;
+        private Basics.BaseControls.C_ToolStrip tsrOperate;
+        private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private Basics.BaseControls.C_DataGridView dgvSemiCheck;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CProcedureName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SemiCheckID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LevelGoodsTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SemiCheckUserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SemiCheckTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn RProcedure;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn BackOutFlag;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BackOutUserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BackOutTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn logoName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectPositionCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectPositionName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectUser;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CurrProcedureName;
+    }
+}

+ 481 - 0
DK.Client/ReportModule/R08/F_RPT_080109-1.cs

@@ -0,0 +1,481 @@
+/*******************************************************************************
+ * Copyright(c) 2016 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_RPT_080109.cs
+ *      2.功能描述:半检登记明细表
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      王鑫            2016/07/12          1.00            新建
+ *******************************************************************************/
+
+using System;
+using System.Data;
+using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.DockPanel;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+using Dongke.IBOSS.PRD.WCF.Proxys.PMModuleService;
+using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
+
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+	/// <summary>
+	/// 半检登记明细表
+	/// </summary>
+	public partial class F_RPT_080109 : DockPanelBase
+	{
+		#region 成员变量
+
+		//单例模式
+		private static F_RPT_080109 _instance;
+
+		#endregion
+
+		#region 构造函数
+
+		/// <summary>
+		/// 废弃一览构造
+		/// </summary>
+		public F_RPT_080109()
+		{
+			InitializeComponent();
+			this.Text = FormTitles.F_RPT_080109;
+			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+			this.btnSearch.Text = ButtonText.BTN_SEARCH;
+			this.btnClearCondition.Text = ButtonText.BTN_CLEARCONDITION;
+		}
+
+		#endregion
+
+		#region 单例模式
+
+		/// <summary>
+		/// 单例模式,防止重复创建窗体
+		/// </summary>
+		public static F_RPT_080109 Instance
+		{
+			get
+			{
+				if (_instance == null)
+				{
+					_instance = new F_RPT_080109();
+				}
+				return _instance;
+			}
+		}
+
+		#endregion
+
+		#region 事件
+
+		/// <summary>
+		/// 打开新建窗体事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnSemiCheck_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//F_PM_2202 frmFPM2202 = new F_PM_2202(0,"半检登记");
+				//DialogResult dialogresult = frmFPM2202.ShowDialog();
+				//if (dialogresult.Equals(DialogResult.OK))
+				//{
+				//    btnSearch_Click(sender, e);
+				//}
+			}
+			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 btnSearch_Click(object sender, EventArgs e)
+		{
+			try
+            {
+                this.dgvSemiCheck.DataSource = null;
+                DataSet dsSemiCheck = (DataSet)DoAsync(new AsyncMethod(() =>
+				{
+					return this.GetSemiCheck();
+				}));
+				if (dsSemiCheck != null && dsSemiCheck.Tables.Count > 0 && dsSemiCheck.Tables[0].Rows.Count > 0)
+                {
+                    this.dgvSemiCheck.DataSource = (dsSemiCheck).Tables[Constant.INT_IS_ZERO];
+                    this.dgvSemiCheck.ReadOnly = true;
+                    this.dgvSemiCheck.Rows[0].Selected = true;
+                }
+				else
+				{
+					// 提示未查找到数据
+					MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+						MessageBoxButtons.OK, MessageBoxIcon.Information);
+				}
+			}
+			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 cbCDateTime_CheckedChanged(object sender, EventArgs e)
+		{
+			this.txtCDateTimeStart.Enabled = this.cbCDateTime.Checked;
+			this.txtCDateTimeEnd.Enabled = this.cbCDateTime.Checked;
+		}
+
+		/// <summary>
+		/// 清空条件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnClearCondition_Click(object sender, EventArgs e)
+		{
+			this.dkCProcedureSearchBox.ClearControl();
+			this.cbCDateTime.Checked = false;
+			// this.txtCDateTimeStart.Value = DateTime.Now;
+			//this.txtCDateTimeEnd.Value = DateTime.Now;
+			this.txtCUserCode.Text = string.Empty;
+			this.scbGoodsType.ClearValue();
+			this.txtGoodsCode.Text = string.Empty;
+			this.txtGroutingUserCode.Text = string.Empty;
+			this.cbGroutingDate.Checked = false;
+			this.txtCDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+			this.txtCDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.txtGroutingDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+			this.txtGroutingDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.txtSemiCheckDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+			this.txtSemiCheckDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.txtBackOutTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+			this.txtBackOutTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+			//this.txtGroutingDateTimeStart.Value = DateTime.Now;
+			//this.txtGroutingDateTimeEnd.Value = DateTime.Now;
+			this.cbDeliveryDate.Checked = false;
+			this.txtDeliveryDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+			this.txtDeliveryDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.cbSemiCheck.Checked = true;
+			// this.txtSemiCheckDateTimeStart.Value = DateTime.Now;
+			// this.txtSemiCheckDateTimeEnd.Value = DateTime.Now;
+			this.txtSemiCheckUserCode.Text = string.Empty;
+			this.dkRProcedureSearchBox.ClearControl();
+			//this.txtReSemiCheckDateTimeStart.Value = DateTime.Now;
+			//this.txtReSemiCheckDateTimeEnd.Value = DateTime.Now;
+			this.chkVYes.Checked = false;
+			//this.chkVNo.Checked = false;
+			this.cbBackOutTime.Checked = false;
+			//this.txtBackOutTimeStart.Value = DateTime.Now;
+			// this.txtBackOutTimeEnd.Value = DateTime.Now;
+			this.txtBackOutUserCode.Text = string.Empty;
+			this.txtBarCode.Text = string.Empty;
+			this.txtDefectCode.Text = string.Empty;
+			this.dkSemiCheckDefectPositionSearchBox1.ClearControl();
+			this.dkProcedureSearchBox1.ClearControl();
+			this.txtDefectUser.Text = string.Empty;
+
+            this.chkLast.Checked = false;
+        }
+
+		/// <summary>
+		/// 编辑窗体打开
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnReSemiCheck_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//F_PM_2204 frmFPM2204 = new F_PM_2204(0, "复检登记");
+				//DialogResult dialogresult = frmFPM2204.ShowDialog();
+				//if (dialogresult.Equals(DialogResult.OK))
+				//{
+				//    btnSearch_Click(sender, e);
+				//}
+			}
+			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 dgvScrapProduct_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+		{
+			try
+			{
+				//DataGridViewRow currentRow = this.dgvScrapProduct.CurrentRow;
+				//if (currentRow != null)
+				//{
+				//    string barCode = currentRow.Cells["BarCode"].Value.ToString();
+				//    int SPId = Convert.ToInt32(currentRow.Cells["ScrapProductID"].Value.ToString());
+				//    F_PM_1102 frmFPM1102 = new F_PM_1102(Constant.FormMode.Edit, barCode, SPId, this.tsbtnApprover.Visible);
+				//    DialogResult dialogresult = frmFPM1102.ShowDialog();
+				//    if (dialogresult.Equals(DialogResult.OK))
+				//    {
+				//        this.dgvScrapProduct.DataSource = null;
+				//        object obScrapResult = DoAsync(new AsyncMethod(GetScrapProduct));
+				//        if (obScrapResult != null)
+				//        {
+				//            DataSet dsScrap = (DataSet)obScrapResult;
+				//            if (dsScrap.Tables.Count != Constant.INT_IS_ZERO)
+				//            {
+				//                this.dgvScrapProduct.DataSource = dsScrap.Tables[Constant.INT_IS_ZERO];
+				//                this.dgvScrapProduct.ReadOnly = true;
+				//            }
+				//        }
+				//    }
+				//}
+				//else
+				//{
+				//    MessageBox.Show(Messages.MSG_CMN_W020, this.Text,
+				//        MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				//}
+			}
+			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 tsbtnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		/// <summary>
+		/// 窗体关闭事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_PM_2201_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			_instance = null;
+		}
+
+		/// <summary>
+		/// 自动列宽
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnAdaptive_Click(object sender, EventArgs e)
+		{
+			this.dgvSemiCheck.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
+		}
+
+		/// <summary>
+		/// 窗体加载
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_PM_2201_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				// 加载权限
+				FormPermissionManager.FormPermissionControl(this.Name, this,
+					Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+					Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+				this.dgvSemiCheck.AutoGenerateColumns = false;
+				// 设置日期控件默认值
+				this.txtCDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+				this.txtCDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.txtGroutingDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+				this.txtGroutingDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.txtSemiCheckDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+				this.txtSemiCheckDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.txtBackOutTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+				this.txtBackOutTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.txtDeliveryDateTimeStart.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+				this.txtDeliveryDateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+			}
+			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 cbGroutingDate_CheckedChanged(object sender, EventArgs e)
+		{
+			this.txtGroutingDateTimeStart.Enabled = this.cbGroutingDate.Checked;
+			this.txtGroutingDateTimeEnd.Enabled = this.cbGroutingDate.Checked;
+		}
+
+		/// <summary>
+		/// 半检时间复选框改变事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void cbSemiCheck_CheckedChanged(object sender, EventArgs e)
+		{
+			this.txtSemiCheckDateTimeStart.Enabled = this.cbSemiCheck.Checked;
+			this.txtSemiCheckDateTimeEnd.Enabled = this.cbSemiCheck.Checked;
+		}
+
+		/// <summary>
+		/// 复检时间复选框改变事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void cbReSemiCheck_CheckedChanged(object sender, EventArgs e)
+		{
+
+		}
+
+		/// <summary>
+		/// 撤销时间复选框改变事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void cbBackOutTime_CheckedChanged(object sender, EventArgs e)
+		{
+			this.txtBackOutTimeStart.Enabled = this.cbBackOutTime.Checked;
+			this.txtBackOutTimeEnd.Enabled = this.cbBackOutTime.Checked;
+		}
+
+		private void cbDeliveryDate_CheckedChanged(object sender, EventArgs e)
+		{
+			this.txtDeliveryDateTimeStart.Enabled = this.cbDeliveryDate.Checked;
+			this.txtDeliveryDateTimeEnd.Enabled = this.cbDeliveryDate.Checked;
+		}
+
+
+		/// <summary>
+		/// 撤销复检按钮事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnBackReSemiCheck_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//F_PM_2205 frmFPM2205 = new F_PM_2205(0, "撤销复检");
+				//DialogResult dialogresult = frmFPM2205.ShowDialog();
+				//if (dialogresult.Equals(DialogResult.OK))
+				//{
+				//    btnSearch_Click(sender, e);
+				//}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+		#endregion
+
+		#region 私有方法
+
+		/// <summary>
+		/// 根据界面查询条件获取数据集
+		/// </summary>
+		private DataSet GetSemiCheck()
+		{
+			try
+			{
+				SemiCheckEntity entity = new SemiCheckEntity();
+				entity.CProcedureIDS = this.dkCProcedureSearchBox.ProcedureIDS;
+				if (cbCDateTime.Checked)
+				{
+					entity.CDateTimeStart = this.txtCDateTimeStart.Value;// DateTime.Parse(this.txtCDateTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
+					entity.CDateTimeEnd = this.txtCDateTimeEnd.Value;// DateTime.Parse(this.txtCDateTimeEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+				}
+
+				entity.CUserCode = this.txtCUserCode.UserCode.Trim(); //xuwei modify 选择用户取用户编码
+                entity.GoodsTypeCode = scbGoodsType.SearchedValue + "";
+				entity.GoodsCode = this.txtGoodsCode.Text.Trim();
+				entity.GroutingUserCode = this.txtGroutingUserCode.UserCode.Trim(); //xuwei modify 选择用户取用户编码
+                if (cbGroutingDate.Checked)
+				{
+					entity.GroutingDateTimeStart = this.txtGroutingDateTimeStart.Value;// DateTime.Parse(this.txtGroutingDateTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
+					entity.GroutingDateTimeEnd = this.txtGroutingDateTimeEnd.Value;// DateTime.Parse(this.txtGroutingDateTimeEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+				}
+				if (cbDeliveryDate.Checked)
+				{
+					entity.DeliveryDateTimeStart = this.txtDeliveryDateTimeStart.Value;// DateTime.Parse(this.txtDeliveryDateTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
+					entity.DeliveryDateTimeEnd = this.txtDeliveryDateTimeEnd.Value;// DateTime.Parse(this.txtDeliveryDateTimeEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+				}
+				if (cbSemiCheck.Checked)
+				{
+					entity.SemiCheckDateTimeStart = this.txtSemiCheckDateTimeStart.Value;// DateTime.Parse(this.txtSemiCheckDateTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
+					entity.SemiCheckDateTimeEnd = this.txtSemiCheckDateTimeEnd.Value;// DateTime.Parse(this.txtSemiCheckDateTimeEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+				}
+				entity.SemiCheckUserCode = this.txtSemiCheckUserCode.UserCode.Trim(); //xuwei modify 选择用户取用户编码
+				entity.RProcedureIDS = this.dkRProcedureSearchBox.ProcedureIDS;
+
+				string strBackOutFlag = "";
+				if (chkVYes.Checked)
+				{
+					strBackOutFlag = "1,";
+				}
+				if (chkVNo.Checked)
+				{
+					strBackOutFlag += "0";
+				}
+				entity.BackOutFlag = strBackOutFlag.TrimEnd(',');
+				if (cbBackOutTime.Checked)
+				{
+					entity.BackOutTimeStart = this.txtBackOutTimeStart.Value;// DateTime.Parse(this.txtBackOutTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
+					entity.BackOutTimeEnd = this.txtBackOutTimeEnd.Value;// DateTime.Parse(this.txtBackOutTimeEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+				}
+				entity.BackOutUserCode = this.txtBackOutUserCode.UserCode.Trim(); //xuwei modify 选择用户取用户编码
+                entity.BarCode = this.txtBarCode.Text.Trim();
+				entity.DefectCode = this.txtDefectCode.Text.Trim();
+				entity.DefectPositionIDS = this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS;
+				entity.DefectProcedureIDS = this.dkProcedureSearchBox1.ProcedureIDS;
+				entity.DefectUser = this.txtDefectUser.Text.Trim();
+                if (this.chkLast.Checked)
+                {
+                    entity.SemiCheckType = "1";
+                }
+				ServiceResultEntity resultEntity = ReportModuleProxy.Service.GetRPT080108IData(entity);
+				return resultEntity.Data;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+		}
+
+		#endregion
+	}
+}

+ 230 - 0
DK.Client/ReportModule/R08/F_RPT_080109-1.resx

@@ -0,0 +1,230 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="gbSelect.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GroutingLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DefectCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DefectName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DefectPositionCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DefectPositionName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DefectUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CurrProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>45</value>
+  </metadata>
+</root>

+ 1151 - 0
DK.Client/ReportModule/R08/F_RPT_080109.Designer.cs

@@ -0,0 +1,1151 @@
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+	partial class F_RPT_080109
+	{
+		/// <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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_080109));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.chkCheckDate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpCheckDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dtpCheckDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.chkHandOver = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpHandOverEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dtpHandOverStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.chkCdate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dropRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.dkCheckProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.txtKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtCheckUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtDefectUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblDefectUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dkDefectTypeNameSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkDefectTypeNameSearchBox();
+            this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dgvDefectDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CheckTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectStaffNames3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.defectjobsname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.czGroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.barcodeRemarks3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bsqx = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.半检缺陷 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.半检位置 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.半检工号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tsrOperate.SuspendLayout();
+            this.gbxCondition.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvDefectDetail)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+            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.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(1174, 35);
+            this.tsrOperate.TabIndex = 0;
+            this.tsrOperate.Text = "toolStrip1";
+            // 
+            // 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);
+            // 
+            // gbxCondition
+            // 
+            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+            this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+            this.gbxCondition.Controls.Add(this.scbGoods);
+            this.gbxCondition.Controls.Add(this.lblGoods);
+            this.gbxCondition.Controls.Add(this.lblGoodsType);
+            this.gbxCondition.Controls.Add(this.scbGoodsType);
+            this.gbxCondition.Controls.Add(this.btnClearCondition);
+            this.gbxCondition.Controls.Add(this.btnSearch);
+            this.gbxCondition.Controls.Add(this.chkCheckDate);
+            this.gbxCondition.Controls.Add(this.c_Label5);
+            this.gbxCondition.Controls.Add(this.dtpCheckDateEnd);
+            this.gbxCondition.Controls.Add(this.dtpCheckDateStart);
+            this.gbxCondition.Controls.Add(this.chkHandOver);
+            this.gbxCondition.Controls.Add(this.c_Label2);
+            this.gbxCondition.Controls.Add(this.dtpHandOverEnd);
+            this.gbxCondition.Controls.Add(this.dtpHandOverStart);
+            this.gbxCondition.Controls.Add(this.chkCdate);
+            this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+            this.gbxCondition.Controls.Add(this.c_Label4);
+            this.gbxCondition.Controls.Add(this.dropRptProcedure);
+            this.gbxCondition.Controls.Add(this.dkCheckProcedureSearchBox);
+            this.gbxCondition.Controls.Add(this.txtKilnCode);
+            this.gbxCondition.Controls.Add(this.c_Label3);
+            this.gbxCondition.Controls.Add(this.txtDefectName);
+            this.gbxCondition.Controls.Add(this.txtGoodsCode);
+            this.gbxCondition.Controls.Add(this.txtCheckUserCode);
+            this.gbxCondition.Controls.Add(this.txtDefectCode);
+            this.gbxCondition.Controls.Add(this.txtDefectUserCode);
+            this.gbxCondition.Controls.Add(this.c_Label1);
+            this.gbxCondition.Controls.Add(this.lblDefectName);
+            this.gbxCondition.Controls.Add(this.lblUserCode);
+            this.gbxCondition.Controls.Add(this.lblDefectCode);
+            this.gbxCondition.Controls.Add(this.lblDefectUserCode);
+            this.gbxCondition.Controls.Add(this.dkDefectTypeNameSearchBox1);
+            this.gbxCondition.Controls.Add(this.dkProcedureSearchBox);
+            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.gbxCondition.IsMustInput = false;
+            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Size = new System.Drawing.Size(1162, 103);
+            this.gbxCondition.TabIndex = 1;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.Location = new System.Drawing.Point(377, 20);
+            this.scbGoods.MultiSelect = true;
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(100, 21);
+            this.scbGoods.TabIndex = 37;
+            // 
+            // lblGoods
+            // 
+            this.lblGoods.AutoSize = true;
+            this.lblGoods.BackColor = System.Drawing.Color.Transparent;
+            this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoods.Location = new System.Drawing.Point(318, 26);
+            this.lblGoods.Name = "lblGoods";
+            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.TabIndex = 36;
+            this.lblGoods.Text = "产品名称";
+            // 
+            // lblGoodsType
+            // 
+            this.lblGoodsType.AutoSize = true;
+            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoodsType.Location = new System.Drawing.Point(12, 26);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
+            this.lblGoodsType.TabIndex = 35;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(70, 20);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(101, 21);
+            this.scbGoodsType.TabIndex = 34;
+            // 
+            // btnClearCondition
+            // 
+            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
+            this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+            this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+            this.btnClearCondition.Location = new System.Drawing.Point(1071, 71);
+            this.btnClearCondition.Name = "btnClearCondition";
+            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.TabIndex = 29;
+            this.btnClearCondition.Text = "清空条件(&C)";
+            this.btnClearCondition.UseVisualStyleBackColor = true;
+            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(1071, 41);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.TabIndex = 28;
+            this.btnSearch.Text = "查询(&Q)";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // chkCheckDate
+            // 
+            this.chkCheckDate.AutoSize = true;
+            this.chkCheckDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkCheckDate.Location = new System.Drawing.Point(624, 76);
+            this.chkCheckDate.Name = "chkCheckDate";
+            this.chkCheckDate.Size = new System.Drawing.Size(72, 16);
+            this.chkCheckDate.TabIndex = 30;
+            this.chkCheckDate.Text = "缺陷登记";
+            this.chkCheckDate.UseVisualStyleBackColor = true;
+            this.chkCheckDate.CheckedChanged += new System.EventHandler(this.chkCheckDate_CheckedChanged);
+            // 
+            // c_Label5
+            // 
+            this.c_Label5.AutoSize = true;
+            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label5.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label5.Location = new System.Drawing.Point(842, 78);
+            this.c_Label5.Name = "c_Label5";
+            this.c_Label5.Size = new System.Drawing.Size(17, 12);
+            this.c_Label5.TabIndex = 32;
+            this.c_Label5.Text = "至";
+            // 
+            // dtpCheckDateEnd
+            // 
+            this.dtpCheckDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpCheckDateEnd.Enabled = false;
+            this.dtpCheckDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpCheckDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpCheckDateEnd.Location = new System.Drawing.Point(865, 74);
+            this.dtpCheckDateEnd.Name = "dtpCheckDateEnd";
+            this.dtpCheckDateEnd.Size = new System.Drawing.Size(134, 21);
+            this.dtpCheckDateEnd.TabIndex = 33;
+            // 
+            // dtpCheckDateStart
+            // 
+            this.dtpCheckDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpCheckDateStart.Enabled = false;
+            this.dtpCheckDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpCheckDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpCheckDateStart.Location = new System.Drawing.Point(702, 74);
+            this.dtpCheckDateStart.Name = "dtpCheckDateStart";
+            this.dtpCheckDateStart.Size = new System.Drawing.Size(134, 21);
+            this.dtpCheckDateStart.TabIndex = 31;
+            // 
+            // chkHandOver
+            // 
+            this.chkHandOver.AutoSize = true;
+            this.chkHandOver.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkHandOver.Location = new System.Drawing.Point(624, 49);
+            this.chkHandOver.Name = "chkHandOver";
+            this.chkHandOver.Size = new System.Drawing.Size(72, 16);
+            this.chkHandOver.TabIndex = 17;
+            this.chkHandOver.Text = "交接时间";
+            this.chkHandOver.UseVisualStyleBackColor = true;
+            this.chkHandOver.CheckedChanged += new System.EventHandler(this.chkHandOver_CheckedChanged);
+            // 
+            // c_Label2
+            // 
+            this.c_Label2.AutoSize = true;
+            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label2.Location = new System.Drawing.Point(842, 51);
+            this.c_Label2.Name = "c_Label2";
+            this.c_Label2.Size = new System.Drawing.Size(17, 12);
+            this.c_Label2.TabIndex = 19;
+            this.c_Label2.Text = "至";
+            // 
+            // dtpHandOverEnd
+            // 
+            this.dtpHandOverEnd.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpHandOverEnd.Enabled = false;
+            this.dtpHandOverEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpHandOverEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpHandOverEnd.Location = new System.Drawing.Point(865, 47);
+            this.dtpHandOverEnd.Name = "dtpHandOverEnd";
+            this.dtpHandOverEnd.Size = new System.Drawing.Size(134, 21);
+            this.dtpHandOverEnd.TabIndex = 20;
+            // 
+            // dtpHandOverStart
+            // 
+            this.dtpHandOverStart.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpHandOverStart.Enabled = false;
+            this.dtpHandOverStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpHandOverStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpHandOverStart.Location = new System.Drawing.Point(702, 47);
+            this.dtpHandOverStart.Name = "dtpHandOverStart";
+            this.dtpHandOverStart.Size = new System.Drawing.Size(134, 21);
+            this.dtpHandOverStart.TabIndex = 18;
+            // 
+            // chkCdate
+            // 
+            this.chkCdate.AutoSize = true;
+            this.chkCdate.Checked = true;
+            this.chkCdate.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chkCdate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkCdate.Location = new System.Drawing.Point(624, 22);
+            this.chkCdate.Name = "chkCdate";
+            this.chkCdate.Size = new System.Drawing.Size(72, 16);
+            this.chkCdate.TabIndex = 6;
+            this.chkCdate.Text = "登记时间";
+            this.chkCdate.UseVisualStyleBackColor = true;
+            this.chkCdate.CheckedChanged += new System.EventHandler(this.chkCdate_CheckedChanged);
+            // 
+            // 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(842, 24);
+            this.lblAccountDateEnd.Name = "lblAccountDateEnd";
+            this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
+            this.lblAccountDateEnd.TabIndex = 8;
+            this.lblAccountDateEnd.Text = "至";
+            // 
+            // dtpAccountDateEnd
+            // 
+            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpAccountDateEnd.Location = new System.Drawing.Point(865, 20);
+            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+            this.dtpAccountDateEnd.Size = new System.Drawing.Size(134, 21);
+            this.dtpAccountDateEnd.TabIndex = 9;
+            // 
+            // dtpAccountDateStart
+            // 
+            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpAccountDateStart.Location = new System.Drawing.Point(702, 20);
+            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+            this.dtpAccountDateStart.Size = new System.Drawing.Size(134, 21);
+            this.dtpAccountDateStart.TabIndex = 7;
+            // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label4.IsMustInput = true;
+            this.c_Label4.Location = new System.Drawing.Point(318, 78);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(53, 12);
+            this.c_Label4.TabIndex = 24;
+            this.c_Label4.Text = "交接工序";
+            // 
+            // dropRptProcedure
+            // 
+            this.dropRptProcedure.BackColor = System.Drawing.Color.Yellow;
+            this.dropRptProcedure.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.dropRptProcedure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.dropRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dropRptProcedure.FormattingEnabled = true;
+            this.dropRptProcedure.IsMustInput = true;
+            this.dropRptProcedure.Location = new System.Drawing.Point(377, 74);
+            this.dropRptProcedure.Name = "dropRptProcedure";
+            this.dropRptProcedure.Size = new System.Drawing.Size(100, 20);
+            this.dropRptProcedure.TabIndex = 25;
+            // 
+            // dkCheckProcedureSearchBox
+            // 
+            this.dkCheckProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkCheckProcedureSearchBox.DataSource = null;
+            this.dkCheckProcedureSearchBox.Enabled = true;
+            this.dkCheckProcedureSearchBox.IsEnablePurview = false;
+            this.dkCheckProcedureSearchBox.IsMustInput = false;
+            this.dkCheckProcedureSearchBox.Location = new System.Drawing.Point(12, 74);
+            this.dkCheckProcedureSearchBox.ModelType = "-1";
+            this.dkCheckProcedureSearchBox.Name = "dkCheckProcedureSearchBox";
+            this.dkCheckProcedureSearchBox.ProcedureCode = "";
+            this.dkCheckProcedureSearchBox.ProcedureID = null;
+            this.dkCheckProcedureSearchBox.ProcedureIDS = null;
+            this.dkCheckProcedureSearchBox.ProcedureName = null;
+            this.dkCheckProcedureSearchBox.Purview = null;
+            this.dkCheckProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkCheckProcedureSearchBox.SelectMore = true;
+            this.dkCheckProcedureSearchBox.Size = new System.Drawing.Size(159, 21);
+            this.dkCheckProcedureSearchBox.TabIndex = 21;
+            this.dkCheckProcedureSearchBox.Title = "检验工序";
+            this.dkCheckProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // txtKilnCode
+            // 
+            this.txtKilnCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtKilnCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtKilnCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtKilnCode.ErrorMessage = "";
+            this.txtKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtKilnCode.Location = new System.Drawing.Point(542, 74);
+            this.txtKilnCode.Name = "txtKilnCode";
+            this.txtKilnCode.Size = new System.Drawing.Size(76, 21);
+            this.txtKilnCode.TabIndex = 27;
+            this.txtKilnCode.TextValue = "";
+            // 
+            // c_Label3
+            // 
+            this.c_Label3.AutoSize = true;
+            this.c_Label3.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label3.Location = new System.Drawing.Point(483, 78);
+            this.c_Label3.Name = "c_Label3";
+            this.c_Label3.Size = new System.Drawing.Size(53, 12);
+            this.c_Label3.TabIndex = 26;
+            this.c_Label3.Text = "窑炉编码";
+            // 
+            // txtDefectName
+            // 
+            this.txtDefectName.BackColor = System.Drawing.SystemColors.Window;
+            this.txtDefectName.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtDefectName.ErrorMessage = "";
+            this.txtDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDefectName.Location = new System.Drawing.Point(542, 47);
+            this.txtDefectName.Name = "txtDefectName";
+            this.txtDefectName.Size = new System.Drawing.Size(76, 21);
+            this.txtDefectName.TabIndex = 16;
+            this.txtDefectName.TextValue = "";
+            // 
+            // txtGoodsCode
+            // 
+            this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGoodsCode.ErrorMessage = "";
+            this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGoodsCode.Location = new System.Drawing.Point(236, 20);
+            this.txtGoodsCode.MaxLength = 50;
+            this.txtGoodsCode.Name = "txtGoodsCode";
+            this.txtGoodsCode.Size = new System.Drawing.Size(76, 21);
+            this.txtGoodsCode.TabIndex = 2;
+            this.txtGoodsCode.TextValue = "";
+            // 
+            // txtCheckUserCode
+            // 
+            this.txtCheckUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtCheckUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtCheckUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtCheckUserCode.ErrorMessage = "";
+            this.txtCheckUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtCheckUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtCheckUserCode.Location = new System.Drawing.Point(236, 74);
+            this.txtCheckUserCode.MaxLength = 20;
+            this.txtCheckUserCode.Name = "txtCheckUserCode";
+            this.txtCheckUserCode.Size = new System.Drawing.Size(76, 21);
+            this.txtCheckUserCode.TabIndex = 23;
+            this.txtCheckUserCode.TextValue = "";
+            // 
+            // txtDefectCode
+            // 
+            this.txtDefectCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtDefectCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtDefectCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtDefectCode.ErrorMessage = "";
+            this.txtDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDefectCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtDefectCode.Location = new System.Drawing.Point(542, 20);
+            this.txtDefectCode.MaxLength = 20;
+            this.txtDefectCode.Name = "txtDefectCode";
+            this.txtDefectCode.Size = new System.Drawing.Size(76, 21);
+            this.txtDefectCode.TabIndex = 5;
+            this.txtDefectCode.TextValue = "";
+            // 
+            // txtDefectUserCode
+            // 
+            this.txtDefectUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtDefectUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtDefectUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtDefectUserCode.ErrorMessage = "";
+            this.txtDefectUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDefectUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtDefectUserCode.Location = new System.Drawing.Point(236, 47);
+            this.txtDefectUserCode.MaxLength = 20;
+            this.txtDefectUserCode.Name = "txtDefectUserCode";
+            this.txtDefectUserCode.Size = new System.Drawing.Size(76, 21);
+            this.txtDefectUserCode.TabIndex = 12;
+            this.txtDefectUserCode.TextValue = "";
+            // 
+            // c_Label1
+            // 
+            this.c_Label1.AutoSize = true;
+            this.c_Label1.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label1.Location = new System.Drawing.Point(177, 24);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.TabIndex = 1;
+            this.c_Label1.Text = "产品编码";
+            // 
+            // lblDefectName
+            // 
+            this.lblDefectName.AutoSize = true;
+            this.lblDefectName.BackColor = System.Drawing.Color.Transparent;
+            this.lblDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblDefectName.Location = new System.Drawing.Point(483, 51);
+            this.lblDefectName.Name = "lblDefectName";
+            this.lblDefectName.Size = new System.Drawing.Size(53, 12);
+            this.lblDefectName.TabIndex = 15;
+            this.lblDefectName.Text = "缺陷名称";
+            // 
+            // lblUserCode
+            // 
+            this.lblUserCode.AutoSize = true;
+            this.lblUserCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblUserCode.Location = new System.Drawing.Point(177, 78);
+            this.lblUserCode.Name = "lblUserCode";
+            this.lblUserCode.Size = new System.Drawing.Size(53, 12);
+            this.lblUserCode.TabIndex = 22;
+            this.lblUserCode.Text = "检验工号";
+            // 
+            // lblDefectCode
+            // 
+            this.lblDefectCode.AutoSize = true;
+            this.lblDefectCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblDefectCode.Location = new System.Drawing.Point(483, 24);
+            this.lblDefectCode.Name = "lblDefectCode";
+            this.lblDefectCode.Size = new System.Drawing.Size(53, 12);
+            this.lblDefectCode.TabIndex = 4;
+            this.lblDefectCode.Text = "缺陷编码";
+            // 
+            // lblDefectUserCode
+            // 
+            this.lblDefectUserCode.AutoSize = true;
+            this.lblDefectUserCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblDefectUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblDefectUserCode.Location = new System.Drawing.Point(177, 51);
+            this.lblDefectUserCode.Name = "lblDefectUserCode";
+            this.lblDefectUserCode.Size = new System.Drawing.Size(53, 12);
+            this.lblDefectUserCode.TabIndex = 11;
+            this.lblDefectUserCode.Text = "责任工号";
+            // 
+            // dkDefectTypeNameSearchBox1
+            // 
+            this.dkDefectTypeNameSearchBox1.BackColor = System.Drawing.Color.Transparent;
+            this.dkDefectTypeNameSearchBox1.DataSource = null;
+            this.dkDefectTypeNameSearchBox1.DefectTypeID = null;
+            this.dkDefectTypeNameSearchBox1.DefectTypeIDS = null;
+            this.dkDefectTypeNameSearchBox1.DefectTypeName = null;
+            this.dkDefectTypeNameSearchBox1.Enabled = true;
+            this.dkDefectTypeNameSearchBox1.IsEnablePurview = false;
+            this.dkDefectTypeNameSearchBox1.IsMustInput = false;
+            this.dkDefectTypeNameSearchBox1.Location = new System.Drawing.Point(318, 47);
+            this.dkDefectTypeNameSearchBox1.Name = "dkDefectTypeNameSearchBox1";
+            this.dkDefectTypeNameSearchBox1.Purview = null;
+            this.dkDefectTypeNameSearchBox1.PurviewType = ((byte)(0));
+            this.dkDefectTypeNameSearchBox1.SelectMore = true;
+            this.dkDefectTypeNameSearchBox1.Size = new System.Drawing.Size(159, 21);
+            this.dkDefectTypeNameSearchBox1.TabIndex = 14;
+            this.dkDefectTypeNameSearchBox1.Title = "缺陷类别";
+            this.dkDefectTypeNameSearchBox1.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkProcedureSearchBox
+            // 
+            this.dkProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkProcedureSearchBox.DataSource = null;
+            this.dkProcedureSearchBox.Enabled = true;
+            this.dkProcedureSearchBox.IsEnablePurview = false;
+            this.dkProcedureSearchBox.IsMustInput = false;
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(12, 47);
+            this.dkProcedureSearchBox.ModelType = null;
+            this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
+            this.dkProcedureSearchBox.ProcedureCode = "";
+            this.dkProcedureSearchBox.ProcedureID = null;
+            this.dkProcedureSearchBox.ProcedureIDS = null;
+            this.dkProcedureSearchBox.ProcedureName = null;
+            this.dkProcedureSearchBox.Purview = null;
+            this.dkProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkProcedureSearchBox.SelectMore = true;
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(159, 21);
+            this.dkProcedureSearchBox.TabIndex = 10;
+            this.dkProcedureSearchBox.Title = "责任工序";
+            this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dgvDefectDetail
+            // 
+            this.dgvDefectDetail.AllowUserToAddRows = false;
+            this.dgvDefectDetail.AllowUserToDeleteRows = false;
+            this.dgvDefectDetail.AllowUserToModifyRows = true;
+            this.dgvDefectDetail.AllowUserToOrderColumns = true;
+            this.dgvDefectDetail.AllowUserToSortRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDefectDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvDefectDetail.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.dgvDefectDetail.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvDefectDetail.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvDefectDetail.CellHeight = 23;
+            this.dgvDefectDetail.ChildNodeColumnName = null;
+            this.dgvDefectDetail.ChildNodeColumnText = null;
+            this.dgvDefectDetail.ColumnDeep = 1;
+            this.dgvDefectDetail.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.dgvDefectDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvDefectDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvDefectDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.CheckTime,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.DefectStaffNames3,
+            this.defectjobsname,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7,
+            this.dataGridViewTextBoxColumn8,
+            this.dataGridViewTextBoxColumn9,
+            this.dataGridViewTextBoxColumn10,
+            this.dataGridViewTextBoxColumn11,
+            this.dataGridViewTextBoxColumn12,
+            this.dataGridViewTextBoxColumn13,
+            this.dataGridViewTextBoxColumn14,
+            this.dataGridViewTextBoxColumn15,
+            this.dataGridViewTextBoxColumn16,
+            this.dataGridViewTextBoxColumn17,
+            this.dataGridViewTextBoxColumn18,
+            this.dataGridViewTextBoxColumn19,
+            this.dataGridViewTextBoxColumn20,
+            this.dataGridViewTextBoxColumn21,
+            this.dataGridViewTextBoxColumn22,
+            this.dataGridViewTextBoxColumn23,
+            this.czGroutingLineCode,
+            this.dataGridViewTextBoxColumn24,
+            this.dataGridViewTextBoxColumn25,
+            this.dataGridViewTextBoxColumn26,
+            this.dataGridViewTextBoxColumn27,
+            this.dataGridViewTextBoxColumn28,
+            this.dataGridViewCheckBoxColumn1,
+            this.barcodeRemarks3,
+            this.bsqx,
+            this.半检缺陷,
+            this.半检位置,
+            this.半检工号});
+            this.dgvDefectDetail.ColumnTreeView = null;
+            this.dgvDefectDetail.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.dgvDefectDetail.DynamicColumnName = "";
+            this.dgvDefectDetail.EnableHeadersVisualStyles = false;
+            this.dgvDefectDetail.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDefectDetail.FormatQuantityColumns = null;
+            this.dgvDefectDetail.HorizontalMergeColumn = null;
+            this.dgvDefectDetail.IsAutoCountSum = true;
+            this.dgvDefectDetail.IsAutoResizeColumns = false;
+            this.dgvDefectDetail.IsClickF12 = false;
+            this.dgvDefectDetail.IsOpenMergeCellFlag = false;
+            this.dgvDefectDetail.IsSubTotalFlag = false;
+            this.dgvDefectDetail.IsTopDeep = false;
+            this.dgvDefectDetail.Location = new System.Drawing.Point(0, 144);
+            this.dgvDefectDetail.Margin = new System.Windows.Forms.Padding(0);
+            this.dgvDefectDetail.MergeColumnNames = null;
+            this.dgvDefectDetail.MergeDetailColumnNames = null;
+            this.dgvDefectDetail.MergeDetailOnlyColumn = null;
+            this.dgvDefectDetail.MergeOnlyColumn = null;
+            this.dgvDefectDetail.MultiSelect = false;
+            this.dgvDefectDetail.Name = "dgvDefectDetail";
+            this.dgvDefectDetail.ReadOnly = true;
+            this.dgvDefectDetail.RefreshAtHscroll = false;
+            this.dgvDefectDetail.RowHeadersWidth = 50;
+            this.dgvDefectDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDefectDetail.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            this.dgvDefectDetail.RowTemplate.Height = 21;
+            this.dgvDefectDetail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvDefectDetail.Size = new System.Drawing.Size(1162, 273);
+            this.dgvDefectDetail.SortOrderColumnName = null;
+            this.dgvDefectDetail.TabIndex = 31;
+            this.dgvDefectDetail.Tag = true;
+            this.dgvDefectDetail.TotalSumColumns = null;
+            this.dgvDefectDetail.ViewRowFilter = "";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "productionlinename";
+            this.dataGridViewTextBoxColumn1.HeaderText = "生产线";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "procedurename";
+            this.dataGridViewTextBoxColumn2.HeaderText = "检验工序";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "pdchecktime";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridViewTextBoxColumn3.HeaderText = "成检登记时间";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            // 
+            // CheckTime
+            // 
+            this.CheckTime.DataPropertyName = "CheckTime";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
+            this.CheckTime.DefaultCellStyle = dataGridViewCellStyle4;
+            this.CheckTime.HeaderText = "缺陷登记时间";
+            this.CheckTime.Name = "CheckTime";
+            this.CheckTime.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "DefectProcedureName";
+            this.dataGridViewTextBoxColumn4.HeaderText = "责任工序";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "DefectUserCode";
+            this.dataGridViewTextBoxColumn5.HeaderText = "责任工号";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            // 
+            // DefectStaffNames3
+            // 
+            this.DefectStaffNames3.DataPropertyName = "DefectStaffNames";
+            this.DefectStaffNames3.HeaderText = "责任员工";
+            this.DefectStaffNames3.Name = "DefectStaffNames3";
+            this.DefectStaffNames3.ReadOnly = true;
+            // 
+            // defectjobsname
+            // 
+            this.defectjobsname.DataPropertyName = "defectjobsname";
+            this.defectjobsname.HeaderText = "责任工种";
+            this.defectjobsname.Name = "defectjobsname";
+            this.defectjobsname.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "DefectTypeName";
+            this.dataGridViewTextBoxColumn6.HeaderText = "缺陷类别";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "defectcode";
+            this.dataGridViewTextBoxColumn7.HeaderText = "缺陷编码";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "alldefectcode";
+            this.dataGridViewTextBoxColumn8.HeaderText = "缺陷编码(全)";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "defectname";
+            this.dataGridViewTextBoxColumn9.HeaderText = "缺陷名称";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "DefectRemarks";
+            this.dataGridViewTextBoxColumn10.HeaderText = "缺陷备注";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "DefectPositionCode";
+            this.dataGridViewTextBoxColumn11.HeaderText = "缺陷位置编码";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "DefectPositionName";
+            this.dataGridViewTextBoxColumn12.HeaderText = "缺陷位置名称";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.DataPropertyName = "DefectFineCode";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle5;
+            this.dataGridViewTextBoxColumn13.HeaderText = "缺陷扣罚";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            this.dataGridViewTextBoxColumn14.DataPropertyName = "DefectDeductionNum";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle6;
+            this.dataGridViewTextBoxColumn14.HeaderText = "缺陷扣除数";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            this.dataGridViewTextBoxColumn15.DataPropertyName = "UserCode";
+            this.dataGridViewTextBoxColumn15.HeaderText = "检验工号";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn16
+            // 
+            this.dataGridViewTextBoxColumn16.DataPropertyName = "Goodstypename";
+            this.dataGridViewTextBoxColumn16.HeaderText = "产品类别";
+            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
+            this.dataGridViewTextBoxColumn16.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            this.dataGridViewTextBoxColumn17.DataPropertyName = "goodscode";
+            this.dataGridViewTextBoxColumn17.HeaderText = "产品编码";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn18
+            // 
+            this.dataGridViewTextBoxColumn18.DataPropertyName = "barcode";
+            this.dataGridViewTextBoxColumn18.HeaderText = "产品条码";
+            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
+            this.dataGridViewTextBoxColumn18.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            this.dataGridViewTextBoxColumn19.DataPropertyName = "LogoCodeName";
+            this.dataGridViewTextBoxColumn19.HeaderText = "商标";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.DataPropertyName = "Goodsleveltype";
+            this.dataGridViewTextBoxColumn20.HeaderText = "产品分级";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.DataPropertyName = "GroutingUserCode";
+            this.dataGridViewTextBoxColumn21.HeaderText = "成型工号";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.DataPropertyName = "groutingdate";
+            this.dataGridViewTextBoxColumn22.HeaderText = "注浆日期";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            this.dataGridViewTextBoxColumn23.DataPropertyName = "groutingnum";
+            this.dataGridViewTextBoxColumn23.HeaderText = "注浆次数";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.ReadOnly = true;
+            // 
+            // czGroutingLineCode
+            // 
+            this.czGroutingLineCode.DataPropertyName = "GroutingLineCode";
+            this.czGroutingLineCode.HeaderText = "成型线编码";
+            this.czGroutingLineCode.Name = "czGroutingLineCode";
+            this.czGroutingLineCode.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn24
+            // 
+            this.dataGridViewTextBoxColumn24.DataPropertyName = "groutingMouldCode";
+            this.dataGridViewTextBoxColumn24.HeaderText = "模具编号";
+            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
+            this.dataGridViewTextBoxColumn24.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn25
+            // 
+            this.dataGridViewTextBoxColumn25.DataPropertyName = "KilnCarCode";
+            this.dataGridViewTextBoxColumn25.HeaderText = "窑车编号";
+            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
+            this.dataGridViewTextBoxColumn25.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn26
+            // 
+            this.dataGridViewTextBoxColumn26.DataPropertyName = "workUsercodes";
+            this.dataGridViewTextBoxColumn26.HeaderText = "生产工号";
+            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
+            this.dataGridViewTextBoxColumn26.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn27
+            // 
+            this.dataGridViewTextBoxColumn27.DataPropertyName = "CreateUserCodes";
+            this.dataGridViewTextBoxColumn27.HeaderText = "操作工号";
+            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
+            this.dataGridViewTextBoxColumn27.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn28
+            // 
+            this.dataGridViewTextBoxColumn28.DataPropertyName = "HandOverTime";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
+            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle7;
+            this.dataGridViewTextBoxColumn28.HeaderText = "交接时间";
+            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
+            this.dataGridViewTextBoxColumn28.ReadOnly = true;
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.DataPropertyName = "undoflag";
+            this.dataGridViewCheckBoxColumn1.FalseValue = "0";
+            this.dataGridViewCheckBoxColumn1.HeaderText = "改判标识";
+            this.dataGridViewCheckBoxColumn1.IndeterminateValue = "";
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn1.TrueValue = "1";
+            // 
+            // barcodeRemarks3
+            // 
+            this.barcodeRemarks3.DataPropertyName = "barcodeRemarks";
+            this.barcodeRemarks3.HeaderText = "产品备注";
+            this.barcodeRemarks3.Name = "barcodeRemarks3";
+            this.barcodeRemarks3.ReadOnly = true;
+            // 
+            // bsqx
+            // 
+            this.bsqx.DataPropertyName = "bsqx";
+            this.bsqx.HeaderText = "本烧缺陷";
+            this.bsqx.Name = "bsqx";
+            this.bsqx.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_080109
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1174, 417);
+            this.Controls.Add(this.dgvDefectDetail);
+            this.Controls.Add(this.gbxCondition);
+            this.Controls.Add(this.tsrOperate);
+            this.Name = "F_RPT_080109";
+            this.Text = "半成检缺陷对照表";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_080109_FormClosed);
+            this.Load += new System.EventHandler(this.F_RPT_080109_Load);
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            this.gbxCondition.ResumeLayout(false);
+            this.gbxCondition.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvDefectDetail)).EndInit();
+            this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private Basics.BaseControls.C_ToolStrip tsrOperate;
+		private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+		private System.Windows.Forms.ToolStripButton tsbtnClose;
+		private Basics.BaseControls.C_GroupBox gbxCondition;
+		private Basics.BaseControls.C_Label lblAccountDateEnd;
+		private Basics.BaseControls.C_DateTimePicker dtpAccountDateEnd;
+		private Basics.BaseControls.C_DateTimePicker dtpAccountDateStart;
+		private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox;
+		private Basics.BaseControls.C_Button btnClearCondition;
+		private Basics.BaseControls.C_Button btnSearch;
+		private Controls.SearchTextBox.dkDefectTypeNameSearchBox dkDefectTypeNameSearchBox1;
+		private Basics.BaseControls.C_Label lblDefectUserCode;
+		private Basics.BaseControls.C_TextBox txtDefectUserCode;
+		private Basics.BaseControls.C_Label lblUserCode;
+		private Basics.BaseControls.C_TextBox txtCheckUserCode;
+		private Basics.BaseControls.C_TextBox txtDefectCode;
+		private Basics.BaseControls.C_Label lblDefectCode;
+		private Basics.BaseControls.C_Label lblDefectName;
+		private Basics.BaseControls.C_Label c_Label1;
+		private Basics.BaseControls.C_TextBox txtGoodsCode;
+		private Basics.BaseControls.C_TextBox txtDefectName;
+		private Basics.BaseControls.C_TextBox txtKilnCode;
+		private Basics.BaseControls.C_Label c_Label3;
+		private Controls.SearchTextBox.dkProcedureSearchBox dkCheckProcedureSearchBox;
+		private Basics.BaseControls.C_ComboBox dropRptProcedure;
+		private Basics.BaseControls.C_Label c_Label4;
+		private Basics.BaseControls.C_CheckBox chkCdate;
+		private Basics.BaseControls.C_CheckBox chkHandOver;
+		private Basics.BaseControls.C_Label c_Label2;
+		private Basics.BaseControls.C_DateTimePicker dtpHandOverEnd;
+		private Basics.BaseControls.C_DateTimePicker dtpHandOverStart;
+		private Basics.BaseControls.C_DataGridView dgvDefectDetail;
+		private Basics.BaseControls.C_CheckBox chkCheckDate;
+		private Basics.BaseControls.C_Label c_Label5;
+		private Basics.BaseControls.C_DateTimePicker dtpCheckDateEnd;
+		private Basics.BaseControls.C_DateTimePicker dtpCheckDateStart;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+		private Controls.SearchBox.ScbGoods scbGoods;
+		private Basics.BaseControls.C_Label lblGoods;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CheckTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectStaffNames3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn defectjobsname;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn czGroutingLineCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn25;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn26;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn27;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn28;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn barcodeRemarks3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bsqx;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 半检缺陷;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 半检位置;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 半检工号;
+    }
+}

+ 339 - 0
DK.Client/ReportModule/R08/F_RPT_080109.cs

@@ -0,0 +1,339 @@
+/*******************************************************************************
+ * Copyright(c) 2015 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_RPT_080109.cs
+ *      2.功能描述:半成检缺陷对照表
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      王鑫          2015/06/13            1.00            新建
+ *******************************************************************************/
+
+using System;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.DockPanel;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Client.Controls;
+using Dongke.IBOSS.PRD.Client.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+	public partial class F_RPT_080109 : DKDockPanelBase
+	{
+		#region 成员变量
+
+		// 窗体的单例模式
+		private static F_RPT_080109 _instance;
+		//实体类 
+		private RPT030106_SE rptse = null;
+		//默认清空工序,重置回用户当前权限工序
+		private string _currentUserPurview = null;
+		//默认清空生产线,重置回用户当前权限生产线
+		private string _currentUserLinePuview = null;
+		//默认清空查看工号,重置回用户当前权限工号
+		private string _currentUserCodePuview = null;
+
+		#endregion
+
+		#region 构造函数
+
+		public F_RPT_080109()
+		{
+			InitializeComponent();
+			// 窗体显示的Title
+			this.Text = "半成检缺陷对照表";
+            this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+			this.btnSearch.Text = ButtonText.BTN_SEARCH;
+			this.btnClearCondition.Text = ButtonText.BTN_CLEARCONDITION;
+			this.gbxCondition.Text = Constant.LABEL_QUERY_CONDITIONS;
+		}
+
+		#endregion
+
+		#region 单例模式
+
+		/// <summary>
+		/// 单例模式,防止重复创建窗体
+		/// </summary>
+		public static F_RPT_080109 Instance
+		{
+			get
+			{
+				if (_instance == null || _instance.IsDisposed)
+				{
+					_instance = new F_RPT_080109();
+				}
+				return _instance;
+			}
+		}
+
+		#endregion
+
+		#region  事件处理
+
+		/// <summary>
+		/// 窗体加载事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_RPT_080109_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				// 加载权限
+				FormPermissionManager.FormPermissionControl(this.Name, this,
+					LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+					LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+				// 设置表格不自动创建列
+				this.dgvDefectDetail.AutoGenerateColumns = false;
+
+				// 初始化时间控件为当前日期
+				this.dtpAccountDateStart.Value = DateTime.Now.Date;
+				this.dtpAccountDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.dtpHandOverStart.Value = DateTime.Now.Date;
+				this.dtpHandOverEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				this.dtpCheckDateStart.Value = DateTime.Now.Date;
+				this.dtpCheckDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+				//getPurview();
+				//getPurviewLine();
+				// 交接工序
+				ServiceResultEntity sresource = ReportModuleProxy.Service.GetRptProcedureModule();
+				if (sresource != null && sresource.Data != null && sresource.Data.Tables.Count > 0)
+				{
+					this.dropRptProcedure.DataSource = sresource.Data.Tables[0];
+					this.dropRptProcedure.ValueMember = "Rptprocedureid";
+					this.dropRptProcedure.DisplayMember = "Rptprocedurename";
+				}
+			}
+			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 tsbtnAdaptive_Click(object sender, EventArgs e)
+        {
+            this.dgvDefectDetail.AutoResizeColumns();
+        }
+
+		/// <summary>
+		/// 窗体关闭事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_RPT_080109_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			_instance = null;
+		}
+
+		/// <summary>
+		/// 关闭按钮
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		/// <summary>
+		/// 查询按钮事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnSearch_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//没有对应的生产线权限,返回   因为有无责任工序,则可以不用分配工序的权限,不分配,只能查无责任工序
+				//if (string.IsNullOrEmpty(this._currentUserLinePuview))
+				//{
+				//    // 提示未查找到数据
+				//    MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+				//        MessageBoxButtons.OK, MessageBoxIcon.Information);
+				//    return;
+				//}
+
+				// 交接工序必须输入项
+				if (this.dropRptProcedure.SelectedValue == null)
+				{
+					MessageBox.Show(Messages.MSG_CMN_W005, this.Text,
+						MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+					return;
+				}
+				// 登记时间与交接时间必须选择一个
+				if ((!this.chkCdate.Checked && (this.chkCheckDate.Enabled && !this.chkCheckDate.Checked)) && !this.chkHandOver.Checked)
+				{
+					MessageBox.Show("(缺陷)登记时间与交接时间至少选择一个作为查询条件。", this.Text,
+						MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+					return;
+				}
+
+				CreateSearchCondition();
+
+                this.dgvDefectDetail.DataSource = null;
+                this.dgvDefectDetail.DataSource = GetSearchDefectData();
+            }
+			catch (Exception ex)
+			{
+				this.btnSearch.Enabled = true;
+				this.btnClearCondition.Enabled = true;
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 清空条件按钮事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnClearCondition_Click(object sender, EventArgs e)
+		{
+			this.scbGoods.ClearValue();
+			this.scbGoodsType.ClearValue();
+			this.dkProcedureSearchBox.ClearControl();
+			this.dkDefectTypeNameSearchBox1.ClearControl();
+			this.dtpAccountDateStart.Value = DateTime.Now.Date;
+			this.dtpAccountDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.dtpHandOverStart.Value = DateTime.Now.Date;
+			this.dtpHandOverEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.dtpCheckDateStart.Value = DateTime.Now.Date;
+			this.dtpCheckDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.chkCdate.Checked = true;
+			this.chkHandOver.Checked = false;
+			this.chkCheckDate.Checked = false;
+			this.dkCheckProcedureSearchBox.ClearControl();
+			this.txtKilnCode.Clear();
+			this.txtDefectUserCode.Text = "";
+			this.txtDefectCode.Text = "";
+			this.txtCheckUserCode.Text = "";
+			this.txtDefectName.Text = "";
+			this.txtGoodsCode.Text = "";
+			this.dkProcedureSearchBox.ProcedureIDS = this._currentUserPurview;
+			if (this.dropRptProcedure.Items.Count > 0)
+			{
+				this.dropRptProcedure.SelectedIndex = 0;
+			}
+		}
+
+		private void chkCdate_CheckedChanged(object sender, EventArgs e)
+		{
+			this.dtpAccountDateStart.Value = DateTime.Now.Date;
+			this.dtpAccountDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.dtpAccountDateStart.Enabled = this.chkCdate.Checked;
+			this.dtpAccountDateEnd.Enabled = this.chkCdate.Checked;
+		}
+
+		private void chkHandOver_CheckedChanged(object sender, EventArgs e)
+		{
+			this.dtpHandOverStart.Value = DateTime.Now.Date;
+			this.dtpHandOverEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.dtpHandOverStart.Enabled = this.chkHandOver.Checked;
+			this.dtpHandOverEnd.Enabled = this.chkHandOver.Checked;
+		}
+
+		private void chkCheckDate_CheckedChanged(object sender, EventArgs e)
+		{
+			this.dtpCheckDateStart.Value = DateTime.Now.Date;
+			this.dtpCheckDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+			this.dtpCheckDateStart.Enabled = this.chkCheckDate.Checked;
+			this.dtpCheckDateEnd.Enabled = this.chkCheckDate.Checked;
+		}
+		#endregion
+
+		#region  私有方法
+		/// <summary>
+		/// 搜索条件
+		/// </summary>
+		/// <returns></returns>
+		private void CreateSearchCondition()
+        {
+            rptse = new RPT030106_SE();
+            rptse.GoodsTypeCode = scbGoodsType.SearchedValue + "";
+            rptse.DefectProcedureIDS = this.dkProcedureSearchBox.ProcedureIDS;
+            //rptse.PurViewUserCodeIDS = this._currentUserCodePuview;//默认查看对应权限工号
+            if (this.chkCdate.Checked)
+            {
+                rptse.CreateTimeStart = DateTime.Parse(this.dtpAccountDateStart.Value.ToString("yyyy-MM-dd HH:mm") + ":00");
+                rptse.CreateTimeEnd = DateTime.Parse(this.dtpAccountDateEnd.Value.ToString("yyyy-MM-dd HH:mm") + ":59");
+            }
+            rptse.DefectTypeIDS = this.dkDefectTypeNameSearchBox1.DefectTypeIDS;
+            rptse.DefectUserCode = this.txtDefectUserCode.Text.Trim();
+            rptse.CheckUserCode = this.txtCheckUserCode.Text.Trim();
+            rptse.DefectCode = this.txtDefectCode.Text.Trim();
+            rptse.DefectName = this.txtDefectName.Text.Trim();
+            rptse.GoodsCode = this.txtGoodsCode.Text.Trim();
+            rptse.GoodsIDS = scbGoods.CheckedPKMember;
+
+            if (this.dropRptProcedure.SelectedValue != null)
+            {
+                rptse.HandOverProcedureID = Convert.ToInt32(this.dropRptProcedure.SelectedValue);
+            }
+            if (this.chkHandOver.Checked)
+            {
+                rptse.HandOverTimeStart = DateTime.Parse(this.dtpHandOverStart.Value.ToString("yyyy-MM-dd HH:mm") + ":00");
+                rptse.HandOverTimeEnd = DateTime.Parse(this.dtpHandOverEnd.Value.ToString("yyyy-MM-dd HH:mm") + ":59");
+            }
+
+            if (this.chkCheckDate.Enabled && this.chkCheckDate.Checked)
+            {
+                rptse.CheckTimeStart = DateTime.Parse(this.dtpCheckDateStart.Value.ToString("yyyy-MM-dd HH:mm") + ":00");
+                rptse.CheckTimeEnd = DateTime.Parse(this.dtpCheckDateEnd.Value.ToString("yyyy-MM-dd HH:mm") + ":59");
+            }
+
+            rptse.CheckProcedureIDS = this.dkCheckProcedureSearchBox.ProcedureIDS;
+            rptse.KilnCode = this.txtKilnCode.Text.Trim();
+        }
+
+		/// <summary>
+		/// 查询缺陷登记明细表
+		/// </summary>
+		private DataTable GetSearchDefectData()
+		{
+			try
+			{
+				// 调用服务器端获取数据集
+				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
+				{
+					return ReportModuleProxy.Service.GetRPT080109DData(rptse);
+				}
+				);
+
+				if (sre.Status == Constant.ServiceResultStatus.Success)
+				{
+					if (sre.Data.Tables[0].Rows.Count <= Constant.INT_IS_ZERO)
+					{
+						// 提示未查找到数据
+						MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+							MessageBoxButtons.OK, MessageBoxIcon.Information);
+						//清空数据
+						return null;
+					}
+					return sre.Data.Tables[0];
+				}
+
+				return null;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+		}
+
+		#endregion
+	}
+}

+ 311 - 0
DK.Client/ReportModule/R08/F_RPT_080109.resx

@@ -0,0 +1,311 @@
+<?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="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CheckTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="defectjobsname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="czGroutingLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn26.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn27.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn28.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="barcodeRemarks3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bsqx.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>
+  <metadata name="半检工号.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>34</value>
+  </metadata>
+</root>

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

@@ -422,6 +422,12 @@
     <Compile Include="R04\M01\F_RPT_040107.Designer.cs">
       <DependentUpon>F_RPT_040107.cs</DependentUpon>
     </Compile>
+    <Compile Include="R08\F_RPT_080109.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="R08\F_RPT_080109.Designer.cs">
+      <DependentUpon>F_RPT_080109.cs</DependentUpon>
+    </Compile>
     <Compile Include="R08\F_RPT_080101.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -635,6 +641,9 @@
     <EmbeddedResource Include="R04\M01\F_RPT_040107.resx">
       <DependentUpon>F_RPT_040107.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="R08\F_RPT_080109.resx">
+      <DependentUpon>F_RPT_080109.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="R08\F_RPT_080101.resx">
       <DependentUpon>F_RPT_080101.cs</DependentUpon>
     </EmbeddedResource>

+ 347 - 0
DK.Service/ReportModuleLogic/ReportDetailedLogic.cs

@@ -0,0 +1,347 @@
+/*******************************************************************************
+ * Copyright(c) 2014 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:ReportModuleLogic.cs
+ *      2.功能描述:生产线报表分析
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      宋扬            2014/11/08          1.00            新建
+ *******************************************************************************/
+
+
+
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using Curtain.DataAccess;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.DataAccess;
+using Dongke.IBOSS.PRD.Service.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Oracle.ManagedDataAccess.Client;
+
+namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
+{
+    /// <summary>
+    /// 明细报表
+    /// </summary>
+    public class ReportDetailedLogic
+    {
+        /// <summary>
+        /// 取得RPT080109(半成检缺陷对照表)的查询数据
+        /// </summary>
+        /// <param name="user">登录用户信息</param>
+        /// <param name="se">查询条件</param>
+        /// <returns>查询结果</returns>
+        public static ServiceResultEntity GetRPT080109DData(SUserInfo user, RPT030106_SE se)
+        {
+            IDataAccess dataAccess  = null; 
+            try
+            {
+                dataAccess = DataAccess.Create();
+
+                List<CDAParameter> parameters = new List<CDAParameter>();
+
+                DataTable data = dataAccess.ExecuteDatatable(ReportDetailedLogic.GetRPT080109DSQL(user, se, ref parameters), parameters.ToArray());
+
+                ServiceResultEntity sre = new ServiceResultEntity();
+                if (data == null || data.Rows.Count == 0)
+                {
+                    sre.Status = Constant.ServiceResultStatus.NoSearchResults;
+                    return sre;
+                }
+                sre.Data = new DataSet();
+                sre.Data.Tables.Add(data);
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                dataAccess?.Close();
+            }
+        }
+
+        /// <summary>
+        /// 获取RPT080109画面(半成检缺陷对照表)的信息查询sql
+        /// </summary>
+        /// <returns>sql</returns>
+        private static string GetRPT080109DSQL(SUserInfo user, RPT030106_SE se, ref List<CDAParameter> parameters)
+        {
+            // 质量登记改判时,缺陷的登记时间是当前时间,不是交接或前次登记时间。
+            // 追加交接时间,改判标识。
+            string selSql =
+                "SELECT pmd.productionlinename\n" +
+                "      ,pmd.procedurename\n" +
+                "      ,pmd.DefectProcedureCode\n" +
+                "      ,pmd.DefectProcedureName\n" +
+                "      ,pmd.DefectUserCode\n" +
+                "      ,pmd.defectusername\n" +
+                "      ,jobs.jobsname defectjobsname\n" +
+                "      ,dt.DefectTypeName\n" +
+                "      ,mstd.Remarks DefectRemarks\n" +
+                "      ,pd.Remarks barcodeRemarks\n" +
+                "      ,pmd.defectcode\n" +
+                "      ,d.alldefectcode\n" +
+                "      ,pmd.defectname\n" +
+                "      ,pmd.UserCode\n" +
+                "      ,pmd.username\n" +
+                "      ,gt.Goodstypename\n" +
+                "      ,pmd.goodscode\n" +
+                "      ,pmd.barcode\n" +
+                "      ,pd.groutingdate\n" +
+                "      ,pd.groutingnum\n" +
+                "      ,pd.groutingMouldCode\n" +
+                "      ,pd.GroutingLineCode\n" +
+                "      ,pd.KilnCarCode\n" +
+                "      ,pd.Procedureid\n" +
+                "      ,gl.goodslevelname Goodsleveltype\n" +
+                "      ,pmd.DefectPositionCode\n" +
+                "      ,pmd.DefectPositionName\n" +
+                "      ,pd.GroutingUserCode\n" +
+                "      , CASE\n" +
+                "          WHEN logo.logoid IS NULL THEN\n" +
+                "           NULL\n" +
+                "          ELSE\n" +
+                "           logo.Logoname || '[' || logo.Logocode || ']'\n" +
+                "        END AS LogoCodeName\n" +
+                //"      ,pmd.CreateTime\n" +
+                "      ,pd.CheckTime pdchecktime\n" +
+                "      ,pmd.CheckTime\n" +
+                "      ,mstdf.DefectFineCode\n" +
+                "      ,pmd.DefectDeductionNum\n" +
+                //"      ,to_char(pmd.DefectDeductionNum, '990.00') DefectDeductionNum\n" +
+                "      ,hopd.createtime handovertime\n" +
+                "      ,(SELECT listagg(to_char(pduc.UserCode), ',') within GROUP(ORDER BY pduc.ProductionDataID) AS WorkUserCodes\n" +
+                "          FROM tp_pm_ProductionData pduc\n" +
+                "         WHERE pduc.barcode = pmd.barcode\n" +
+                "           AND pduc.valueflag = '1') AS WorkUserCodes\n" +
+                "      ,(SELECT listagg(to_char(u.UserCode), ',') within GROUP(ORDER BY pdcu.ProductionDataID) AS CreateUserCodes\n" +
+                "          FROM tp_pm_ProductionData pdcu\n" +
+                "          Left join tp_mst_user u on u.userid = pdcu.createuserid\n" +
+                "         WHERE pdcu.barcode = pmd.barcode\n" +
+                "           AND pdcu.valueflag = '1') AS CreateUserCodes\n" +
+                "      ,(SELECT listagg(to_char(s.StaffName), ',') within GROUP(ORDER BY s.Staffid) AS DefectStaffNames\n" +
+                "          FROM TP_PM_DefectResponsible dr\n" +
+                "          Left join TP_HR_Staff s on s.Staffid = dr.Staffid\n" +
+                "         WHERE dr.ProductionDefectID = pmd.ProductionDefectID --dr pdcu.valueflag = '1'\n" +
+                "           ) AS DefectStaffNames\n" +
+                "      , CASE\n" +
+                "          WHEN pd.isrefire <> '0' THEN\n" +
+                "               (select listagg(to_char(d.defectname || '[' || d.defectpositionname || ']')\n" +
+                "                             ,',') within group(order by d.productiondefectid) bsqx\n" +
+                "                  from tp_pm_productiondata p\n" +
+                "                 inner join tp_pm_defect d\n" +
+                "                    on d.productiondataid = p.productiondataid\n" +
+                "                 where p.valueflag = '1'\n" +
+                "                   and d.valueflag = '1'\n" +
+                "                   and p.barcode = pd.barcode\n" +
+                "                   and p.modeltype = -1\n" +
+                "                   and p.isrefire = '0')\n" +
+                "          ELSE\n" +
+                "           null\n" +
+                "        END AS bsqx\n" +
+                "      , CASE\n" +
+                "          WHEN EXISTS (SELECT 1\n" +
+                "                  FROM tp_pm_ProductionData pdud\n" +
+                "                 WHERE pdud.barcode = pmd.barcode\n" +
+                "                   AND pdud.modeltype = -1\n" +
+                "                   AND pdud.procedureid = pd.procedureid\n" +
+                "                   AND pdud.kilncarbatchno = pd.kilncarbatchno\n" +
+                "                   AND pdud.valueflag = '0') THEN\n" +
+                "           1\n" +
+                "          ELSE\n" +
+                "           0\n" +
+                "        END AS undoflag\n" +
+                "        ,semid.DEFECTNAME AS 半检缺陷\n" +
+                "        ,semid.DEFECTPOSITIONNAME AS 半检位置\n" +
+                "        ,semi.SEMIREWORKUSERCODE AS 半检工号\n" +
+                "  FROM tp_pm_defect pmd\n" +
+                "  LEFT JOIN TP_PC_Procedure p\n" +
+                "    ON p.procedureid = pmd.procedureid\n" +
+                "  LEFT JOIN TP_PC_Procedure pdd\n" +
+                "    ON pdd.procedureid = pmd.defectprocedureid\n" +
+                "  LEFT JOIN TP_MST_Goods g\n" +
+                "    ON pmd.Goodsid = g.Goodsid\n" +
+                "  LEFT JOIN TP_MST_GoodsType gt\n" +
+                "    ON g.GoodsTypeID = gt.GoodsTypeID\n" +
+                "  LEFT JOIN TP_MST_Defect mstd\n" +
+                "    ON pmd.DefectID = mstd.DefectID\n" +
+                "  LEFT JOIN TP_MST_Jobs jobs\n" +
+                "    ON jobs.jobsid = pmd.Defectjobs\n" +
+                "  LEFT JOIN TP_MST_DefectType dt\n" +
+                "    ON mstd.DefectTypeID = dt.DefectTypeID\n" +
+                " INNER JOIN tp_pm_productiondata pd\n" +
+                "    ON pmd.ProductionDataID = pd.ProductionDataID\n" +
+                "  LEFT JOIN tp_mst_goodslevel gl\n" +
+                "    ON pd.goodslevelid = gl.goodslevelid\n" +
+                //"-- 交接工序\n" +
+                //" INNER JOIN tp_pm_productiondata hopd\n" +
+                //"    ON hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
+                //"   AND hopd.valueflag = '1'\n" +
+                //"   AND hopd.barcode = pd.barcode\n" +
+                //"   AND hopd.kilncarbatchno = pd.kilncarbatchno\n" +
+                " INNER JOIN tp_pm_productiondata hopd\n" +
+                "    ON hopd.kilncarbatchno = pd.kilncarbatchno\n " +
+                "   AND hopd.barcode = pd.barcode\n" +
+                "   AND hopd.valueflag = '1'\n" +
+                "   AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = @HandOverProcedureID@) \n" +
+                "  LEFT JOIN TP_MST_DefectFine mstdf\n" +
+                "    ON pmd.DefectFine = mstdf.DefectFineID\n" +
+                "  LEFT JOIN tp_mst_logo logo\n" +
+                "    ON pd.logoid = logo.logoid\n" +
+                "  LEFT JOIN (SELECT def.barcode, wmsys.wm_concat( to_char(def.defectcode)) alldefectcode\n" +
+                "               FROM tp_pm_defect def\n" +
+                "              WHERE def.valueflag = '1'\n" +
+                //def.createtime
+                "              group by def.barcode ) d\n" +
+                "    ON d.barcode = pmd.barcode\n" +
+                "  INNER JOIN TP_PM_SEMIREWORK semi ON semi.GROUTINGDAILYDETAILID = hopd.GROUTINGDAILYDETAILID AND semi.VALUEFLAG = '1' AND semi.BACKOUTFLAG = '0' \n" +
+                "  INNER JOIN TP_PM_SEMIREWORKDEFECT semid ON semi.SEMIREWORKID = semid.SEMIREWORKDEFECTID AND semid.VALUEFLAG = '1' \n" +
+
+                " WHERE pmd.valueflag = '1' \n" +
+                "   AND pd.ModelType = -1\n" +
+                "   AND pmd.AccountID = @AccountID@\n";
+
+            parameters.Add(new CDAParameter("@AccountID@", user.AccountID));
+            parameters.Add(new CDAParameter("@HandOverProcedureID@", se.HandOverProcedureID));
+
+            //selSql = selSql +
+            //        "  Where TP_PM_Defect.valueflag='1' and tp_pm_productiondata.ModelType=-1" +
+            //        "  and TP_PM_Defect.AccountID=:AccountID ";
+            if (!string.IsNullOrEmpty(se.GoodsTypeCode))
+            {
+                selSql = selSql + " AND instr(gt.GOODSTYPECode,@GoodsTypeCode@)=1 ";
+                parameters.Add(new CDAParameter("@GoodsTypeCode@", se.GoodsTypeCode));
+            }
+            if (!string.IsNullOrEmpty(se.LineIDS))
+            {
+                selSql = selSql + " AND instr(','||@ProductionLineIDS@||',',','||pmd.ProductionLineId||',')>0 ";
+                parameters.Add(new CDAParameter("@ProductionLineIDS@", se.LineIDS));
+            }
+            if (!string.IsNullOrEmpty(se.DefectProcedureIDS))
+            {
+                //selSql = selSql + " AND (instr(','||:DefectProcedureIDS||',',','||TP_PM_Defect.DefectProcedureID||',')>0 or TP_PM_Defect.DefectProcedureID  is null ) ";
+                selSql = selSql + " AND (instr(','||@DefectProcedureIDS@||',',','||pmd.DefectProcedureID||',')>0 ) ";
+                parameters.Add(new CDAParameter("@DefectProcedureIDS@", se.DefectProcedureIDS));
+            }
+            else
+            {
+                // modify by chenxy :没有选择时,应全查询出来。
+                //selSql = selSql + " AND TP_PM_Defect.DefectProcedureID  is null ";//因为有无责任工序
+            }
+
+            if (!string.IsNullOrEmpty(se.CheckProcedureIDS))
+            {
+                selSql = selSql + " AND instr(','||@ProcedureIDS@||',',','||pmd.ProcedureID||',')>0 ";
+                parameters.Add(new CDAParameter("@ProcedureIDS@", se.CheckProcedureIDS));
+            }
+
+            if (!string.IsNullOrEmpty(se.KilnCode))
+            {
+                selSql = selSql + " AND instr(pd.KilnCode,@KilnCode@) >0 ";
+                parameters.Add(new CDAParameter("@KilnCode@", se.KilnCode));
+            }
+
+            if (!string.IsNullOrEmpty(se.GoodsIDS))
+            {
+                selSql = selSql + " AND instr(','||@GoodsIDS@||',',','||pmd.Goodsid||',')>0 ";
+                parameters.Add(new CDAParameter("@GoodsIDS@", se.GoodsIDS));
+            }
+
+            if (!string.IsNullOrEmpty(se.GoodsCode))
+            {
+                selSql = selSql + " AND instr(pmd.goodsCode,@GoodsCode@) >0 ";
+                parameters.Add(new CDAParameter("@GoodsCode@", se.GoodsCode));
+            }
+            if (!string.IsNullOrEmpty(se.GoodsCodeS2D))
+            {
+                selSql = selSql + " AND pmd.goodsCode = @GoodsCodeS2D@ ";
+                parameters.Add(new CDAParameter("@GoodsCodeS2D@", se.GoodsCodeS2D));
+            }
+
+            if (!string.IsNullOrEmpty(se.DefectUserCode))
+            {
+                selSql = selSql + " AND instr(pmd.DefectUserCode,@DefectUserCode@) >0 ";
+                parameters.Add(new CDAParameter("@DefectUserCode@", se.DefectUserCode));
+            }
+
+            if (!string.IsNullOrEmpty(se.DefectTypeIDS))
+            {
+                selSql = selSql + " AND instr(','||@DefectTypeIDS@||',',','||dt.DefectTypeID||',')>0 ";
+                parameters.Add(new CDAParameter("@DefectTypeIDS@", se.DefectTypeIDS));
+            }
+
+            if (!string.IsNullOrEmpty(se.DefectCode))
+            {
+                selSql = selSql + " AND instr(pmd.DefectCode,@DefectCode@) >0 ";
+                parameters.Add(new CDAParameter("@DefectCode@", se.DefectCode));
+            }
+            if (!string.IsNullOrEmpty(se.DefectCodeS2D))
+            {
+                selSql = selSql + " AND pmd.DefectCode = @DefectCodeS2D@ ";
+                parameters.Add(new CDAParameter("@DefectCodeS2D@", se.DefectCodeS2D));
+            }
+
+            if (!string.IsNullOrEmpty(se.DefectName))
+            {
+                selSql = selSql + " AND instr(pmd.DefectName,@DefectName@) >0 ";
+                parameters.Add(new CDAParameter("@DefectName@", se.DefectName));
+            }
+
+            if (!string.IsNullOrEmpty(se.CheckUserCode))
+            {
+                selSql = selSql + " AND instr(pmd.UserCode,@UserCode@) >0";
+                parameters.Add(new CDAParameter("@UserCode@", se.CheckUserCode));
+            }
+            if (!string.IsNullOrEmpty(se.CheckUserCodeS2D))
+            {
+                selSql = selSql + " AND pmd.UserCode = @CheckUserCodeS2D@ ";
+                parameters.Add(new CDAParameter("@CheckUserCodeS2D@", se.CheckUserCodeS2D));
+            }
+
+            // 成检登记时间
+            if (se.CreateTimeStart.HasValue)
+            {
+                selSql = selSql + "  AND pd.checktime>= @CreateTimeStart@  ";
+                parameters.Add(new CDAParameter("@CreateTimeStart@", se.CreateTimeStart.Value));
+            }
+            if (se.CreateTimeEnd.HasValue)
+            {
+                selSql = selSql + "  AND pd.checktime<= @CreateTimeEnd@  ";
+                parameters.Add(new CDAParameter("@CreateTimeEnd@", se.CreateTimeEnd.Value));
+            }
+            // 缺陷登记时间
+            if (se.CheckTimeStart.HasValue)
+            {
+                selSql = selSql + "  AND pmd.checktime>= @CheckTimeStart@  ";
+                parameters.Add(new CDAParameter("@CheckTimeStart@", se.CheckTimeStart.Value));
+            }
+            if (se.CheckTimeEnd.HasValue)
+            {
+                selSql = selSql + "  AND pmd.checktime<= @CheckTimeEnd@  ";
+                parameters.Add(new CDAParameter("@CheckTimeEnd@", se.CheckTimeEnd.Value));
+            }
+            // 交接时间
+            if (se.HandOverTimeStart.HasValue)
+            {
+                selSql = selSql + "  AND hopd.CreateTime>= @HandOverTimeStart@  ";
+                parameters.Add(new CDAParameter("@HandOverTimeStart@", se.HandOverTimeStart.Value));
+            }
+            if (se.HandOverTimeEnd.HasValue)
+            {
+                selSql = selSql + "  AND hopd.CreateTime<= @HandOverTimeEnd@  ";
+                parameters.Add(new CDAParameter("@HandOverTimeEnd@", se.HandOverTimeEnd.Value));
+            }
+
+            //selSql = selSql + " order by pmd.productionlinename,pmd.procedurename,pmd.defectprocedurename,pmd.defectusercode ";
+            selSql = selSql + " order by pmd.productionlinename,p.DISPLAYNO,pdd.DISPLAYNO,dt.DISPLAYNO,mstd.DISPLAYNO,pmd.defectusercode,pmd.barcode ";
+            return selSql;
+        }
+
+    }
+}

+ 4 - 3
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -12230,12 +12230,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             // 只显示最后一条半检记录
             if (se.SemiCheckType == "1")
             {
-                sqlString += "  and not exists (select sw.semireworkid\n" +
+                // 撤销的记录全显示,未撤销的记录只显示最后一条
+                sqlString += "  and (sr.backoutflag = '1' or not exists (select sw.semireworkid\n" +
                 "       from TP_PM_SEMIREWORK sw\n" +
                 "      where sw.barcode = sr.barcode\n" +
                 "        and sw.valueflag = '1'\n" +
-                "        and (sw.backoutflag = '0' or sr.backoutflag = '1')\n" +
-                "        and sw.semireworkid > sr.semireworkid)";
+                "        and (sw.backoutflag = '0')\n" +
+                "        and sw.semireworkid > sr.semireworkid) )";
             }
             return sqlString;
         }

+ 7 - 0
DK.Service/ReportModuleLogic/ReportModuleLogic.csproj

@@ -74,6 +74,12 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Curtain.Core">
+      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Curtain.DataAccess">
+      <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
@@ -92,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReportDetailedLogic.cs" />
     <Compile Include="ReportModuleLogic.cs" />
   </ItemGroup>
   <ItemGroup>

+ 7 - 6
IBOSS.PRD/F_SYS_0202.cs

@@ -930,10 +930,14 @@ namespace Dongke.IBOSS.PRD.Client
 									this.ShowInDockPanel(F_RPT_040104.Instance);
 									// this.ShowInDockPanel(F_RPT_080101.Instance);
 									break;
-								#endregion
+                                case "080109":
+                                    // 半成检缺陷对照表(潮州)
+                                    this.ShowInDockPanel(F_RPT_080109.Instance);
+                                    break;
+                                #endregion
 
-								#region 质量报表
-								case "040105":
+                                #region 质量报表
+                                case "040105":
 									this.ShowInDockPanel(F_RPT_040105.Instance);
 									break;
 								case "040106":
@@ -947,9 +951,6 @@ namespace Dongke.IBOSS.PRD.Client
                                     // 综合合格率分析表
                                     this.ShowInDockPanel(F_RPT_040114.Instance);
                                     break;
-                                //case "040105":
-                                //    this.ShowInDockPanel(F_RPT_040105.Instance);
-                                //    break;
                                 #endregion
 
                                 #endregion

+ 10 - 0
WCF.Client/WCF.Proxys/ReportModuleProxy.cs

@@ -599,6 +599,16 @@ namespace Dongke.IBOSS.PRD.WCF.Proxys
         }
 
         /// <summary>
+        /// 取得RPT080109(半成检缺陷对照表)的查询数据
+        /// </summary>
+        /// <param name="se">查询条件</param>
+        /// <returns>查询结果</returns>
+        public ServiceResultEntity GetRPT080109DData(RPT030106_SE se)
+        {
+            return this.Invoker.Invoke<ServiceResultEntity>(p => p.GetRPT080109DData(se));
+        }
+
+        /// <summary>
         /// 窑车状态主表查询
         /// </summary>
         /// <param name="kilnCode">窑炉编码</param>

+ 56 - 0
WCF.Client/WCF.Proxys/Service References/ReportModuleService/Reference.cs

@@ -2672,6 +2672,58 @@ namespace Dongke.IBOSS.PRD.WCF.Proxys.ReportModuleService {
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.Basics.BaseResources.Constant.ServiceResultStatus))]
         Dongke.IBOSS.PRD.WCF.DataModels.ServiceResultEntity GetRPT030106ProData(Dongke.IBOSS.PRD.WCF.DataModels.RPT030106_SE se);
         
+        [System.ServiceModel.OperationContractAttribute(Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT080109DData", ReplyAction="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT080109DDataResponse")]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Exception))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.DBNull))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.ReportModule.SearchGoodsFollowingEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.PMModule.SearchProductionDataEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.PMModule.SearchFinishedProductEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, object>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT020101_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010101_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010102_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010103_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010105_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010106_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010201_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010301_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010401_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010402_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010403_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.GroutingLineEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT010302_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040101_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040102_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040103_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040104_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040105_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040106_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040107_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040108_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040109_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT040110_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030101_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030102_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030103_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030104_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030107_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030108_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030109_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030111_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030105_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT030106_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT080102_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.RPT080103_SE))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.CelsiusRecordEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.SemiCheckEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.SemiCheckDefectEntity[]))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.SemiCheckDefectEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.SemiCheckResponsibleEntity[]))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.SemiCheckResponsibleEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.WCF.DataModels.ClientRequestEntity))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(Dongke.IBOSS.PRD.Basics.BaseResources.Constant.ServiceResultStatus))]
+        Dongke.IBOSS.PRD.WCF.DataModels.ServiceResultEntity GetRPT080109DData(Dongke.IBOSS.PRD.WCF.DataModels.RPT030106_SE se);
+        
         [System.ServiceModel.OperationContractAttribute(Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetKilnCarStatusByCode", ReplyAction="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetKilnCarStatusByCodeResponse")]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Exception))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.DBNull))]
@@ -3589,6 +3641,10 @@ namespace Dongke.IBOSS.PRD.WCF.Proxys.ReportModuleService {
             return base.Channel.GetRPT030106ProData(se);
         }
         
+        public Dongke.IBOSS.PRD.WCF.DataModels.ServiceResultEntity GetRPT080109DData(Dongke.IBOSS.PRD.WCF.DataModels.RPT030106_SE se) {
+            return base.Channel.GetRPT080109DData(se);
+        }
+        
         public Dongke.IBOSS.PRD.WCF.DataModels.ServiceResultEntity GetKilnCarStatusByCode(string kilnCode, string kilnCarCode) {
             return base.Channel.GetKilnCarStatusByCode(kilnCode, kilnCarCode);
         }

+ 9 - 0
WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService2.wsdl

@@ -480,6 +480,15 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="GetRPT080109DData">
+      <soap12:operation soapAction="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT080109DData" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="GetKilnCarStatusByCode">
       <soap12:operation soapAction="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetKilnCarStatusByCode" style="document" />
       <wsdl:input>

+ 39 - 25
WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService2.xsd

@@ -738,6 +738,20 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="GetRPT080109DData">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q97="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q97:RPT030106_SE" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetRPT080109DDataResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q98="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080109DDataResult" nillable="true" type="q98:ServiceResultEntity" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="GetKilnCarStatusByCode">
     <xs:complexType>
       <xs:sequence>
@@ -749,7 +763,7 @@
   <xs:element name="GetKilnCarStatusByCodeResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q97="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetKilnCarStatusByCodeResult" nillable="true" type="q97:ServiceResultEntity" />
+        <xs:element xmlns:q99="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetKilnCarStatusByCodeResult" nillable="true" type="q99:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -763,70 +777,70 @@
   <xs:element name="GetKilnCarStatusDetailByCodeResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q98="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetKilnCarStatusDetailByCodeResult" nillable="true" type="q98:ServiceResultEntity" />
+        <xs:element xmlns:q100="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetKilnCarStatusDetailByCodeResult" nillable="true" type="q100:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080101SData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q99="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q99:RPT010201_SE" />
+        <xs:element xmlns:q101="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q101:RPT010201_SE" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080101SDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q100="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080101SDataResult" nillable="true" type="q100:ServiceResultEntity" />
+        <xs:element xmlns:q102="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080101SDataResult" nillable="true" type="q102:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080102SData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q101="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q101:RPT080102_SE" />
+        <xs:element xmlns:q103="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q103:RPT080102_SE" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080102SDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q102="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080102SDataResult" nillable="true" type="q102:ServiceResultEntity" />
+        <xs:element xmlns:q104="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080102SDataResult" nillable="true" type="q104:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080103SData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q103="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q103:RPT080103_SE" />
+        <xs:element xmlns:q105="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q105:RPT080103_SE" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080103SDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q104="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080103SDataResult" nillable="true" type="q104:ServiceResultEntity" />
+        <xs:element xmlns:q106="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080103SDataResult" nillable="true" type="q106:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080104SData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q105="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q105:RPT080103_SE" />
+        <xs:element xmlns:q107="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q107:RPT080103_SE" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080104SDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q106="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080104SDataResult" nillable="true" type="q106:ServiceResultEntity" />
+        <xs:element xmlns:q108="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080104SDataResult" nillable="true" type="q108:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetProductionData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q107="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="searchEntity" nillable="true" type="q107:SearchProductionDataEntity" />
+        <xs:element xmlns:q109="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="searchEntity" nillable="true" type="q109:SearchProductionDataEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -852,98 +866,98 @@
   <xs:element name="GetRPT080106IData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q108="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q108:CelsiusRecordEntity" />
+        <xs:element xmlns:q110="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q110:CelsiusRecordEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080106IDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q109="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080106IDataResult" nillable="true" type="q109:ServiceResultEntity" />
+        <xs:element xmlns:q111="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080106IDataResult" nillable="true" type="q111:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT030110Data">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q110="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q110:SemiCheckEntity" />
+        <xs:element xmlns:q112="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q112:SemiCheckEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT030110DataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q111="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT030110DataResult" nillable="true" type="q111:ServiceResultEntity" />
+        <xs:element xmlns:q113="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT030110DataResult" nillable="true" type="q113:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080107IData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q112="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q112:SemiCheckEntity" />
+        <xs:element xmlns:q114="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q114:SemiCheckEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080107IDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q113="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080107IDataResult" nillable="true" type="q113:ServiceResultEntity" />
+        <xs:element xmlns:q115="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080107IDataResult" nillable="true" type="q115:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080108IData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q114="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q114:SemiCheckEntity" />
+        <xs:element xmlns:q116="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="se" nillable="true" type="q116:SemiCheckEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT080108IDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q115="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080108IDataResult" nillable="true" type="q115:ServiceResultEntity" />
+        <xs:element xmlns:q117="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT080108IDataResult" nillable="true" type="q117:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT0030112SData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q116="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="se" nillable="true" type="q116:SearchFinishedProductEntity" />
+        <xs:element xmlns:q118="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="se" nillable="true" type="q118:SearchFinishedProductEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT0030112SDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q117="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT0030112SDataResult" nillable="true" type="q117:ServiceResultEntity" />
+        <xs:element xmlns:q119="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT0030112SDataResult" nillable="true" type="q119:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT0030112DetailSData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q118="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="se" nillable="true" type="q118:SearchFinishedProductEntity" />
+        <xs:element xmlns:q120="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels.PMModule" minOccurs="0" name="se" nillable="true" type="q120:SearchFinishedProductEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="GetRPT0030112DetailSDataResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q119="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT0030112DetailSDataResult" nillable="true" type="q119:ServiceResultEntity" />
+        <xs:element xmlns:q121="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="GetRPT0030112DetailSDataResult" nillable="true" type="q121:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="DoRequest">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q120="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="cre" nillable="true" type="q120:ClientRequestEntity" />
+        <xs:element xmlns:q122="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="cre" nillable="true" type="q122:ClientRequestEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="DoRequestResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q121="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="DoRequestResult" nillable="true" type="q121:ServiceResultEntity" />
+        <xs:element xmlns:q123="http://schemas.datacontract.org/2004/07/Dongke.IBOSS.PRD.WCF.DataModels" minOccurs="0" name="DoRequestResult" nillable="true" type="q123:ServiceResultEntity" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>

+ 10 - 0
WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService21.wsdl

@@ -326,6 +326,12 @@
   <wsdl:message name="IReportModule_GetRPT030106ProData_OutputMessage">
     <wsdl:part name="parameters" element="tns:GetRPT030106ProDataResponse" />
   </wsdl:message>
+  <wsdl:message name="IReportModule_GetRPT080109DData_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetRPT080109DData" />
+  </wsdl:message>
+  <wsdl:message name="IReportModule_GetRPT080109DData_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetRPT080109DDataResponse" />
+  </wsdl:message>
   <wsdl:message name="IReportModule_GetKilnCarStatusByCode_InputMessage">
     <wsdl:part name="parameters" element="tns:GetKilnCarStatusByCode" />
   </wsdl:message>
@@ -619,6 +625,10 @@
       <wsdl:input wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT030106ProData" message="tns:IReportModule_GetRPT030106ProData_InputMessage" />
       <wsdl:output wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT030106ProDataResponse" message="tns:IReportModule_GetRPT030106ProData_OutputMessage" />
     </wsdl:operation>
+    <wsdl:operation name="GetRPT080109DData">
+      <wsdl:input wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT080109DData" message="tns:IReportModule_GetRPT080109DData_InputMessage" />
+      <wsdl:output wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetRPT080109DDataResponse" message="tns:IReportModule_GetRPT080109DData_OutputMessage" />
+    </wsdl:operation>
     <wsdl:operation name="GetKilnCarStatusByCode">
       <wsdl:input wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetKilnCarStatusByCode" message="tns:IReportModule_GetKilnCarStatusByCode_InputMessage" />
       <wsdl:output wsaw:Action="Dongke.IBOSS.PRD.WCF.Contracts/IReportModule/GetKilnCarStatusByCodeResponse" message="tns:IReportModule_GetKilnCarStatusByCode_OutputMessage" />

+ 1 - 0
WCF.Client/WCF.Proxys/Service References/ReportModuleService/ReportModuleService8.xsd

@@ -232,6 +232,7 @@
       <xs:element minOccurs="0" name="GROUTINGLINENAME" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="GROUTINGLINENO" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="GoodsCode" nillable="true" type="xs:string" />
+      <xs:element minOccurs="0" name="HIGHPRESSUREFLAG" nillable="true" type="xs:int" />
       <xs:element minOccurs="0" name="MOULDQUANTITY" type="xs:decimal" />
       <xs:element minOccurs="0" name="MOULDTYPEID" nillable="true" type="xs:int" />
       <xs:element minOccurs="0" name="MOULDTYPENAME" nillable="true" type="xs:string" />

+ 9 - 0
WCF.Service/WCF.Contracts/IReportModule.cs

@@ -491,6 +491,15 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         ServiceResultEntity GetRPT030106ProData(RPT030106_SE se);
 
         /// <summary>
+        /// 取得RPT080109(半成检缺陷对照表)的查询数据
+        /// </summary>
+        /// <param name="user">登录用户信息</param>
+        /// <param name="se">查询条件</param>
+        /// <returns>查询结果</returns>
+        [OperationContract]
+        ServiceResultEntity GetRPT080109DData(RPT030106_SE se);
+
+        /// <summary>
         /// 窑车状态主表查询
         /// </summary>
         /// <param name="kilnCode">窑炉编码</param>

+ 37 - 9
WCF.Service/WCF.Hosting/ConfigMain.cs

@@ -7,7 +7,10 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows.Forms;
 using System.Xml.Linq;
+
+using Curtain.DataAccess;
 using Curtain.Log;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
@@ -305,6 +308,8 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
                                                 this.txtUser.Text.Trim(),
                                                 this.txtPassword.Text.Trim()
                                                 );
+                DataAccess.DefaultConnectionString = DataManager.ConnectionString;
+                DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
 
                 MessageBox.Show("数据库配置保存成功。", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
@@ -373,13 +378,38 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
                                             this.txtPassword.Text.Trim()
                                             );
 
-            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, conStr);
+            //IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, conStr);
+            //try
+            //{
+            //    oracleConn.Open();
+            //    string sql = "select 1 from dual";
+
+            //    DataSet returnDataSet = oracleConn.GetSqlResultToDs(sql);
+            //    DialogResult dialogResult = MessageBox.Show("数据库连接测试成功。\r\n是否保存数据库配置?",
+            //        this.Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+            //    if (DialogResult.Yes == dialogResult)
+            //    {
+            //        this.btnDBSave_Click(sender, e);
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    MessageBox.Show("数据库连接测试失败。", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            //    LogFileOperation.Error(ConfigConst.LogFileName, ex.ToString());
+            //}
+            //finally
+            //{
+            //    if (oracleConn.ConnState == ConnectionState.Open)
+            //    {
+            //        oracleConn.Close();
+            //    }
+            //}
+            IDataAccess dataAccess = null;
             try
             {
-                oracleConn.Open();
-                string sql = "select 1 from dual";
+                dataAccess = DataAccess.Create(Curtain.DataAccess.DataBaseType.Oracle, conStr);
 
-                DataSet returnDataSet = oracleConn.GetSqlResultToDs(sql);
+                dataAccess.ExecuteScalar("select sysdate from dual");
                 DialogResult dialogResult = MessageBox.Show("数据库连接测试成功。\r\n是否保存数据库配置?",
                     this.Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
                 if (DialogResult.Yes == dialogResult)
@@ -394,12 +424,8 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
             }
             finally
             {
-                if (oracleConn.ConnState == ConnectionState.Open)
-                {
-                    oracleConn.Close();
-                }
+                dataAccess?.Close();
             }
-
         }
         #endregion
 
@@ -756,6 +782,8 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
                                             this.txtUser.Text.Trim(),
                                             this.txtPassword.Text.Trim()
                                             );
+            DataAccess.DefaultConnectionString = DataManager.ConnectionString;
+            DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
         }
 
         /// <summary>

+ 4 - 0
WCF.Service/WCF.Hosting/WCF.Hosting.csproj

@@ -128,6 +128,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Curtain.DataAccess, Version=1.1.7285.24561, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>

+ 25 - 15
WCF.Service/WCF.Services/ReportModuleService.cs

@@ -576,14 +576,14 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 		public ServiceResultEntity GetRPT030106IData(RPT030106_SE se)
 		{
 			return ServiceInvoker.Invoke(this, () => ReportModuleLogic.GetRPT030106IData(this.SUserInfo, se));
-		}
+        }
 
-		/// <summary>
-		/// 取得RPT030106画面(成检缺陷汇总表-缺陷登记明细)的明细信息查询数据
-		/// </summary> 
-		/// <param name="se">查询条件</param>
-		/// <returns>查询结果</returns>
-		public ServiceResultEntity GetRPT030106DData(RPT030106_SE se)
+        /// <summary>
+        /// 取得RPT030106画面(成检缺陷汇总表-缺陷登记明细)的明细信息查询数据
+        /// </summary> 
+        /// <param name="se">查询条件</param>
+        /// <returns>查询结果</returns>
+        public ServiceResultEntity GetRPT030106DData(RPT030106_SE se)
 		{
 			return ServiceInvoker.Invoke(this, () => ReportModuleLogic.GetRPT030106DData(this.SUserInfo, se));
 		}
@@ -595,15 +595,25 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 		public ServiceResultEntity GetRPT030106ProData(RPT030106_SE se)
 		{
 			return ServiceInvoker.Invoke(this, () => ReportModuleLogic.GetRPT030106ProData(this.SUserInfo, se));
-		}
+        }
 
-		/// <summary>
-		/// 窑车状态主表查询
-		/// </summary>
-		/// <param name="kilnCode">窑炉编码</param>
-		/// <param name="kilnCarCode">窑车编码</param>
-		/// <returns></returns>
-		public ServiceResultEntity GetKilnCarStatusByCode(string kilnCode, string kilnCarCode)
+        /// <summary>
+        /// 取得RPT080109(半成检缺陷对照表)的查询数据
+        /// </summary> 
+        /// <param name="se">查询条件</param>
+        /// <returns>查询结果</returns>
+        public ServiceResultEntity GetRPT080109DData(RPT030106_SE se)
+        {
+            return ServiceInvoker.Invoke(this, () => ReportDetailedLogic.GetRPT080109DData(this.SUserInfo, se));
+        }
+
+        /// <summary>
+        /// 窑车状态主表查询
+        /// </summary>
+        /// <param name="kilnCode">窑炉编码</param>
+        /// <param name="kilnCarCode">窑车编码</param>
+        /// <returns></returns>
+        public ServiceResultEntity GetKilnCarStatusByCode(string kilnCode, string kilnCarCode)
 		{
 			return ServiceInvoker.Invoke(this, () => ReportModuleLogic.GetKilnCarStatusByCode(kilnCode, kilnCarCode, this.SUserInfo));
 		}

+ 3 - 0
WCF.Service/WCF.WebHosting/Global.asax.cs

@@ -4,6 +4,7 @@ using System.ServiceModel.Activation;
 using System.Timers;
 using System.Web;
 using System.Web.Routing;
+using Curtain.DataAccess;
 using Curtain.Log;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
@@ -28,6 +29,8 @@ namespace Dongke.IBOSS.PRD.WCF.WebHosting
                                             ini.ReadIniData("DBSetting", "DBUser"),
                                             Encryption.DecryptDES(ini.ReadIniData("DBSetting", "DBPassword"), Constant.S_ENCRYPTION_KEY)
                                             );
+            DataAccess.DefaultConnectionString = DataManager.ConnectionString;
+            DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
 
             // SAP接口自动调用
             InitSAP_HEGII(ini.ReadIniData("SAP_HEGII", "Interval"));

+ 4 - 0
WCF.Service/WCF.WebHosting/WCF.WebHosting.csproj

@@ -105,6 +105,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Curtain.DataAccess, Version=1.1.7285.24561, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel" />