diff --git a/SGGL/BLL/Transfer/PunchlistFromService.cs b/SGGL/BLL/Transfer/PunchlistFromService.cs index 63724288..83a4af46 100644 --- a/SGGL/BLL/Transfer/PunchlistFromService.cs +++ b/SGGL/BLL/Transfer/PunchlistFromService.cs @@ -67,5 +67,101 @@ namespace BLL select x.Action_By).Distinct().OrderBy(x => x).ToList(); return list; } + + + /// + /// 责任人pic下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitPICDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetPICDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取责任人pic下拉选项 + /// + /// 项目id + /// + public static List GetPICDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.PIC).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// 责任人-五环/PIC-WUH下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitWUHPICDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetWUHPICDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取责任人-五环/PIC-WUH下拉选项 + /// + /// 项目id + /// + public static List GetWUHPICDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.PIC_WUH).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// disc下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitDiscDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetDiscDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取disc下拉选项 + /// + /// 项目id + /// + public static List GetDiscDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.Disc).Distinct().OrderBy(x => x).ToList(); + return list; + } } } diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx index f83ed14e..d98c2928 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx @@ -26,8 +26,9 @@ - - + <%-- --%> + + @@ -91,9 +92,13 @@ + + + + <%----%> - - + <%-- --%> + <%-- --%> diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs index 13f666e6..b09e45d1 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs @@ -33,6 +33,9 @@ namespace FineUIPro.Web.Transfer GetButtonPower(); BLL.PunchlistFromService.InitTurnoverSystemCodeUnitDropDownList(this.drpTurnoverSystemCode, this.CurrUser.LoginProjectId, false); BLL.PunchlistFromService.InitActionByUnitDropDownList(this.ddlAction_By, this.CurrUser.LoginProjectId, false); + BLL.PunchlistFromService.InitPICDropDownList(this.ddlPIC, this.CurrUser.LoginProjectId, false);//责任人PIC + BLL.PunchlistFromService.InitWUHPICDropDownList(this.ddlPIC_WUH, this.CurrUser.LoginProjectId, false);//责任人-五环/PIC-WUH + BLL.PunchlistFromService.InitDiscDropDownList(this.ddlDisc, this.CurrUser.LoginProjectId, false);//Disc BindGrid(); this.btnNew.OnClientClick = Window1.GetShowReference("PunchlistFromEdit.aspx") + "return false;"; @@ -109,11 +112,26 @@ namespace FineUIPro.Web.Transfer // strSql += " AND Actual_Date <= @EndActual_Date"; // listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim()))); //} - if (!string.IsNullOrEmpty(txtDisc.Text.Trim())) + if (this.ddlDisc.SelectedItemArray.Count() > 1 || (this.ddlDisc.SelectedValue != BLL.Const._Null && this.ddlDisc.SelectedItemArray.Count() == 1)) { - strSql += " AND Disc = @Disc"; - listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim())); + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlDisc.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR Disc = @Disc" + i.ToString(); + listStr.Add(new SqlParameter("@Disc" + i.ToString(), item)); + } + i++; + } + strSql += ")"; } + // if (!string.IsNullOrEmpty(txtDisc.Text.Trim())) + // { + // strSql += " AND Disc = @Disc"; + // listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim())); + // } if (!string.IsNullOrEmpty(ddlEng.SelectedValue.Trim())) { strSql += " AND IsEng = @IsEng"; @@ -160,22 +178,52 @@ namespace FineUIPro.Web.Transfer } strSql += ")"; } + if (this.ddlPIC.SelectedItemArray.Count() > 1 || (this.ddlPIC.SelectedValue != BLL.Const._Null && this.ddlPIC.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlPIC.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR PIC = @PIC" + i.ToString(); + listStr.Add(new SqlParameter("@PIC" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ddlPIC_WUH.SelectedItemArray.Count() > 1 || (this.ddlPIC_WUH.SelectedValue != BLL.Const._Null && this.ddlPIC_WUH.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlPIC_WUH.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR PIC_WUH = @PIC_WUH" + i.ToString(); + listStr.Add(new SqlParameter("@PIC_WUH" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } //if (ddlAction_By.SelectedValue != null && ddlAction_By.SelectedValue != BLL.Const._Null) //{ // strSql += " AND Action_By = @Action_By"; // listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim())); //} - if (!string.IsNullOrEmpty(txtPIC.Text.Trim())) - { - strSql += " AND PIC like @PIC"; - listStr.Add(new SqlParameter("@PIC", "%" + this.txtPIC.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(txtPIC_WUH.Text.Trim())) - { - strSql += " AND PIC_WUH like @PIC_WUH"; - listStr.Add(new SqlParameter("@PIC_WUH", "%" + this.txtPIC_WUH.Text.Trim() + "%")); - } + // if (!string.IsNullOrEmpty(txtPIC.Text.Trim())) + // { + // strSql += " AND PIC like @PIC"; + // listStr.Add(new SqlParameter("@PIC", "%" + this.txtPIC.Text.Trim() + "%")); + // } + // if (!string.IsNullOrEmpty(txtPIC_WUH.Text.Trim())) + // { + // strSql += " AND PIC_WUH like @PIC_WUH"; + // listStr.Add(new SqlParameter("@PIC_WUH", "%" + this.txtPIC_WUH.Text.Trim() + "%")); + // } if (!string.IsNullOrEmpty(ddlStatus.SelectedValue.Trim())) { strSql += " AND Status = @Status"; diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs index 2962b7df..c20c7832 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs @@ -87,13 +87,13 @@ namespace FineUIPro.Web.Transfer protected global::FineUIPro.TextBox txtRaised_By; /// - /// txtDisc 控件。 + /// ddlDisc 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtDisc; + protected global::FineUIPro.DropDownList ddlDisc; /// /// btnSearch 控件。 @@ -222,22 +222,22 @@ namespace FineUIPro.Web.Transfer protected global::FineUIPro.DropDownList ddlAction_By; /// - /// txtPIC 控件。 + /// ddlPIC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPIC; + protected global::FineUIPro.DropDownList ddlPIC; /// - /// txtPIC_WUH 控件。 + /// ddlPIC_WUH 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPIC_WUH; + protected global::FineUIPro.DropDownList ddlPIC_WUH; /// /// txtEndRequired_Date 控件。