gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

This commit is contained in:
毕文静 2025-12-23 16:43:56 +08:00
parent 6e85c8e240 79948bf676
commit be5278865f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
View File

@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(wmeCode)) //焊接方法 if (!string.IsNullOrEmpty(wmeCode)) //焊接方法
{ {
if (wmeCode.Contains(welderQualify.WeldingMethodId)) if (welderQualify.WeldingMethodId.Contains(wmeCode))
{ {
okNum++; okNum++;
} }
@ -373,14 +373,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
var floorQ = from x in floorWelderQualifys var floorQ = from x in floorWelderQualifys
where wmeCode1.Contains(x.WeldingMethodId) where x.WeldingMethodId.Contains(wmeCode1)
&& (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia) // && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in cellWelderQualifys var cellQ = from x in cellWelderQualifys
where wmeCode2.Contains(x.WeldingMethodId) where x.WeldingMethodId.Contains(wmeCode2)
&& (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)

10
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
View File

@ -30,6 +30,7 @@
this.drpProject.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); this.drpProject.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProject.DataBind(); this.drpProject.DataBind();
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId; this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
Funs.FineUIPleaseSelect(this.drpProject);
var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4); var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4);
///单位 ///单位
@ -176,7 +177,14 @@
{ {
listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndDate.Text))); listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndDate.Text)));
} }
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue)); if (this.drpProject.SelectedValue == BLL.Const._Null)
{
listStr.Add(new SqlParameter("@projectId", null));
}
else
{
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
//tb = (DataTable)CacheHelper.GetCache("HJGL_sp_rpt_iso_analyze"); //tb = (DataTable)CacheHelper.GetCache("HJGL_sp_rpt_iso_analyze");