林勇 冯 3 rokov pred
rodič
commit
d419aec62d

+ 2 - 1
DK.Client/SystemModule/F_MST_1302.Designer.cs

@@ -157,10 +157,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			// scbGoodsCode
 			// 
 			this.scbGoodsCode.CheckedData = null;
+			this.scbGoodsCode.DisplayMember = "GoodsCode";
 			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;
+			this.scbGoodsCode.TabIndex = 89;
 			// 
 			// F_MST_1302
 			// 

+ 16 - 10
DK.Client/SystemModule/F_MST_1302.cs

@@ -57,15 +57,15 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 					ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 					if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
 					{
+						DataRow item = sre.Data.Tables[0].Rows[0];
 						//金蝶代码
 						this.txtKingdeeCode.Text = KingdeeCode;
 						//产品编码
 						this.scbGoodsCode.Text = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
-						this.scbGoodsCode.ValueMember = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
 						//商标名称
-						this.ddlLogoName.SelectedValue = sre.Data.Tables[0].Rows[0]["LOGONAME"].ToString();
+						this.ddlLogoName.InitValue(item["LOGONAME"].ToString(), 1);
 						//釉料类别
-						this.ddlGlazeTypeID.SelectedValue = sre.Data.Tables[0].Rows[0]["KINGDEECODE"].ToString();
+						this.ddlLogoName.InitValue(item["GLAZETYPE"].ToString(),1);
 					}
 				}
 			}
@@ -238,7 +238,17 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			ClientRequestEntity cre = new ClientRequestEntity();
 			cre.NameSpace = "F_MST_1301";
 			cre.Name = "AddKingdeeCode";
-			cre.Properties["GOODSCODE"] = this.scbGoodsCode.SearchedValue + "";
+			if (!string.IsNullOrWhiteSpace(this.scbGoodsCode.Text))
+			{
+				if (this.scbGoodsCode.CheckedPKMember.Contains(","))
+				{
+					cre.Properties["GOODSCODE"] = scbGoodsCode.CheckedPKMember;
+				}
+				else
+				{
+					cre.Properties["GOODSCODE"] = scbGoodsCode.SearchedPKMember;
+				}
+			}
 			cre.Properties["GLAZETYPE"] = this.ddlGlazeTypeID.Text;
 			cre.Properties["LOGONAME"] = this.ddlLogoName.Text;
 			cre.Properties["KINGDEECODE"] = this.txtKingdeeCode.Text;
@@ -272,13 +282,9 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			ClientRequestEntity cre = new ClientRequestEntity();
 			cre.NameSpace = "F_MST_1301";
 			cre.Name = "AddKingdeeCode";
-			if (this.scbGoodsCode.ValueMember + "" == this.scbGoodsCode.Text + "")
-			{
-				cre.Properties["GOODSCODE"] = this.scbGoodsCode.CheckedData.Rows[0]["GOODSCODE"] + "";
-			}
-			else
+			if (!string.IsNullOrWhiteSpace(this.scbGoodsCode.Text))
 			{
-				cre.Properties["GOODSCODE"] = this.scbGoodsCode.Text + "";
+				cre.Properties["GOODSCODE"] = this.scbGoodsCode.Text;
 			}
 			cre.Properties["GLAZETYPE"] = this.ddlGlazeTypeID.Text;
 			cre.Properties["LOGONAME"] = this.ddlLogoName.Text;