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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
李超 2026-04-25 07:47:11 +08:00
parent f416b8bffd 5ab2995c4a
commit e6884c19da
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
View File

@ -83,6 +83,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
if (!string.IsNullOrEmpty(this.ReportId)) if (!string.IsNullOrEmpty(this.ReportId))
{ {
var db = Funs.DB;
Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId); Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
if (weekAndMonthReport != null) if (weekAndMonthReport != null)
{ {
@ -103,7 +104,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 加载本月质量目标管理情况 #region 加载本月质量目标管理情况
detailsGrid1.Clear(); detailsGrid1.Clear();
detailsGrid1 = (from x in Funs.DB.Report_CqmsTarget detailsGrid1 = (from x in db.Report_CqmsTarget
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
orderby x.SortId orderby x.SortId
select x).ToList(); select x).ToList();
@ -119,7 +120,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 加载18.本月质量问题处理情况 #region 加载18.本月质量问题处理情况
//(1)原材料问题 //(1)原材料问题
rowMaterialProblemLists.Clear(); rowMaterialProblemLists.Clear();
rowMaterialProblemLists = (from x in Funs.DB.Report_RowMaterialProblem rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
select x).ToList(); select x).ToList();
if (rowMaterialProblemLists.Count > 0) if (rowMaterialProblemLists.Count > 0)
@ -130,7 +131,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
} }
//(2)施工过程问题 //(2)施工过程问题
constructionProblemsLists.Clear(); constructionProblemsLists.Clear();
constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems constructionProblemsLists = (from x in db.Report_ConstructionProblems
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
select x).ToList(); select x).ToList();
if (constructionProblemsLists.Count > 0) if (constructionProblemsLists.Count > 0)
@ -143,7 +144,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 加载19.下月质量控制重点 #region 加载19.下月质量控制重点
nextQualityControlLists.Clear(); nextQualityControlLists.Clear();
nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl nextQualityControlLists = (from x in db.Report_NextQualityControl
where x.ReportId == this.ReportId where x.ReportId == this.ReportId
select x).ToList(); select x).ToList();
if (nextQualityControlLists.Count > 0) if (nextQualityControlLists.Count > 0)
@ -482,8 +483,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0; int Quantity1Sum = 0;
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -563,8 +564,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0; int Quantity1Sum = 0;
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -621,6 +622,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
public void CheckLotBindStatisc(string cNProfessionalCode) public void CheckLotBindStatisc(string cNProfessionalCode)
{ {
var db = Funs.DB;
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
@ -646,7 +648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
} }
} }
//int i = 1; //int i = 1;
string cNProfessionalId = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault(); string cNProfessionalId = (from x in db.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault();
List<string> workNames = new List<string>(); List<string> workNames = new List<string>();
//专业下所有集合 //专业下所有集合
@ -869,8 +871,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0; int Quantity1Sum = 0;
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -947,8 +949,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -1025,8 +1027,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0; int Quantity1Sum = 0;
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -1092,6 +1094,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary> /// </summary>
void loadNcrManagementInspection(string objType) void loadNcrManagementInspection(string objType)
{ {
var db = Funs.DB;
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
List<Model.NCRReportStatisc> StatisticsList = new List<Model.NCRReportStatisc>(); List<Model.NCRReportStatisc> StatisticsList = new List<Model.NCRReportStatisc>();
@ -1108,12 +1111,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{ {
projectStartDate = project.StartDate.Value; projectStartDate = project.StartDate.Value;
} }
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
var db = Funs.DB;
foreach (var item in units) foreach (var item in units)
{ {
@ -1204,8 +1206,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0; int Quantity1Sum = 0;
int Quantity2Sum = 0; int Quantity2Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };
@ -1344,8 +1346,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity3Sum = 0; int Quantity3Sum = 0;
int Quantity4Sum = 0; int Quantity4Sum = 0;
//加载所有单位 //加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit var units = from x in db.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode orderby y.UnitCode
select new { x.UnitId, y.UnitName }; select new { x.UnitId, y.UnitName };

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -20498,7 +20498,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">