金蝶代码对应 修改产品编码为文本框 模糊查询 添加产品名称 查询条件模糊查询

DK.Client/SystemModule/F_MST_1301.Designer.cs

@@ -28,13 +28,14 @@
         /// </summary>
         private void InitializeComponent()
         {
-			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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_MST_1301));
+			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();
 			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
 			this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
+			this.delBtn = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
 			this.lblGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -42,7 +43,9 @@
 			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.lblGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-			this.scbGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+			this.goodsnametxt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.goodscodetxt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
 			this.ddlLogoName = new Dongke.WinForm.Controls.FtcFilterComboBox();
 			this.ddlGlazeTypeID = new Dongke.WinForm.Controls.FtcFilterComboBox();
 			this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -50,10 +53,10 @@
 			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dgvGoosKingdeecode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GLAZETYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LOGONAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KINGDEECODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.delBtn = new System.Windows.Forms.ToolStripButton();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvGoosKingdeecode)).BeginInit();
@@ -75,7 +78,7 @@
 			this.tsrOperate.Name = "tsrOperate";
 			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
 			this.tsrOperate.ShowItemToolTips = false;
-			this.tsrOperate.Size = new System.Drawing.Size(1037, 35);
+			this.tsrOperate.Size = new System.Drawing.Size(1128, 35);
 			this.tsrOperate.TabIndex = 1;
 			// 
 			// tsbtnAdd
@@ -100,6 +103,16 @@
 			this.tsbtnEdit.Text = "编辑(&E)";
 			this.tsbtnEdit.Click += new System.EventHandler(this.tsbtnEdit_Click);
 			// 
+			// delBtn
+			// 
+			this.delBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.delBtn.Image = ((System.Drawing.Image)(resources.GetObject("delBtn.Image")));
+			this.delBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.delBtn.Name = "delBtn";
+			this.delBtn.Size = new System.Drawing.Size(33, 32);
+			this.delBtn.Text = "删除";
+			this.delBtn.Click += new System.EventHandler(this.delBtn_Click);
+			// 
 			// tsbtnAdaptive
 			// 
 			this.tsbtnAdaptive.AutoSize = false;
@@ -141,7 +154,7 @@
 			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
-			this.btnSearch.Location = new System.Drawing.Point(849, 14);
+			this.btnSearch.Location = new System.Drawing.Point(940, 14);
 			this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(85, 30);
@@ -157,7 +170,7 @@
 			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
 			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-			this.btnClearCondition.Location = new System.Drawing.Point(940, 14);
+			this.btnClearCondition.Location = new System.Drawing.Point(1031, 14);
 			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
@@ -172,7 +185,7 @@
 			this.lblGlazeTypeID.BackColor = System.Drawing.SystemColors.Control;
 			this.lblGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.lblGlazeTypeID.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGlazeTypeID.Location = new System.Drawing.Point(212, 24);
+			this.lblGlazeTypeID.Location = new System.Drawing.Point(386, 23);
 			this.lblGlazeTypeID.Name = "lblGlazeTypeID";
 			this.lblGlazeTypeID.Size = new System.Drawing.Size(53, 12);
 			this.lblGlazeTypeID.TabIndex = 15;
@@ -184,7 +197,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
-			this.gbxCondition.Controls.Add(this.scbGoodsCode);
+			this.gbxCondition.Controls.Add(this.goodsnametxt);
+			this.gbxCondition.Controls.Add(this.c_Label3);
+			this.gbxCondition.Controls.Add(this.goodscodetxt);
 			this.gbxCondition.Controls.Add(this.ddlLogoName);
 			this.gbxCondition.Controls.Add(this.ddlGlazeTypeID);
 			this.gbxCondition.Controls.Add(this.c_Label2);
@@ -200,24 +215,56 @@
 			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(1037, 56);
+			this.gbxCondition.Size = new System.Drawing.Size(1128, 56);
 			this.gbxCondition.TabIndex = 23;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
 			// 
-			// scbGoodsCode
-			// 
-			this.scbGoodsCode.CheckedData = null;
-			this.scbGoodsCode.Location = new System.Drawing.Point(75, 20);
-			this.scbGoodsCode.Name = "scbGoodsCode";
-			this.scbGoodsCode.Size = new System.Drawing.Size(130, 21);
-			this.scbGoodsCode.TabIndex = 87;
+			// goodsnametxt
+			// 
+			this.goodsnametxt.BackColor = System.Drawing.SystemColors.Window;
+			this.goodsnametxt.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.goodsnametxt.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.goodsnametxt.ErrorMessage = "";
+			this.goodsnametxt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.goodsnametxt.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.goodsnametxt.Location = new System.Drawing.Point(260, 18);
+			this.goodsnametxt.MaxLength = 50;
+			this.goodsnametxt.Name = "goodsnametxt";
+			this.goodsnametxt.Size = new System.Drawing.Size(120, 21);
+			this.goodsnametxt.TabIndex = 89;
+			// 
+			// c_Label3
+			// 
+			this.c_Label3.AutoSize = true;
+			this.c_Label3.BackColor = System.Drawing.SystemColors.Control;
+			this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label3.Location = new System.Drawing.Point(201, 23);
+			this.c_Label3.Name = "c_Label3";
+			this.c_Label3.Size = new System.Drawing.Size(53, 12);
+			this.c_Label3.TabIndex = 88;
+			this.c_Label3.Text = "产品名称";
+			// 
+			// goodscodetxt
+			// 
+			this.goodscodetxt.BackColor = System.Drawing.SystemColors.Window;
+			this.goodscodetxt.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.goodscodetxt.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.goodscodetxt.ErrorMessage = "";
+			this.goodscodetxt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.goodscodetxt.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.goodscodetxt.Location = new System.Drawing.Point(75, 19);
+			this.goodscodetxt.MaxLength = 50;
+			this.goodscodetxt.Name = "goodscodetxt";
+			this.goodscodetxt.Size = new System.Drawing.Size(120, 21);
+			this.goodscodetxt.TabIndex = 87;
 			// 
 			// ddlLogoName
 			// 
 			this.ddlLogoName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.ddlLogoName.FormattingEnabled = true;
-			this.ddlLogoName.Location = new System.Drawing.Point(444, 20);
+			this.ddlLogoName.Location = new System.Drawing.Point(618, 19);
 			this.ddlLogoName.Name = "ddlLogoName";
 			this.ddlLogoName.ShowMustInputAlert = false;
 			this.ddlLogoName.Size = new System.Drawing.Size(130, 20);
@@ -227,7 +274,7 @@
 			// 
 			this.ddlGlazeTypeID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.ddlGlazeTypeID.FormattingEnabled = true;
-			this.ddlGlazeTypeID.Location = new System.Drawing.Point(271, 20);
+			this.ddlGlazeTypeID.Location = new System.Drawing.Point(445, 19);
 			this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
 			this.ddlGlazeTypeID.ShowMustInputAlert = false;
 			this.ddlGlazeTypeID.Size = new System.Drawing.Size(127, 20);
@@ -239,7 +286,7 @@
 			this.c_Label2.BackColor = System.Drawing.SystemColors.Control;
 			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.SystemColors.ControlText;
-			this.c_Label2.Location = new System.Drawing.Point(580, 24);
+			this.c_Label2.Location = new System.Drawing.Point(754, 23);
 			this.c_Label2.Name = "c_Label2";
 			this.c_Label2.Size = new System.Drawing.Size(53, 12);
 			this.c_Label2.TabIndex = 19;
@@ -253,7 +300,7 @@
 			this.txtKingdeeCode.ErrorMessage = "";
 			this.txtKingdeeCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtKingdeeCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtKingdeeCode.Location = new System.Drawing.Point(639, 20);
+			this.txtKingdeeCode.Location = new System.Drawing.Point(813, 19);
 			this.txtKingdeeCode.MaxLength = 50;
 			this.txtKingdeeCode.Name = "txtKingdeeCode";
 			this.txtKingdeeCode.Size = new System.Drawing.Size(120, 21);
@@ -265,7 +312,7 @@
 			this.c_Label1.BackColor = System.Drawing.SystemColors.Control;
 			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label1.Location = new System.Drawing.Point(412, 24);
+			this.c_Label1.Location = new System.Drawing.Point(586, 23);
 			this.c_Label1.Name = "c_Label1";
 			this.c_Label1.Size = new System.Drawing.Size(29, 12);
 			this.c_Label1.TabIndex = 17;
@@ -276,8 +323,8 @@
 			this.dgvGoosKingdeecode.AllowUserToAddRows = false;
 			this.dgvGoosKingdeecode.AllowUserToDeleteRows = false;
 			this.dgvGoosKingdeecode.AllowUserToModifyRows = true;
-			dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvGoosKingdeecode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvGoosKingdeecode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
 			this.dgvGoosKingdeecode.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)));
@@ -288,17 +335,18 @@
 			this.dgvGoosKingdeecode.ChildNodeColumnText = null;
 			this.dgvGoosKingdeecode.ColumnDeep = 1;
 			this.dgvGoosKingdeecode.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvGoosKingdeecode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			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.dgvGoosKingdeecode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
 			this.dgvGoosKingdeecode.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.dgvGoosKingdeecode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GOODSCODE,
+            this.GoodsNames,
             this.GLAZETYPE,
             this.LOGONAME,
             this.KINGDEECODE});
@@ -325,10 +373,10 @@
 			this.dgvGoosKingdeecode.RefreshAtHscroll = false;
 			this.dgvGoosKingdeecode.RowHeadersWidth = 50;
 			this.dgvGoosKingdeecode.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvGoosKingdeecode.RowsDefaultCellStyle = dataGridViewCellStyle6;
+			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvGoosKingdeecode.RowsDefaultCellStyle = dataGridViewCellStyle3;
 			this.dgvGoosKingdeecode.RowTemplate.Height = 21;
-			this.dgvGoosKingdeecode.Size = new System.Drawing.Size(1031, 349);
+			this.dgvGoosKingdeecode.Size = new System.Drawing.Size(1122, 404);
 			this.dgvGoosKingdeecode.SortOrderColumnName = null;
 			this.dgvGoosKingdeecode.TabIndex = 24;
 			this.dgvGoosKingdeecode.Tag = true;
@@ -342,6 +390,13 @@
 			this.GOODSCODE.Name = "GOODSCODE";
 			this.GOODSCODE.ReadOnly = true;
 			// 
+			// GoodsNames
+			// 
+			this.GoodsNames.DataPropertyName = "GoodsName";
+			this.GoodsNames.HeaderText = "产品名称";
+			this.GoodsNames.Name = "GoodsNames";
+			this.GoodsNames.ReadOnly = true;
+			// 
 			// GLAZETYPE
 			// 
 			this.GLAZETYPE.DataPropertyName = "GLAZETYPE";
@@ -365,21 +420,11 @@
 			this.KINGDEECODE.ReadOnly = true;
 			this.KINGDEECODE.Width = 150;
 			// 
-			// delBtn
-			// 
-			this.delBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-			this.delBtn.Image = ((System.Drawing.Image)(resources.GetObject("delBtn.Image")));
-			this.delBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.delBtn.Name = "delBtn";
-			this.delBtn.Size = new System.Drawing.Size(33, 32);
-			this.delBtn.Text = "删除";
-			this.delBtn.Click += new System.EventHandler(this.delBtn_Click);
-			// 
 			// F_MST_1301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1037, 461);
+			this.ClientSize = new System.Drawing.Size(1128, 516);
 			this.Controls.Add(this.dgvGoosKingdeecode);
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.tsrOperate);
@@ -410,16 +455,19 @@
 		private Basics.BaseControls.C_GroupBox gbxCondition;
 		private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
 		private Basics.BaseControls.C_DataGridView dgvGoosKingdeecode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GLAZETYPE;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LOGONAME;
-		private System.Windows.Forms.DataGridViewTextBoxColumn KINGDEECODE;
 		private Basics.BaseControls.C_Label c_Label1;
 		private Basics.BaseControls.C_Label c_Label2;
 		private Basics.BaseControls.C_TextBox txtKingdeeCode;
 		private WinForm.Controls.FtcFilterComboBox ddlGlazeTypeID;
 		private WinForm.Controls.FtcFilterComboBox ddlLogoName;
-		private Controls.SearchBox.ScbGoods scbGoodsCode;
 		private System.Windows.Forms.ToolStripButton delBtn;
+		private Basics.BaseControls.C_TextBox goodsnametxt;
+		private Basics.BaseControls.C_Label c_Label3;
+		private Basics.BaseControls.C_TextBox goodscodetxt;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsNames;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GLAZETYPE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LOGONAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn KINGDEECODE;
 	}
 }

DK.Client/SystemModule/F_MST_1301.cs

@@ -92,7 +92,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		/// <param name="e"></param>
 		private void btnClearCondition_Click(object sender, EventArgs e)
 		{
-			this.scbGoodsCode.ClearValue();
+			this.goodscodetxt.Clear();
+			this.goodsnametxt.Clear();
 			this.ddlGlazeTypeID.ClearValue();
 			this.ddlLogoName.ClearValue();
 			this.txtKingdeeCode.Clear();
@@ -208,7 +209,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				ClientRequestEntity cre = new ClientRequestEntity();
 				cre.NameSpace = "F_MST_1301";
 				cre.Name = "GetKingdeeCode";
-				cre.Properties["GoodsCode"] = this.scbGoodsCode.SearchedValue+ "";
+				cre.Properties["GoodsCode"] = this.goodscodetxt.Text;
+				cre.Properties["GoodsName"] = this.goodsnametxt.Text;
 				cre.Properties["GlazeType"] = this.ddlGlazeTypeID.Text;
 				cre.Properties["LogoName"] = this.ddlLogoName.Text;
 				cre.Properties["KingdeeCode"] = this.txtKingdeeCode.Text;

DK.Client/SystemModule/F_MST_1301.resx

@@ -212,6 +212,9 @@
   <metadata name="GOODSCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="GoodsNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GLAZETYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1291,31 +1291,38 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 
 				string sqlString = @"
 								SELECT
-									GOODSCODE,
-									GLAZETYPE,
-									LOGONAME,
-									KINGDEECODE 
+									TP_MST_GOODSKINGDEECODE.GOODSCODE,
+									gd.goodsname,
+									TP_MST_GOODSKINGDEECODE.GLAZETYPE,
+									TP_MST_GOODSKINGDEECODE.LOGONAME,
+									TP_MST_GOODSKINGDEECODE.KINGDEECODE 
 								FROM
 									TP_MST_GOODSKINGDEECODE
-								WHERE 1=1  AND valueflag=1";
+									LEFT JOIN TP_MST_GOODS gd on gd.GOODSCODE=TP_MST_GOODSKINGDEECODE.GOODSCODE
+								WHERE 1=1  AND TP_MST_GOODSKINGDEECODE.valueflag=1";
 				if (!string.IsNullOrEmpty(cre.Properties["GoodsCode"].ToString()))
 				{
-					sqlString += " AND GOODSCODE like :GOODSCODE";
+					sqlString += " AND TP_MST_GOODSKINGDEECODE.GOODSCODE like :GOODSCODE";
 				}
 				if (!string.IsNullOrEmpty(cre.Properties["GlazeType"].ToString()))
 				{
-					sqlString += " AND GLAZETYPE = :GLAZETYPE";
+					sqlString += " AND TP_MST_GOODSKINGDEECODE.GLAZETYPE = :GLAZETYPE";
 				}
 				if (!string.IsNullOrEmpty(cre.Properties["LogoName"].ToString()))
 				{
-					sqlString += " AND LOGONAME = :LOGONAME";
+					sqlString += " AND TP_MST_GOODSKINGDEECODE.LOGONAME = :LOGONAME";
 				}
 				if (!string.IsNullOrEmpty(cre.Properties["KingdeeCode"].ToString()))
 				{
-					sqlString += " AND KINGDEECODE like :KINGDEECODE";
+					sqlString += " AND TP_MST_GOODSKINGDEECODE.KINGDEECODE like :KINGDEECODE";
+				}
+				if (!string.IsNullOrEmpty(cre.Properties["GoodsName"].ToString()))
+				{
+					sqlString += " AND gd.goodsname like :GoodsName";
 				}
 				OracleParameter[] paras = new OracleParameter[]{
 					new OracleParameter(":GOODSCODE",'%'+cre.Properties["GoodsCode"].ToString()+'%'),
+					new OracleParameter(":GoodsName",'%'+cre.Properties["GoodsName"].ToString()+'%'),
 					new OracleParameter(":GLAZETYPE",cre.Properties["GlazeType"].ToString()),
 					new OracleParameter(":LOGONAME",cre.Properties["LogoName"].ToString()),
 					new OracleParameter(":KINGDEECODE",'%'+cre.Properties["KingdeeCode"].ToString()+'%'),