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

20240410 开车会议管理

Browse Source
This commit is contained in:
毕文静
2024-04-10 14:39:52 +08:00
parent 9bb7f02b83 7cdbe93dca
commit b99cae6a84
75 changed files with 10429 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs
+12 -12
View File
@@ -220,12 +220,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
dataDistribution.DataDistributionId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataDistribution));
this.hdAttachUrl.Text = dataDistribution.DataDistributionId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataDistribution.DataDistributionId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataDistribution.DataDistributionId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
dataDistribution.CompileMan = this.CurrUser.UserId;
dataDistribution.CompileDate = DateTime.Now;
dataDistribution.Status = BLL.Const.Comprehensive_Compile;
@@ -246,12 +246,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
dataDistribution.Status = BLL.Const.Comprehensive_Compile;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataDistributionId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataDistributionId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
BLL.DataDistributionService.UpdateDataDistribution(dataDistribution);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs
+12 -12
View File
@@ -274,12 +274,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
dataReceivingDoc.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc));
this.hdAttachUrl.Text = dataReceivingDoc.DataReceivingDocId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceivingDoc.DataReceivingDocId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceivingDoc.DataReceivingDocId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
dataReceivingDoc.CompileMan = this.CurrUser.UserId;
dataReceivingDoc.CompileDate = DateTime.Now;
dataReceivingDoc.Status = BLL.Const.Comprehensive_Compile;
@@ -298,12 +298,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
dataReceivingDoc.Status = BLL.Const.Comprehensive_Compile;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingDocId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingDocId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
BLL.DataReceivingDocService.UpdateDataReceivingDoc(dataReceivingDoc);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs
+12 -12
View File
@@ -208,12 +208,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
dataReceiving.DataReceivingId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceiving));
this.hdAttachUrl.Text = dataReceiving.DataReceivingId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceiving.DataReceivingId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceiving.DataReceivingId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
dataReceiving.CompileMan = this.CurrUser.UserId;
dataReceiving.CompileDate = DateTime.Now;
dataReceiving.Status = BLL.Const.Comprehensive_Audit;
@@ -222,12 +222,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
dataReceiving.DataReceivingId = this.DataReceivingId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
dataReceiving.Status = BLL.Const.Comprehensive_Audit;
var model = Funs.DB.Comprehensive_DataReceiving.Where(u => u.DataReceivingId == this.DataReceivingId).FirstOrDefault();
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
+12 -12
View File
@@ -232,12 +232,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
designChangeOrder.CompileMan = this.CurrUser.UserId;
designChangeOrder.CompileDate = DateTime.Now;
@@ -247,12 +247,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
+12 -12
View File
@@ -226,12 +226,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = designDetails.DesignDetailsId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDetails.DesignDetailsId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDetails.DesignDetailsId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Compile;
@@ -240,12 +240,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
designDetails.DesignDetailsId = this.DesignDetailsId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDetailsId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDetailsId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
+12 -12
View File
@@ -215,12 +215,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (!string.IsNullOrEmpty(this.DesignDrawingsId))
{
designDrawings.DesignDrawingsId = this.DesignDrawingsId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDrawingsId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDrawingsId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault();
if (model != null)
@@ -242,12 +242,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = designDrawings.DesignDrawingsId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
designDrawings.Status = BLL.Const.Comprehensive_Compile;
BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
+12 -12
View File
@@ -413,23 +413,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
}
else
{
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
if (oldInspectionEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
+12 -12
View File
@@ -229,12 +229,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = inspectionMachone.InspectionMachineId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionMachone.InspectionMachineId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionMachone.InspectionMachineId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
inspectionMachone.CompileMan = this.CurrUser.UserId;
inspectionMachone.CompileDate = DateTime.Now;
inspectionMachone.Status = BLL.Const.Comprehensive_Compile;
@@ -243,12 +243,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
inspectionMachone.InspectionMachineId = this.InspectionMachineId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionMachineId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionMachineId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault();
if (model != null)
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+12 -12
View File
@@ -333,12 +333,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = inspectionPerson.InspectionPersonId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionPerson.InspectionPersonId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionPerson.InspectionPersonId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
// 人员报验
BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
@@ -363,12 +363,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
inspectionPerson.Status = BLL.Const.Comprehensive_Compile;
inspectionPerson.InspectionPersonId = this.InspectionPersonId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionPersonId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionPersonId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
+2 -2
View File
@@ -71,9 +71,9 @@
<f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
<%-- <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
HeaderTextAlign="Center" Width="220px">
</f:RenderField>
</f:RenderField>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
+7 -1
View File
@@ -48,7 +48,13 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>
<%--<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>--%>
<f:RadioButtonList runat="server" ID="rblIsReview" Label="是否通过专家评审" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
<f:Label Hidden="true" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
+14 -2
View File
@@ -64,8 +64,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtAuditMan.Text = majorPlanApproval.AuditMan;
this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
//this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan;
this.rblIsReview.SelectedValue = majorPlanApproval.IsReview.HasValue && majorPlanApproval.IsReview == true ? "true" : "false";
}
else
{
@@ -108,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim();
majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim();
majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
//majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
@@ -120,6 +122,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
ids = ids.Substring(0, ids.LastIndexOf(","));
}
majorPlanApproval.UnitWorkId = ids;
if (this.rblIsReview.SelectedValue == "true")
{
majorPlanApproval.IsReview = true;
}
else
{
majorPlanApproval.IsReview = false;
}
if (string.IsNullOrEmpty(this.MajorPlanApprovalId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -132,13 +132,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.TextBox txtExpertReviewMan;
/// <summary>
/// txtImplementationDeviation 控件。
/// rblIsReview 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtImplementationDeviation;
protected global::FineUIPro.RadioButtonList rblIsReview;
/// <summary>
/// Panel2 控件。
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+12 -12
View File
@@ -272,12 +272,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement));
this.hdAttachUrl.Text = nCRManagement.NCRManagementId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
nCRManagement.CompileMan = this.CurrUser.UserId;
nCRManagement.Status = BLL.Const.Comprehensive_Compile;
BLL.NCRManagementService.AddNCRManagement(nCRManagement);
@@ -285,12 +285,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
nCRManagement.NCRManagementId = this.NCRManagementId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs
+12 -12
View File
@@ -213,12 +213,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
pressurePipe.PressurePipeId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe));
this.hdAttachUrl.Text = pressurePipe.PressurePipeId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.PressurePipeId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.PressurePipeId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.Status = BLL.Const.Comprehensive_Compile;
@@ -227,12 +227,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
pressurePipe.PressurePipeId = this.PressurePipeId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PressurePipeId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PressurePipeId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault();
if (model != null)
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs
+12 -12
View File
@@ -193,12 +193,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
pressurePipe.QualityAccidentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident));
this.hdAttachUrl.Text = pressurePipe.QualityAccidentId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.QualityAccidentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.QualityAccidentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.CompileDate = DateTime.Now;
pressurePipe.Status = BLL.Const.Comprehensive_Compile;
@@ -207,12 +207,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
pressurePipe.QualityAccidentId = this.QualityAccidentId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.QualityAccidentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.QualityAccidentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault();
if (model != null)
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs
+12 -12
View File
@@ -211,12 +211,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
siteVisaManagement.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement));
this.hdAttachUrl.Text = siteVisaManagement.VisaId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == siteVisaManagement.VisaId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == siteVisaManagement.VisaId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
siteVisaManagement.CompileMan = this.CurrUser.UserId;
siteVisaManagement.Status = BLL.Const.Comprehensive_Compile;
BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement);
@@ -224,12 +224,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
siteVisaManagement.VisaId = this.VisaId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.VisaId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.VisaId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
+12 -12
View File
@@ -211,12 +211,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
specialEquipment.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment));
this.hdAttachUrl.Text = specialEquipment.SpecialEquipmentId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == specialEquipment.SpecialEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == specialEquipment.SpecialEquipmentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
specialEquipment.CompileMan = this.CurrUser.UserId;
specialEquipment.Status = BLL.Const.Comprehensive_Compile;
BLL.SpecialEquipmentServices.AddEquipment(specialEquipment);
@@ -224,12 +224,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
specialEquipment.SpecialEquipmentId = this.SpecialEquipmentId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.SpecialEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.SpecialEquipmentId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
+1 -1
View File
@@ -51,7 +51,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑施工质量月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="编辑项目质量月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="620px">
</f:Window>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+3 -1
View File
@@ -629,7 +629,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+9 -3
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑施工质量周报(新)</title>
<title>编辑项目质量月报(新)</title>
<base target="_self" />
<script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
@@ -57,7 +57,7 @@
<tr>
<td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
<asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
&nbsp;编辑施工质量月报
&nbsp;编辑项目质量月报
</td>
<td align="right" valign="middle" style="width: 50%; height: 30px;">
<%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
@@ -96,7 +96,7 @@
</tr>
<tr>
<td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
<asp:Label ID="lblTital" runat="server" Text="施 工 质 量 月 报"></asp:Label>
<asp:Label ID="lblTital" runat="server" Text="项 目 质 量 月 报"></asp:Label>
</td>
</tr>
</table>
@@ -787,6 +787,12 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="hidWsjcgl" Hidden="true" Text="无数据"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+27 -12
View File
@@ -493,6 +493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId,
u.UnitName,
c.ExpertReviewMan,
c.IsReview,
c.CompileDate
};
@@ -506,7 +507,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.UnitOrMajor = item.UnitName;
model.Quantity1 = monethCount.Count();
model.Quantity2 = AllList.Count();
model.Quantity3 = AllList.Where(x => x.ExpertReviewMan != "").ToList().Count();
model.Quantity3 = AllList.Where(x => x.IsReview == true).ToList().Count();
model.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
@@ -643,6 +644,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@@ -726,6 +728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@@ -813,7 +816,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
@@ -1254,18 +1258,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(model);
}
}
if (list.Count == 0)
{
Grid10.Hidden = true;
hidWsjcgl.Hidden = false;
}
else {
Grid10.DataSource = list;
Grid10.DataBind();
Grid10.DataSource = list;
Grid10.DataBind();
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
Grid10.SummaryData = summary;
Grid10.SummaryData = summary;
}
}
#endregion
@@ -2635,6 +2645,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
{
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
Generated
+224 -213
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
+1571 -130
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
+3029
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs
Generated
+1037 -2
View File
File diff suppressed because it is too large Load Diff