lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、索引项目中，删除英文，保留中文；

Browse Source 
2、尾项管理中，筛选条件调整；
3、尾项管理中，支持点击图片预览；
4、增加尾项统计表中的完成比例；
5、更新管道表的表格（增加焊接信息、试压包状态、电伴热和保温/冷信息）；
6、更新移交统计表（补充管道试压包其他信息统计）；
7、删除索引项目中的地管和消防2个项目；
This commit is contained in:
liuhui11
2024-10-31 19:11:00 +08:00
parent 27df9766f7
commit ea734b0874
23 changed files with 1623 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+35 -35
View File
@@ -62,36 +62,36 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Sub_Sys_No like @Sub_Sys_No";
listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised >= @StartDate_Raised";
listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised <= @EndDate_Raised";
listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
{
strSql += " AND Required_Date >= @StartRequired_Date";
listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
{
strSql += " AND Required_Date <= @EndRequired_Date";
listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
{
strSql += " AND Actual_Date >= @StartActual_Date";
listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
{
strSql += " AND Actual_Date <= @EndActual_Date";
listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
//{
// strSql += " AND Date_Raised >= @StartDate_Raised";
// listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
//{
// strSql += " AND Date_Raised <= @EndDate_Raised";
// listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
//{
// strSql += " AND Required_Date >= @StartRequired_Date";
// listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
//{
// strSql += " AND Required_Date <= @EndRequired_Date";
// listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
//{
// strSql += " AND Actual_Date >= @StartActual_Date";
// listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
//{
// strSql += " AND Actual_Date <= @EndActual_Date";
// listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
//}
if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
{
strSql += " AND Disc = @Disc";
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Cat = @Cat";
listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
}
if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
{
strSql += " AND Action_By = @Action_By";
listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
}
//if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
//{
// strSql += " AND Action_By = @Action_By";
// listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
//}
if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
{
strSql += " AND PIC = @PIC";