产品对应釉料商标查询下拉框增加空值可查询全部数据

DK.Client/SystemModule/F_MST_1701.cs

@@ -61,10 +61,21 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			FormPermissionManager.FormPermissionControl(this.Name, this,
 			LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
 			LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
-			DataSet logoInfo = SystemModuleProxy.Service.GetLogoInfo();
-			this.cmbLogo.DataSource = logoInfo.Tables[0];
-			this.cmbLogo.DisplayMember = "LOGONAME";
+			ClientRequestEntity cres = new ClientRequestEntity();
+			cres.NameSpace = "F_MST_1701";
+			cres.Name = "GetLogo";
+			cres.Properties["LOGOCODE"] = "";
+			ServiceResultEntity sres = SystemModuleProxy.Service.DoRequest(cres);
+			DataSet set = sres.Data;
+			DataTable dt = set.Tables[0];
+			DataRow dr = dt.NewRow();
+			dr["LOGOCODE"] = "";
+			dr["LOGONAME"] = "";
+			dt.Rows.Add(dr);
+			this.cmbLogo.DataSource = dt;
 			this.cmbLogo.ValueMember = "LOGOCODE";
+			this.cmbLogo.DisplayMember = "LOGONAME";
+			this.cmbLogo.SelectedValue = "";
 			//设置表格不自动创建列
 			this.dgvLayout.AutoGenerateColumns = false;
 		}
@@ -180,6 +191,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private void btnClearCondition_Click(object sender, EventArgs e)
 		{
 			this.txtGoodsCode.Clear();
+			this.cmbLogo.SelectedValue = "";
 			this.cbflagtrue.Checked = true;
 			this.cbflagfalse.Checked = true;
 		}

DK.Client/SystemModule/F_MST_1702.Designer.cs

@@ -44,6 +44,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			// 
 			this.cmbLogos.BackColor = System.Drawing.SystemColors.Window;
 			this.cmbLogos.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.cmbLogos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.cmbLogos.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cmbLogos.FormattingEnabled = true;
 			this.cmbLogos.Location = new System.Drawing.Point(77, 57);

DK.Client/SystemModule/F_MST_1801.cs

@@ -25,7 +25,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		public F_MST_1801()
 		{
 			InitializeComponent();
-			this.Text = "产品对应商标";
+			this.Text = "产品对应釉料";
 			this.tsbtnAdd.Text = ButtonText.TSBTN_ADD;
 			this.tsbtnEdit.Text = ButtonText.TSBTN_EDIT;
 			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
@@ -66,12 +66,19 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			cre.Name = "GetGlaze";
 			cre.Properties["GLAZE"] = "";
 			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+			DataSet set = sre.Data;
+			DataTable dt = set.Tables[0];
+			DataRow dr = dt.NewRow();
+			dr["GLAZETYPEID"] = "0";
+			dr["GLAZE"] = "";
+			dt.Rows.Add(dr);
 			DataSet GlazeInfo = sre.Data;
 			if (GlazeInfo != null && GlazeInfo.Tables.Count > 0)
 			{
-				this.cmbGlaze.DataSource = GlazeInfo.Tables[0];
+				this.cmbGlaze.DataSource = dt;
 				this.cmbGlaze.DisplayMember = "GLAZE";
 				this.cmbGlaze.ValueMember = "GLAZETYPEID";
+				this.cmbGlaze.SelectedValue = "0";
 			}
 		}
 
@@ -186,6 +193,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private void btnClearCondition_Click(object sender, EventArgs e)
 		{
 			this.txtGoodsCode.Clear();
+			this.cmbGlaze.SelectedValue = "0";
 			this.cbflagtrue.Checked = true;
 			this.cbflagfalse.Checked = true;
 		}

DK.Client/SystemModule/F_MST_1802.Designer.cs

@@ -44,6 +44,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			// 
 			this.cmbGlaze.BackColor = System.Drawing.SystemColors.Window;
 			this.cmbGlaze.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.cmbGlaze.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.cmbGlaze.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cmbGlaze.FormattingEnabled = true;
 			this.cmbGlaze.Location = new System.Drawing.Point(77, 57);

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -2525,7 +2525,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 									FROM TP_MST_GOODSGLAZE GL 
 										LEFT JOIN TP_MST_GOODS GD ON GL.GOODSCODE=GD.GOODSCODE
 									WHERE 1=1";
-				if (!string.IsNullOrEmpty(cre.Properties["GLAZETYPEID"].ToString()))
+				if (!string.IsNullOrEmpty(cre.Properties["GLAZETYPEID"].ToString()) && cre.Properties["GLAZETYPEID"].ToString()!="0")
 				{
 					sqlString += " AND GL.GLAZETYPEID=:GLAZETYPEID";
 				}
@@ -2575,7 +2575,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 											FROM TP_MST_DATADICTIONARY
 											WHERE DICTIONARYTYPE='TPC002'
 											";
-				if (cre.Properties["GLAZE"].ToString() != null && cre.Properties["GLAZE"].ToString() != "")
+				if (cre.Properties["GLAZE"].ToString() != null && cre.Properties["GLAZE"].ToString() != "" && cre.Properties["GLAZE"].ToString()!="0")
 				{
 					sqlString += "ORDER BY  DECODE(DICTIONARYID, '" + cre.Properties["GLAZE"].ToString() + "', 1)";
 				}