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

2023-10-20

This commit is contained in:
李鹏飞 2023-10-20 17:25:08 +08:00
parent 2d159fa64c
commit 913dd5de3a
5 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DataBase/版本日志/SGGLDB_WH_2023-10-20.sql Normal file
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx
View File

@ -60,7 +60,7 @@
EnableMultiSelect="true"> EnableMultiSelect="true">
</f:DropDownList> </f:DropDownList>
<%-- <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px" ></f:TextBox>--%> <%-- <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px" ></f:TextBox>--%>
<f:Label ID="Label1" runat="server" Label="上传附件" ShowRedStar="true" <f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="130px" LabelAlign="Right" > LabelWidth="130px" LabelAlign="Right" >
</f:Label> </f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click" > <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click" >

8
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
View File

@ -128,12 +128,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
inspectionManagement.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement)); inspectionManagement.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement));
this.hdInspectionNoticeId.Text = inspectionManagement.InspectionId; this.hdInspectionNoticeId.Text = inspectionManagement.InspectionId;
} }
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); /*var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{ {
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return; return;
} }*/
BLL.InspectionManagementService.AddInspectionManagement(inspectionManagement); BLL.InspectionManagementService.AddInspectionManagement(inspectionManagement);
} }
@ -152,11 +152,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2; inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2;
inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim(); inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) /*if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{ {
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return; return;
} }*/
BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement); BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement);
BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId); BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId);
} }

8
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -178,19 +178,19 @@
<div class="zyp"> <div class="zyp">
<div class="zyp_box"> <div class="zyp_box">
<div class="zyp_label">动火</div> <div class="zyp_label">动火</div>
<div class="zyp_number"><%=getWrokCount0() %></div> <div class="zyp_number"><%=getWrokCount0() %>/<%=getALLWrokCount0() %></div>
</div> </div>
<div class="zyp_box"> <div class="zyp_box">
<div class="zyp_label">高处</div> <div class="zyp_label">高处</div>
<div class="zyp_number"><%=getWrokCount1() %></div> <div class="zyp_number"><%=getWrokCount1() %>/<%=getALLWrokCount1() %></div>
</div> </div>
<div class="zyp_box"> <div class="zyp_box">
<div class="zyp_label">吊装</div> <div class="zyp_label">吊装</div>
<div class="zyp_number"><%=getWrokCount2() %></div> <div class="zyp_number"><%=getWrokCount2() %>/<%=getALLWrokCount2() %></div>
</div> </div>
<div class="zyp_box"> <div class="zyp_box">
<div class="zyp_label">其他</div> <div class="zyp_label">其他</div>
<div class="zyp_number"><%=getWrokCount3() %></div> <div class="zyp_number"><%=getWrokCount3() %>/<%=getALLWrokCount3() %></div>
</div> </div>
</div> </div>
<div class="zyp-lis"> <div class="zyp-lis">

25
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -65,8 +65,9 @@ namespace FineUIPro.Web.common
//安全管理人员 //安全管理人员
var allSum = from x in Funs.DB.SitePerson_Person var allSum = from x in Funs.DB.SitePerson_Person
where x.IsUsed == true && x.ProjectId == ProjectId where x.ProjectId == ProjectId && x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
select x; select x;
var glAllPerson = from x in allSum var glAllPerson = from x in allSum
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where y.IsHsse==true && x.ProjectId == ProjectId //安管人员 where y.IsHsse==true && x.ProjectId == ProjectId //安管人员
@ -511,18 +512,32 @@ namespace FineUIPro.Web.common
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" &&x.WorkStatesStr=="作业中").ToList().Count; var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" &&x.WorkStatesStr=="作业中").ToList().Count;
return result; return result;
} }
protected int getALLWrokCount0()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" ).ToList().Count;
return result;
}
protected int getWrokCount1() protected int getWrokCount1()
{ {
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result; return result;
} }
protected int getALLWrokCount1()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" ).ToList().Count;
return result;
}
protected int getWrokCount2() protected int getWrokCount2()
{ {
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result; return result;
} }
protected int getALLWrokCount2()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证").ToList().Count;
return result;
}
protected int getWrokCount3() protected int getWrokCount3()
{ {
@ -530,6 +545,12 @@ namespace FineUIPro.Web.common
&& x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; && x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count;
return result; return result;
} }
protected int getALLWrokCount3()
{
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId
&& x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" ).ToList().Count;
return result;
}
#endregion #endregion
#region 质量问题 #region 质量问题