修改BUG

DK.Client/PCModule/F_PC_0104_1.Designer.cs

@@ -28,23 +28,23 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0104_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = 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();
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
@@ -57,26 +57,6 @@
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.dgvGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.HIGHPRESSUREFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.monitorcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.staffCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goosCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BeginUsedDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.EndUsedDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.valueflag2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.txtEndUsedDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
@@ -151,6 +131,27 @@
             this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HIGHPRESSUREFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.monitorcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.staffCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goosCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BeginUsedDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.EndUsedDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.non_sap = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.valueflag2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).BeginInit();
             this.gbxCondition.SuspendLayout();
@@ -289,8 +290,8 @@
             this.dgvGroutingLine.AllowUserToDeleteRows = false;
             this.dgvGroutingLine.AllowUserToModifyRows = true;
             this.dgvGroutingLine.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGroutingLine.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGroutingLine.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvGroutingLine.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvGroutingLine.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvGroutingLine.CellHeight = 23;
@@ -298,14 +299,14 @@
             this.dgvGroutingLine.ChildNodeColumnText = null;
             this.dgvGroutingLine.ColumnDeep = 1;
             this.dgvGroutingLine.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGroutingLine.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
+            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.dgvGroutingLine.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvGroutingLine.ColumnHeadersHeight = 29;
             this.dgvGroutingLine.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGroutingLine.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -326,19 +327,20 @@
             this.BeginUsedDate,
             this.EndUsedDate,
             this.GMOULDSTATUSNAME,
+            this.non_sap,
             this.valueflag2,
             this.Remarks,
             this.GMouldStatus});
             this.dgvGroutingLine.ColumnTreeView = null;
             this.dgvGroutingLine.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)));
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGroutingLine.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGroutingLine.DefaultCellStyle = dataGridViewCellStyle5;
             this.dgvGroutingLine.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGroutingLine.DynamicColumnName = "";
             this.dgvGroutingLine.EnableHeadersVisualStyles = false;
@@ -362,8 +364,8 @@
             this.dgvGroutingLine.RefreshAtHscroll = false;
             this.dgvGroutingLine.RowHeadersWidth = 50;
             this.dgvGroutingLine.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvGroutingLine.RowTemplate.Height = 21;
             this.dgvGroutingLine.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvGroutingLine.ShowEditingIcon = false;
@@ -377,206 +379,6 @@
             this.dgvGroutingLine.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvGroutingLine_ColumnHeaderMouseClick);
             this.dgvGroutingLine.SelectionChanged += new System.EventHandler(this.dgvGroutingLine_SelectionChanged);
             // 
-            // GroutingLineID
-            // 
-            this.GroutingLineID.DataPropertyName = "GroutingLineID";
-            this.GroutingLineID.HeaderText = "成型生产线ID";
-            this.GroutingLineID.MinimumWidth = 6;
-            this.GroutingLineID.Name = "GroutingLineID";
-            this.GroutingLineID.ReadOnly = true;
-            this.GroutingLineID.Visible = false;
-            this.GroutingLineID.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;
-            // 
-            // GroutingLineName
-            // 
-            this.GroutingLineName.DataPropertyName = "GroutingLineName";
-            this.GroutingLineName.HeaderText = "成型线名称";
-            this.GroutingLineName.MinimumWidth = 6;
-            this.GroutingLineName.Name = "GroutingLineName";
-            this.GroutingLineName.ReadOnly = true;
-            this.GroutingLineName.Width = 125;
-            // 
-            // ValueFlag
-            // 
-            this.ValueFlag.DataPropertyName = "ValueFlag";
-            this.ValueFlag.FalseValue = "0";
-            this.ValueFlag.HeaderText = "有效标识";
-            this.ValueFlag.MinimumWidth = 6;
-            this.ValueFlag.Name = "ValueFlag";
-            this.ValueFlag.ReadOnly = true;
-            this.ValueFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.ValueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.ValueFlag.TrueValue = "1";
-            this.ValueFlag.Visible = false;
-            this.ValueFlag.Width = 125;
-            // 
-            // BuildingNo
-            // 
-            this.BuildingNo.DataPropertyName = "BuildingNo";
-            this.BuildingNo.HeaderText = "楼号";
-            this.BuildingNo.MinimumWidth = 6;
-            this.BuildingNo.Name = "BuildingNo";
-            this.BuildingNo.ReadOnly = true;
-            this.BuildingNo.Width = 125;
-            // 
-            // FloorNo
-            // 
-            this.FloorNo.DataPropertyName = "FloorNo";
-            this.FloorNo.HeaderText = "楼层";
-            this.FloorNo.MinimumWidth = 6;
-            this.FloorNo.Name = "FloorNo";
-            this.FloorNo.ReadOnly = true;
-            this.FloorNo.Width = 125;
-            // 
-            // GroutingLineNo
-            // 
-            this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
-            this.GroutingLineNo.HeaderText = "线号";
-            this.GroutingLineNo.MinimumWidth = 6;
-            this.GroutingLineNo.Name = "GroutingLineNo";
-            this.GroutingLineNo.ReadOnly = true;
-            this.GroutingLineNo.Width = 125;
-            // 
-            // MouldQuantity
-            // 
-            this.MouldQuantity.DataPropertyName = "MouldQuantity";
-            this.MouldQuantity.HeaderText = "模具个数";
-            this.MouldQuantity.MinimumWidth = 6;
-            this.MouldQuantity.Name = "MouldQuantity";
-            this.MouldQuantity.ReadOnly = true;
-            this.MouldQuantity.Width = 125;
-            // 
-            // GMouldTypeName
-            // 
-            this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
-            this.GMouldTypeName.HeaderText = "成型线类型";
-            this.GMouldTypeName.MinimumWidth = 6;
-            this.GMouldTypeName.Name = "GMouldTypeName";
-            this.GMouldTypeName.ReadOnly = true;
-            this.GMouldTypeName.Width = 125;
-            // 
-            // HIGHPRESSUREFLAG
-            // 
-            this.HIGHPRESSUREFLAG.DataPropertyName = "HIGHPRESSUREFLAG";
-            this.HIGHPRESSUREFLAG.FalseValue = "0";
-            this.HIGHPRESSUREFLAG.HeaderText = "高压注浆";
-            this.HIGHPRESSUREFLAG.MinimumWidth = 6;
-            this.HIGHPRESSUREFLAG.Name = "HIGHPRESSUREFLAG";
-            this.HIGHPRESSUREFLAG.ReadOnly = true;
-            this.HIGHPRESSUREFLAG.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.HIGHPRESSUREFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.HIGHPRESSUREFLAG.TrueValue = "1";
-            this.HIGHPRESSUREFLAG.Width = 125;
-            // 
-            // monitorcode
-            // 
-            this.monitorcode.DataPropertyName = "monitorcode";
-            this.monitorcode.HeaderText = "成型班长";
-            this.monitorcode.MinimumWidth = 6;
-            this.monitorcode.Name = "monitorcode";
-            this.monitorcode.ReadOnly = true;
-            this.monitorcode.Width = 125;
-            // 
-            // UserCode
-            // 
-            this.UserCode.DataPropertyName = "userCodeList";
-            this.UserCode.HeaderText = "成型工号";
-            this.UserCode.MinimumWidth = 6;
-            this.UserCode.Name = "UserCode";
-            this.UserCode.ReadOnly = true;
-            this.UserCode.Width = 125;
-            // 
-            // staffCodeList
-            // 
-            this.staffCodeList.DataPropertyName = "staffCodeList";
-            this.staffCodeList.HeaderText = "员工姓名";
-            this.staffCodeList.MinimumWidth = 6;
-            this.staffCodeList.Name = "staffCodeList";
-            this.staffCodeList.ReadOnly = true;
-            this.staffCodeList.Width = 125;
-            // 
-            // goosCodeList
-            // 
-            this.goosCodeList.DataPropertyName = "goosCodeList";
-            this.goosCodeList.HeaderText = "产品编码";
-            this.goosCodeList.MinimumWidth = 6;
-            this.goosCodeList.Name = "goosCodeList";
-            this.goosCodeList.ReadOnly = true;
-            this.goosCodeList.Width = 125;
-            // 
-            // BeginUsedDate
-            // 
-            this.BeginUsedDate.DataPropertyName = "BeginUsedDate";
-            dataGridViewCellStyle20.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle20.NullValue = null;
-            this.BeginUsedDate.DefaultCellStyle = dataGridViewCellStyle20;
-            this.BeginUsedDate.HeaderText = "开始使用日期";
-            this.BeginUsedDate.MinimumWidth = 6;
-            this.BeginUsedDate.Name = "BeginUsedDate";
-            this.BeginUsedDate.ReadOnly = true;
-            this.BeginUsedDate.Width = 120;
-            // 
-            // EndUsedDate
-            // 
-            this.EndUsedDate.DataPropertyName = "EndUsedDate";
-            dataGridViewCellStyle21.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle21.NullValue = null;
-            this.EndUsedDate.DefaultCellStyle = dataGridViewCellStyle21;
-            this.EndUsedDate.HeaderText = "结束使用日期";
-            this.EndUsedDate.MinimumWidth = 6;
-            this.EndUsedDate.Name = "EndUsedDate";
-            this.EndUsedDate.ReadOnly = true;
-            this.EndUsedDate.Width = 120;
-            // 
-            // GMOULDSTATUSNAME
-            // 
-            this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
-            this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
-            this.GMOULDSTATUSNAME.MinimumWidth = 6;
-            this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
-            this.GMOULDSTATUSNAME.ReadOnly = true;
-            this.GMOULDSTATUSNAME.Width = 120;
-            // 
-            // valueflag2
-            // 
-            this.valueflag2.DataPropertyName = "valueflag2";
-            this.valueflag2.FalseValue = "2";
-            this.valueflag2.HeaderText = "有效标识";
-            this.valueflag2.MinimumWidth = 6;
-            this.valueflag2.Name = "valueflag2";
-            this.valueflag2.ReadOnly = true;
-            this.valueflag2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.valueflag2.TrueValue = "1";
-            this.valueflag2.Width = 125;
-            // 
-            // Remarks
-            // 
-            this.Remarks.DataPropertyName = "Remarks";
-            this.Remarks.HeaderText = "备注";
-            this.Remarks.MinimumWidth = 6;
-            this.Remarks.Name = "Remarks";
-            this.Remarks.ReadOnly = true;
-            this.Remarks.Width = 125;
-            // 
-            // GMouldStatus
-            // 
-            this.GMouldStatus.DataPropertyName = "GMouldStatus";
-            this.GMouldStatus.HeaderText = "GMouldStatus";
-            this.GMouldStatus.MinimumWidth = 6;
-            this.GMouldStatus.Name = "GMouldStatus";
-            this.GMouldStatus.ReadOnly = true;
-            this.GMouldStatus.Visible = false;
-            this.GMouldStatus.Width = 125;
-            // 
             // btnClearCondition
             // 
             this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1008,8 +810,8 @@
             this.dgvGroutingLineDetail.AllowUserToDeleteRows = false;
             this.dgvGroutingLineDetail.AllowUserToModifyRows = true;
             this.dgvGroutingLineDetail.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGroutingLineDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGroutingLineDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvGroutingLineDetail.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvGroutingLineDetail.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvGroutingLineDetail.CellHeight = 23;
@@ -1017,14 +819,14 @@
             this.dgvGroutingLineDetail.ChildNodeColumnText = null;
             this.dgvGroutingLineDetail.ColumnDeep = 1;
             this.dgvGroutingLineDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGroutingLineDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            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.dgvGroutingLineDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvGroutingLineDetail.ColumnHeadersHeight = 29;
             this.dgvGroutingLineDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGroutingLineDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1047,14 +849,14 @@
             this.RecordRemarks});
             this.dgvGroutingLineDetail.ColumnTreeView = null;
             this.dgvGroutingLineDetail.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)));
-            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGroutingLineDetail.DefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGroutingLineDetail.DefaultCellStyle = dataGridViewCellStyle13;
             this.dgvGroutingLineDetail.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGroutingLineDetail.DynamicColumnName = "";
             this.dgvGroutingLineDetail.EnableHeadersVisualStyles = false;
@@ -1078,8 +880,8 @@
             this.dgvGroutingLineDetail.RefreshAtHscroll = false;
             this.dgvGroutingLineDetail.RowHeadersWidth = 50;
             this.dgvGroutingLineDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGroutingLineDetail.RowsDefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGroutingLineDetail.RowsDefaultCellStyle = dataGridViewCellStyle14;
             this.dgvGroutingLineDetail.RowTemplate.Height = 21;
             this.dgvGroutingLineDetail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvGroutingLineDetail.Size = new System.Drawing.Size(1016, 158);
@@ -1188,8 +990,8 @@
             // StandardGroutingCount
             // 
             this.StandardGroutingCount.DataPropertyName = "StandardGroutingCount";
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle9;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
             this.StandardGroutingCount.MinimumWidth = 6;
             this.StandardGroutingCount.Name = "StandardGroutingCount";
@@ -1199,8 +1001,8 @@
             // GroutingCount
             // 
             this.GroutingCount.DataPropertyName = "GroutingCount";
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle27;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle10;
             this.GroutingCount.HeaderText = "注浆次数";
             this.GroutingCount.MinimumWidth = 6;
             this.GroutingCount.Name = "GroutingCount";
@@ -1219,9 +1021,9 @@
             // BeginUsedDateM
             // 
             this.BeginUsedDateM.DataPropertyName = "BeginUsedDate";
-            dataGridViewCellStyle28.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle28.NullValue = null;
-            this.BeginUsedDateM.DefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle11.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle11.NullValue = null;
+            this.BeginUsedDateM.DefaultCellStyle = dataGridViewCellStyle11;
             this.BeginUsedDateM.HeaderText = "开始使用日期";
             this.BeginUsedDateM.MinimumWidth = 6;
             this.BeginUsedDateM.Name = "BeginUsedDateM";
@@ -1231,8 +1033,8 @@
             // EndUsedDate2
             // 
             this.EndUsedDate2.DataPropertyName = "EndUsedDate";
-            dataGridViewCellStyle29.Format = "yyyy-MM-dd";
-            this.EndUsedDate2.DefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle12.Format = "yyyy-MM-dd";
+            this.EndUsedDate2.DefaultCellStyle = dataGridViewCellStyle12;
             this.EndUsedDate2.HeaderText = "结束使用日期";
             this.EndUsedDate2.MinimumWidth = 6;
             this.EndUsedDate2.Name = "EndUsedDate2";
@@ -1353,9 +1155,9 @@
             // dataGridViewTextBoxColumn10
             // 
             this.dataGridViewTextBoxColumn10.DataPropertyName = "BeginUsedDate";
-            dataGridViewCellStyle32.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle32.NullValue = null;
-            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle32;
+            dataGridViewCellStyle15.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle15.NullValue = null;
+            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle15;
             this.dataGridViewTextBoxColumn10.HeaderText = "开始使用日期";
             this.dataGridViewTextBoxColumn10.MinimumWidth = 6;
             this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
@@ -1364,9 +1166,9 @@
             // dataGridViewTextBoxColumn11
             // 
             this.dataGridViewTextBoxColumn11.DataPropertyName = "EndUsedDate";
-            dataGridViewCellStyle33.Format = "yyyy-MM-dd HH:mm:ss";
-            dataGridViewCellStyle33.NullValue = null;
-            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle16.Format = "yyyy-MM-dd HH:mm:ss";
+            dataGridViewCellStyle16.NullValue = null;
+            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle16;
             this.dataGridViewTextBoxColumn11.HeaderText = "结束使用日期";
             this.dataGridViewTextBoxColumn11.MinimumWidth = 6;
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
@@ -1475,14 +1277,225 @@
             // dataGridViewTextBoxColumn24
             // 
             this.dataGridViewTextBoxColumn24.DataPropertyName = "BeginUsedDate";
-            dataGridViewCellStyle34.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle34.NullValue = null;
-            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle34;
+            dataGridViewCellStyle17.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle17.NullValue = null;
+            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle17;
             this.dataGridViewTextBoxColumn24.HeaderText = "开始使用日期";
             this.dataGridViewTextBoxColumn24.MinimumWidth = 6;
             this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
             this.dataGridViewTextBoxColumn24.Width = 120;
             // 
+            // GroutingLineID
+            // 
+            this.GroutingLineID.DataPropertyName = "GroutingLineID";
+            this.GroutingLineID.HeaderText = "成型生产线ID";
+            this.GroutingLineID.MinimumWidth = 6;
+            this.GroutingLineID.Name = "GroutingLineID";
+            this.GroutingLineID.ReadOnly = true;
+            this.GroutingLineID.Visible = false;
+            this.GroutingLineID.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;
+            // 
+            // GroutingLineName
+            // 
+            this.GroutingLineName.DataPropertyName = "GroutingLineName";
+            this.GroutingLineName.HeaderText = "成型线名称";
+            this.GroutingLineName.MinimumWidth = 6;
+            this.GroutingLineName.Name = "GroutingLineName";
+            this.GroutingLineName.ReadOnly = true;
+            this.GroutingLineName.Width = 125;
+            // 
+            // ValueFlag
+            // 
+            this.ValueFlag.DataPropertyName = "ValueFlag";
+            this.ValueFlag.FalseValue = "0";
+            this.ValueFlag.HeaderText = "有效标识";
+            this.ValueFlag.MinimumWidth = 6;
+            this.ValueFlag.Name = "ValueFlag";
+            this.ValueFlag.ReadOnly = true;
+            this.ValueFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.ValueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.ValueFlag.TrueValue = "1";
+            this.ValueFlag.Visible = false;
+            this.ValueFlag.Width = 125;
+            // 
+            // BuildingNo
+            // 
+            this.BuildingNo.DataPropertyName = "BuildingNo";
+            this.BuildingNo.HeaderText = "楼号";
+            this.BuildingNo.MinimumWidth = 6;
+            this.BuildingNo.Name = "BuildingNo";
+            this.BuildingNo.ReadOnly = true;
+            this.BuildingNo.Width = 125;
+            // 
+            // FloorNo
+            // 
+            this.FloorNo.DataPropertyName = "FloorNo";
+            this.FloorNo.HeaderText = "楼层";
+            this.FloorNo.MinimumWidth = 6;
+            this.FloorNo.Name = "FloorNo";
+            this.FloorNo.ReadOnly = true;
+            this.FloorNo.Width = 125;
+            // 
+            // GroutingLineNo
+            // 
+            this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
+            this.GroutingLineNo.HeaderText = "线号";
+            this.GroutingLineNo.MinimumWidth = 6;
+            this.GroutingLineNo.Name = "GroutingLineNo";
+            this.GroutingLineNo.ReadOnly = true;
+            this.GroutingLineNo.Width = 125;
+            // 
+            // MouldQuantity
+            // 
+            this.MouldQuantity.DataPropertyName = "MouldQuantity";
+            this.MouldQuantity.HeaderText = "模具个数";
+            this.MouldQuantity.MinimumWidth = 6;
+            this.MouldQuantity.Name = "MouldQuantity";
+            this.MouldQuantity.ReadOnly = true;
+            this.MouldQuantity.Width = 125;
+            // 
+            // GMouldTypeName
+            // 
+            this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
+            this.GMouldTypeName.HeaderText = "成型线类型";
+            this.GMouldTypeName.MinimumWidth = 6;
+            this.GMouldTypeName.Name = "GMouldTypeName";
+            this.GMouldTypeName.ReadOnly = true;
+            this.GMouldTypeName.Width = 125;
+            // 
+            // HIGHPRESSUREFLAG
+            // 
+            this.HIGHPRESSUREFLAG.DataPropertyName = "HIGHPRESSUREFLAG";
+            this.HIGHPRESSUREFLAG.FalseValue = "0";
+            this.HIGHPRESSUREFLAG.HeaderText = "高压注浆";
+            this.HIGHPRESSUREFLAG.MinimumWidth = 6;
+            this.HIGHPRESSUREFLAG.Name = "HIGHPRESSUREFLAG";
+            this.HIGHPRESSUREFLAG.ReadOnly = true;
+            this.HIGHPRESSUREFLAG.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.HIGHPRESSUREFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.HIGHPRESSUREFLAG.TrueValue = "1";
+            this.HIGHPRESSUREFLAG.Width = 125;
+            // 
+            // monitorcode
+            // 
+            this.monitorcode.DataPropertyName = "monitorcode";
+            this.monitorcode.HeaderText = "成型班长";
+            this.monitorcode.MinimumWidth = 6;
+            this.monitorcode.Name = "monitorcode";
+            this.monitorcode.ReadOnly = true;
+            this.monitorcode.Width = 125;
+            // 
+            // UserCode
+            // 
+            this.UserCode.DataPropertyName = "userCodeList";
+            this.UserCode.HeaderText = "成型工号";
+            this.UserCode.MinimumWidth = 6;
+            this.UserCode.Name = "UserCode";
+            this.UserCode.ReadOnly = true;
+            this.UserCode.Width = 125;
+            // 
+            // staffCodeList
+            // 
+            this.staffCodeList.DataPropertyName = "staffCodeList";
+            this.staffCodeList.HeaderText = "员工姓名";
+            this.staffCodeList.MinimumWidth = 6;
+            this.staffCodeList.Name = "staffCodeList";
+            this.staffCodeList.ReadOnly = true;
+            this.staffCodeList.Width = 125;
+            // 
+            // goosCodeList
+            // 
+            this.goosCodeList.DataPropertyName = "goosCodeList";
+            this.goosCodeList.HeaderText = "产品编码";
+            this.goosCodeList.MinimumWidth = 6;
+            this.goosCodeList.Name = "goosCodeList";
+            this.goosCodeList.ReadOnly = true;
+            this.goosCodeList.Width = 125;
+            // 
+            // BeginUsedDate
+            // 
+            this.BeginUsedDate.DataPropertyName = "BeginUsedDate";
+            dataGridViewCellStyle3.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle3.NullValue = null;
+            this.BeginUsedDate.DefaultCellStyle = dataGridViewCellStyle3;
+            this.BeginUsedDate.HeaderText = "开始使用日期";
+            this.BeginUsedDate.MinimumWidth = 6;
+            this.BeginUsedDate.Name = "BeginUsedDate";
+            this.BeginUsedDate.ReadOnly = true;
+            this.BeginUsedDate.Width = 120;
+            // 
+            // EndUsedDate
+            // 
+            this.EndUsedDate.DataPropertyName = "EndUsedDate";
+            dataGridViewCellStyle4.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle4.NullValue = null;
+            this.EndUsedDate.DefaultCellStyle = dataGridViewCellStyle4;
+            this.EndUsedDate.HeaderText = "结束使用日期";
+            this.EndUsedDate.MinimumWidth = 6;
+            this.EndUsedDate.Name = "EndUsedDate";
+            this.EndUsedDate.ReadOnly = true;
+            this.EndUsedDate.Width = 120;
+            // 
+            // GMOULDSTATUSNAME
+            // 
+            this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
+            this.GMOULDSTATUSNAME.MinimumWidth = 6;
+            this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.ReadOnly = true;
+            this.GMOULDSTATUSNAME.Width = 120;
+            // 
+            // non_sap
+            // 
+            this.non_sap.DataPropertyName = "non_sap";
+            this.non_sap.FalseValue = "0";
+            this.non_sap.HeaderText = "转厂标识";
+            this.non_sap.Name = "non_sap";
+            this.non_sap.ReadOnly = true;
+            this.non_sap.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.non_sap.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.non_sap.TrueValue = "1";
+            // 
+            // valueflag2
+            // 
+            this.valueflag2.DataPropertyName = "valueflag2";
+            this.valueflag2.FalseValue = "2";
+            this.valueflag2.HeaderText = "有效标识";
+            this.valueflag2.MinimumWidth = 6;
+            this.valueflag2.Name = "valueflag2";
+            this.valueflag2.ReadOnly = true;
+            this.valueflag2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.valueflag2.TrueValue = "1";
+            this.valueflag2.Width = 125;
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.MinimumWidth = 6;
+            this.Remarks.Name = "Remarks";
+            this.Remarks.ReadOnly = true;
+            this.Remarks.Width = 125;
+            // 
+            // GMouldStatus
+            // 
+            this.GMouldStatus.DataPropertyName = "GMouldStatus";
+            this.GMouldStatus.HeaderText = "GMouldStatus";
+            this.GMouldStatus.MinimumWidth = 6;
+            this.GMouldStatus.Name = "GMouldStatus";
+            this.GMouldStatus.ReadOnly = true;
+            this.GMouldStatus.Visible = false;
+            this.GMouldStatus.Width = 125;
+            // 
             // F_PC_0104_1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1491,7 +1504,7 @@
             this.Controls.Add(this.splLine);
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.tsrOperate);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "F_PC_0104_1";
             this.Text = "F_PC_0104";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PC_0104_FormClosed);
@@ -1615,6 +1628,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn BeginUsedDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn EndUsedDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMOULDSTATUSNAME;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn non_sap;
         private System.Windows.Forms.DataGridViewCheckBoxColumn valueflag2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatus;

DK.Client/PCModule/F_PC_0104_1.resx

@@ -181,6 +181,9 @@
   <metadata name="goosCodeList.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="non_sap.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="valueflag2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/PMModule/F_PM_3302.cs

@@ -97,7 +97,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             {
                 txtRemarks.Focus();//把光标移开，由于删除工号后，值未变
                 DataTable dtBarcode = dgvBarcode.DataSource as DataTable;
-                dtBarcode.AcceptChanges();
+                dtBarcode?.AcceptChanges();
                 if (dtBarcode == null || dtBarcode.Rows.Count == 0)
                 {
                     MessageBox.Show("没有选择任何条码",

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

@@ -89,12 +89,12 @@
             this.ScrapProductID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tapUndoTotal = new System.Windows.Forms.TabPage();
             this.dgvScrapProductTotal = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.page = new System.Windows.Forms.TabControl();
             this.ScrapDate1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Rreason1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsCode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsName1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Quantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.page = new System.Windows.Forms.TabControl();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             this.tapUndoDetail.SuspendLayout();
@@ -745,6 +745,21 @@
             this.dgvScrapProductTotal.VirtualMode = true;
             this.dgvScrapProductTotal.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvScrapProductTotal_CellDoubleClick);
             // 
+            // page
+            // 
+            this.page.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.page.Controls.Add(this.tapUndoTotal);
+            this.page.Controls.Add(this.tapUndoDetail);
+            this.page.Location = new System.Drawing.Point(0, 96);
+            this.page.Margin = new System.Windows.Forms.Padding(0);
+            this.page.Name = "page";
+            this.page.Padding = new System.Drawing.Point(0, 0);
+            this.page.SelectedIndex = 0;
+            this.page.Size = new System.Drawing.Size(1187, 535);
+            this.page.TabIndex = 2;
+            // 
             // ScrapDate1
             // 
             this.ScrapDate1.DataPropertyName = "ScrapDate";
@@ -755,6 +770,7 @@
             this.ScrapDate1.Name = "ScrapDate1";
             this.ScrapDate1.ReadOnly = true;
             this.ScrapDate1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ScrapDate1.Width = 150;
             // 
             // Rreason1
             // 
@@ -788,21 +804,6 @@
             this.Quantity.ReadOnly = true;
             this.Quantity.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
-            // page
-            // 
-            this.page.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.page.Controls.Add(this.tapUndoTotal);
-            this.page.Controls.Add(this.tapUndoDetail);
-            this.page.Location = new System.Drawing.Point(0, 96);
-            this.page.Margin = new System.Windows.Forms.Padding(0);
-            this.page.Name = "page";
-            this.page.Padding = new System.Drawing.Point(0, 0);
-            this.page.SelectedIndex = 0;
-            this.page.Size = new System.Drawing.Size(1187, 535);
-            this.page.TabIndex = 2;
-            // 
             // F_RPT_030120
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

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

@@ -308,7 +308,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 cre.Properties["barcode"] = txtBarCode.Text.Trim();
                 cre.Properties["goodscode"] = txtGoodsCode.Text.Trim();
                 cre.Properties["scrapdatestart"] = dtpScrapDateStart.Value;
-                cre.Properties["scrapdateend"] = dtpScrapDateStart.Value.AddDays(1);
+                cre.Properties["scrapdateend"] = dtpScrapDateEnd.Value.AddDays(1);
                 cre.Properties["rreason"] = cmbRreason.Text.Trim();
 
                 // 调用服务器端获取数据集
@@ -347,7 +347,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 cre.Properties["barcode"] = txtBarCode.Text.Trim();
                 cre.Properties["goodscode"] = txtGoodsCode.Text.Trim();
                 cre.Properties["scrapdatestart"] = dtpScrapDateStart.Value;
-                cre.Properties["scrapdateend"] = dtpScrapDateStart.Value.AddDays(1);
+                cre.Properties["scrapdateend"] = dtpScrapDateEnd.Value.AddDays(1);
                 cre.Properties["rreason"] = cmbRreason.Text.Trim();
 
                 // 调用服务器端获取数据集

DK.Client/SystemModule/F_MST_1301.Designer.cs

@@ -49,12 +49,11 @@
             this.txtRemarks = new System.Windows.Forms.TextBox();
             this.lblWorkStationName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.dgvWorkStation = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.dgvUser = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.splLine = new System.Windows.Forms.SplitContainer();
             this.WorkStationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remarks1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WorkStationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvUser = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -63,6 +62,7 @@
             this.Telephone = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.splLine = new System.Windows.Forms.SplitContainer();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvWorkStation)).BeginInit();
@@ -297,8 +297,40 @@
             this.dgvWorkStation.Tag = true;
             this.dgvWorkStation.TotalSumColumns = null;
             this.dgvWorkStation.ViewRowFilter = "";
+            this.dgvWorkStation.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvWorkStation_CellDoubleClick);
             this.dgvWorkStation.SelectionChanged += new System.EventHandler(this.dgvWorkStation_SelectionChanged);
             // 
+            // WorkStationName
+            // 
+            this.WorkStationName.DataPropertyName = "WorkStationName";
+            this.WorkStationName.HeaderText = "工位名称";
+            this.WorkStationName.MaxInputLength = 20;
+            this.WorkStationName.Name = "WorkStationName";
+            this.WorkStationName.ReadOnly = true;
+            // 
+            // ProcedureName
+            // 
+            this.ProcedureName.DataPropertyName = "ProcedureName";
+            this.ProcedureName.HeaderText = "工序名称";
+            this.ProcedureName.MaxInputLength = 20;
+            this.ProcedureName.Name = "ProcedureName";
+            this.ProcedureName.ReadOnly = true;
+            // 
+            // Remarks1
+            // 
+            this.Remarks1.DataPropertyName = "Remarks";
+            this.Remarks1.HeaderText = "备注";
+            this.Remarks1.Name = "Remarks1";
+            this.Remarks1.ReadOnly = true;
+            // 
+            // WorkStationID
+            // 
+            this.WorkStationID.DataPropertyName = "WorkStationID";
+            this.WorkStationID.HeaderText = "WorkStationID";
+            this.WorkStationID.Name = "WorkStationID";
+            this.WorkStationID.ReadOnly = true;
+            this.WorkStationID.Visible = false;
+            // 
             // dgvUser
             // 
             this.dgvUser.AllowUserToAddRows = false;
@@ -373,57 +405,6 @@
             this.dgvUser.TotalSumColumns = null;
             this.dgvUser.ViewRowFilter = "";
             // 
-            // splLine
-            // 
-            this.splLine.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.splLine.Location = new System.Drawing.Point(12, 98);
-            this.splLine.Name = "splLine";
-            this.splLine.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splLine.Panel1
-            // 
-            this.splLine.Panel1.Controls.Add(this.dgvWorkStation);
-            // 
-            // splLine.Panel2
-            // 
-            this.splLine.Panel2.Controls.Add(this.dgvUser);
-            this.splLine.Size = new System.Drawing.Size(813, 390);
-            this.splLine.SplitterDistance = 184;
-            this.splLine.TabIndex = 106;
-            // 
-            // WorkStationName
-            // 
-            this.WorkStationName.DataPropertyName = "WorkStationName";
-            this.WorkStationName.HeaderText = "工位名称";
-            this.WorkStationName.MaxInputLength = 20;
-            this.WorkStationName.Name = "WorkStationName";
-            this.WorkStationName.ReadOnly = true;
-            // 
-            // ProcedureName
-            // 
-            this.ProcedureName.DataPropertyName = "ProcedureName";
-            this.ProcedureName.HeaderText = "工序名称";
-            this.ProcedureName.MaxInputLength = 20;
-            this.ProcedureName.Name = "ProcedureName";
-            this.ProcedureName.ReadOnly = true;
-            // 
-            // Remarks1
-            // 
-            this.Remarks1.DataPropertyName = "Remarks";
-            this.Remarks1.HeaderText = "备注";
-            this.Remarks1.Name = "Remarks1";
-            this.Remarks1.ReadOnly = true;
-            // 
-            // WorkStationID
-            // 
-            this.WorkStationID.DataPropertyName = "WorkStationID";
-            this.WorkStationID.HeaderText = "WorkStationID";
-            this.WorkStationID.Name = "WorkStationID";
-            this.WorkStationID.ReadOnly = true;
-            this.WorkStationID.Visible = false;
-            // 
             // UserCode
             // 
             this.UserCode.DataPropertyName = "UserCode";
@@ -495,6 +476,26 @@
             this.UserID.ReadOnly = true;
             this.UserID.Visible = false;
             // 
+            // splLine
+            // 
+            this.splLine.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.splLine.Location = new System.Drawing.Point(12, 98);
+            this.splLine.Name = "splLine";
+            this.splLine.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splLine.Panel1
+            // 
+            this.splLine.Panel1.Controls.Add(this.dgvWorkStation);
+            // 
+            // splLine.Panel2
+            // 
+            this.splLine.Panel2.Controls.Add(this.dgvUser);
+            this.splLine.Size = new System.Drawing.Size(813, 390);
+            this.splLine.SplitterDistance = 184;
+            this.splLine.TabIndex = 106;
+            // 
             // F_MST_1301
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

DK.Client/SystemModule/F_MST_1301.cs

@@ -225,6 +225,16 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
         }
 
         /// <summary>
+        /// 单元格双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvWorkStation_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            tsbtnAddUser_Click(null, null);
+        }
+
+        /// <summary>
         /// 释放窗体
         /// </summary>
         /// <param name="sender"></param>

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -7323,8 +7323,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 " WHERE sp.valueflag = '1'\n" +
                 "   AND gl.goodsleveltypeid = 10\n" +
                 "   AND sp.accountid = :accountid\n" +
-                "   AND sp.createtime >= :scrapdatestart\n" +
-                "   AND sp.createtime < :scrapdateend\n";
+                "   AND sp.scrapdate >= :scrapdatestart\n" +
+                "   AND sp.scrapdate < :scrapdateend\n";
 
                 paras.Add(new OracleParameter(":accountid", sUserInfo.AccountID));
                 paras.Add(new OracleParameter(":scrapdatestart", cre.Properties["scrapdatestart"]));
@@ -7589,6 +7589,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 "    ,goodsleveltypeid\n" +
                 "    ,respontype\n" +
                 "    ,scrapdate\n" +
+                "    ,accountdate\n" +
                 "    ,rreason\n" +
                 "    ,remarks\n" +
                 "    ,auditstatus\n" +
@@ -7630,6 +7631,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 "          ,10\n" +
                 "          ,'1'\n" +
                 "          ,:scrapdate\n" +
+                "          ,:scrapdate\n" +
                 "          ,:rreason\n" +
                 "          ,:remarks\n" +
                 "          ,1\n" +
@@ -8263,8 +8265,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 "         WHERE sp.valueflag = '1'\n" +
                 "           AND gl.goodsleveltypeid = 10\n" +
                 "           AND sp.accountid = :accountid\n" +
-                "           AND sp.createtime >= :scrapdatestart\n" +
-                "           AND sp.createtime < :scrapdateend ";
+                "           AND sp.scrapdate >= :scrapdatestart\n" +
+                "           AND sp.scrapdate < :scrapdateend ";
 
                 paras.Add(new OracleParameter(":accountid", sUserInfo.AccountID));
                 paras.Add(new OracleParameter(":scrapdatestart", cre.Properties["scrapdatestart"]));