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

13
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.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges(); db.SubmitChanges();
} }
} }
#endregion #endregion
@ -3831,7 +3830,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary> /// </summary>
void saveSpecialCheck() 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>(); List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData(); JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
@ -3868,7 +3867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary> /// </summary>
void saveFileReport() 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>(); List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData(); JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
@ -3915,7 +3914,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index"); //int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{ {
RowMaterialProblemId = values.Value<string>("Id"), RowMaterialProblemId = values.Value<string>("RowMaterialProblemId"),
ReportId = ReportId, ReportId = ReportId,
UnitId = values.Value<string>("UnitId"), UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"), ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3950,7 +3949,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index"); //int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{ {
ConstructionProblemsId = values.Value<string>("Id"), ConstructionProblemsId = values.Value<string>("ConstructionProblemsId"),
ReportId = ReportId, ReportId = ReportId,
UnitId = values.Value<string>("UnitId"), UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"), ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3988,7 +3987,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index"); //int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{ {
NextQualityControlId = values.Value<string>("Id"), NextQualityControlId = values.Value<string>("NextQualityControlId"),
ReportId = ReportId, ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent") NextQualityControlContent = values.Value<string>("NextQualityControlContent")
}; };
@ -4067,7 +4066,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
protected void Text_TextChanged(object sender, EventArgs e) protected void Text_TextChanged(object sender, EventArgs e)
{ {
SaveMethod(); //SaveMethod();
} }
protected override object LoadPageStateFromPersistenceMedium() protected override object LoadPageStateFromPersistenceMedium()

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

@ -221,7 +221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 加载文本框内容 #region 加载文本框内容
var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList(); 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; txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText; txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
@ -2931,14 +2931,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges(); db.SubmitChanges();
} }
} }
#endregion #endregion
#region 保存PQR/WPS报验情况 #region 保存PQR/WPS报验情况
void savePqrWps() 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>(); List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid9.GetMergedData(); JArray teamGroupData = Grid9.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
@ -3255,7 +3254,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 9.计量器具报验管理情况 #region 9.计量器具报验管理情况
void saveMeasuringInspection() 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>(); List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData(); JArray teamGroupData = gvMeasuringInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData) foreach (JObject teamGroupRow in teamGroupData)
@ -4010,7 +4009,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
protected void Text_TextChanged(object sender, EventArgs e) protected void Text_TextChanged(object sender, EventArgs e)
{ {
SaveMethod(); //SaveMethod();
} }
protected override object LoadPageStateFromPersistenceMedium() protected override object LoadPageStateFromPersistenceMedium()

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

@ -11,7 +11,7 @@
<FineUIPro DebugMode="true" Theme="Cupertino"/> <FineUIPro DebugMode="true" Theme="Cupertino"/>
<appSettings> <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="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"/> <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"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <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_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth> <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>