未修复问题：已报废无法改回良品

DK.Client/PMModule/F_PM_3201.Designer.cs

@@ -32,14 +32,14 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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 dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle 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();
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
@@ -73,6 +73,16 @@
             this.txtBarCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.dgvProduction = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.dgvDefect = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.DefectName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectFine = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectDeductionNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectStaffNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.JobsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DefectRemarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Goodsleveltype = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.KilnCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -100,16 +110,6 @@
             this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dgvDefect = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.DefectName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectFine = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectDeductionNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectStaffNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.JobsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectRemarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -226,10 +226,10 @@
             this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
             this.gbxCondition.IsMustInput = false;
             this.gbxCondition.Location = new System.Drawing.Point(0, 49);
-            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
             this.gbxCondition.Size = new System.Drawing.Size(1453, 131);
             this.gbxCondition.TabIndex = 28;
             this.gbxCondition.TabStop = false;
@@ -253,7 +253,7 @@
             this.scbOrganization.CheckedData = null;
             this.scbOrganization.IsOnlyDisplayEnd = false;
             this.scbOrganization.Location = new System.Drawing.Point(352, 58);
-            this.scbOrganization.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbOrganization.Margin = new System.Windows.Forms.Padding(4);
             this.scbOrganization.Name = "scbOrganization";
             this.scbOrganization.Size = new System.Drawing.Size(179, 26);
             this.scbOrganization.TabIndex = 60;
@@ -276,7 +276,7 @@
             this.scbGoodsType.CheckedData = null;
             this.scbGoodsType.IsOnlyDisplayEnd = false;
             this.scbGoodsType.Location = new System.Drawing.Point(941, 22);
-            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
             this.scbGoodsType.Name = "scbGoodsType";
             this.scbGoodsType.Size = new System.Drawing.Size(179, 26);
             this.scbGoodsType.TabIndex = 58;
@@ -289,7 +289,7 @@
             this.txtKilnCarName.ErrorMessage = "";
             this.txtKilnCarName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtKilnCarName.Location = new System.Drawing.Point(352, 92);
-            this.txtKilnCarName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtKilnCarName.Margin = new System.Windows.Forms.Padding(4);
             this.txtKilnCarName.MaxLength = 500;
             this.txtKilnCarName.Name = "txtKilnCarName";
             this.txtKilnCarName.Size = new System.Drawing.Size(177, 25);
@@ -301,7 +301,7 @@
             this.cobKilnCarPosition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cobKilnCarPosition.FormattingEnabled = true;
             this.cobKilnCarPosition.Location = new System.Drawing.Point(649, 94);
-            this.cobKilnCarPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cobKilnCarPosition.Margin = new System.Windows.Forms.Padding(4);
             this.cobKilnCarPosition.Name = "cobKilnCarPosition";
             this.cobKilnCarPosition.Size = new System.Drawing.Size(177, 23);
             this.cobKilnCarPosition.TabIndex = 11;
@@ -338,7 +338,7 @@
             this.cobKilnName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cobKilnName.FormattingEnabled = true;
             this.cobKilnName.Location = new System.Drawing.Point(87, 94);
-            this.cobKilnName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cobKilnName.Margin = new System.Windows.Forms.Padding(4);
             this.cobKilnName.Name = "cobKilnName";
             this.cobKilnName.Size = new System.Drawing.Size(177, 23);
             this.cobKilnName.TabIndex = 9;
@@ -364,7 +364,7 @@
             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(1332, 84);
-            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
             this.btnClearCondition.TabIndex = 13;
@@ -380,7 +380,7 @@
             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(1211, 85);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(113, 38);
             this.btnSearch.TabIndex = 12;
@@ -406,7 +406,7 @@
             this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
             this.dtpEndTime.Location = new System.Drawing.Point(941, 58);
-            this.dtpEndTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dtpEndTime.Margin = new System.Windows.Forms.Padding(4);
             this.dtpEndTime.Name = "dtpEndTime";
             this.dtpEndTime.Size = new System.Drawing.Size(177, 25);
             this.dtpEndTime.TabIndex = 8;
@@ -417,7 +417,7 @@
             this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
             this.dtpStartTime.Location = new System.Drawing.Point(649, 58);
-            this.dtpStartTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dtpStartTime.Margin = new System.Windows.Forms.Padding(4);
             this.dtpStartTime.Name = "dtpStartTime";
             this.dtpStartTime.Size = new System.Drawing.Size(177, 25);
             this.dtpStartTime.TabIndex = 7;
@@ -496,7 +496,7 @@
             this.txtUserCode.ErrorMessage = "";
             this.txtUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUserCode.Location = new System.Drawing.Point(87, 58);
-            this.txtUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtUserCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtUserCode.MaxLength = 20;
             this.txtUserCode.Name = "txtUserCode";
             this.txtUserCode.Size = new System.Drawing.Size(177, 25);
@@ -509,7 +509,7 @@
             this.txtGoodsName.ErrorMessage = "";
             this.txtGoodsName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGoodsName.Location = new System.Drawing.Point(649, 22);
-            this.txtGoodsName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGoodsName.Margin = new System.Windows.Forms.Padding(4);
             this.txtGoodsName.MaxLength = 20;
             this.txtGoodsName.Name = "txtGoodsName";
             this.txtGoodsName.Size = new System.Drawing.Size(177, 25);
@@ -524,7 +524,7 @@
             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(352, 22);
-            this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtGoodsCode.MaxLength = 10;
             this.txtGoodsCode.Name = "txtGoodsCode";
             this.txtGoodsCode.Size = new System.Drawing.Size(177, 25);
@@ -538,7 +538,7 @@
             this.txtBarCode.ErrorMessage = "";
             this.txtBarCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBarCode.Location = new System.Drawing.Point(87, 22);
-            this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtBarCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtBarCode.MaxLength = 50;
             this.txtBarCode.Name = "txtBarCode";
             this.txtBarCode.Size = new System.Drawing.Size(177, 25);
@@ -550,7 +550,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.splitContainer1.Location = new System.Drawing.Point(0, 188);
-            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -656,6 +656,162 @@
             this.dgvProduction.ViewRowFilter = "";
             this.dgvProduction.SelectionChanged += new System.EventHandler(this.dgvProduction_SelectionChanged);
             // 
+            // dgvDefect
+            // 
+            this.dgvDefect.AllowUserToAddRows = false;
+            this.dgvDefect.AllowUserToModifyRows = true;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+            this.dgvDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvDefect.CellHeight = 23;
+            this.dgvDefect.ChildNodeColumnName = null;
+            this.dgvDefect.ChildNodeColumnText = null;
+            this.dgvDefect.ColumnDeep = 1;
+            this.dgvDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            this.dgvDefect.ColumnHeadersHeight = 29;
+            this.dgvDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.DefectName,
+            this.DefectPositionName,
+            this.DefectProcedureName,
+            this.DefectFine,
+            this.DefectDeductionNum,
+            this.DefectUserName,
+            this.DefectStaffNames,
+            this.JobsName,
+            this.DefectRemarks});
+            this.dgvDefect.ColumnTreeView = null;
+            this.dgvDefect.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.dgvDefect.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvDefect.DynamicColumnName = "";
+            this.dgvDefect.EnableHeadersVisualStyles = false;
+            this.dgvDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDefect.FormatQuantityColumns = null;
+            this.dgvDefect.HorizontalMergeColumn = null;
+            this.dgvDefect.IsAutoCountSum = true;
+            this.dgvDefect.IsAutoResizeColumns = false;
+            this.dgvDefect.IsClickF12 = false;
+            this.dgvDefect.IsOpenMergeCellFlag = false;
+            this.dgvDefect.IsSubTotalFlag = false;
+            this.dgvDefect.IsTopDeep = false;
+            this.dgvDefect.Location = new System.Drawing.Point(0, 0);
+            this.dgvDefect.Margin = new System.Windows.Forms.Padding(0);
+            this.dgvDefect.MergeColumnNames = null;
+            this.dgvDefect.MergeDetailColumnNames = null;
+            this.dgvDefect.MergeDetailOnlyColumn = null;
+            this.dgvDefect.MergeOnlyColumn = null;
+            this.dgvDefect.MultiSelect = false;
+            this.dgvDefect.Name = "dgvDefect";
+            this.dgvDefect.ReadOnly = true;
+            this.dgvDefect.RefreshAtHscroll = false;
+            this.dgvDefect.RowHeadersWidth = 50;
+            this.dgvDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle11;
+            this.dgvDefect.RowTemplate.Height = 25;
+            this.dgvDefect.Size = new System.Drawing.Size(1453, 214);
+            this.dgvDefect.SortOrderColumnName = null;
+            this.dgvDefect.TabIndex = 0;
+            this.dgvDefect.Tag = true;
+            this.dgvDefect.TotalSumColumns = null;
+            this.dgvDefect.ViewRowFilter = "";
+            // 
+            // DefectName
+            // 
+            this.DefectName.DataPropertyName = "DefectName";
+            this.DefectName.HeaderText = "缺陷";
+            this.DefectName.MinimumWidth = 6;
+            this.DefectName.Name = "DefectName";
+            this.DefectName.ReadOnly = true;
+            this.DefectName.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;
+            // 
+            // DefectProcedureName
+            // 
+            this.DefectProcedureName.DataPropertyName = "DefectProcedureName";
+            this.DefectProcedureName.HeaderText = "责任工序";
+            this.DefectProcedureName.MinimumWidth = 6;
+            this.DefectProcedureName.Name = "DefectProcedureName";
+            this.DefectProcedureName.ReadOnly = true;
+            this.DefectProcedureName.Width = 125;
+            // 
+            // DefectFine
+            // 
+            this.DefectFine.DataPropertyName = "DefectFine";
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.DefectFine.DefaultCellStyle = dataGridViewCellStyle9;
+            this.DefectFine.HeaderText = "缺陷扣罚";
+            this.DefectFine.MinimumWidth = 6;
+            this.DefectFine.Name = "DefectFine";
+            this.DefectFine.ReadOnly = true;
+            this.DefectFine.Width = 125;
+            // 
+            // DefectDeductionNum
+            // 
+            this.DefectDeductionNum.DataPropertyName = "DefectDeductionNum";
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.DefectDeductionNum.DefaultCellStyle = dataGridViewCellStyle10;
+            this.DefectDeductionNum.HeaderText = "缺陷扣除数";
+            this.DefectDeductionNum.MinimumWidth = 6;
+            this.DefectDeductionNum.Name = "DefectDeductionNum";
+            this.DefectDeductionNum.ReadOnly = true;
+            this.DefectDeductionNum.Width = 125;
+            // 
+            // DefectUserName
+            // 
+            this.DefectUserName.DataPropertyName = "DefectUserCode";
+            this.DefectUserName.HeaderText = "责任工号";
+            this.DefectUserName.MinimumWidth = 6;
+            this.DefectUserName.Name = "DefectUserName";
+            this.DefectUserName.ReadOnly = true;
+            this.DefectUserName.Width = 125;
+            // 
+            // DefectStaffNames
+            // 
+            this.DefectStaffNames.DataPropertyName = "DefectStaffNames";
+            this.DefectStaffNames.HeaderText = "责任员工";
+            this.DefectStaffNames.MinimumWidth = 6;
+            this.DefectStaffNames.Name = "DefectStaffNames";
+            this.DefectStaffNames.ReadOnly = true;
+            this.DefectStaffNames.Width = 125;
+            // 
+            // JobsName
+            // 
+            this.JobsName.DataPropertyName = "JobsName";
+            this.JobsName.HeaderText = "责任工种";
+            this.JobsName.MinimumWidth = 6;
+            this.JobsName.Name = "JobsName";
+            this.JobsName.ReadOnly = true;
+            this.JobsName.Width = 125;
+            // 
+            // DefectRemarks
+            // 
+            this.DefectRemarks.DataPropertyName = "Remarks";
+            this.DefectRemarks.HeaderText = "备注";
+            this.DefectRemarks.MaxInputLength = 200;
+            this.DefectRemarks.MinimumWidth = 6;
+            this.DefectRemarks.Name = "DefectRemarks";
+            this.DefectRemarks.ReadOnly = true;
+            this.DefectRemarks.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.DefectRemarks.Width = 200;
+            // 
             // BarCode
             // 
             this.BarCode.DataPropertyName = "BarCode";
@@ -681,6 +837,7 @@
             this.KilnCode.MinimumWidth = 6;
             this.KilnCode.Name = "KilnCode";
             this.KilnCode.ReadOnly = true;
+            this.KilnCode.Visible = false;
             this.KilnCode.Width = 125;
             // 
             // KilnCarCode
@@ -690,6 +847,7 @@
             this.KilnCarCode.MinimumWidth = 6;
             this.KilnCarCode.Name = "KilnCarCode";
             this.KilnCarCode.ReadOnly = true;
+            this.KilnCarCode.Visible = false;
             this.KilnCarCode.Width = 125;
             // 
             // KilnCarPositionName
@@ -699,6 +857,7 @@
             this.KilnCarPositionName.MinimumWidth = 6;
             this.KilnCarPositionName.Name = "KilnCarPositionName";
             this.KilnCarPositionName.ReadOnly = true;
+            this.KilnCarPositionName.Visible = false;
             this.KilnCarPositionName.Width = 125;
             // 
             // ProductionDataID
@@ -923,162 +1082,6 @@
             this.LogoCodeName.ReadOnly = true;
             this.LogoCodeName.Width = 125;
             // 
-            // dgvDefect
-            // 
-            this.dgvDefect.AllowUserToAddRows = false;
-            this.dgvDefect.AllowUserToModifyRows = true;
-            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
-            this.dgvDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvDefect.CellHeight = 23;
-            this.dgvDefect.ChildNodeColumnName = null;
-            this.dgvDefect.ChildNodeColumnText = null;
-            this.dgvDefect.ColumnDeep = 1;
-            this.dgvDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
-            this.dgvDefect.ColumnHeadersHeight = 29;
-            this.dgvDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.DefectName,
-            this.DefectPositionName,
-            this.DefectProcedureName,
-            this.DefectFine,
-            this.DefectDeductionNum,
-            this.DefectUserName,
-            this.DefectStaffNames,
-            this.JobsName,
-            this.DefectRemarks});
-            this.dgvDefect.ColumnTreeView = null;
-            this.dgvDefect.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.dgvDefect.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvDefect.DynamicColumnName = "";
-            this.dgvDefect.EnableHeadersVisualStyles = false;
-            this.dgvDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvDefect.FormatQuantityColumns = null;
-            this.dgvDefect.HorizontalMergeColumn = null;
-            this.dgvDefect.IsAutoCountSum = true;
-            this.dgvDefect.IsAutoResizeColumns = false;
-            this.dgvDefect.IsClickF12 = false;
-            this.dgvDefect.IsOpenMergeCellFlag = false;
-            this.dgvDefect.IsSubTotalFlag = false;
-            this.dgvDefect.IsTopDeep = false;
-            this.dgvDefect.Location = new System.Drawing.Point(0, 0);
-            this.dgvDefect.Margin = new System.Windows.Forms.Padding(0);
-            this.dgvDefect.MergeColumnNames = null;
-            this.dgvDefect.MergeDetailColumnNames = null;
-            this.dgvDefect.MergeDetailOnlyColumn = null;
-            this.dgvDefect.MergeOnlyColumn = null;
-            this.dgvDefect.MultiSelect = false;
-            this.dgvDefect.Name = "dgvDefect";
-            this.dgvDefect.ReadOnly = true;
-            this.dgvDefect.RefreshAtHscroll = false;
-            this.dgvDefect.RowHeadersWidth = 50;
-            this.dgvDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle11;
-            this.dgvDefect.RowTemplate.Height = 25;
-            this.dgvDefect.Size = new System.Drawing.Size(1453, 214);
-            this.dgvDefect.SortOrderColumnName = null;
-            this.dgvDefect.TabIndex = 0;
-            this.dgvDefect.Tag = true;
-            this.dgvDefect.TotalSumColumns = null;
-            this.dgvDefect.ViewRowFilter = "";
-            // 
-            // DefectName
-            // 
-            this.DefectName.DataPropertyName = "DefectName";
-            this.DefectName.HeaderText = "缺陷";
-            this.DefectName.MinimumWidth = 6;
-            this.DefectName.Name = "DefectName";
-            this.DefectName.ReadOnly = true;
-            this.DefectName.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;
-            // 
-            // DefectProcedureName
-            // 
-            this.DefectProcedureName.DataPropertyName = "DefectProcedureName";
-            this.DefectProcedureName.HeaderText = "责任工序";
-            this.DefectProcedureName.MinimumWidth = 6;
-            this.DefectProcedureName.Name = "DefectProcedureName";
-            this.DefectProcedureName.ReadOnly = true;
-            this.DefectProcedureName.Width = 125;
-            // 
-            // DefectFine
-            // 
-            this.DefectFine.DataPropertyName = "DefectFine";
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.DefectFine.DefaultCellStyle = dataGridViewCellStyle9;
-            this.DefectFine.HeaderText = "缺陷扣罚";
-            this.DefectFine.MinimumWidth = 6;
-            this.DefectFine.Name = "DefectFine";
-            this.DefectFine.ReadOnly = true;
-            this.DefectFine.Width = 125;
-            // 
-            // DefectDeductionNum
-            // 
-            this.DefectDeductionNum.DataPropertyName = "DefectDeductionNum";
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.DefectDeductionNum.DefaultCellStyle = dataGridViewCellStyle10;
-            this.DefectDeductionNum.HeaderText = "缺陷扣除数";
-            this.DefectDeductionNum.MinimumWidth = 6;
-            this.DefectDeductionNum.Name = "DefectDeductionNum";
-            this.DefectDeductionNum.ReadOnly = true;
-            this.DefectDeductionNum.Width = 125;
-            // 
-            // DefectUserName
-            // 
-            this.DefectUserName.DataPropertyName = "DefectUserCode";
-            this.DefectUserName.HeaderText = "责任工号";
-            this.DefectUserName.MinimumWidth = 6;
-            this.DefectUserName.Name = "DefectUserName";
-            this.DefectUserName.ReadOnly = true;
-            this.DefectUserName.Width = 125;
-            // 
-            // DefectStaffNames
-            // 
-            this.DefectStaffNames.DataPropertyName = "DefectStaffNames";
-            this.DefectStaffNames.HeaderText = "责任员工";
-            this.DefectStaffNames.MinimumWidth = 6;
-            this.DefectStaffNames.Name = "DefectStaffNames";
-            this.DefectStaffNames.ReadOnly = true;
-            this.DefectStaffNames.Width = 125;
-            // 
-            // JobsName
-            // 
-            this.JobsName.DataPropertyName = "JobsName";
-            this.JobsName.HeaderText = "责任工种";
-            this.JobsName.MinimumWidth = 6;
-            this.JobsName.Name = "JobsName";
-            this.JobsName.ReadOnly = true;
-            this.JobsName.Width = 125;
-            // 
-            // DefectRemarks
-            // 
-            this.DefectRemarks.DataPropertyName = "Remarks";
-            this.DefectRemarks.HeaderText = "备注";
-            this.DefectRemarks.MaxInputLength = 200;
-            this.DefectRemarks.MinimumWidth = 6;
-            this.DefectRemarks.Name = "DefectRemarks";
-            this.DefectRemarks.ReadOnly = true;
-            this.DefectRemarks.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.DefectRemarks.Width = 200;
-            // 
             // F_PM_3201
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -1088,7 +1091,7 @@
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.tsrOperate);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_PM_3201";
             this.Text = "半检一览";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PM_3201_FormClosed);
@@ -1139,6 +1142,19 @@
         private System.Windows.Forms.SplitContainer splitContainer1;
         private Basics.BaseControls.C_DataGridView dgvProduction;
         private Basics.BaseControls.C_DataGridView dgvDefect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectPositionName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectProcedureName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectFine;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectDeductionNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectUserName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectStaffNames;
+        private System.Windows.Forms.DataGridViewTextBoxColumn JobsName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DefectRemarks;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+		private Basics.BaseControls.C_Label lblOrganization;
+		private Controls.SearchBox.ScbOrganization scbOrganization;
         private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn Goodsleveltype;
         private System.Windows.Forms.DataGridViewTextBoxColumn KilnCode;
@@ -1166,18 +1182,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
         private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
         private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectPositionName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectProcedureName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectFine;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectDeductionNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectUserName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectStaffNames;
-        private System.Windows.Forms.DataGridViewTextBoxColumn JobsName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DefectRemarks;
-		private Basics.BaseControls.C_Label lblGoodsType;
-		private Controls.SearchBox.ScbGoodsType scbGoodsType;
-		private Basics.BaseControls.C_Label lblOrganization;
-		private Controls.SearchBox.ScbOrganization scbOrganization;
-	}
+    }
 }

DK.Client/PMModule/F_PM_3202.cs

@@ -1447,9 +1447,12 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                             break;
                         }
                     }
-                    if (Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) != (int)Constant.GoodsLevelType.NoDefects) //良品 xuwei modify 2019-12-13
+                    if (Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) != (int)Constant.GoodsLevelType.NoDefects 
+                        &&
+                        Convert.ToInt32(this.TableProductionData.Rows[i]["GoodsLevelTypeID"]) != 15
+                        ) //良品 或 复检 xuwei modify 2019-12-13
                     {
-                        // 不是良品
+                        // 不是 良品 和 复检
                         if (this.DSTable.Tables[productionDataEntity.Barcode].Rows.Count == Constant.INT_IS_ZERO)
                         {
                             isError = true;

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -9232,11 +9232,17 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     }
 
                     #endregion
-                    //如果原来是次品
-                    if (productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode())
+                    //如果原来是 次品 / 废品 xuwei modify 2019-12-13 加入 废品识别
+                    if (productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
+                        || 
+                        productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                        )
                     {
-                        //改为次品
-                        if (productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode())
+                        //改为 次品 废品 xuwei modify 2019-12-13 加入废品识别
+                        if (productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
+                            ||
+                            productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                            )
                         {
                             // 删除生产数据及相关表与报损表
                             errMsg = DeleteSubstandardToSubstandardByID(oracleTrConn, productionData.ProductionDataID, productionData.Barcode, sUserInfo);
@@ -9245,8 +9251,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 return errMsg;
                             }
                             RejectToReject = true;
-                        } //改为不是次品
-                        else if (productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Reject.GetHashCode())
+                        } //改为不是 次品 废品 xuwei modify 2019-12-13 加入废品识别
+                        else if (productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Reject.GetHashCode()
+                            ||
+                            productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Waste.GetHashCode()
+                            )
                         {
                             // 删除生产数据及相关表与报损表
                             errMsg = DeleteSubstandardToOtherByID(oracleTrConn, productionData.ProductionDataID, productionData.Barcode, sUserInfo);
@@ -9342,8 +9351,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     productionData.IsReFire = (int)Constant.ReFireFlag.No;//产品分级的时候，并不标记，走过重烧第一个结点之后，更新此字段
 
                 }
-                // 次品
-                else if (productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Reject)
+                // 次品 废品 xuwei 2019-12-13 加入 废品识别
+                else if (productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Reject
+                        ||
+                        productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Waste
+                    )
                 {
                     //productionData.GoodsLevelID = null;
                     substandardFlag = true;

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -994,7 +994,23 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 		{
 			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
 			string procsql = "";//PRO_PM_GetProductionDataPDA
-			procsql = @"SELECT TP_PM_ProductionDataIn.ProductionDataID  FROM TP_PM_ProductionDataIn where valueflag=1 and 1=1 and ProcedureID=" + searchEntity.ProcedureID + " and barcode='" + searchEntity.BarCode + "'  order by TP_PM_ProductionDataIn.ProductionDataid desc";
+
+			//xuwei modify 2019-12-13 修正读取当前工序 是编辑还是插入
+			//procsql = @"SELECT TP_PM_ProductionDataIn.ProductionDataID  FROM TP_PM_ProductionDataIn where valueflag=1 and 1=1 and ProcedureID=" + searchEntity.ProcedureID + " and barcode='" + searchEntity.BarCode + "'  order by TP_PM_ProductionDataIn.ProductionDataid desc";
+			procsql = $@"
+				SELECT
+					TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID
+				FROM
+					TP_PM_PRODUCTIONDATAIN 
+				WHERE
+					VALUEFLAG = 1 
+					AND 1 = 1 
+					AND PROCEDUREID = {searchEntity.ProcedureID} 
+					AND BARCODE = '{searchEntity.BarCode}' 
+					AND PRODUCTIONDATAID = ( SELECT MAX( PRODUCTIONDATAID ) FROM TP_PM_PRODUCTIONDATAIN WHERE BARCODE = '{searchEntity.BarCode}' )
+				ORDER BY
+					TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID DESC
+			";
 
 			try
 			{