From fbbe1413f499f84dfcb1f4d2aafb6d36136caa85 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 12 Apr 2024 15:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comprehensive/DataDistributionEdit.aspx | 2 +- .../DataDistributionEdit.aspx.cs | 24 -------- .../Comprehensive/DataReceivingDocEdit.aspx | 2 +- .../DataReceivingDocEdit.aspx.cs | 24 -------- .../CQMS/Comprehensive/DataReceivingEdit.aspx | 2 +- .../Comprehensive/DataReceivingEdit.aspx.cs | 24 -------- .../Comprehensive/DesignChangeOrderEdit.aspx | 2 +- .../DesignChangeOrderEdit.aspx.cs | 26 -------- .../Comprehensive/DesignDetailsEdit.aspx.cs | 26 +------- .../Comprehensive/DesignDrawingsEdit.aspx | 2 +- .../Comprehensive/DesignDrawingsEdit.aspx.cs | 24 -------- .../InspectionEquipmentEdit.aspx | 2 +- .../InspectionEquipmentEdit.aspx.cs | 59 +------------------ .../Comprehensive/InspectionMachineEdit.aspx | 2 +- .../InspectionMachineEdit.aspx.cs | 26 +------- .../Comprehensive/InspectionPersonEdit.aspx | 2 +- .../InspectionPersonEdit.aspx.cs | 24 -------- .../CQMS/Comprehensive/NCRManagementEdit.aspx | 2 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 24 -------- .../CQMS/Comprehensive/PressurePipeEdit.aspx | 2 +- .../Comprehensive/PressurePipeEdit.aspx.cs | 24 -------- .../Comprehensive/QualityAccidentEdit.aspx | 2 +- .../Comprehensive/QualityAccidentEdit.aspx.cs | 24 -------- .../Comprehensive/ReviewDrawingsEdit.aspx.cs | 24 -------- .../Comprehensive/SiteVisaManagementEdit.aspx | 2 +- .../SiteVisaManagementEdit.aspx.cs | 24 -------- .../Comprehensive/SpecialEquipmentEdit.aspx | 2 +- .../SpecialEquipmentEdit.aspx.cs | 24 -------- .../InspectionNoticeEdit.aspx.cs | 6 +- 29 files changed, 23 insertions(+), 410 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx index 314e0c4a..41ab701a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx @@ -60,7 +60,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs index 658e3f9d..8813804e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx index bf9a3b48..ac43dbb0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx @@ -119,7 +119,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs index 56948b88..e504dc57 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs @@ -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)//编制状态提交变审核 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx index 360e9a3b..b9e3c50a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx @@ -61,7 +61,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs index 6d5b6de4..417a86dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs @@ -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); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx index a6bd50d0..70b4acc8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx @@ -52,7 +52,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index d4aad9b3..26ea6252 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index 2921ee50..592da456 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx index 0b9f4b4d..97230392 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx @@ -62,7 +62,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 17626a42..638aca3c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -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); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 9bbdad44..25506189 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -73,7 +73,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 934304f7..b882db8e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx index d78f12e8..1198ad9f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx @@ -82,7 +82,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index c102c56f..690b7c73 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx index 1a3dfea6..5e08b175 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx @@ -79,7 +79,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index 8c2a2432..ad5dcbeb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 1a44d148..c75baf46 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -83,7 +83,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index dc99fa6e..5abfa10e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx index 4439355a..99ee012a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx @@ -42,7 +42,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index b63ad6b8..27a642a2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx index c90a35b8..e9093686 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx @@ -51,7 +51,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index 9dc30816..2499b1ef 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs index 85226e42..5dff7a25 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -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); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx index 5e932d59..eb016042 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx @@ -57,7 +57,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs index 287c04c8..6695d741 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs @@ -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(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 8893694e..115203ae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -35,7 +35,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index 89a7cb5a..3eb296ea 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -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) //数据库没有记录 直接点提交 当前状态为 审核状态 diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index 1b1e5e13..7f16cf78 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -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;