0818-1555

DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql

@@ -0,0 +1,2 @@
+alter table dbo.Comprehensive_DesignDrawings drop constraint FK_Comprehensive_DesignDrawings_Base_CNProfessional
+GO

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive
             if (!IsPostBack)
             {
                 GetButtonPower();
-                BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
+                BLL.DesignProfessionalService.InitDesignProfessionalDownList(this.sdrpCNProfessionalId, true);
                 BindGrid();
             }
         }
@@ -47,9 +47,9 @@ namespace FineUIPro.Web.Comprehensive
                                      C.RemarkCode, 
                                      C.UnitWorkId,
                                      CN.ProfessionalName"
-                            +@" FROM Comprehensive_DesignDrawings C "
+                            + @" FROM Comprehensive_DesignDrawings C "
-                            +@" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
+                            + @" LEFT JOIN Base_DesignProfessional CN ON C.CNProfessionalId=CN.DesignProfessionalId"
-                            +@" WHERE C.ProjectId = @ProjectId";
+                            + @" WHERE C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs

@@ -168,7 +168,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             where y.ProjectId == this.CurrUser.LoginProjectId
                             select x;
 
-                var cns = from x in Funs.DB.Base_CNProfessional select x;
+                var cns = from x in Funs.DB.Base_DesignProfessional select x;
 
                 for (int i = 0; i < ir; i++)
                 {
@@ -402,7 +402,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             where y.ProjectId == this.CurrUser.LoginProjectId
                             select x;
 
-                var cns = from x in Funs.DB.Base_CNProfessional select x;
+                var cns = from x in Funs.DB.Base_DesignProfessional select x;
 
                 for (int i = 0; i < ir; i++)
                 {
@@ -416,7 +416,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings();
                         des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
                         des.ProjectId = this.CurrUser.LoginProjectId;
-                        des.CNProfessionalId = cn.CNProfessionalId;
+                        des.CNProfessionalId = cn.DesignProfessionalId;
                         des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
                         des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
                         des.Edition = pds.Rows[i][3].ToString().Trim();
@@ -443,7 +443,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     }
                     else
                     {
-                        oldViewInfo.CNProfessionalId = cn.CNProfessionalId;
+                        oldViewInfo.CNProfessionalId = cn.DesignProfessionalId;
                         oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
                         oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
                         oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim();

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             if (!IsPostBack)
             {
                 GetButtonPower();
-                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+                BLL.DesignProfessionalService.InitDesignProfessionalDownList(this.drpCNProfessionalId, true);
                 BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
                 BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
                 this.DesignDrawingsId = Request.Params["DesignDrawingsId"];

SGGL/FineUIPro.Web/ErrLog.txt

@@ -62,3 +62,25 @@ IP地址:::1
 
 出错时间:08/17/2021 10:54:26
 
+
+错误信息开始=====>
+错误类型:ChangeConflictException
+错误信息:找不到行或行已更改。
+错误堆栈:
+   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
+   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
+   在 BLL.DesignDrawingsService.DeleteDesignDrawingsById(String designDrawingsId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\CQMS\Comprehensive\DesignDrawingsService.cs:行号 167
+   在 FineUIPro.Web.Comprehensive.DesignDrawings.btnMenuDel_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignDrawings.aspx.cs:行号 182
+   在 FineUIPro.MenuButton.OnClick(EventArgs e)
+   在 (MenuButton , EventArgs )
+   在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:08/18/2021 15:38:32
+出错文件:http://localhost:8118/CQMS/Comprehensive/DesignDrawings.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:08/18/2021 15:38:32
+

SGGL/Model/Model.cs

@@ -15662,8 +15662,6 @@ namespace Model
 		
 		private EntitySet<Comprehensive_DesignChangeOrder> _Comprehensive_DesignChangeOrder;
 		
-		private EntitySet<Comprehensive_DesignDrawings> _Comprehensive_DesignDrawings;
-		
 		private EntitySet<Comprehensive_GeneralPlanApproval> _Comprehensive_GeneralPlanApproval;
 		
 		private EntitySet<Comprehensive_InspectionEquipment> _Comprehensive_InspectionEquipment;
@@ -15704,7 +15702,6 @@ namespace Model
 			this._Base_DesignProfessional = new EntitySet<Base_DesignProfessional>(new Action<Base_DesignProfessional>(this.attach_Base_DesignProfessional), new Action<Base_DesignProfessional>(this.detach_Base_DesignProfessional));
 			this._Comprehensive_DataDistribution = new EntitySet<Comprehensive_DataDistribution>(new Action<Comprehensive_DataDistribution>(this.attach_Comprehensive_DataDistribution), new Action<Comprehensive_DataDistribution>(this.detach_Comprehensive_DataDistribution));
 			this._Comprehensive_DesignChangeOrder = new EntitySet<Comprehensive_DesignChangeOrder>(new Action<Comprehensive_DesignChangeOrder>(this.attach_Comprehensive_DesignChangeOrder), new Action<Comprehensive_DesignChangeOrder>(this.detach_Comprehensive_DesignChangeOrder));
-			this._Comprehensive_DesignDrawings = new EntitySet<Comprehensive_DesignDrawings>(new Action<Comprehensive_DesignDrawings>(this.attach_Comprehensive_DesignDrawings), new Action<Comprehensive_DesignDrawings>(this.detach_Comprehensive_DesignDrawings));
 			this._Comprehensive_GeneralPlanApproval = new EntitySet<Comprehensive_GeneralPlanApproval>(new Action<Comprehensive_GeneralPlanApproval>(this.attach_Comprehensive_GeneralPlanApproval), new Action<Comprehensive_GeneralPlanApproval>(this.detach_Comprehensive_GeneralPlanApproval));
 			this._Comprehensive_InspectionEquipment = new EntitySet<Comprehensive_InspectionEquipment>(new Action<Comprehensive_InspectionEquipment>(this.attach_Comprehensive_InspectionEquipment), new Action<Comprehensive_InspectionEquipment>(this.detach_Comprehensive_InspectionEquipment));
 			this._Comprehensive_MajorPlanApproval = new EntitySet<Comprehensive_MajorPlanApproval>(new Action<Comprehensive_MajorPlanApproval>(this.attach_Comprehensive_MajorPlanApproval), new Action<Comprehensive_MajorPlanApproval>(this.detach_Comprehensive_MajorPlanApproval));
@@ -15850,19 +15847,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_CNProfessional", Storage="_Comprehensive_DesignDrawings", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
-		public EntitySet<Comprehensive_DesignDrawings> Comprehensive_DesignDrawings
-		{
-			get
-			{
-				return this._Comprehensive_DesignDrawings;
-			}
-			set
-			{
-				this._Comprehensive_DesignDrawings.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_GeneralPlanApproval_Base_CNProfessional", Storage="_Comprehensive_GeneralPlanApproval", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
 		public EntitySet<Comprehensive_GeneralPlanApproval> Comprehensive_GeneralPlanApproval
 		{
@@ -16061,18 +16045,6 @@ namespace Model
 			entity.Base_CNProfessional = null;
 		}
 		
-		private void attach_Comprehensive_DesignDrawings(Comprehensive_DesignDrawings entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_CNProfessional = this;
-		}
-		
-		private void detach_Comprehensive_DesignDrawings(Comprehensive_DesignDrawings entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_CNProfessional = null;
-		}
-		
 		private void attach_Comprehensive_GeneralPlanApproval(Comprehensive_GeneralPlanApproval entity)
 		{
 			this.SendPropertyChanging();
@@ -68353,8 +68325,6 @@ namespace Model
 		
 		private string _UnitWorkId;
 		
-		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
-		
 		private EntityRef<Base_Project> _Base_Project;
 		
     #region 可扩展性方法定义
@@ -68393,7 +68363,6 @@ namespace Model
 		
 		public Comprehensive_DesignDrawings()
 		{
-			this._Base_CNProfessional = default(EntityRef<Base_CNProfessional>);
 			this._Base_Project = default(EntityRef<Base_Project>);
 			OnCreated();
 		}
@@ -68453,10 +68422,6 @@ namespace Model
 			{
 				if ((this._CNProfessionalId != value))
 				{
-					if (this._Base_CNProfessional.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnCNProfessionalIdChanging(value);
 					this.SendPropertyChanging();
 					this._CNProfessionalId = value;
@@ -68686,40 +68651,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
-		public Base_CNProfessional Base_CNProfessional
-		{
-			get
-			{
-				return this._Base_CNProfessional.Entity;
-			}
-			set
-			{
-				Base_CNProfessional previousValue = this._Base_CNProfessional.Entity;
-				if (((previousValue != value) 
-							|| (this._Base_CNProfessional.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Base_CNProfessional.Entity = null;
-						previousValue.Comprehensive_DesignDrawings.Remove(this);
-					}
-					this._Base_CNProfessional.Entity = value;
-					if ((value != null))
-					{
-						value.Comprehensive_DesignDrawings.Add(this);
-						this._CNProfessionalId = value.CNProfessionalId;
-					}
-					else
-					{
-						this._CNProfessionalId = default(string);
-					}
-					this.SendPropertyChanged("Base_CNProfessional");
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{