This commit is contained in:
2025-10-24 18:27:46 +08:00
parent 47172cd0b3
commit 78a2b0f525
47 changed files with 678 additions and 277 deletions
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
public void BindGrid()
{
StringBuilder sb = new StringBuilder();
sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='False' THEN '' ELSE '' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate ");
sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='True' THEN '' ELSE '' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate,P.CompileDate ");
sb.Append("FROM ProcessControl_InspectionManagement AS P ");
sb.Append("LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId ");
sb.Append("LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId ");
@@ -68,6 +68,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
listStr.Add(new SqlParameter("@endTime", endTime));
}
}
if (!string.IsNullOrEmpty(txtCompileDateS.Text.Trim()))
{
sb.Append("AND P.CompileDate >= @CompileDateS ");
listStr.Add(new SqlParameter("@CompileDateS", Funs.GetNewDateTime(txtCompileDateS.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtCompileDateE.Text.Trim()))
{
sb.Append("AND P.CompileDate <= @CompileDateE ");
listStr.Add(new SqlParameter("@CompileDateE", Funs.GetNewDateTime(txtCompileDateE.Text.Trim())));
}
sb.Append("ORDER BY P.NoticeCode DESC ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
@@ -349,7 +359,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IsOnceQualified == false ? "" : "");//是否一次合格
cell.SetCellValue(item.IsOnceQualified == true ? "" : "");//是否一次合格
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;