1-3节点到3-2节点都加一个成型车间的筛选条件

DK.Client/PCModule/F_PC_0104_1.Designer.cs

@@ -32,8 +32,6 @@
             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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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();
@@ -45,6 +43,8 @@
             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,29 +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.goosNameList = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.workshop = 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.TESTFLAGNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            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();
@@ -162,6 +139,29 @@
             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.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.staffCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goosCodeList = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goosNameList = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.workshop = 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.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.TESTFLAGNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            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();
@@ -323,6 +323,9 @@
             this.GroutingLineID,
             this.GroutingLineCode,
             this.GroutingLineName,
+            this.UserCode,
+            this.staffCodeList,
+            this.goosCodeList,
             this.goosNameList,
             this.workshop,
             this.ValueFlag,
@@ -333,9 +336,6 @@
             this.GMouldTypeName,
             this.HIGHPRESSUREFLAG,
             this.monitorcode,
-            this.UserCode,
-            this.staffCodeList,
-            this.goosCodeList,
             this.BeginUsedDate,
             this.EndUsedDate,
             this.GMOULDSTATUSNAME,
@@ -377,244 +377,19 @@
             this.dgvGroutingLine.RowHeadersWidth = 50;
             this.dgvGroutingLine.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             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;
-            this.dgvGroutingLine.Size = new System.Drawing.Size(1204, 197);
-            this.dgvGroutingLine.SortOrderColumnName = null;
-            this.dgvGroutingLine.TabIndex = 0;
-            this.dgvGroutingLine.Tag = true;
-            this.dgvGroutingLine.TotalSumColumns = null;
-            this.dgvGroutingLine.ViewRowFilter = "";
-            this.dgvGroutingLine.VirtualMode = true;
-            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;
-            // 
-            // goosNameList
-            // 
-            this.goosNameList.DataPropertyName = "goosNameList";
-            this.goosNameList.HeaderText = "产品名称";
-            this.goosNameList.Name = "goosNameList";
-            this.goosNameList.ReadOnly = true;
-            // 
-            // workshop
-            // 
-            this.workshop.DataPropertyName = "WORKSHOP";
-            this.workshop.HeaderText = "部门";
-            this.workshop.MinimumWidth = 6;
-            this.workshop.Name = "workshop";
-            this.workshop.ReadOnly = true;
-            this.workshop.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;
-            // 
-            // 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;
-            // 
-            // TESTFLAGNAME
-            // 
-            this.TESTFLAGNAME.DataPropertyName = "TESTFLAGNAME";
-            this.TESTFLAGNAME.HeaderText = "成型线类别";
-            this.TESTFLAGNAME.MinimumWidth = 6;
-            this.TESTFLAGNAME.Name = "TESTFLAGNAME";
-            this.TESTFLAGNAME.ReadOnly = true;
-            this.TESTFLAGNAME.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;
+            this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle6;
+            this.dgvGroutingLine.RowTemplate.Height = 21;
+            this.dgvGroutingLine.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvGroutingLine.ShowEditingIcon = false;
+            this.dgvGroutingLine.Size = new System.Drawing.Size(1204, 197);
+            this.dgvGroutingLine.SortOrderColumnName = null;
+            this.dgvGroutingLine.TabIndex = 0;
+            this.dgvGroutingLine.Tag = true;
+            this.dgvGroutingLine.TotalSumColumns = null;
+            this.dgvGroutingLine.ViewRowFilter = "";
+            this.dgvGroutingLine.VirtualMode = true;
+            this.dgvGroutingLine.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvGroutingLine_ColumnHeaderMouseClick);
+            this.dgvGroutingLine.SelectionChanged += new System.EventHandler(this.dgvGroutingLine_SelectionChanged);
             // 
             // btnClearCondition
             // 
@@ -1641,6 +1416,231 @@
             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;
+            // 
+            // 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;
+            // 
+            // goosNameList
+            // 
+            this.goosNameList.DataPropertyName = "goosNameList";
+            this.goosNameList.HeaderText = "产品名称";
+            this.goosNameList.Name = "goosNameList";
+            this.goosNameList.ReadOnly = true;
+            // 
+            // workshop
+            // 
+            this.workshop.DataPropertyName = "WORKSHOP";
+            this.workshop.HeaderText = "部门";
+            this.workshop.MinimumWidth = 6;
+            this.workshop.Name = "workshop";
+            this.workshop.ReadOnly = true;
+            this.workshop.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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // TESTFLAGNAME
+            // 
+            this.TESTFLAGNAME.DataPropertyName = "TESTFLAGNAME";
+            this.TESTFLAGNAME.HeaderText = "成型线类别";
+            this.TESTFLAGNAME.MinimumWidth = 6;
+            this.TESTFLAGNAME.Name = "TESTFLAGNAME";
+            this.TESTFLAGNAME.ReadOnly = true;
+            this.TESTFLAGNAME.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);
@@ -1758,9 +1758,18 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn EndUsedDate2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks1;
         private System.Windows.Forms.DataGridViewTextBoxColumn RecordRemarks;
+        private Basics.BaseControls.C_TextBox goodscodeText;
+        private Basics.BaseControls.C_Label c_Label1;
+        private Controls.SearchBox.ScbGoods scbGoods;
+        private Basics.BaseControls.C_Label lblGoods;
+        private Basics.BaseControls.DKListBoxComboBox cbWorkShop;
+        private Basics.BaseControls.C_Label lblWorkShop;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn staffCodeList;
+        private System.Windows.Forms.DataGridViewTextBoxColumn goosCodeList;
         private System.Windows.Forms.DataGridViewTextBoxColumn goosNameList;
         private System.Windows.Forms.DataGridViewTextBoxColumn workshop;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;
@@ -1771,9 +1780,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
         private System.Windows.Forms.DataGridViewCheckBoxColumn HIGHPRESSUREFLAG;
         private System.Windows.Forms.DataGridViewTextBoxColumn monitorcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn staffCodeList;
-        private System.Windows.Forms.DataGridViewTextBoxColumn goosCodeList;
         private System.Windows.Forms.DataGridViewTextBoxColumn BeginUsedDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn EndUsedDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMOULDSTATUSNAME;
@@ -1781,11 +1787,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn TESTFLAGNAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatus;
-        private Basics.BaseControls.C_TextBox goodscodeText;
-        private Basics.BaseControls.C_Label c_Label1;
-        private Controls.SearchBox.ScbGoods scbGoods;
-        private Basics.BaseControls.C_Label lblGoods;
-        private Basics.BaseControls.DKListBoxComboBox cbWorkShop;
-        private Basics.BaseControls.C_Label lblWorkShop;
     }
 }

DK.Client/PCModule/F_PC_0104_1.resx

@@ -166,6 +166,12 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="staffCodeList.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="goosCodeList.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="goosNameList.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -181,12 +187,6 @@
   <metadata name="monitorcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="staffCodeList.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="goosCodeList.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_0301.cs

@@ -116,6 +116,21 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 				this.dtpEndTime.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day).AddDays(1).AddMinutes(-1);
 				// 设置ToolStripButton状态
 				this.SetToolStripButtonEnable();
+				// 1-3节点到3-2节点都加一个成型车间的筛选条件 250317
+				// 2-1打磨--4 2-2擦洗--5 2-4半检--6 3-1精坯入--7 3-2精坯出--8 2-3打磨擦洗--36
+				if (_currentProcedureID == 4 ||  _currentProcedureID == 5 
+					|| _currentProcedureID == 6 || _currentProcedureID == 7 
+					|| _currentProcedureID == 8 || _currentProcedureID == 36)
+				{
+					this.cobworkshop.Visible = true;
+					this.lblworkshop.Visible = true;
+
+				}
+                else
+                {
+					this.cobworkshop.Visible = false;
+					this.lblworkshop.Visible = false;
+				}
 			}
 			catch (Exception ex)
 			{
@@ -162,6 +177,15 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.scbGoodsType.ClearValue();
 			this.dtpStartTime.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
 			this.dtpEndTime.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day).AddDays(1).AddMinutes(-1);
+			// 1-3节点到3-2节点都加一个成型车间的筛选条件 250317
+			// 2-1打磨--4 2-2擦洗--5 2-4半检--6 3-1精坯入--7 3-2精坯出--8 2-3打磨擦洗--36
+			if (_currentProcedureID == 4 || _currentProcedureID == 5
+				|| _currentProcedureID == 6 || _currentProcedureID == 7
+				|| _currentProcedureID == 8 || _currentProcedureID == 36)
+			{
+				this.cobworkshop.SelectedIndex = Constant.INT_IS_NEGATIE_ONE;
+			}	 
+			
 		}
 
 		/// <summary>
@@ -306,7 +330,19 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			result.GoodsName = this.txtGoodsName.Text.Trim();
 			result.UserCode = this.txtUserCode.Text.Trim();
 			result.OrganizationID = scbOrganization.SearchedPKMember;
-			result.Remarks = "";
+			
+			// 1-3节点到3-2节点都加一个成型车间的筛选条件 250317
+			// 2-1打磨--4 2-2擦洗--5 2-4半检--6 3-1精坯入--7 3-2精坯出--8 2-3打磨擦洗--36
+			if (_currentProcedureID == 4 || _currentProcedureID == 5
+				|| _currentProcedureID == 6 || _currentProcedureID == 7
+				|| _currentProcedureID == 8 || _currentProcedureID == 36)
+			{
+				result.Remarks = cobworkshop.Text;//暂传车间（）
+			}
+            else
+            {
+				result.Remarks = "";
+			}
 			// this.txtRemarks.Text.Trim();
 			//object[] objRework = this.statusIsReworked.SelectedValues;
 			string Rework = "";

DK.Client/PMModule/F_PM_3201.cs

@@ -177,6 +177,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.cobKilnName.SelectedIndex = Constant.INT_IS_ZERO;
 			this.txtKilnCarName.Text = string.Empty;
 			this.cobKilnCarPosition.SelectedIndex = Constant.INT_IS_ZERO;
+			this.cobworkshop.SelectedIndex = Constant.INT_IS_NEGATIE_ONE;
 		}
 
 		/// <summary>
@@ -468,7 +469,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			result.GoodsName = this.txtGoodsName.Text.Trim();
 			result.UserCode = this.txtUserCode.Text.Trim();
 			result.OrganizationID = this.scbOrganization.SearchedPKMember;
-			result.Remarks = "";
+			// 1-3节点到3-2节点都加一个成型车间的筛选条件 250317
+			result.Remarks = cobworkshop.Text;//暂传车间（成检部分）
 			// this.txtRemarks.Text.Trim();
 			//object[] objRework = this.statusIsReworked.SelectedValues;
 			//string Rework = "";