金蝶代码对应(完成)

DK.Client/SystemModule/F_MST_1301.Designer.cs

@@ -38,21 +38,21 @@
 			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
 			this.lblGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
 			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			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.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.txtKingdeeCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.ddlLogoName = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
 			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.ddlGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
 			this.dgvGoosKingdeecode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.GOODSCODE = 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.ddlGlazeTypeID = new Dongke.WinForm.Controls.FtcFilterComboBox();
+			this.ddlLogoName = new Dongke.WinForm.Controls.FtcFilterComboBox();
+			this.scbGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvGoosKingdeecode)).BeginInit();
@@ -132,20 +132,6 @@
 			this.lblGoodsCode.TabIndex = 3;
 			this.lblGoodsCode.Text = "产品编码";
 			// 
-			// txtGoodsCode
-			// 
-			this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGoodsCode.ErrorMessage = "";
-			this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGoodsCode.Location = new System.Drawing.Point(75, 20);
-			this.txtGoodsCode.MaxLength = 50;
-			this.txtGoodsCode.Name = "txtGoodsCode";
-			this.txtGoodsCode.Size = new System.Drawing.Size(120, 21);
-			this.txtGoodsCode.TabIndex = 1;
-			// 
 			// btnSearch
 			// 
 			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -196,15 +182,15 @@
             | 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.ddlLogoName);
+			this.gbxCondition.Controls.Add(this.ddlGlazeTypeID);
 			this.gbxCondition.Controls.Add(this.c_Label2);
 			this.gbxCondition.Controls.Add(this.txtKingdeeCode);
-			this.gbxCondition.Controls.Add(this.ddlLogoName);
 			this.gbxCondition.Controls.Add(this.c_Label1);
-			this.gbxCondition.Controls.Add(this.ddlGlazeTypeID);
 			this.gbxCondition.Controls.Add(this.btnClearCondition);
 			this.gbxCondition.Controls.Add(this.btnSearch);
 			this.gbxCondition.Controls.Add(this.lblGoodsCode);
-			this.gbxCondition.Controls.Add(this.txtGoodsCode);
 			this.gbxCondition.Controls.Add(this.lblGlazeTypeID);
 			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -243,27 +229,6 @@
 			this.txtKingdeeCode.Size = new System.Drawing.Size(120, 21);
 			this.txtKingdeeCode.TabIndex = 18;
 			// 
-			// ddlLogoName
-			// 
-			this.ddlLogoName.BackColor = System.Drawing.SystemColors.Window;
-			this.ddlLogoName.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.ddlLogoName.DataSource = null;
-			this.ddlLogoName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlLogoName.FormattingEnabled = true;
-			// 
-			// 
-			// 
-			this.ddlLogoName.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ddlLogoName.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlLogoName.ListBox.Location = new System.Drawing.Point(0, 0);
-			this.ddlLogoName.ListBox.Name = "";
-			this.ddlLogoName.ListBox.Size = new System.Drawing.Size(118, 136);
-			this.ddlLogoName.ListBox.TabIndex = 0;
-			this.ddlLogoName.Location = new System.Drawing.Point(447, 21);
-			this.ddlLogoName.Name = "ddlLogoName";
-			this.ddlLogoName.Size = new System.Drawing.Size(120, 20);
-			this.ddlLogoName.TabIndex = 16;
-			// 
 			// c_Label1
 			// 
 			this.c_Label1.AutoSize = true;
@@ -276,27 +241,6 @@
 			this.c_Label1.TabIndex = 17;
 			this.c_Label1.Text = "商标";
 			// 
-			// ddlGlazeTypeID
-			// 
-			this.ddlGlazeTypeID.BackColor = System.Drawing.SystemColors.Window;
-			this.ddlGlazeTypeID.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.ddlGlazeTypeID.DataSource = null;
-			this.ddlGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlGlazeTypeID.FormattingEnabled = true;
-			// 
-			// 
-			// 
-			this.ddlGlazeTypeID.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ddlGlazeTypeID.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlGlazeTypeID.ListBox.Location = new System.Drawing.Point(0, 0);
-			this.ddlGlazeTypeID.ListBox.Name = "";
-			this.ddlGlazeTypeID.ListBox.Size = new System.Drawing.Size(118, 136);
-			this.ddlGlazeTypeID.ListBox.TabIndex = 0;
-			this.ddlGlazeTypeID.Location = new System.Drawing.Point(271, 21);
-			this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
-			this.ddlGlazeTypeID.Size = new System.Drawing.Size(120, 20);
-			this.ddlGlazeTypeID.TabIndex = 5;
-			// 
 			// dgvGoosKingdeecode
 			// 
 			this.dgvGoosKingdeecode.AllowUserToAddRows = false;
@@ -391,6 +335,34 @@
 			this.KINGDEECODE.ReadOnly = true;
 			this.KINGDEECODE.Width = 150;
 			// 
+			// ddlGlazeTypeID
+			// 
+			this.ddlGlazeTypeID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.ddlGlazeTypeID.FormattingEnabled = true;
+			this.ddlGlazeTypeID.Location = new System.Drawing.Point(271, 20);
+			this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
+			this.ddlGlazeTypeID.ShowMustInputAlert = false;
+			this.ddlGlazeTypeID.Size = new System.Drawing.Size(127, 20);
+			this.ddlGlazeTypeID.TabIndex = 85;
+			// 
+			// ddlLogoName
+			// 
+			this.ddlLogoName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.ddlLogoName.FormattingEnabled = true;
+			this.ddlLogoName.Location = new System.Drawing.Point(444, 20);
+			this.ddlLogoName.Name = "ddlLogoName";
+			this.ddlLogoName.ShowMustInputAlert = false;
+			this.ddlLogoName.Size = new System.Drawing.Size(130, 20);
+			this.ddlLogoName.TabIndex = 86;
+			// 
+			// 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;
+			// 
 			// F_MST_1301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -420,21 +392,21 @@
         private System.Windows.Forms.ToolStripButton tsbtnEdit;
         private System.Windows.Forms.ToolStripButton tsbtnClose;
         private Basics.BaseControls.C_Label lblGoodsCode;
-        private Basics.BaseControls.C_TextBox txtGoodsCode;
         private Basics.BaseControls.C_Button btnSearch;
         private Basics.BaseControls.C_Button btnClearCondition;
         private Basics.BaseControls.C_Label lblGlazeTypeID;
 		private Basics.BaseControls.C_GroupBox gbxCondition;
-        private Basics.BaseControls.DKListBoxComboBox ddlGlazeTypeID;
 		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.DKListBoxComboBox ddlLogoName;
 		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;
 	}
 }

DK.Client/SystemModule/F_MST_1301.cs

@@ -71,8 +71,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			{
 				this.dgvGoosKingdeecode.AutoGenerateColumns = false;
 				this.loadDataSource();
-				this.ddlGlazeTypeID.SelectedValue = null;
-				this.ddlLogoName.SelectedValue = null;
+				this.ddlGlazeTypeID.ClearValue();
+				this.ddlLogoName.ClearValue();
 				FormPermissionManager.FormPermissionControl(this.Name, this,
 				 Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
 				 Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
@@ -92,9 +92,9 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		/// <param name="e"></param>
 		private void btnClearCondition_Click(object sender, EventArgs e)
 		{
-			this.txtGoodsCode.Clear();
-			this.ddlGlazeTypeID.SelectedValue = null;
-			this.ddlLogoName.SelectedValue = null;
+			this.scbGoodsCode.ClearValue();
+			this.ddlGlazeTypeID.ClearValue();
+			this.ddlLogoName.ClearValue();
 			this.txtKingdeeCode.Clear();
 		}
 
@@ -207,7 +207,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				ClientRequestEntity cre = new ClientRequestEntity();
 				cre.NameSpace = "F_MST_1301";
 				cre.Name = "GetKingdeeCode";
-				cre.Properties["GoodsCode"] = this.txtGoodsCode.Text;
+				cre.Properties["GoodsCode"] = this.scbGoodsCode.Text;
 				cre.Properties["GlazeType"] = this.ddlGlazeTypeID.Text;
 				cre.Properties["LogoName"] = this.ddlLogoName.Text;
 				cre.Properties["KingdeeCode"] = this.txtKingdeeCode.Text;
@@ -232,31 +232,24 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		{
 			try
 			{
-				ClientRequestEntity cre = new ClientRequestEntity();
-				cre.NameSpace = "F_MST_1301";
-				cre.Name = "GetGlazeType";
-				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
-				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+				DataTable dtGlazeType = SystemModuleProxy.Service.GetDataDictionaryByType(Constant.DictionaryType.TPC002, Constant.INT_IS_ONE);
+				if (dtGlazeType != null)
 				{
-					DataTable dtGlazeType = sre.Data.Tables[0];
-					if (dtGlazeType != null)
-					{
-						ddlGlazeTypeID.DisplayMember = "GLAZETYPE";
-						ddlGlazeTypeID.ValueMember = "ROWNUM";
-						ddlGlazeTypeID.DataSource = dtGlazeType;
-					}
+					ddlGlazeTypeID.DisplayMember = "DictionaryValue";
+					ddlGlazeTypeID.ValueMember = "DictionarylD";
+					ddlGlazeTypeID.DataSource = dtGlazeType;
 				}
-				cre = new ClientRequestEntity();
+				ClientRequestEntity cre = new ClientRequestEntity();
 				cre.NameSpace = "F_MST_1301";
 				cre.Name = "GetLogoName";
-				sre = SystemModuleProxy.Service.DoRequest(cre);
+				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
 				{
 					DataTable dtLogoName = sre.Data.Tables[0];
 					if (dtLogoName != null)
 					{
-						ddlLogoName.DisplayMember = "LOGONAME";
-						ddlLogoName.ValueMember = "ROWNUM";
+						ddlLogoName.DisplayMember = "LogoNameCode";
+						ddlLogoName.ValueMember = "LogoID";
 						ddlLogoName.DataSource = dtLogoName;
 					}
 				}

DK.Client/SystemModule/F_MST_1302.Designer.cs

@@ -34,12 +34,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label6 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
 			this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.txtKingdeeCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.ddlLogoName = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
-			this.ddlGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
+			this.ddlLogoName = new Dongke.WinForm.Controls.FtcFilterComboBox();
+			this.ddlGlazeTypeID = new Dongke.WinForm.Controls.FtcFilterComboBox();
+			this.scbGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
 			this.SuspendLayout();
 			// 
 			// c_Label1
@@ -95,19 +95,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.btnCancel.UseVisualStyleBackColor = false;
 			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
 			// 
-			// txtGoodsCode
-			// 
-			this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGoodsCode.ErrorMessage = "";
-			this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGoodsCode.Location = new System.Drawing.Point(74, 20);
-			this.txtGoodsCode.MaxLength = 20;
-			this.txtGoodsCode.Name = "txtGoodsCode";
-			this.txtGoodsCode.Size = new System.Drawing.Size(130, 21);
-			this.txtGoodsCode.TabIndex = 72;
-			// 
 			// c_Label5
 			// 
 			this.c_Label5.AutoSize = true;
@@ -149,58 +136,44 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			// 
 			// ddlLogoName
 			// 
-			this.ddlLogoName.BackColor = System.Drawing.SystemColors.Window;
-			this.ddlLogoName.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.ddlLogoName.DataSource = null;
-			this.ddlLogoName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.ddlLogoName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.ddlLogoName.FormattingEnabled = true;
-			// 
-			// 
-			// 
-			this.ddlLogoName.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ddlLogoName.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlLogoName.ListBox.Location = new System.Drawing.Point(0, 0);
-			this.ddlLogoName.ListBox.Name = "";
-			this.ddlLogoName.ListBox.Size = new System.Drawing.Size(128, 136);
-			this.ddlLogoName.ListBox.TabIndex = 0;
-			this.ddlLogoName.Location = new System.Drawing.Point(74, 68);
+			this.ddlLogoName.Location = new System.Drawing.Point(74, 71);
 			this.ddlLogoName.Name = "ddlLogoName";
+			this.ddlLogoName.ShowMustInputAlert = false;
 			this.ddlLogoName.Size = new System.Drawing.Size(130, 20);
-			this.ddlLogoName.TabIndex = 81;
+			this.ddlLogoName.TabIndex = 83;
 			// 
 			// ddlGlazeTypeID
 			// 
-			this.ddlGlazeTypeID.BackColor = System.Drawing.SystemColors.Window;
-			this.ddlGlazeTypeID.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.ddlGlazeTypeID.DataSource = null;
-			this.ddlGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.ddlGlazeTypeID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.ddlGlazeTypeID.FormattingEnabled = true;
+			this.ddlGlazeTypeID.Location = new System.Drawing.Point(290, 71);
+			this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
+			this.ddlGlazeTypeID.ShowMustInputAlert = false;
+			this.ddlGlazeTypeID.Size = new System.Drawing.Size(127, 20);
+			this.ddlGlazeTypeID.TabIndex = 84;
 			// 
+			// scbGoodsCode
 			// 
-			// 
-			this.ddlGlazeTypeID.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.ddlGlazeTypeID.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.ddlGlazeTypeID.ListBox.Location = new System.Drawing.Point(0, 0);
-			this.ddlGlazeTypeID.ListBox.Name = "";
-			this.ddlGlazeTypeID.ListBox.Size = new System.Drawing.Size(128, 136);
-			this.ddlGlazeTypeID.ListBox.TabIndex = 0;
-			this.ddlGlazeTypeID.Location = new System.Drawing.Point(287, 68);
-			this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
-			this.ddlGlazeTypeID.Size = new System.Drawing.Size(130, 20);
-			this.ddlGlazeTypeID.TabIndex = 82;
+			this.scbGoodsCode.CheckedData = null;
+			this.scbGoodsCode.Location = new System.Drawing.Point(74, 20);
+			this.scbGoodsCode.Name = "scbGoodsCode";
+			this.scbGoodsCode.Size = new System.Drawing.Size(130, 21);
+			this.scbGoodsCode.TabIndex = 88;
 			// 
 			// F_MST_1302
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(431, 172);
+			this.Controls.Add(this.scbGoodsCode);
 			this.Controls.Add(this.ddlGlazeTypeID);
 			this.Controls.Add(this.ddlLogoName);
 			this.Controls.Add(this.c_Label1);
 			this.Controls.Add(this.c_Label6);
 			this.Controls.Add(this.btnSave);
 			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.txtGoodsCode);
 			this.Controls.Add(this.c_Label5);
 			this.Controls.Add(this.c_Label4);
 			this.Controls.Add(this.txtKingdeeCode);
@@ -219,12 +192,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private Basics.BaseControls.C_Label c_Label6;
 		private Basics.BaseControls.C_Button btnSave;
 		private Basics.BaseControls.C_Button btnCancel;
-		private Basics.BaseControls.C_TextBox txtGoodsCode;
 		private Basics.BaseControls.C_Label c_Label5;
 		private Basics.BaseControls.C_Label c_Label4;
 		private Basics.BaseControls.C_TextBox txtKingdeeCode;
 		private Basics.BaseControls.C_Label c_Label1;
-		private Basics.BaseControls.DKListBoxComboBox ddlLogoName;
-		private Basics.BaseControls.DKListBoxComboBox ddlGlazeTypeID;
+		private WinForm.Controls.FtcFilterComboBox ddlLogoName;
+		private WinForm.Controls.FtcFilterComboBox ddlGlazeTypeID;
+		private Controls.SearchBox.ScbGoods scbGoodsCode;
 	}
 }

DK.Client/SystemModule/F_MST_1302.cs

@@ -60,11 +60,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 						//金蝶代码
 						this.txtKingdeeCode.Text = KingdeeCode;
 						//产品编码
-						this.txtGoodsCode.Text = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
+						this.scbGoodsCode.Text = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
 						//商标名称
-						this.ddlLogoName.Text = sre.Data.Tables[0].Rows[0]["LOGONAME"].ToString();
+						this.ddlLogoName.SelectedValue = sre.Data.Tables[0].Rows[0]["LOGONAME"].ToString();
 						//釉料类别
-						this.ddlGlazeTypeID.Text = sre.Data.Tables[0].Rows[0]["KINGDEECODE"].ToString();
+						this.ddlGlazeTypeID.SelectedValue = sre.Data.Tables[0].Rows[0]["KINGDEECODE"].ToString();
 					}
 				}
 			}
@@ -96,12 +96,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			try
 			{
 				//商品编码
-				if (string.IsNullOrEmpty(this.txtGoodsCode.Text.ToString()))
+				if (string.IsNullOrEmpty(this.scbGoodsCode.Text.ToString()))
 				{
 					//必须输入
 					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "商品编码"),
 						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
-					this.txtGoodsCode.Focus();
+					this.scbGoodsCode.Focus();
 					return;
 				}
 
@@ -139,7 +139,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 					this.btnSave.Enabled = false;
 					this.btnCancel.Enabled = false;
 					this.AddCustomerInfo();
-					this.Clear();
 				}
 				if (_editStatus == Constant.FormMode.Edit)
 				{
@@ -174,7 +173,10 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		{
 			try
 			{
+				this.ddlGlazeTypeID.ClearValue();
+				this.ddlLogoName.ClearValue();
 				this.loadDataSource();
+
 			}
 			catch (Exception ex)
 			{
@@ -193,31 +195,24 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		{
 			try
 			{
-				ClientRequestEntity cre = new ClientRequestEntity();
-				cre.NameSpace = "F_MST_1301";
-				cre.Name = "GetGlazeType";
-				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
-				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+				DataTable dtGlazeType = SystemModuleProxy.Service.GetDataDictionaryByType(Constant.DictionaryType.TPC002, Constant.INT_IS_ONE);
+				if (dtGlazeType != null)
 				{
-					DataTable dtGlazeType = sre.Data.Tables[0];
-					if (dtGlazeType != null)
-					{
-						ddlGlazeTypeID.DisplayMember = "GLAZETYPE";
-						ddlGlazeTypeID.ValueMember = "ROWNUM";
-						ddlGlazeTypeID.DataSource = dtGlazeType;
-					}
+					ddlGlazeTypeID.DisplayMember = "DictionaryValue";
+					ddlGlazeTypeID.ValueMember = "DictionarylD";
+					ddlGlazeTypeID.DataSource = dtGlazeType;
 				}
-				cre = new ClientRequestEntity();
+				ClientRequestEntity cre = new ClientRequestEntity();
 				cre.NameSpace = "F_MST_1301";
 				cre.Name = "GetLogoName";
-				sre = SystemModuleProxy.Service.DoRequest(cre);
+				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
 				{
 					DataTable dtLogoName = sre.Data.Tables[0];
 					if (dtLogoName != null)
 					{
-						ddlLogoName.DisplayMember = "LOGONAME";
-						ddlLogoName.ValueMember = "ROWNUM";
+						ddlLogoName.DisplayMember = "LogoNameCode";
+						ddlLogoName.ValueMember = "LogoID";
 						ddlLogoName.DataSource = dtLogoName;
 					}
 				}
@@ -231,7 +226,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 
 		private void Clear()
 		{
-			this.txtGoodsCode.Clear();
+			this.scbGoodsCode.ClearValue();
 			this.txtKingdeeCode.Clear();
 			this.ddlLogoName.SelectedText = "";
 			this.ddlGlazeTypeID.SelectedText = "";
@@ -242,7 +237,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			ClientRequestEntity cre = new ClientRequestEntity();
 			cre.NameSpace = "F_MST_1301";
 			cre.Name = "AddKingdeeCode";
-			cre.Properties["GOODSCODE"] = this.txtGoodsCode.Text;
+			cre.Properties["GOODSCODE"] = this.scbGoodsCode.SearchedValue;
 			cre.Properties["GLAZETYPE"] = this.ddlGlazeTypeID.Text;
 			cre.Properties["LOGONAME"] = this.ddlLogoName.Text;
 			cre.Properties["KINGDEECODE"] = this.txtKingdeeCode.Text;
@@ -254,6 +249,10 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			if (sre.OtherStatus > 0)
 			{
 				DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+				this.Clear();
+				this.txtKingdeeCode.Focus();
+				this.ddlGlazeTypeID.ClearValue();
+				this.ddlLogoName.ClearValue();
 				return;
 			}
 			else if (Convert.ToInt32(sre.OtherStatus) == -1001)
@@ -272,7 +271,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			ClientRequestEntity cre = new ClientRequestEntity();
 			cre.NameSpace = "F_MST_1301";
 			cre.Name = "AddKingdeeCode";
-			cre.Properties["GOODSCODE"] = this.txtGoodsCode.Text;
+			cre.Properties["GOODSCODE"] = this.scbGoodsCode.Text;
 			cre.Properties["GLAZETYPE"] = this.ddlGlazeTypeID.Text;
 			cre.Properties["LOGONAME"] = this.ddlLogoName.Text;
 			cre.Properties["KINGDEECODE"] = this.txtKingdeeCode.Text;

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1339,44 +1339,6 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 		}
 
 		/// <summary>
-		/// 查询釉料类别
-		/// </summary>
-		/// <param name="sUserInfo"></param>
-		/// <param name="goodsID"></param>
-		/// <returns></returns>
-		public static ServiceResultEntity GetGlazeType(SUserInfo sUserInfo, ClientRequestEntity cre)
-		{
-			IDBConnection conn = null;
-			try
-			{
-				conn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
-
-				string sqlString = @"
-							SELECT 
-								ROWNUM,
-								GLAZETYPE 
-							FROM
-							( SELECT DISTINCT GLAZETYPE FROM TP_MST_GOODSKINGDEECODE )";
-				ServiceResultEntity sre = new ServiceResultEntity();
-				sre.Data = conn.GetSqlResultToDs(sqlString, null);
-				return sre;
-			}
-			catch (Exception ex)
-			{
-				throw ex;
-			}
-			finally
-			{
-				if (conn != null &&
-					conn.ConnState == ConnectionState.Open)
-				{
-					conn.Close();
-				}
-			}
-		}
-
-
-		/// <summary>
 		/// 查询商标名称
 		/// </summary>
 		/// <param name="sUserInfo"></param>
@@ -1391,10 +1353,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 
 				string sqlString = @"
 							SELECT
-								ROWNUM,
-								LOGONAME
+								LogoID,
+								LogoName AS LogoNameCode 
 							FROM
-								( SELECT DISTINCT LOGONAME FROM TP_MST_GOODSKINGDEECODE )";
+								tp_mst_logo 
+							WHERE
+								AccountID = 1
+								AND valueflag = '1' 
+							ORDER BY
+								isdefault DESC,
+								displayno";
 				ServiceResultEntity sre = new ServiceResultEntity();
 				sre.Data = conn.GetSqlResultToDs(sqlString, null);
 				return sre;
@@ -1412,11 +1380,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				}
 			}
 		}
-		
-			///<summary>
-			///保存金蝶代码信息
-			/// </summary>
-			public static ServiceResultEntity AddKingdeeCode(SUserInfo sUserInfo, ClientRequestEntity cre)
+
+		///<summary>
+		///保存金蝶代码信息
+		/// </summary>
+		public static ServiceResultEntity AddKingdeeCode(SUserInfo sUserInfo, ClientRequestEntity cre)
 			{
 				IDBTransaction conn = null;
 				try

IBOSS.PRD/F_SYS_0202.cs

@@ -288,7 +288,7 @@ namespace Dongke.IBOSS.PRD.Client
 									mst1002.ShowDialog();
 									break;
 								case "010310":
-									//系统管理-产品信息-半成品缺陷位置
+									//系统管理-产品信息-金蝶代码对应
 									ShowInDockPanel(F_MST_1301.Instance);
 									break;
 								#endregion

WCF.Service/WCF.Services/SystemModuleService.cs

@@ -2670,25 +2670,18 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 }
                 if ("F_MST_1301" == cre.NameSpace)
                 {
-                    if ("GetKingdeeCode" == cre.Name)
-                    {
-                        ServiceResultEntity result =
-                           ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SystemModuleLogic.GetKingdeeCode(SUserInfo, cre));
-                        return result;
-                    }
-                    if ("GetGlazeType" == cre.Name)
+                    if ("GetLogoName" == cre.Name)
                     {
                         ServiceResultEntity result =
                            ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SystemModuleLogic.GetGlazeType(SUserInfo, cre));
+                           () => SystemModuleLogic.GetLogoName(SUserInfo, cre));
                         return result;
                     }
-                    if ("GetLogoName" == cre.Name)
+                    if ("GetKingdeeCode" == cre.Name)
                     {
                         ServiceResultEntity result =
                            ServiceInvoker.Invoke<ServiceResultEntity>(this,
-                           () => SystemModuleLogic.GetLogoName(SUserInfo, cre));
+                           () => SystemModuleLogic.GetKingdeeCode(SUserInfo, cre));
                         return result;
                     }
                     if ("AddKingdeeCode" == cre.Name)