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

增加焊接数据录入页面

Browse Source
This commit is contained in:
高飞
2023-06-09 18:17:40 +08:00
parent e9e7949712
commit 8433bb4ad7
17 changed files with 1336 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+47 -55
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
@@ -29,7 +29,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -176,6 +176,17 @@ namespace FineUIPro.Web.DataShow
cout1 += Funs.GetNewDecimalOrZero(item.TotalWeldQuantity);
}
}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectId.ToString()
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
cout1 = Funs.GetNewDecimalOrZero(getD2.TotalWeldQuantity);
}
}
}
return cout1;
}
@@ -192,10 +203,6 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
//var getD1 = from x in Funs.DB.PW_JointInfo
// join y in Funs.DB.BO_WeldReportMain on x.DReportID equals y.DReportID
// where x.ProjectId == projectId.ToString()
// select new { x.JOT_DoneDin, y.JOT_WeldDate };
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where x.ProjectId == projectId.ToString()
select x;
@@ -206,18 +213,17 @@ namespace FineUIPro.Web.DataShow
cout1 += Funs.GetNewDecimalOrZero(item.TotalCompleted);
}
}
//if (datetime1.HasValue)
//{
// getD1 = getD1.Where(x => x.JOT_WeldDate >= datetime1);
//}
//if (datetime2.HasValue)
//{
// getD1 = getD1.Where(x => x.JOT_WeldDate <= datetime2);
//}
//if (getD1.Count() > 0)
//{
// cout1 += getD1.Sum(x => x.JOT_DoneDin ?? 0);
//}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectId.ToString()
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
cout1 = Funs.GetNewDecimalOrZero(getD2.TotalCompleted);
}
}
}
return cout1;
@@ -235,23 +241,6 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
//var getC1 = from x in Funs.DB.CH_CheckItem
// join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
// where y.ProjectId == projectId.ToString()
// select new { x.CHT_TotalFilm, y.CHT_CheckDate };
//if (datetime1.HasValue)
//{
// getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1);
//}
//if (datetime2.HasValue)
//{
// getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2);
//}
//if (getC1.Count() > 0)
//{
// cout1 = getC1.Sum(x => x.CHT_TotalFilm ?? 0);
//}
var getD1 = from x in Funs.DB.HJGL_FL_NdtList
where x.ProjectId == projectId.ToString()
select x;
@@ -262,7 +251,17 @@ namespace FineUIPro.Web.DataShow
cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmAmount);
}
}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectId.ToString()
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
cout1 = Funs.GetNewDecimalOrZero(getD2.OneTimeFilmAmount);
}
}
}
return cout1;
}
@@ -279,23 +278,6 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
//var getC1 = from x in Funs.DB.CH_CheckItem
// join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
// where y.ProjectId == projectId.ToString()
// select new { x.CHT_PassFilm, y.CHT_CheckDate };
//if (datetime1.HasValue)
//{
// getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1);
//}
//if (datetime2.HasValue)
//{
// getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2);
//}
//if (getC1.Count() > 0)
//{
// cout1 = getC1.Sum(x => x.CHT_PassFilm ?? 0);
//}
var getD1 = from x in Funs.DB.HJGL_FL_NdtList
where x.ProjectId == projectId.ToString()
select x;
@@ -306,7 +288,17 @@ namespace FineUIPro.Web.DataShow
cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmQualifiedAmount);
}
}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectId.ToString()
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
cout1 = Funs.GetNewDecimalOrZero(getD2.OneTimeFilmQualifiedAmount);
}
}
}
return cout1;
}