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

20250124 质量周报月报

This commit is contained in:
毕文静 2025-01-24 17:39:19 +08:00
parent 85bd05b848
commit 915a460c6b
4 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -2995,7 +2995,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
}
#endregion
@ -3422,7 +3421,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveGDInspection() //检验批统计:管道
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3457,7 +3456,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
void saveDQInspection() //检验批统计:电气
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvDq.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3493,7 +3492,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveYBInspection() //检验批统计:仪表
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvYb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3529,7 +3528,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveFFInspection() //检验批统计:防腐
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvFf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3565,7 +3564,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveXFInspection() //检验批统计:消防
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvXf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3601,7 +3600,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveInspectionDataInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3643,7 +3642,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 11.压力管道监检情况
void savePressureInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPressureInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3680,7 +3679,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 12.管道试压包管理情况
void savePipingInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPipingInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3717,7 +3716,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 13.特种设备监检情况
void saveSpecialInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3754,7 +3753,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 14.NCR管理情况
void saveNcrManagementInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3793,7 +3792,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveQualityInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvQualityInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3831,7 +3830,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSpecialCheck()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"2");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3868,7 +3867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveFileReport()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"3");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3906,7 +3905,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveRowMaterialProblem()
{
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3915,7 +3914,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
RowMaterialProblemId = values.Value<string>("Id"),
RowMaterialProblemId = values.Value<string>("RowMaterialProblemId"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3941,7 +3940,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveConstructionProblems()
{
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
JArray teamGroupData = gvConstructionProblems.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3950,7 +3949,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
ConstructionProblemsId = values.Value<string>("Id"),
ConstructionProblemsId = values.Value<string>("ConstructionProblemsId"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3988,7 +3987,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
NextQualityControlId = values.Value<string>("Id"),
NextQualityControlId = values.Value<string>("NextQualityControlId"),
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};
@ -4067,7 +4066,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
}
protected override object LoadPageStateFromPersistenceMedium()

13
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -221,7 +221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 加载文本框内容
var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
if (txtReportList.Count>0)
if (txtReportList.Count > 0)
{
txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
@ -525,7 +525,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
foreach (var item in unitLists)
{
@ -1148,7 +1148,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2)
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计
@ -2931,14 +2931,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
}
#endregion
#region 保存PQR/WPS报验情况
void savePqrWps()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId,"5");
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid9.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3255,7 +3254,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 9.计量器具报验管理情况
void saveMeasuringInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"9");
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -4010,7 +4009,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
}
protected override object LoadPageStateFromPersistenceMedium()

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

@ -11,7 +11,7 @@
<FineUIPro DebugMode="true" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>

4
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>E:\诺必达\五环\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>