产品类别，增加 sap产品层次关联

DK.Client/SystemModule/F_MST_0405.Designer.cs

@@ -29,28 +29,30 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_MST_0405));
+            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();
             this.dgvGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.GoodsTypeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.GoodsTypeID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsTypeFullName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tvwType = new System.Windows.Forms.TreeView();
             this.chkDisplayDisabledData = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.imglstNavigation = new System.Windows.Forms.ImageList(this.components);
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.GoodsTypeID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeFullName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.saptypecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.saptypesumcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGoodsType)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -66,11 +68,8 @@
             this.dgvGoodsType.AllowUserToOrderColumns = true;
             this.dgvGoodsType.AllowUserToResizeRows = false;
             this.dgvGoodsType.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGoodsType.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvGoodsType.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGoodsType.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvGoodsType.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvGoodsType.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvGoodsType.CellHeight = 23;
@@ -78,135 +77,78 @@
             this.dgvGoodsType.ChildNodeColumnText = null;
             this.dgvGoodsType.ColumnDeep = 1;
             this.dgvGoodsType.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.dgvGoodsType.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvGoodsType.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;
             this.dgvGoodsType.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGoodsType.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.GoodsTypeID,
             this.GoodsTypeCode,
             this.GoodsTypeName,
-            this.Remarks,
+            this.GoodsTypeFullName,
             this.ValueFlag,
-            this.GoodsTypeID,
-            this.GoodsTypeFullName});
+            this.saptypecode,
+            this.saptypesumcode,
+            this.Remarks});
             this.dgvGoodsType.ColumnTreeView = null;
             this.dgvGoodsType.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvGoodsType.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGoodsType.DynamicColumnName = "";
             this.dgvGoodsType.EnableHeadersVisualStyles = false;
             this.dgvGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvGoodsType.FormatQuantityColumns = null;
+            this.dgvGoodsType.HasNode = false;
+            this.dgvGoodsType.HorizontalMergeColumn = null;
             this.dgvGoodsType.IsAutoCountSum = true;
             this.dgvGoodsType.IsAutoResizeColumns = false;
             this.dgvGoodsType.IsClickF12 = false;
+            this.dgvGoodsType.IsOpenMergeCellFlag = false;
             this.dgvGoodsType.IsSubTotalFlag = false;
-            this.dgvGoodsType.Location = new System.Drawing.Point(3, 4);
+            this.dgvGoodsType.IsTopDeep = false;
+            this.dgvGoodsType.Location = new System.Drawing.Point(0, 0);
             this.dgvGoodsType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.dgvGoodsType.MergeColumnNames = null;
+            this.dgvGoodsType.MergeDetailColumnNames = null;
+            this.dgvGoodsType.MergeDetailOnlyColumn = null;
+            this.dgvGoodsType.MergeOnlyColumn = null;
             this.dgvGoodsType.MultiSelect = false;
             this.dgvGoodsType.Name = "dgvGoodsType";
             this.dgvGoodsType.RefreshAtHscroll = false;
             this.dgvGoodsType.RowHeadersWidth = 50;
             this.dgvGoodsType.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGoodsType.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGoodsType.RowsDefaultCellStyle = dataGridViewCellStyle24;
             this.dgvGoodsType.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 9F);
             this.dgvGoodsType.RowTemplate.Height = 21;
-            this.dgvGoodsType.Size = new System.Drawing.Size(555, 429);
+            this.dgvGoodsType.Size = new System.Drawing.Size(784, 437);
             this.dgvGoodsType.SortOrderColumnName = null;
             this.dgvGoodsType.TabIndex = 2;
             this.dgvGoodsType.Tag = true;
             this.dgvGoodsType.TotalSumColumns = null;
             this.dgvGoodsType.ViewRowFilter = "";
+            this.dgvGoodsType.VirtualNodes = false;
             this.dgvGoodsType.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGoodsType_CellValidated);
             this.dgvGoodsType.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dgvGoodsType_CellValidating);
             this.dgvGoodsType.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dgvGoodsType_DefaultValuesNeeded);
             this.dgvGoodsType.RowValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGoodsType_RowValidated);
             this.dgvGoodsType.RowValidating += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvGoodsType_RowValidating);
             // 
-            // GoodsTypeCode
-            // 
-            this.GoodsTypeCode.DataPropertyName = "GoodsTypeCode";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GoodsTypeCode.DefaultCellStyle = dataGridViewCellStyle3;
-            this.GoodsTypeCode.HeaderText = "产品类别编码";
-            this.GoodsTypeCode.Name = "GoodsTypeCode";
-            this.GoodsTypeCode.ReadOnly = true;
-            this.GoodsTypeCode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.GoodsTypeCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // GoodsTypeName
-            // 
-            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F);
-            this.GoodsTypeName.DefaultCellStyle = dataGridViewCellStyle4;
-            this.GoodsTypeName.HeaderText = "产品类别名称";
-            this.GoodsTypeName.MaxInputLength = 20;
-            this.GoodsTypeName.Name = "GoodsTypeName";
-            this.GoodsTypeName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.GoodsTypeName.Width = 113;
-            // 
-            // Remarks
-            // 
-            this.Remarks.DataPropertyName = "Remarks";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F);
-            this.Remarks.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Remarks.HeaderText = "备注";
-            this.Remarks.MaxInputLength = 500;
-            this.Remarks.Name = "Remarks";
-            this.Remarks.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // ValueFlag
-            // 
-            this.ValueFlag.DataPropertyName = "ValueFlag";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F);
-            dataGridViewCellStyle6.NullValue = false;
-            this.ValueFlag.DefaultCellStyle = dataGridViewCellStyle6;
-            this.ValueFlag.FalseValue = "0";
-            this.ValueFlag.HeaderText = "正常";
-            this.ValueFlag.IndeterminateValue = "0";
-            this.ValueFlag.Name = "ValueFlag";
-            this.ValueFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.ValueFlag.TrueValue = "1";
-            this.ValueFlag.Width = 50;
-            // 
-            // GoodsTypeID
-            // 
-            this.GoodsTypeID.DataPropertyName = "GoodsTypeID";
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GoodsTypeID.DefaultCellStyle = dataGridViewCellStyle7;
-            this.GoodsTypeID.HeaderText = "产品类别ID";
-            this.GoodsTypeID.Name = "GoodsTypeID";
-            this.GoodsTypeID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.GoodsTypeID.Visible = false;
-            this.GoodsTypeID.Width = 80;
-            // 
-            // GoodsTypeFullName
-            // 
-            this.GoodsTypeFullName.DataPropertyName = "GoodsTypeFullName";
-            this.GoodsTypeFullName.HeaderText = "产品类别全称";
-            this.GoodsTypeFullName.Name = "GoodsTypeFullName";
-            this.GoodsTypeFullName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
             // tvwType
             // 
-            this.tvwType.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tvwType.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tvwType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tvwType.HideSelection = false;
             this.tvwType.Indent = 20;
             this.tvwType.ItemHeight = 20;
-            this.tvwType.Location = new System.Drawing.Point(3, 4);
+            this.tvwType.Location = new System.Drawing.Point(0, 0);
             this.tvwType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.tvwType.Name = "tvwType";
-            this.tvwType.Size = new System.Drawing.Size(197, 429);
+            this.tvwType.Size = new System.Drawing.Size(283, 437);
             this.tvwType.TabIndex = 3;
             this.tvwType.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvwType_BeforeCollapse);
             this.tvwType.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvwType_BeforeExpand);
@@ -215,6 +157,7 @@
             // 
             // chkDisplayDisabledData
             // 
+            this.chkDisplayDisabledData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.chkDisplayDisabledData.AutoSize = true;
             this.chkDisplayDisabledData.BackgroundImage = global::Dongke.IBOSS.PRD.Client.SystemModule.Resource1.functionbackground;
             this.chkDisplayDisabledData.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -234,7 +177,7 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F);
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(605, 456);
+            this.btnSave.Location = new System.Drawing.Point(908, 456);
             this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(85, 30);
@@ -251,7 +194,7 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F);
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(696, 456);
+            this.btnCancel.Location = new System.Drawing.Point(999, 456);
             this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(85, 30);
@@ -268,6 +211,10 @@
             // 
             // splitContainer1
             // 
+            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
             this.splitContainer1.Location = new System.Drawing.Point(12, 12);
             this.splitContainer1.Name = "splitContainer1";
             // 
@@ -278,27 +225,106 @@
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.dgvGoodsType);
-            this.splitContainer1.Size = new System.Drawing.Size(768, 437);
-            this.splitContainer1.SplitterDistance = 203;
+            this.splitContainer1.Size = new System.Drawing.Size(1071, 437);
+            this.splitContainer1.SplitterDistance = 283;
             this.splitContainer1.TabIndex = 7;
             // 
+            // GoodsTypeID
+            // 
+            this.GoodsTypeID.DataPropertyName = "GoodsTypeID";
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.GoodsTypeID.DefaultCellStyle = dataGridViewCellStyle19;
+            this.GoodsTypeID.HeaderText = "产品类别ID";
+            this.GoodsTypeID.Name = "GoodsTypeID";
+            this.GoodsTypeID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsTypeID.Visible = false;
+            this.GoodsTypeID.Width = 80;
+            // 
+            // GoodsTypeCode
+            // 
+            this.GoodsTypeCode.DataPropertyName = "GoodsTypeCode";
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.GoodsTypeCode.DefaultCellStyle = dataGridViewCellStyle20;
+            this.GoodsTypeCode.HeaderText = "产品类别编码";
+            this.GoodsTypeCode.Name = "GoodsTypeCode";
+            this.GoodsTypeCode.ReadOnly = true;
+            this.GoodsTypeCode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.GoodsTypeCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // GoodsTypeName
+            // 
+            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 9F);
+            this.GoodsTypeName.DefaultCellStyle = dataGridViewCellStyle21;
+            this.GoodsTypeName.HeaderText = "产品类别名称";
+            this.GoodsTypeName.MaxInputLength = 20;
+            this.GoodsTypeName.Name = "GoodsTypeName";
+            this.GoodsTypeName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsTypeName.Width = 113;
+            // 
+            // GoodsTypeFullName
+            // 
+            this.GoodsTypeFullName.DataPropertyName = "GoodsTypeFullName";
+            this.GoodsTypeFullName.HeaderText = "产品类别全称";
+            this.GoodsTypeFullName.Name = "GoodsTypeFullName";
+            this.GoodsTypeFullName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // ValueFlag
+            // 
+            this.ValueFlag.DataPropertyName = "ValueFlag";
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F);
+            dataGridViewCellStyle22.NullValue = false;
+            this.ValueFlag.DefaultCellStyle = dataGridViewCellStyle22;
+            this.ValueFlag.FalseValue = "0";
+            this.ValueFlag.HeaderText = "正常";
+            this.ValueFlag.IndeterminateValue = "0";
+            this.ValueFlag.Name = "ValueFlag";
+            this.ValueFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.ValueFlag.TrueValue = "1";
+            this.ValueFlag.Width = 50;
+            // 
+            // saptypecode
+            // 
+            this.saptypecode.DataPropertyName = "saptypecode";
+            this.saptypecode.HeaderText = "SAP产品层次编码";
+            this.saptypecode.Name = "saptypecode";
+            this.saptypecode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // saptypesumcode
+            // 
+            this.saptypesumcode.DataPropertyName = "saptypesumcode";
+            this.saptypesumcode.HeaderText = "汇总SAP层次编码";
+            this.saptypesumcode.Name = "saptypesumcode";
+            this.saptypesumcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 9F);
+            this.Remarks.DefaultCellStyle = dataGridViewCellStyle23;
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.MaxInputLength = 500;
+            this.Remarks.Name = "Remarks";
+            this.Remarks.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // F_MST_0405
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(792, 511);
+            this.ClientSize = new System.Drawing.Size(1095, 511);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.chkDisplayDisabledData);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.IsSaveFormSize = false;
-            this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "F_MST_0405";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.StatusSizingGrip = false;
             this.Text = "F_MST_0405";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.F_MST_0405_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_MST_0405_FormClosed);
@@ -326,12 +352,13 @@
         private Basics.BaseControls.C_Button btnCancel;
         private System.Windows.Forms.ImageList imglstNavigation;
         private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeFullName;
-
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;
+        private System.Windows.Forms.DataGridViewTextBoxColumn saptypecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn saptypesumcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
     }
 }

DK.Client/SystemModule/F_MST_0405.resx

@@ -120,23 +120,27 @@
   <metadata name="GoodsTypeFullName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="saptypecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="saptypesumcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="imglstNavigation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

DK.Service/BPMDataService/BPMDataService.csproj

@@ -30,6 +30,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -1783,6 +1783,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                                 + "(GoodsTypeCode"
                                                 + ",GoodsTypeName"
                                                 + ",GoodsTypeFullName"
+                                                + ",SAPTYPECODE"
+                                                + ",SAPTYPESUMCODE"
                                                 + ",Remarks"
                                                 + ",AccountID"
                                                 + ",CreateTime"
@@ -1794,6 +1796,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                                 + "(:goodsTypeCode"
                                                 + ",:goodsTypeName"
                                                 + ",:goodsTypeFullName"
+                                                + ",:SAPTYPECODE"
+                                                + ",:SAPTYPESUMCODE"
                                                 + ",:Remarks"
                                                 + ",:AccountID"
                                                 + ",sysdate"
@@ -1805,6 +1809,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             new OracleParameter(":goodsTypeCode",dataRow["goodsTypeCode"].ToString()),
                             new OracleParameter(":goodsTypeName",dataRow["goodsTypeName"].ToString()),
                             new OracleParameter(":goodsTypeFullName",dataRow["goodsTypeFullName"].ToString()),
+                            new OracleParameter(":SAPTYPECODE",dataRow["SAPTYPECODE"].ToString()),
+                            new OracleParameter(":SAPTYPESUMCODE",dataRow["SAPTYPESUMCODE"].ToString()),
                             new OracleParameter(":Remarks",dataRow["Remarks"].ToString()),
                             new OracleParameter(":AccountID",sUserInfo.AccountID),
                             new OracleParameter(":UpdateUserID",sUserInfo.UserID),
@@ -1832,6 +1838,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                         string sqlString = "UPDATE TP_MST_GoodsType SET "
                                             + " GoodsTypeName = :goodsTypeName,"
                                             + " GoodsTypeFullName = :GoodsTypeFullName,"
+                                            + " SAPTYPECODE = :SAPTYPECODE,"
+                                            + " SAPTYPESUMCODE = :SAPTYPESUMCODE,"
                                             + " Remarks = :Remarks,"
                                             + " AccountID = :AccountID,"
                                             + " ValueFlag = :ValueFlag,"
@@ -1862,6 +1870,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                         {
                             new OracleParameter(":goodsTypeName",dataRow["goodsTypeName"].ToString()),
                             new OracleParameter(":GoodsTypeFullName",dataRow["GoodsTypeFullName"].ToString()),
+                            new OracleParameter(":SAPTYPECODE",dataRow["SAPTYPECODE"].ToString()),
+                            new OracleParameter(":SAPTYPESUMCODE",dataRow["SAPTYPESUMCODE"].ToString()),
                             new OracleParameter(":Remarks",dataRow["Remarks"].ToString()),
                             new OracleParameter(":AccountID",sUserInfo.AccountID),
                             new OracleParameter(":ValueFlag",dataRow["ValueFlag"].ToString()),

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -2539,8 +2539,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					//根据帐套查询数据
-					sqlString = "Select GoodsTypeID,GoodsTypeCode,GoodsTypeName,GoodsTypeFullName,IsLeafNode,Remarks,AccountID,ValueFlag,"
-							   + "CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_GoodsType where AccountID =:accountID";
+					sqlString = "Select * from TP_MST_GoodsType where AccountID =:accountID";
 					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
 					  new OracleParameter(":accountID",sUserInfo.AccountID)
@@ -2549,8 +2548,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				else if (pValue.ToString() == Constant.INT_IS_ZERO.ToString())
 				{
 					//根据帐套，标识符查询数据
-					sqlString = "Select GoodsTypeID,GoodsTypeCode,GoodsTypeName,GoodsTypeFullName,IsLeafNode,Remarks,AccountID,ValueFlag,"
-								+ "CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_GoodsType where valueflag = :valueflag and AccountID =:accountID";
+					sqlString = "Select * from TP_MST_GoodsType where valueflag = :valueflag and AccountID =:accountID";
 					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
 					   new OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
@@ -2584,8 +2582,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
 			try
 			{
-				string sqlString = "Select GoodsTypeID,GoodsTypeCode,GoodsTypeName,GoodsTypeFullName,IsLeafNode,Remarks,AccountID,ValueFlag,"
-					+ "CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_GoodsType where  AccountID =:accountID order by goodstypecode";
+				string sqlString = "Select * from TP_MST_GoodsType where AccountID =:accountID order by goodstypecode";
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{
 					new OracleParameter(":accountID",sUserInfo.AccountID)

DK.Service/WMSDataService/WMSDataService.csproj

@@ -30,6 +30,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>

IBOSS.PRD.sln

@@ -1028,8 +1028,8 @@ Global
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x64.Build.0 = Debug|Any CPU
-		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x86.Build.0 = Debug|Any CPU
+		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x86.ActiveCfg = Debug|x86
+		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Debug|x86.Build.0 = Debug|x86
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Release|Any CPU.Build.0 = Release|Any CPU
 		{66595313-4446-423E-A3CA-8D9EC76B2C27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -1044,8 +1044,8 @@ Global
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x64.Build.0 = Debug|Any CPU
-		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x86.ActiveCfg = Debug|x86
+		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Debug|x86.Build.0 = Debug|x86
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5E1F20D-62B9-452F-AF7F-096E94D584A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU