增加工序简称

DK.Basics/FlowSetting/Common/ItemManager.cs

@@ -1889,7 +1889,25 @@ namespace Dongke.IBOSS.Basics.FlowSetting
                 this._penDrawString.Color = node.FontColor;
                 //graphics.DrawString(node.Name, node.Font, this._penDrawString.Brush, p5.X - size.Width / 2, p5.Y + Consts.NODE_STRING_MARGIN);
                 RectangleF ff = new RectangleF(xx, (float)(node.Bounds.Bottom + Consts.NODE_STRING_MARGIN), ww, size.Height);
-                graphics.DrawString(node.Name, node.Font, this._penDrawString.Brush, ff, _stringFormat);
+
+                string nn = node.ShortName;
+                if (string.IsNullOrEmpty(nn))
+                {
+                    nn = node.Name;
+                }
+                /*
+                int ida = nn.IndexOf('-');
+                if (ida > 0)
+                {
+                    nn = nn.Substring(ida + 1);
+                    ida = nn.IndexOf('-');
+                    if (ida > 0)
+                    {
+                        nn = nn.Substring(ida + 1);
+                    }
+                }
+                */
+                graphics.DrawString(nn, node.Font, this._penDrawString.Brush, ff, _stringFormat);
             }
 
             // this.DrawSelectedNode(graphics, node);

DK.Basics/FlowSetting/Items/FlowItem.cs

@@ -172,6 +172,15 @@ namespace Dongke.IBOSS.Basics.FlowSetting
         }
 
         /// <summary>
+        /// 获取或设置名称
+        /// </summary>
+        public string ShortName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
         /// 获取或设置备注
         /// </summary>
         public string Remark

DK.Client/PCModule/F_PC_0203.Designer.cs

@@ -59,9 +59,9 @@
             this.panel2.Controls.Add(this.btnExpImage);
             this.panel2.Controls.Add(this.btnSave);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(170, 345);
+            this.panel2.Location = new System.Drawing.Point(170, 491);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(565, 44);
+            this.panel2.Size = new System.Drawing.Size(758, 44);
             this.panel2.TabIndex = 5;
             // 
             // btnClose
@@ -72,7 +72,7 @@
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClose.ForeColor = System.Drawing.Color.White;
-            this.btnClose.Location = new System.Drawing.Point(468, 6);
+            this.btnClose.Location = new System.Drawing.Point(661, 6);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(85, 30);
             this.btnClose.TabIndex = 2;
@@ -102,7 +102,7 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(377, 6);
+            this.btnSave.Location = new System.Drawing.Point(570, 6);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(85, 30);
             this.btnSave.TabIndex = 9;
@@ -119,7 +119,7 @@
             this.flowBox.FlowName = null;
             this.flowBox.Location = new System.Drawing.Point(170, 0);
             this.flowBox.Name = "flowBox";
-            this.flowBox.Size = new System.Drawing.Size(565, 345);
+            this.flowBox.Size = new System.Drawing.Size(758, 491);
             this.flowBox.TabIndex = 7;
             // 
             // lblLineCode
@@ -292,7 +292,7 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(170, 389);
+            this.panel1.Size = new System.Drawing.Size(170, 535);
             this.panel1.TabIndex = 6;
             // 
             // c_Button1
@@ -352,7 +352,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnClose;
-            this.ClientSize = new System.Drawing.Size(735, 411);
+            this.ClientSize = new System.Drawing.Size(928, 557);
             this.Controls.Add(this.flowBox);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);

DK.Client/PCModule/F_PC_0203.cs

@@ -214,12 +214,15 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                     }
                     node.Code = dr1[0]["ProcedureCode"].ToString();
                     node.Name = dr1[0]["ProcedureName"].ToString();
+                    node.ShortName = dr1[0]["p_name"].ToString();
                     node.Remark = dr1[0]["Remarks"].ToString();
                     ProcedureEntity procedureEntity = new ProcedureEntity();//工序
 
                     procedureEntity.ProcedureID = Convert.ToInt32(dr1[0]["ProcedureID"].ToString());
                     procedureEntity.ProcedureCode = dr1[0]["ProcedureCode"].ToString();
                     procedureEntity.ProcedureName = dr1[0]["ProcedureName"].ToString();
+                    procedureEntity.PName = dr1[0]["p_name"].ToString();
+
                     procedureEntity.ProcedureModel = Convert.ToInt32(dr1[0]["ProcedureModel"].ToString());
                     procedureEntity.ModelType = Convert.ToInt32(dr1[0]["modeltype"].ToString());
                     procedureEntity.NodeType = Convert.ToInt32(dr1[0]["nodetype"].ToString());
@@ -524,6 +527,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 entity.NodeNo = n.ItemID;//(this.flowBox.AllNodes.Count - this.flowBox.DeletedNodes.Count) + _ValueFlagRow;
                 entity.ProcedureCode = n.ItemID.ToString();
                 entity.ProcedureName = n.Name;
+                entity.PName = n.ShortName;
                 entity.CollectType = 1;
                 entity.MustFlag = 1;
                 entity.ProcedureModel = 1;
@@ -559,6 +563,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 entity.NodeNo = n.ItemID;//(this.flowBox.AllNodes.Count - this.flowBox.DeletedNodes.Count) + _ValueFlagRow;
                 entity.ProcedureCode = n.ItemID.ToString();
                 entity.ProcedureName = n.Name;
+                entity.PName = n.ShortName;
                 entity.CollectType = 1;
                 entity.MustFlag = 1;
                 entity.ProcedureModel = 2;

DK.Client/PCModule/F_PC_0205.Designer.cs

@@ -75,6 +75,7 @@
             this.UpdateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.ProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.p_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureModelName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -452,6 +453,7 @@
             this.dgvLine.EnableHeadersVisualStyles = false;
             this.dgvLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvLine.FormatQuantityColumns = null;
+            this.dgvLine.HasNode = false;
             this.dgvLine.HorizontalMergeColumn = null;
             this.dgvLine.IsAutoCountSum = true;
             this.dgvLine.IsAutoResizeColumns = false;
@@ -487,6 +489,7 @@
             this.dgvLine.Tag = true;
             this.dgvLine.TotalSumColumns = null;
             this.dgvLine.ViewRowFilter = "";
+            this.dgvLine.VirtualNodes = false;
             this.dgvLine.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLine_CellDoubleClick);
             this.dgvLine.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLine_CellEnter);
             this.dgvLine.SelectionChanged += new System.EventHandler(this.dgvLine_SelectionChanged);
@@ -609,6 +612,7 @@
             this.dgvProcedure.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvProcedure.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.ProcedureCode,
+            this.p_name,
             this.ProcedureName,
             this.ProcedureModelName,
             this.OrganizationName,
@@ -650,6 +654,7 @@
             this.dgvProcedure.EnableHeadersVisualStyles = false;
             this.dgvProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvProcedure.FormatQuantityColumns = null;
+            this.dgvProcedure.HasNode = false;
             this.dgvProcedure.HorizontalMergeColumn = null;
             this.dgvProcedure.IsAutoCountSum = true;
             this.dgvProcedure.IsAutoResizeColumns = false;
@@ -686,6 +691,7 @@
             this.dgvProcedure.Tag = true;
             this.dgvProcedure.TotalSumColumns = null;
             this.dgvProcedure.ViewRowFilter = "";
+            this.dgvProcedure.VirtualNodes = false;
             this.dgvProcedure.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcedure_CellDoubleClick);
             // 
             // ProcedureCode
@@ -697,6 +703,13 @@
             this.ProcedureCode.ReadOnly = true;
             this.ProcedureCode.Width = 125;
             // 
+            // p_name
+            // 
+            this.p_name.DataPropertyName = "p_name";
+            this.p_name.HeaderText = "工序简称";
+            this.p_name.Name = "p_name";
+            this.p_name.ReadOnly = true;
+            // 
             // ProcedureName
             // 
             this.ProcedureName.DataPropertyName = "ProcedureName";
@@ -1026,6 +1039,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
         private System.Windows.Forms.ToolStripButton tsbtnDisable;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn p_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureName;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureModelName;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationName;

DK.Client/PCModule/F_PC_0205.cs

@@ -876,12 +876,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             }
             node.Code = dr1[0]["ProcedureCode"].ToString();
             node.Name = dr1[0]["ProcedureName"].ToString();
+            node.ShortName = dr1[0]["P_Name"].ToString();
             node.Remark = dr1[0]["Remarks"].ToString();
             ProcedureEntity procedureEntity = new ProcedureEntity();//工序
 
             procedureEntity.ProcedureID = Convert.ToInt32(dr1[0]["ProcedureID"].ToString());
             procedureEntity.ProcedureCode = dr1[0]["ProcedureCode"].ToString();
             procedureEntity.ProcedureName = dr1[0]["ProcedureName"].ToString();
+            procedureEntity.PName = dr1[0]["P_Name"].ToString();
             procedureEntity.ProcedureModel = Convert.ToInt32(dr1[0]["ProcedureModel"].ToString());
             procedureEntity.ModelType = Convert.ToInt32(dr1[0]["modeltype"].ToString());
             procedureEntity.NodeType = Convert.ToInt32(dr1[0]["nodetype"].ToString());

DK.Client/PCModule/F_PC_0205.resx

@@ -281,6 +281,9 @@
   <metadata name="ProcedureCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="p_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/PCModule/F_PC_0206.Designer.cs

@@ -59,5 +59,7 @@
         private WinForm.Controls.CklCheckedListBox cklSemiGoodsLevel;
         private WinForm.Controls.LblLabel lblFinishedCheckProcedure;
         private Basics.BaseControls.C_ComboBox cboFinishedCheckProcedure;
+        private Basics.BaseControls.C_TextBox txtPName;
+        private Basics.BaseControls.C_Label c_Label7;
     }
 }

DK.Client/PCModule/F_PC_0206.cs

@@ -168,7 +168,9 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             if (this._procedureEntity != null)
             {
                 this.txtProcedureCode.Text = this._procedureEntity.ProcedureCode;
-                this.txtProcedureName.Text = this.node.Name; ;
+                this.txtProcedureName.Text = this.node.Name;
+                this.txtPName.Text = this.node.ShortName;
+
                 this.txtRemarks.Text = this._procedureEntity.Remarks;
                 this.rbtnOne.Checked = (this._procedureEntity.CollectType == 2);
                 this.rbtnMore.Checked = (this._procedureEntity.CollectType == 1);
@@ -210,21 +212,23 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = 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 dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = 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 dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = 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 dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0206));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cboFinishedCheckProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.lblFinishedCheckProcedure = new Dongke.WinForm.Controls.LblLabel();
             this.ddlProcessModelType = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
             this.groupBoxSemi = new System.Windows.Forms.GroupBox();
             this.cklSemiGoodsLevel = new Dongke.WinForm.Controls.CklCheckedListBox();
@@ -285,8 +289,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.JobsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.lblFinishedCheckProcedure = new Dongke.WinForm.Controls.LblLabel();
-            this.cboFinishedCheckProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.txtPName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.c_Label7 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.groupBox1.SuspendLayout();
             this.groupBoxSemi.SuspendLayout();
             this.groupBox4.SuspendLayout();
@@ -309,6 +313,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+            this.groupBox1.Controls.Add(this.txtPName);
+            this.groupBox1.Controls.Add(this.c_Label7);
             this.groupBox1.Controls.Add(this.cboFinishedCheckProcedure);
             this.groupBox1.Controls.Add(this.lblFinishedCheckProcedure);
             this.groupBox1.Controls.Add(this.ddlProcessModelType);
@@ -325,10 +331,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Controls.Add(this.lblmisspriority);
             this.groupBox1.Controls.Add(this.sbOrganizationID);
             this.groupBox1.Controls.Add(this.txtRemarks);
-            this.groupBox1.Controls.Add(this.txtProcedureName);
             this.groupBox1.Controls.Add(this.txtProcedureCode);
             this.groupBox1.Controls.Add(this.c_Label3);
-            this.groupBox1.Controls.Add(this.c_Label2);
             this.groupBox1.Controls.Add(this.c_Label1);
             this.groupBox1.Controls.Add(this.GetDataOgrp);
             this.groupBox1.Controls.Add(this.groupBox2);
@@ -340,6 +344,25 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "基本属性";
             // 
+            // cboFinishedCheckProcedure
+            // 
+            this.cboFinishedCheckProcedure.BackColor = System.Drawing.SystemColors.Window;
+            this.cboFinishedCheckProcedure.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cboFinishedCheckProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cboFinishedCheckProcedure.FormattingEnabled = true;
+            this.cboFinishedCheckProcedure.Location = new System.Drawing.Point(77, 159);
+            this.cboFinishedCheckProcedure.Name = "cboFinishedCheckProcedure";
+            this.cboFinishedCheckProcedure.Size = new System.Drawing.Size(106, 20);
+            this.cboFinishedCheckProcedure.TabIndex = 29;
+            // 
+            // lblFinishedCheckProcedure
+            // 
+            this.lblFinishedCheckProcedure.Location = new System.Drawing.Point(18, 162);
+            this.lblFinishedCheckProcedure.Name = "lblFinishedCheckProcedure";
+            this.lblFinishedCheckProcedure.Size = new System.Drawing.Size(53, 12);
+            this.lblFinishedCheckProcedure.TabIndex = 28;
+            this.lblFinishedCheckProcedure.Text = "成检工序";
+            // 
             // ddlProcessModelType
             // 
             this.ddlProcessModelType.BackColor = System.Drawing.Color.Yellow;
@@ -613,10 +636,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureName.HasError = true;
             this.txtProcedureName.IsMustInput = true;
-            this.txtProcedureName.Location = new System.Drawing.Point(238, 20);
+            this.txtProcedureName.Location = new System.Drawing.Point(77, 478);
             this.txtProcedureName.MaxLength = 50;
             this.txtProcedureName.Name = "txtProcedureName";
-            this.txtProcedureName.Size = new System.Drawing.Size(108, 21);
+            this.txtProcedureName.Size = new System.Drawing.Size(451, 21);
             this.txtProcedureName.TabIndex = 3;
             // 
             // txtProcedureCode
@@ -627,7 +650,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureCode.HasError = true;
             this.txtProcedureCode.IsMustInput = true;
-            this.txtProcedureCode.Location = new System.Drawing.Point(65, 20);
+            this.txtProcedureCode.Location = new System.Drawing.Point(65, 19);
             this.txtProcedureCode.MaxLength = 20;
             this.txtProcedureCode.Name = "txtProcedureCode";
             this.txtProcedureCode.Size = new System.Drawing.Size(108, 21);
@@ -653,7 +676,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.c_Label2.IsMustInput = true;
-            this.c_Label2.Location = new System.Drawing.Point(179, 23);
+            this.c_Label2.Location = new System.Drawing.Point(18, 482);
             this.c_Label2.Name = "c_Label2";
             this.c_Label2.Size = new System.Drawing.Size(53, 12);
             this.c_Label2.TabIndex = 2;
@@ -795,8 +818,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvGoods
             // 
             this.dgvGoods.AllowUserToModifyRows = true;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGoods.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGoods.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
             this.dgvGoods.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvGoods.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvGoods.CellHeight = 23;
@@ -804,14 +827,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.ChildNodeColumnText = null;
             this.dgvGoods.ColumnDeep = 1;
             this.dgvGoods.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGoods.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvGoods.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvGoods.ColumnHeadersHeight = 29;
             this.dgvGoods.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGoods.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -822,19 +845,20 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.GoodsSpecification});
             this.dgvGoods.ColumnTreeView = null;
             this.dgvGoods.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGoods.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGoods.DefaultCellStyle = dataGridViewCellStyle16;
             this.dgvGoods.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGoods.DynamicColumnName = "";
             this.dgvGoods.EnableHeadersVisualStyles = false;
             this.dgvGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvGoods.FormatQuantityColumns = null;
+            this.dgvGoods.HasNode = false;
             this.dgvGoods.HorizontalMergeColumn = null;
             this.dgvGoods.IsAutoCountSum = true;
             this.dgvGoods.IsAutoResizeColumns = false;
@@ -851,8 +875,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.RefreshAtHscroll = false;
             this.dgvGoods.RowHeadersWidth = 50;
             this.dgvGoods.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvGoods.RowTemplate.Height = 21;
             this.dgvGoods.Size = new System.Drawing.Size(724, 223);
             this.dgvGoods.SortOrderColumnName = null;
@@ -860,6 +884,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.Tag = true;
             this.dgvGoods.TotalSumColumns = null;
             this.dgvGoods.ViewRowFilter = "";
+            this.dgvGoods.VirtualNodes = false;
             this.dgvGoods.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvGoods_CellBeginEdit);
             this.dgvGoods.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGoods_CellValueChanged);
             // 
@@ -917,7 +942,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Margin = new System.Windows.Forms.Padding(0);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(724, 246);
+            this.tabPage2.Size = new System.Drawing.Size(724, 223);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "检验工号";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -925,8 +950,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvUser
             // 
             this.dgvUser.AllowUserToModifyRows = true;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18;
             this.dgvUser.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvUser.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvUser.CellHeight = 23;
@@ -934,14 +959,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.ChildNodeColumnText = null;
             this.dgvUser.ColumnDeep = 1;
             this.dgvUser.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
             this.dgvUser.ColumnHeadersHeight = 29;
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -956,6 +981,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.EnableHeadersVisualStyles = false;
             this.dgvUser.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvUser.FormatQuantityColumns = null;
+            this.dgvUser.HasNode = false;
             this.dgvUser.HorizontalMergeColumn = null;
             this.dgvUser.IsAutoCountSum = true;
             this.dgvUser.IsAutoResizeColumns = false;
@@ -972,15 +998,16 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.RefreshAtHscroll = false;
             this.dgvUser.RowHeadersWidth = 50;
             this.dgvUser.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvUser.RowTemplate.Height = 21;
-            this.dgvUser.Size = new System.Drawing.Size(724, 246);
+            this.dgvUser.Size = new System.Drawing.Size(724, 223);
             this.dgvUser.SortOrderColumnName = null;
             this.dgvUser.TabIndex = 55;
             this.dgvUser.Tag = true;
             this.dgvUser.TotalSumColumns = null;
             this.dgvUser.ViewRowFilter = "";
+            this.dgvUser.VirtualNodes = false;
             this.dgvUser.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvUser_CellBeginEdit);
             this.dgvUser.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellValueChanged);
             // 
@@ -1030,7 +1057,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.tabPage3.Location = new System.Drawing.Point(4, 22);
             this.tabPage3.Margin = new System.Windows.Forms.Padding(0);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(724, 246);
+            this.tabPage3.Size = new System.Drawing.Size(724, 223);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "可检缺陷";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -1038,8 +1065,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvDefect
             // 
             this.dgvDefect.AllowUserToModifyRows = true;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
             this.dgvDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvDefect.CellHeight = 23;
@@ -1047,14 +1074,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.ChildNodeColumnText = null;
             this.dgvDefect.ColumnDeep = 1;
             this.dgvDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvDefect.ColumnHeadersHeight = 29;
             this.dgvDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1069,6 +1096,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.EnableHeadersVisualStyles = false;
             this.dgvDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvDefect.FormatQuantityColumns = null;
+            this.dgvDefect.HasNode = false;
             this.dgvDefect.HorizontalMergeColumn = null;
             this.dgvDefect.IsAutoCountSum = true;
             this.dgvDefect.IsAutoResizeColumns = false;
@@ -1085,15 +1113,16 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.RefreshAtHscroll = false;
             this.dgvDefect.RowHeadersWidth = 50;
             this.dgvDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle23;
             this.dgvDefect.RowTemplate.Height = 21;
-            this.dgvDefect.Size = new System.Drawing.Size(724, 246);
+            this.dgvDefect.Size = new System.Drawing.Size(724, 223);
             this.dgvDefect.SortOrderColumnName = null;
             this.dgvDefect.TabIndex = 55;
             this.dgvDefect.Tag = true;
             this.dgvDefect.TotalSumColumns = null;
             this.dgvDefect.ViewRowFilter = "";
+            this.dgvDefect.VirtualNodes = false;
             this.dgvDefect.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvDefect_CellBeginEdit);
             this.dgvDefect.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDefect_CellValueChanged);
             // 
@@ -1141,7 +1170,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.tabPage4.Controls.Add(this.dgvMissDefect);
             this.tabPage4.Location = new System.Drawing.Point(4, 22);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(724, 246);
+            this.tabPage4.Size = new System.Drawing.Size(724, 223);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "漏检缺陷";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -1149,8 +1178,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvMissDefect
             // 
             this.dgvMissDefect.AllowUserToModifyRows = true;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvMissDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvMissDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle24;
             this.dgvMissDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvMissDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvMissDefect.CellHeight = 23;
@@ -1158,14 +1187,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvMissDefect.ChildNodeColumnText = null;
             this.dgvMissDefect.ColumnDeep = 1;
             this.dgvMissDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMissDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            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.dgvMissDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
             this.dgvMissDefect.ColumnHeadersHeight = 29;
             this.dgvMissDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMissDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1182,6 +1211,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvMissDefect.EnableHeadersVisualStyles = false;
             this.dgvMissDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvMissDefect.FormatQuantityColumns = null;
+            this.dgvMissDefect.HasNode = false;
             this.dgvMissDefect.HorizontalMergeColumn = null;
             this.dgvMissDefect.IsAutoCountSum = true;
             this.dgvMissDefect.IsAutoResizeColumns = false;
@@ -1198,15 +1228,16 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvMissDefect.RefreshAtHscroll = false;
             this.dgvMissDefect.RowHeadersWidth = 50;
             this.dgvMissDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvMissDefect.RowsDefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvMissDefect.RowsDefaultCellStyle = dataGridViewCellStyle26;
             this.dgvMissDefect.RowTemplate.Height = 21;
-            this.dgvMissDefect.Size = new System.Drawing.Size(724, 246);
+            this.dgvMissDefect.Size = new System.Drawing.Size(724, 223);
             this.dgvMissDefect.SortOrderColumnName = null;
             this.dgvMissDefect.TabIndex = 55;
             this.dgvMissDefect.Tag = true;
             this.dgvMissDefect.TotalSumColumns = null;
             this.dgvMissDefect.ViewRowFilter = "";
+            this.dgvMissDefect.VirtualNodes = false;
             this.dgvMissDefect.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvMissDefect_CellBeginEdit);
             this.dgvMissDefect.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMissDefect_CellValueChanged);
             // 
@@ -1272,7 +1303,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(665, 470);
+            this.btnCancel.Location = new System.Drawing.Point(665, 473);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(85, 30);
             this.btnCancel.TabIndex = 5;
@@ -1286,7 +1317,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(574, 470);
+            this.btnSave.Location = new System.Drawing.Point(574, 473);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(85, 30);
             this.btnSave.TabIndex = 4;
@@ -1294,24 +1325,32 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.btnSave.UseVisualStyleBackColor = false;
             this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
-            // lblFinishedCheckProcedure
-            // 
-            this.lblFinishedCheckProcedure.Location = new System.Drawing.Point(18, 162);
-            this.lblFinishedCheckProcedure.Name = "lblFinishedCheckProcedure";
-            this.lblFinishedCheckProcedure.Size = new System.Drawing.Size(53, 12);
-            this.lblFinishedCheckProcedure.TabIndex = 28;
-            this.lblFinishedCheckProcedure.Text = "成检工序";
-            // 
-            // cboFinishedCheckProcedure
-            // 
-            this.cboFinishedCheckProcedure.BackColor = System.Drawing.SystemColors.Window;
-            this.cboFinishedCheckProcedure.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.cboFinishedCheckProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cboFinishedCheckProcedure.FormattingEnabled = true;
-            this.cboFinishedCheckProcedure.Location = new System.Drawing.Point(77, 159);
-            this.cboFinishedCheckProcedure.Name = "cboFinishedCheckProcedure";
-            this.cboFinishedCheckProcedure.Size = new System.Drawing.Size(106, 20);
-            this.cboFinishedCheckProcedure.TabIndex = 29;
+            // txtPName
+            // 
+            this.txtPName.BackColor = System.Drawing.Color.Yellow;
+            this.txtPName.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtPName.ErrorMessage = "必须输入项目";
+            this.txtPName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtPName.HasError = true;
+            this.txtPName.IsMustInput = true;
+            this.txtPName.Location = new System.Drawing.Point(238, 19);
+            this.txtPName.MaxLength = 50;
+            this.txtPName.Name = "txtPName";
+            this.txtPName.Size = new System.Drawing.Size(108, 21);
+            this.txtPName.TabIndex = 7;
+            // 
+            // c_Label7
+            // 
+            this.c_Label7.AutoSize = true;
+            this.c_Label7.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label7.IsMustInput = true;
+            this.c_Label7.Location = new System.Drawing.Point(179, 23);
+            this.c_Label7.Name = "c_Label7";
+            this.c_Label7.Size = new System.Drawing.Size(53, 12);
+            this.c_Label7.TabIndex = 6;
+            this.c_Label7.Text = "工序简称";
             // 
             // F_PC_0206
             // 
@@ -1322,6 +1361,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.txtProcedureName);
+            this.Controls.Add(this.c_Label2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.IsSaveFormSize = false;
             this.Margin = new System.Windows.Forms.Padding(5);
@@ -1333,6 +1374,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.StatusSizingGrip = false;
             this.Text = "检验属性";
             this.Load += new System.EventHandler(this.F_PC_0206_Load);
+            this.Controls.SetChildIndex(this.c_Label2, 0);
+            this.Controls.SetChildIndex(this.txtProcedureName, 0);
             this.Controls.SetChildIndex(this.groupBox1, 0);
             this.Controls.SetChildIndex(this.groupBox3, 0);
             this.Controls.SetChildIndex(this.btnSave, 0);
@@ -1637,7 +1680,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 #region 工序节点赋值
                 this._procedureEntity.ProcedureCode = this.txtProcedureCode.Text.Trim();
                 this.node.Name = this.txtProcedureName.Text.Trim();
+                this.node.ShortName = this.txtPName.Text.Trim();
+
                 this._procedureEntity.ProcedureName = this.txtProcedureName.Text.Trim();
+                this._procedureEntity.PName = this.txtPName.Text.Trim();
+
                 this._procedureEntity.ModelType = Convert.ToInt32(this.ddlProcessModelType.ListBox.SelectedValue);
                 this._procedureEntity.OrganizationID = (int)this.sbOrganizationID.OrganizationID;
                 this._procedureEntity.CollectType = rbtnMore.Checked ? 1 : 2;
@@ -1860,6 +1907,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 }
 
                 this.txtProcedureName.Text = this.node.Name;
+                this.txtPName.Text = this.node.ShortName;
+
                 this.txtRemarks.Text = this._procedureEntity.Remarks;
                 this.ddlProcessModelType.ListBox.SelectedValue = this._procedureEntity.ModelType;
                 // 不是重复代码。必须要赋值2行

DK.Client/PCModule/F_PC_0207.Designer.cs

@@ -67,5 +67,7 @@
         public System.Windows.Forms.RadioButton rbtnGlazeChange;
 		private Basics.BaseControls.C_ComboBox cboFinishedCheckProcedure;
 		private WinForm.Controls.LblLabel lblFinishedCheckProcedure;
-	}
+        private Basics.BaseControls.C_Label c_Label7;
+        private Basics.BaseControls.C_TextBox txtPName;
+    }
 }

DK.Client/PCModule/F_PC_0207.cs

@@ -283,6 +283,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.rbtnAuto = new System.Windows.Forms.RadioButton();
             this.rbtnHand = new System.Windows.Forms.RadioButton();
             this.sbOrganizationID = new Dongke.IBOSS.PRD.Client.Controls.dkOrganizationSearchBox();
+            this.c_Label7 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtPName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.GetDataOgrp.SuspendLayout();
             this.groupBox5.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -311,10 +313,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureName.HasError = true;
             this.txtProcedureName.IsMustInput = true;
-            this.txtProcedureName.Location = new System.Drawing.Point(238, 20);
+            this.txtProcedureName.Location = new System.Drawing.Point(77, 468);
             this.txtProcedureName.MaxLength = 50;
             this.txtProcedureName.Name = "txtProcedureName";
-            this.txtProcedureName.Size = new System.Drawing.Size(108, 21);
+            this.txtProcedureName.Size = new System.Drawing.Size(454, 21);
             this.txtProcedureName.TabIndex = 3;
             // 
             // txtProcedureCode
@@ -325,7 +327,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureCode.HasError = true;
             this.txtProcedureCode.IsMustInput = true;
-            this.txtProcedureCode.Location = new System.Drawing.Point(65, 20);
+            this.txtProcedureCode.Location = new System.Drawing.Point(65, 19);
             this.txtProcedureCode.MaxLength = 20;
             this.txtProcedureCode.Name = "txtProcedureCode";
             this.txtProcedureCode.Size = new System.Drawing.Size(108, 21);
@@ -351,7 +353,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.c_Label2.IsMustInput = true;
-            this.c_Label2.Location = new System.Drawing.Point(179, 23);
+            this.c_Label2.Location = new System.Drawing.Point(18, 472);
             this.c_Label2.Name = "c_Label2";
             this.c_Label2.Size = new System.Drawing.Size(53, 12);
             this.c_Label2.TabIndex = 2;
@@ -576,6 +578,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.EnableHeadersVisualStyles = false;
             this.dgvGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvGoods.FormatQuantityColumns = null;
+            this.dgvGoods.HasNode = false;
             this.dgvGoods.HorizontalMergeColumn = null;
             this.dgvGoods.IsAutoCountSum = true;
             this.dgvGoods.IsAutoResizeColumns = false;
@@ -601,6 +604,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.Tag = true;
             this.dgvGoods.TotalSumColumns = null;
             this.dgvGoods.ViewRowFilter = "";
+            this.dgvGoods.VirtualNodes = false;
             this.dgvGoods.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvGoods_CellBeginEdit);
             this.dgvGoods.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGoods_CellValueChanged);
             // 
@@ -693,6 +697,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.EnableHeadersVisualStyles = false;
             this.dgvUser.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvUser.FormatQuantityColumns = null;
+            this.dgvUser.HasNode = false;
             this.dgvUser.HorizontalMergeColumn = null;
             this.dgvUser.IsAutoCountSum = true;
             this.dgvUser.IsAutoResizeColumns = false;
@@ -718,6 +723,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.Tag = true;
             this.dgvUser.TotalSumColumns = null;
             this.dgvUser.ViewRowFilter = "";
+            this.dgvUser.VirtualNodes = false;
             this.dgvUser.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvUser_CellBeginEdit);
             this.dgvUser.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellValueChanged);
             this.dgvUser.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvUser_EditingControlShowing);
@@ -809,6 +815,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.EnableHeadersVisualStyles = false;
             this.dgvDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvDefect.FormatQuantityColumns = null;
+            this.dgvDefect.HasNode = false;
             this.dgvDefect.HorizontalMergeColumn = null;
             this.dgvDefect.IsAutoCountSum = true;
             this.dgvDefect.IsAutoResizeColumns = false;
@@ -834,6 +841,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.Tag = true;
             this.dgvDefect.TotalSumColumns = null;
             this.dgvDefect.ViewRowFilter = "";
+            this.dgvDefect.VirtualNodes = false;
             this.dgvDefect.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvDefect_CellBeginEdit);
             this.dgvDefect.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDefect_CellValueChanged);
             this.dgvDefect.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvDefect_EditingControlShowing);
@@ -955,6 +963,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvKiln.EnableHeadersVisualStyles = false;
             this.dgvKiln.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvKiln.FormatQuantityColumns = null;
+            this.dgvKiln.HasNode = false;
             this.dgvKiln.HorizontalMergeColumn = null;
             this.dgvKiln.IsAutoCountSum = true;
             this.dgvKiln.IsAutoResizeColumns = false;
@@ -980,6 +989,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvKiln.Tag = true;
             this.dgvKiln.TotalSumColumns = null;
             this.dgvKiln.ViewRowFilter = "";
+            this.dgvKiln.VirtualNodes = false;
             this.dgvKiln.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvKiln_CellBeginEdit);
             this.dgvKiln.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvKiln_CellValueChanged);
             // 
@@ -1099,6 +1109,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Controls.Add(this.lblFinishedCheckProcedure);
             this.groupBox1.Controls.Add(this.groupBox8);
             this.groupBox1.Controls.Add(this.ddlPrintType);
+            this.groupBox1.Controls.Add(this.txtPName);
+            this.groupBox1.Controls.Add(this.c_Label7);
             this.groupBox1.Controls.Add(this.c_Label6);
             this.groupBox1.Controls.Add(this.groupBox7);
             this.groupBox1.Controls.Add(this.txtBarCodePrintCopies);
@@ -1110,10 +1122,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Controls.Add(this.lblmisspriority);
             this.groupBox1.Controls.Add(this.groupBox4);
             this.groupBox1.Controls.Add(this.ddlProcessModelType);
-            this.groupBox1.Controls.Add(this.txtProcedureName);
             this.groupBox1.Controls.Add(this.txtProcedureCode);
             this.groupBox1.Controls.Add(this.c_Label3);
-            this.groupBox1.Controls.Add(this.c_Label2);
             this.groupBox1.Controls.Add(this.c_Label1);
             this.groupBox1.Controls.Add(this.GetDataOgrp);
             this.groupBox1.Controls.Add(this.groupBox6);
@@ -1424,7 +1434,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.ddlProcessModelType.ListBox.Size = new System.Drawing.Size(106, 136);
             this.ddlProcessModelType.ListBox.TabIndex = 0;
             this.ddlProcessModelType.ListBox.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
-            this.ddlProcessModelType.Location = new System.Drawing.Point(411, 20);
+            this.ddlProcessModelType.Location = new System.Drawing.Point(411, 19);
             this.ddlProcessModelType.Name = "ddlProcessModelType";
             this.ddlProcessModelType.Size = new System.Drawing.Size(108, 20);
             this.ddlProcessModelType.TabIndex = 5;
@@ -1474,7 +1484,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.sbOrganizationID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sbOrganizationID.IsMustInput = true;
             this.sbOrganizationID.IsOnlyDisplayEnd = false;
-            this.sbOrganizationID.Location = new System.Drawing.Point(525, 20);
+            this.sbOrganizationID.Location = new System.Drawing.Point(525, 19);
             this.sbOrganizationID.Margin = new System.Windows.Forms.Padding(4);
             this.sbOrganizationID.Name = "sbOrganizationID";
             this.sbOrganizationID.OrganizationCode = "";
@@ -1485,6 +1495,33 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.sbOrganizationID.TabIndex = 6;
             this.sbOrganizationID.TxtOrganizationBackColor = System.Drawing.SystemColors.Control;
             // 
+            // c_Label7
+            // 
+            this.c_Label7.AutoSize = true;
+            this.c_Label7.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label7.IsMustInput = true;
+            this.c_Label7.Location = new System.Drawing.Point(179, 23);
+            this.c_Label7.Name = "c_Label7";
+            this.c_Label7.Size = new System.Drawing.Size(53, 12);
+            this.c_Label7.TabIndex = 2;
+            this.c_Label7.Text = "工序简称";
+            // 
+            // txtPName
+            // 
+            this.txtPName.BackColor = System.Drawing.Color.Yellow;
+            this.txtPName.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtPName.ErrorMessage = "必须输入项目";
+            this.txtPName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtPName.HasError = true;
+            this.txtPName.IsMustInput = true;
+            this.txtPName.Location = new System.Drawing.Point(238, 19);
+            this.txtPName.MaxLength = 50;
+            this.txtPName.Name = "txtPName";
+            this.txtPName.Size = new System.Drawing.Size(108, 21);
+            this.txtPName.TabIndex = 3;
+            // 
             // F_PC_0207
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1495,6 +1532,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.txtProcedureName);
+            this.Controls.Add(this.c_Label2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.IsSaveFormSize = false;
             this.Margin = new System.Windows.Forms.Padding(5);
@@ -1506,6 +1545,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.StatusSizingGrip = false;
             this.Text = "计件属性";
             this.Load += new System.EventHandler(this.F_PC_0207_Load);
+            this.Controls.SetChildIndex(this.c_Label2, 0);
+            this.Controls.SetChildIndex(this.txtProcedureName, 0);
             this.Controls.SetChildIndex(this.groupBox1, 0);
             this.Controls.SetChildIndex(this.groupBox3, 0);
             this.Controls.SetChildIndex(this.btnSave, 0);
@@ -1638,6 +1679,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 }
 
                 this.txtProcedureName.Text = this.node.Name;
+                this.txtPName.Text = this.node.ShortName;
+
                 this.txtRemarks.Text = this._procedureEntity.Remarks;
                 this.txtBarCodePrintCopies.DataValue = this._procedureEntity.BarCodePrintCopies;
                 this.ddlProcessModelType.ListBox.SelectedValue = this._procedureEntity.ModelType;
@@ -1803,6 +1846,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 
             this._procedureEntity.ProcedureCode = this.txtProcedureCode.Text.Trim();
             this.node.Name = this.txtProcedureName.Text.Trim();
+            this.node.ShortName = this.txtPName.Text.Trim();
+
             this._procedureEntity.Remarks = this.txtRemarks.Text.Trim();
             this._procedureEntity.ModelType = (int)ddlProcessModelType.SelectedValue;
             //this.node.OrganizationID = this.cobOrganizationID.SelectedIndex;
@@ -2305,7 +2350,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 #region 工序节点赋值
                 this._procedureEntity.ProcedureCode = this.txtProcedureCode.Text.Trim();
                 this.node.Name = this.txtProcedureName.Text.Trim();
+                this.node.ShortName = this.txtPName.Text.Trim();
                 this._procedureEntity.ProcedureName = this.txtProcedureName.Text.Trim();
+                this._procedureEntity.PName = this.txtPName.Text.Trim();
+
                 this._procedureEntity.ModelType = Convert.ToInt32(this.ddlProcessModelType.ListBox.SelectedValue);
                 this._procedureEntity.OrganizationID = (int)this.sbOrganizationID.OrganizationID;
                 this._procedureEntity.CollectType = rbtnMore.Checked ? 1 : 2;

DK.Service/PCModuleLogic/PCModuleLogic.cs

@@ -105,6 +105,18 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     new OracleParameter("rs_result",OracleDbType.RefCursor,ParameterDirection.Output),
                     new OracleParameter("rs_resultDetail",OracleDbType.RefCursor,ParameterDirection.Output),
                 };
+                /*
+                OracleParameter[] paras = new OracleParameter[]{
+                    new OracleParameter("productionLineID",OracleDbType.Int32,productionLine.ProductionLineID,ParameterDirection.Input),
+                    new OracleParameter("productionLineCode",OracleDbType.NVarchar2,productionLine.ProductionLineCode,ParameterDirection.Input),
+                    new OracleParameter("productionLineName",OracleDbType.NVarchar2,productionLine.ProductionLineName,ParameterDirection.Input),
+                    new OracleParameter("remarks",OracleDbType.NVarchar2,productionLine.Remarks,ParameterDirection.Input),
+                    new OracleParameter("accountID",OracleDbType.Int32,sUserInfo.AccountID,ParameterDirection.Input),
+                    new OracleParameter("valueFlags",OracleDbType.NVarchar2,str_vauleFlags,ParameterDirection.Input),
+                    new OracleParameter("rs_result",OracleDbType.RefCursor,ParameterDirection.Output),
+                    new OracleParameter("rs_resultDetail",OracleDbType.RefCursor,ParameterDirection.Output),
+                };
+                */
                 DataSet ds = con.ExecStoredProcedure("PRO_PC_SearchProductionLine", paras);
                 return ds;
             }

DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -129,6 +129,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                     + "ProductionLineID,"
                                                     + "ProcedureCode,"
                                                     + "ProcedureName,"
+                                                    + "P_Name,"
                                                     + "ProcedureModel,"
                                                     + "ModelType,"
                                                     + "NodeType,"
@@ -148,6 +149,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                     + ":productionLineID,"
                                                     + ":procedureCode,"
                                                     + ":procedureName,"
+                                                    + ":pName,"
                                                     + ":procedureModel,"
                                                     + ":ModelType,"
                                                     + ":NodeType,"
@@ -169,6 +171,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                             new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                             new OracleParameter(":procedureCode",procedure.ProcedureCode),
                             new OracleParameter(":procedureName",procedure.ProcedureName),
+                            new OracleParameter(":pName",procedure.PName),
                             new OracleParameter(":procedureModel",procedure.ProcedureModel),
                             new OracleParameter(":ModelType",procedure.ModelType),
                             new OracleParameter(":NodeType",procedure.NodeType),
@@ -278,6 +281,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                         + "ProductionLineID,"
                                                         + "ProcedureCode,"
                                                         + "ProcedureName,"
+                                                        + "P_Name,"
                                                         + "ProcedureModel,"
                                                         + "ModelType,"
                                                         + "NodeType,"
@@ -297,6 +301,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                         + ":productionLineID,"
                                                         + ":procedureCode,"
                                                         + ":procedureName,"
+                                                        + ":pName,"
                                                         + ":procedureModel,"
                                                         + ":ModelType,"
                                                         + ":NodeType,"
@@ -318,6 +323,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                     new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                                     new OracleParameter(":procedureCode",procedure.ProcedureCode),
                                     new OracleParameter(":procedureName",procedure.ProcedureName),
+                                    new OracleParameter(":pName",procedure.PName),
                                     new OracleParameter(":procedureModel",procedure.ProcedureModel),
                                     new OracleParameter(":ModelType",procedure.ModelType),
                                     new OracleParameter(":NodeType",procedure.NodeType),
@@ -339,6 +345,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                             #region 编辑
                             sqlText = "UPDATE TP_PC_Procedure SET "
                                                                                 + " ProcedureName=:procedureName,"
+                                                                                + " P_Name=:pName,"
                                                                                 + " ProcedureCode=:ProcedureCode,"
                                                                                 + " ModelType=:modelType,"
                                                                                 + " MustFlag=:mustFlag,"
@@ -359,6 +366,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                 new OracleParameter(":nodeNo",procedure.NodeNo),
                                 new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                                 new OracleParameter(":procedureName",procedure.ProcedureName),
+                                    new OracleParameter(":pName",procedure.PName),
                                 new OracleParameter(":ProcedureCode",procedure.ProcedureCode),
                                 new OracleParameter(":modelType",procedure.ModelType),
                                 new OracleParameter(":mustFlag",procedure.MustFlag),
@@ -921,6 +929,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                     + "ProductionLineID,"
                                                     + "ProcedureCode,"
                                                     + "ProcedureName,"
+                                                    + "P_Name,"
                                                     + "ProcedureModel,"
                                                     + "ModelType,"
                                                     + "NodeType,"
@@ -940,6 +949,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                     + ":productionLineID,"
                                                     + ":procedureCode,"
                                                     + ":procedureName,"
+                                                    + ":pName,"
                                                     + ":procedureModel,"
                                                     + ":ModelType,"
                                                     + ":NodeType,"
@@ -961,6 +971,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                             new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                             new OracleParameter(":procedureCode",procedure.ProcedureCode),
                             new OracleParameter(":procedureName",procedure.ProcedureName),
+                            new OracleParameter(":pName",procedure.PName),
                             new OracleParameter(":procedureModel",procedure.ProcedureModel),
                             new OracleParameter(":ModelType",procedure.ModelType),
                             new OracleParameter(":NodeType",procedure.NodeType),
@@ -1077,6 +1088,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                         + "ProductionLineID,"
                                                         + "ProcedureCode,"
                                                         + "ProcedureName,"
+                                                        + "P_Name,"
                                                         + "ProcedureModel,"
                                                         + "ModelType,"
                                                         + "NodeType,"
@@ -1096,6 +1108,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                         + ":productionLineID,"
                                                         + ":procedureCode,"
                                                         + ":procedureName,"
+                                                        + ":pName,"
                                                         + ":procedureModel,"
                                                         + ":ModelType,"
                                                         + ":NodeType,"
@@ -1117,6 +1130,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                     new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                                     new OracleParameter(":procedureCode",procedure.ProcedureCode),
                                     new OracleParameter(":procedureName",procedure.ProcedureName),
+                                    new OracleParameter(":pName",procedure.PName),
                                     new OracleParameter(":procedureModel",procedure.ProcedureModel),
                                     new OracleParameter(":ModelType",procedure.ModelType),
                                     new OracleParameter(":NodeType",procedure.NodeType),
@@ -1157,6 +1171,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                             #region 编辑
                             sqlText = "UPDATE TP_PC_Procedure SET "
                                                                                 + " ProcedureName=:procedureName,"
+                                                                                + " P_Name=:pName,"
                                                                                 + " ProcedureCode=:ProcedureCode,"
                                                                                 + " ModelType=:modelType,"
                                                                                 + " MustFlag=:mustFlag,"
@@ -1185,6 +1200,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                 new OracleParameter(":nodeNo",procedure.NodeNo),
                                 new OracleParameter(":productionLineID",productionLine.ProductionLineID),
                                 new OracleParameter(":procedureName",procedure.ProcedureName),
+                                new OracleParameter(":pName",procedure.PName),
                                 new OracleParameter(":ProcedureCode",procedure.ProcedureCode),
                                 new OracleParameter(":modelType",procedure.ModelType),
                                 new OracleParameter(":mustFlag",procedure.MustFlag),
@@ -1560,6 +1576,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 #region 更新工序信息
                 sqlText = "UPDATE TP_PC_Procedure SET "
                     + " ProcedureName=:procedureName,"
+                    + " P_Name=:PName,"
                     + " ProcedureCode=:ProcedureCode,"
                     + " CollectType=:collectType,"
                     + " OrganizationID=:organizationID,"
@@ -1588,6 +1605,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                 new OracleParameter(":nodeNo",procedure.NodeNo),
                                 new OracleParameter(":productionLineID",procedure.ProductionLineID),
                                 new OracleParameter(":procedureName",procedure.ProcedureName),
+                                new OracleParameter(":PName",procedure.PName),
                                 new OracleParameter(":ProcedureCode",procedure.ProcedureCode),
                                 new OracleParameter(":collectType",procedure.CollectType),
                                 new OracleParameter(":organizationID",procedure.OrganizationID),

WCF.Service/WCF.DataModels/PCModule/ProcedureEntity.cs

@@ -254,6 +254,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get { return procedureName; }
             set { procedureName = value; }
         }
+        /// <summary>
+        /// 生产工序名称
+        /// </summary>
+        [DataMember]
+        public string PName
+        {
+            get;
+            set;
+        }
 
         /// <summary>
         /// 工序模型