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

提交代码

This commit is contained in:
高飞 2024-04-12 15:35:37 +08:00
parent 546e2764a1
commit fbbe1413f4
29 changed files with 23 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx
View File

@ -60,7 +60,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="120px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs
View File

@ -220,12 +220,6 @@ 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;
//}
dataDistribution.CompileMan = this.CurrUser.UserId;
dataDistribution.CompileDate = DateTime.Now;
dataDistribution.Status = BLL.Const.Comprehensive_Compile;
@ -246,12 +240,6 @@ 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;
//}
BLL.DataDistributionService.UpdateDataDistribution(dataDistribution);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -303,12 +291,6 @@ 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;
}
dataDistribution.CompileMan = this.CurrUser.UserId;
dataDistribution.CompileDate = DateTime.Now;
dataDistribution.Status = BLL.Const.Comprehensive_Audit;
@ -317,12 +299,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
dataDistribution.DataDistributionId = this.DataDistributionId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataDistributionId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
var model = Funs.DB.Comprehensive_DataDistribution.Where(u => u.DataDistributionId == this.DataDistributionId).FirstOrDefault();

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx
View File

@ -119,7 +119,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="130px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs
View File

@ -274,12 +274,6 @@ 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;
//}
dataReceivingDoc.CompileMan = this.CurrUser.UserId;
dataReceivingDoc.CompileDate = DateTime.Now;
dataReceivingDoc.Status = BLL.Const.Comprehensive_Compile;
@ -298,12 +292,6 @@ 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;
//}
BLL.DataReceivingDocService.UpdateDataReceivingDoc(dataReceivingDoc);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -389,12 +377,6 @@ 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;
}
dataReceivingDoc.CompileMan = this.CurrUser.UserId;
dataReceivingDoc.CompileDate = DateTime.Now;
dataReceivingDoc.Status = BLL.Const.Comprehensive_Audit;
@ -403,12 +385,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
dataReceivingDoc.DataReceivingDocId = this.DataReceivingDocId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingDocId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
var model = Funs.DB.Comprehensive_DataReceivingDoc.Where(u => u.DataReceivingDocId == this.DataReceivingDocId).FirstOrDefault();
if (model.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx
View File

@ -61,7 +61,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件" ShowRedStar="true" LabelAlign="Right">
<f:Label ID="Label1" runat="server" Label="上传附件" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs
View File

@ -208,12 +208,6 @@ 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;
//}
dataReceiving.CompileMan = this.CurrUser.UserId;
dataReceiving.CompileDate = DateTime.Now;
dataReceiving.Status = BLL.Const.Comprehensive_Audit;
@ -222,12 +216,6 @@ 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;
//}
dataReceiving.Status = BLL.Const.Comprehensive_Audit;
var model = Funs.DB.Comprehensive_DataReceiving.Where(u => u.DataReceivingId == this.DataReceivingId).FirstOrDefault();
@ -366,12 +354,6 @@ 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;
}
dataReceiving.CompileMan = this.CurrUser.UserId;
dataReceiving.CompileDate = DateTime.Now;
dataReceiving.Status = Const.Comprehensive_Compile;
@ -385,12 +367,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
dataReceiving.Status = model.Status;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
BLL.DataReceivingService.UpdateDataReceiving(dataReceiving);
}

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx
View File

@ -52,7 +52,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件" LabelAlign="Right">
<f:Label ID="Label1" runat="server" Label="上传附件" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>

26
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
View File

@ -231,13 +231,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder));
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;
//}
designChangeOrder.CompileMan = this.CurrUser.UserId;
designChangeOrder.CompileDate = DateTime.Now;
@ -247,12 +240,6 @@ 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 model = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault();
if (model != null)
{
@ -325,13 +312,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder));
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;
}
designChangeOrder.CompileMan = this.CurrUser.UserId;
designChangeOrder.CompileDate = DateTime.Now;
designChangeOrder.Status = BLL.Const.Comprehensive_Audit;
@ -340,12 +320,6 @@ 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 oldDesignChangeOrder = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault();

26
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
View File

@ -226,12 +226,7 @@ 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;
//}
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Compile;
@ -240,12 +235,6 @@ 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 model = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
if (model != null)
{
@ -317,12 +306,6 @@ 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;
}
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Audit;
@ -331,12 +314,7 @@ 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 oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault();
if (oldDesignDetails == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx
View File

@ -62,7 +62,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="130px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
View File

@ -215,12 +215,6 @@ 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 model = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault();
if (model != null)
@ -242,12 +236,6 @@ 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;
//}
designDrawings.Status = BLL.Const.Comprehensive_Compile;
BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
}
@ -306,12 +294,6 @@ 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;
}
//BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault();
if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态
@ -359,12 +341,6 @@ 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;
}
designDrawings.Status = BLL.Const.Comprehensive_Audit;
BLL.DesignDrawingsService.AddDesignDrawings(designDrawings);
}

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx
View File

@ -73,7 +73,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="120px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

59
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
View File

@ -285,24 +285,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newInspectionEquipment.CompileMan = this.CurrUser.UserId;
newInspectionEquipment.CompileDate = DateTime.Now;
newInspectionEquipment.Status = BLL.Const.Comprehensive_Compile;
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
{
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
if (oldInspectionEquipment == null)
{
@ -320,40 +308,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
//else
//{
// newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
// var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
// if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
// {
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
// }
// BLL.InspectionEquipmentService.UpdateInspectionEquipment(newInspectionEquipment);
//}
//#region 审核记录
//var approve = InspectionEquipmentApproveService.GetApproveByApproveMan(newInspectionEquipment.InspectionEquipmentId, CurrUser.UserId);
//if (approve == null) //未添加审核信息时
//{
// approve = new Model.Comprehensive_InspectionEquipmentApprove();
// approve.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// InspectionEquipmentApproveService.EditApprove(approve); //新增编制记录
//}
//else
//{
// approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// approve.ApproveIdea = txtidea.Text.Trim();
//}
//#endregion
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -413,23 +368,11 @@ 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;
//}
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;
//}
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
if (oldInspectionEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx
View File

@ -82,7 +82,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" ShowRedStar="true" runat="server" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="140px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

26
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
View File

@ -229,12 +229,6 @@ 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;
//}
inspectionMachone.CompileMan = this.CurrUser.UserId;
inspectionMachone.CompileDate = DateTime.Now;
inspectionMachone.Status = BLL.Const.Comprehensive_Compile;
@ -243,12 +237,6 @@ 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 model = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault();
if (model != null)
@ -309,12 +297,7 @@ 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;
}
inspectionMachone.CompileMan = this.CurrUser.UserId;
inspectionMachone.CompileDate = DateTime.Now;
inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
@ -323,12 +306,7 @@ 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;
}
//BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone);
var oldInspectionMachine = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault();

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
View File

@ -79,7 +79,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="150px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
View File

@ -333,12 +333,6 @@ 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;
//}
// 人员报验
BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
@ -363,12 +357,6 @@ 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 model = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault();
if (model != null)
{
@ -523,12 +511,6 @@ 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;
}
inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// 人员报验
BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
@ -551,12 +533,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
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;
}
// BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson);
var oldInspectionPerson = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault();
if (oldInspectionPerson == null) //数据库没有记录 直接点提交 当前状态为 审核状态

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
View File

@ -83,7 +83,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" ShowRedStar="true" runat="server" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="130px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
View File

@ -272,12 +272,6 @@ 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;
//}
nCRManagement.CompileMan = this.CurrUser.UserId;
nCRManagement.Status = BLL.Const.Comprehensive_Compile;
BLL.NCRManagementService.AddNCRManagement(nCRManagement);
@ -285,12 +279,6 @@ 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 model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault();
if (model != null)
{
@ -391,12 +379,6 @@ 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;
}
nCRManagement.CompileMan = this.CurrUser.UserId;
nCRManagement.Status = BLL.Const.Comprehensive_Audit;
BLL.NCRManagementService.AddNCRManagement(nCRManagement);
@ -404,12 +386,6 @@ 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;
}
//BLL.NCRManagementService.UpdateNCRManagement(nCRManagement);
var oldNCRManagement = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault();
if (oldNCRManagement == null) //数据库没有记录 直接点提交 当前状态为 审核状态

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx
View File

@ -42,7 +42,7 @@
</f:NumberBox>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="180px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs
View File

@ -213,12 +213,6 @@ 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;
//}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.Status = BLL.Const.Comprehensive_Compile;
@ -227,12 +221,6 @@ 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 model = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault();
if (model != null)
@ -303,12 +291,6 @@ 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;
}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.Status = BLL.Const.Comprehensive_Audit;
BLL.PressurePipeService.AddPressurePipe(pressurePipe);
@ -316,12 +298,6 @@ 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;
}
// BLL.PressurePipeService.UpdatePressurePipe(pressurePipe);
var oldPressurePipe = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault();
if (oldPressurePipe == null) //数据库没有记录 直接点提交 当前状态为 审核状态

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx
View File

@ -51,7 +51,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="120px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs
View File

@ -193,12 +193,6 @@ 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;
//}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.CompileDate = DateTime.Now;
pressurePipe.Status = BLL.Const.Comprehensive_Compile;
@ -207,12 +201,6 @@ 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 model = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault();
if (model != null)
@ -278,12 +266,6 @@ 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;
}
pressurePipe.CompileMan = this.CurrUser.UserId;
pressurePipe.CompileDate = DateTime.Now;
pressurePipe.Status = BLL.Const.Comprehensive_Audit;
@ -292,12 +274,6 @@ 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;
}
// BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe);
var oldQualityAccident = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault();

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
View File

@ -251,12 +251,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (!string.IsNullOrEmpty(this.Id))
{
designDrawings.Id = this.Id;
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault();
if (model != null)
@ -278,12 +272,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = designDrawings.Id;
}
//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.ReviewDrawingsService.Insert(designDrawings);
}
@ -337,12 +325,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (!string.IsNullOrEmpty(this.Id))
{
designDrawings.Id = this.Id;
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
//BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault();
if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态
@ -390,12 +372,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.hdAttachUrl.Text = designDrawings.Id;
}
//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_Audit;
BLL.ReviewDrawingsService.Insert(designDrawings);
}

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx
View File

@ -57,7 +57,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="120px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs
View File

@ -211,12 +211,6 @@ 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;
//}
siteVisaManagement.CompileMan = this.CurrUser.UserId;
siteVisaManagement.Status = BLL.Const.Comprehensive_Compile;
BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement);
@ -224,12 +218,6 @@ 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 model = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault();
if (model != null)
{
@ -289,12 +277,6 @@ 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;
}
siteVisaManagement.CompileMan = this.CurrUser.UserId;
siteVisaManagement.Status = BLL.Const.Comprehensive_Audit;
BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement);
@ -302,12 +284,6 @@ 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;
}
// BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement);
var oldSiteVisaManagement = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault();

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx
View File

@ -35,7 +35,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelWidth="130px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
View File

@ -211,12 +211,6 @@ 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;
//}
specialEquipment.CompileMan = this.CurrUser.UserId;
specialEquipment.Status = BLL.Const.Comprehensive_Compile;
BLL.SpecialEquipmentServices.AddEquipment(specialEquipment);
@ -224,12 +218,6 @@ 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 model = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault();
if (model != null)
{
@ -296,12 +284,6 @@ 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;
}
specialEquipment.CompileMan = this.CurrUser.UserId;
specialEquipment.Status = BLL.Const.Comprehensive_Audit;
BLL.SpecialEquipmentServices.AddEquipment(specialEquipment);
@ -309,12 +291,6 @@ 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;
}
// BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment);
var oldSpecialEquipment = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault();
if (oldSpecialEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态

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

@ -81,7 +81,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
Alert.ShowInTop("请先选择专业！", MessageBoxIcon.Warning);
return;
}
if (this.Grid1.Rows.Count == 0)
{
Alert.ShowInTop("请选择共检内容！", MessageBoxIcon.Warning);
return;
}
Model.ProcessControl_InspectionManagement inspectionManagement = new Model.ProcessControl_InspectionManagement();
inspectionManagement.ProjectId = this.CurrUser.LoginProjectId;