From 0ec0031e20f85a48e5ee1936a584661f243c2c27 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Sat, 15 Oct 2022 15:40:49 +0800 Subject: [PATCH] =?UTF-8?q?2022-10-15=20=E7=84=8A=E6=8E=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-10-15.sql | 6 + .../BLL/API/HJGL/APIPackagingManageService.cs | 14 +- .../API/HJGL/APIPipelineComponentService.cs | 14 +- SGGL/BLL/HJGL/DataImport/DataImportService.cs | 2 +- .../HJGL/PreDesign/PackagingManageService .cs | 4 + .../WeldingManage/PipelineComponentService.cs | 8 +- SGGL/FineUIPro.Web/Controls/_3DLook.ascx | 2 +- .../HJGL/InfoQuery/JointQuery.aspx | 20 +- .../HJGL/InfoQuery/JointQuery.aspx.cs | 32 +- .../HJGL/PointTrust/PointBatch.aspx.cs | 12 +- .../HJGL/PreDesign/PackagingManage.aspx | 6 + .../HJGL/PreDesign/PackagingManage.aspx.cs | 7 +- .../HJGL/PreDesign/PipelingDivide.aspx | 2 +- .../HJGL/PreDesign/PipelingDivide.aspx.cs | 104 +- .../HJGL/PreDesign/PipelingDivideChart.aspx | 4 +- .../HJGL/PreDesign/PrePipeline.aspx | 8 +- .../HJGL/PreDesign/PrePipeline.aspx.cs | 4 +- .../HJGL/TestPackage/TestPackageEdit.aspx.cs | 31 +- .../HJGL/WeldingManage/WeldMatMatch.aspx.cs | 42 +- .../HJGL/WeldingManage/WeldReport.aspx.cs | 2 +- .../Model/APIItem/HJGL/PackagingManageItem.cs | 6 +- .../APIItem/HJGL/PipelineComponentItem.cs | 2 + SGGL/Model/HJGL/3DParameter.cs | 4 +- SGGL/Model/Model.cs | 1446 ++++++++++++++++- .../HJGL/PackagingManageController.cs | 4 +- .../HJGL/PipelineComponentController.cs | 4 +- 26 files changed, 1623 insertions(+), 167 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-10-15.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-10-15.sql b/DataBase/版本日志/SGGLDB_V2022-10-15.sql new file mode 100644 index 00000000..05a8d33e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-10-15.sql @@ -0,0 +1,6 @@ + + +alter table HJGL_PackagingManage add ReceiveMan varchar(50) +alter table HJGL_PackagingManage add ReceiveDate Datetime +alter table HJGL_Pipeline_Component add ReceiveMan varchar(50) +alter table HJGL_Pipeline_Component add ReceiveDate Datetime \ No newline at end of file diff --git a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs index adc56ee2..518af20f 100644 --- a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs +++ b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs @@ -16,6 +16,8 @@ namespace BLL { var q = (from x in db.HJGL_PackagingManage join n in db.Base_Project on x.ProjectId equals n.ProjectId + join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt + from t in tt.DefaultIfEmpty() where x.ProjectId == projectId select new PackagingManageDetailItem { @@ -26,6 +28,8 @@ namespace BLL ContactPhone = x.ContactPhone, StackingPosition = x.StackingPosition, State= x.State, + ReceiveMan=t.PersonName, + ReceiveDate=x.ReceiveDate, }).Distinct(); return q.ToList(); @@ -39,6 +43,8 @@ namespace BLL PackagingManageItem packagingManageItem = new PackagingManageItem(); var q = (from x in db.HJGL_PackagingManage join n in db.Base_Project on x.ProjectId equals n.ProjectId + join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt + from t in tt.DefaultIfEmpty() where x.PackagingManageId == packagingManageId select new PackagingManageDetailItem { @@ -49,7 +55,9 @@ namespace BLL ContactName = x.ContactName, ContactPhone = x.ContactPhone, StackingPosition = x.StackingPosition, - State =x.State + State =x.State, + ReceiveMan = t.PersonName, + ReceiveDate = x.ReceiveDate, }).FirstOrDefault(); var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId select x ).FirstOrDefault() ; var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(','); @@ -74,12 +82,14 @@ namespace BLL } } - public static void GetPackingInfoConfirmArrival(string packagingManageId) + public static void GetPackingInfoConfirmArrival(string packagingManageId,string PersonId) { var q= BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(packagingManageId); if (q!=null) { q.State = HJGL_PackagingmanageService.state_2; + q.ReceiveMan = PersonId; + q.ReceiveDate = DateTime.Now; HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(q); } } diff --git a/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs index 4688b099..34e3bda3 100644 --- a/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs +++ b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs @@ -18,7 +18,9 @@ namespace BLL var q = (from x in db.HJGL_Pipeline_Component join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt - from t in tt.DefaultIfEmpty() + join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp + from t in tt.DefaultIfEmpty() + from p in pp.DefaultIfEmpty() where y.ProjectId == projectid select new PipelineComponentItem { @@ -30,6 +32,8 @@ namespace BLL State = x.State, PlanStartDate = y.PlanStartDate, QRCode = x.QRCode, + ReceiveMan=p.PersonName, + ReceiveDate=x.ReceiveDate }).Distinct(); return q.ToList(); @@ -44,7 +48,9 @@ namespace BLL var q = (from x in db.HJGL_Pipeline_Component join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt + join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp from t in tt.DefaultIfEmpty() + from p in pp.DefaultIfEmpty() where x.PipelineComponentId== PipelineComponentId select new PipelineComponentItem { @@ -56,6 +62,8 @@ namespace BLL State = x.State, PlanStartDate = y.PlanStartDate, QRCode = x.QRCode, + ReceiveMan = p.PersonName, + ReceiveDate = x.ReceiveDate }).FirstOrDefault(); bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId); pipelineComponentDetail.pipelineComponentItem = q; @@ -64,12 +72,14 @@ namespace BLL } } - public static void GetComponentConfirmArrival(string PipelineComponentId) + public static void GetComponentConfirmArrival(string PipelineComponentId,string PersonId) { var q = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(PipelineComponentId); if (q != null) { q.State = HJGL_PipelineComponentService.state_1; + q.ReceiveMan = PersonId; + q.ReceiveDate = DateTime.Now; HJGL_PipelineComponentService.UpdatePipelineComponent(q); } } diff --git a/SGGL/BLL/HJGL/DataImport/DataImportService.cs b/SGGL/BLL/HJGL/DataImport/DataImportService.cs index d12e0370..b7c037f7 100644 --- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs +++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs @@ -179,7 +179,7 @@ namespace BLL } ).FirstOrDefault(); //where t.Key == UnitWorkId & x.FileType == "1" select x.Version).Distinct().ToList(); - if (!string.IsNullOrEmpty(q.FileName)) + if (q!=null&&!string.IsNullOrEmpty(q.FileName)) { result=q.FileName.Substring (0,q.FileName.LastIndexOf('.')); diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index e1db947a..f5767c4a 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs @@ -158,6 +158,8 @@ namespace BLL ContactName = newtable.ContactName, ContactPhone = newtable.ContactPhone, Remark = newtable.Remark, + ReceiveDate = newtable.ReceiveDate, + ReceiveMan = newtable.ReceiveMan, }; db.HJGL_PackagingManage.InsertOnSubmit(table); db.SubmitChanges(); @@ -179,6 +181,8 @@ namespace BLL table.ContactName = newtable.ContactName; table.ContactPhone = newtable.ContactPhone; table.Remark = newtable.Remark; + table.ReceiveMan=newtable.ReceiveMan; + table.ReceiveDate=newtable.ReceiveDate; db.SubmitChanges(); } diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 2f6de2a1..a4dc0252 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -133,6 +133,8 @@ namespace BLL newPipeline.ActStartDate = pipeline.ActStartDate; newPipeline.ActEndDate = pipeline.ActEndDate; newPipeline.DrawingName = pipeline.DrawingName; + newPipeline.ReceiveMan= pipeline.ReceiveMan; + newPipeline.ReceiveDate= pipeline.ReceiveDate; db.HJGL_Pipeline_Component.InsertOnSubmit(newPipeline); db.SubmitChanges(); } @@ -160,15 +162,19 @@ namespace BLL newPipeline.ActStartDate = pipeline.ActStartDate; newPipeline.ActEndDate = pipeline.ActEndDate; newPipeline.DrawingName = pipeline.DrawingName; + newPipeline.ReceiveMan = pipeline.ReceiveMan; + newPipeline.ReceiveDate = pipeline.ReceiveDate; + db.SubmitChanges(); } } - public static void UpdateOutState(string pipelineComponentId) + public static void UpdateOutState(string pipelineComponentId,string BoxNumber) { var q=GetPipelineComponentById(pipelineComponentId); if (q.State==state_1) { q.State = state_2; + q.BoxNumber=BoxNumber; UpdatePipelineComponent(q); } diff --git a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx index 5b127caf..84ad8315 100644 --- a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx +++ b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx @@ -22,7 +22,7 @@ function BindData(dataList, Url_item,Url) { receiver.src = Url_item; // var newdatalist = dataList.split(","); - // console.log(dataList); + console.log(dataList); receiver.contentWindow.postMessage(dataList, Url); } function iFrameHeight() { diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx index 20814597..ab64098c 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx @@ -94,23 +94,25 @@ + + + + <%-- --%> - - - - - - + --%> + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 877bdc87..1d8f96ae 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -173,7 +173,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = ""; parameter3D.ButtonType = "0,2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); + if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); + + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -377,7 +392,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; parameter3D.ButtonType = "0,2"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); + if (model != null && !string.IsNullOrEmpty(model.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); + + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index 379016fc..3290ca42 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -370,12 +370,12 @@ namespace FineUIPro.Web.HJGL.PointTrust } } } - Model.Parameter3D parameter3D = new Model.Parameter3D(); - Model.ColorModel colorModel = new Model.ColorModel(); - colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); - parameter3D.ColorModel = colorModel; - parameter3D.TagNum = "/E-9001,/E-9002"; - parameter3D.ButtonType = "0,4"; + //Model.Parameter3D parameter3D = new Model.Parameter3D(); + //Model.ColorModel colorModel = new Model.ColorModel(); + //colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); + //parameter3D.ColorModel = colorModel; + //parameter3D.TagNum = "/E-9001,/E-9002"; + //parameter3D.ButtonType = "0,4"; //ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A"; //ctlAuditFlow.data = parameter3D; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index e2fc866d..129c1eb3 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -61,6 +61,12 @@ + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs index 073850e7..e5aa63ae 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs @@ -42,11 +42,14 @@ namespace FineUIPro.Web.HJGL.PreDesign pack.StackingPosition, pack.State, pack.ContactName, - pack.ContactPhone + pack.ContactPhone, + pack.ReceiveDate, + person.PersonName from HJGL_PackagingManage as pack left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId left join WBS_UnitWork unit on pipe.UnitWorkId=unit.UnitWorkId + left join Person_Persons person on pack.ReceiveMan=person.PersonId WHERE pack.ProjectId = @ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -306,7 +309,7 @@ namespace FineUIPro.Web.HJGL.PreDesign var PipelineComponent = model.PipelineComponentId.Split(','); foreach (var item in PipelineComponent) { - HJGL_PipelineComponentService.UpdateOutState(item); + HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode); } HJGL_PackagingmanageService.PutOutOrder(Id); Pring(Id); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx index d7b74527..cc25aa89 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx @@ -93,7 +93,7 @@ - x["PipeArea"].ToString() == "工厂预制"); + var q2 = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "现场施工"); + PipelineComplete = q.Count(); + PipelineNOComplete = q2.Count(); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); Grid1.RecordCount = tb.Rows.Count; @@ -240,14 +269,20 @@ namespace FineUIPro.Web.HJGL.PreDesign } protected void Grid1_RowClick(object sender, GridRowClickEventArgs e) { - var q = PipelineService.GetPipelineByPipelineId(Grid1.SelectedRowID); - var pipecode = "/" + q.PipelineCode; + var Id =Grid1.SelectedRowIDArray; + List listpipecode=new List () ; + foreach (var item in Id) + { + var q = PipelineService.GetPipelineByPipelineId(item); + listpipecode.Add("/" + q.PipelineCode); + } + var pipecode = string.Join(",", listpipecode); Model.Parameter3D parameter3D = new Model.Parameter3D(); Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; - parameter3D.ButtonType = "0,4"; + parameter3D.ButtonType = "0,1"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; @@ -288,36 +323,11 @@ namespace FineUIPro.Web.HJGL.PreDesign } #endregion - protected string ConvertDetectionType(object detectionType) - { - string detectionName = string.Empty; - if (detectionType != null) - { - string[] types = detectionType.ToString().Split('|'); - foreach (string t in types) - { - var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t); - if (type != null) - { - detectionName += type.DetectionTypeCode + ","; - } - } - } - if (detectionName != string.Empty) - { - return detectionName.Substring(0, detectionName.Length - 1); - } - else - { - return ""; - } - } - + #region 按钮事件 protected void btnGetChart_Click(object sender, EventArgs e) { - decimal PipelineComplete = 0; - decimal PipelineNoComplete = 0; - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - "))); + + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNOComplete, "编辑 - "))); } @@ -351,5 +361,33 @@ namespace FineUIPro.Web.HJGL.PreDesign txtMaterialCode.Text = String.Empty; BindGrid(); } + + #endregion + protected string ConvertDetectionType(object detectionType) + { + string detectionName = string.Empty; + if (detectionType != null) + { + string[] types = detectionType.ToString().Split('|'); + foreach (string t in types) + { + var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t); + if (type != null) + { + detectionName += type.DetectionTypeCode + ","; + } + } + } + if (detectionName != string.Empty) + { + return detectionName.Substring(0, detectionName.Length - 1); + } + else + { + return ""; + } + } + + } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx index a2c73953..99d46538 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx @@ -53,7 +53,7 @@ var data = [ { - name: '未完成', value: options.n, label: { + name: '现场施工', value: options.n, label: { rich: { name: { fontSize: 10, @@ -69,7 +69,7 @@ } }, { - name: '已完成', value: options.y, label: { + name: '工厂预制', value: options.y, label: { rich: { name: { fontSize: 10, diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index bcc062ea..1f49e85a 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -79,7 +79,7 @@ - + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 70c5c742..3d7b3ab1 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -161,11 +161,13 @@ namespace FineUIPro.Web.HJGL.PreDesign { string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber, com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit, - com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName + com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate, + person.PersonName FROM HJGL_Pipeline_Component com LEFT JOIN HJGL_Pipeline pipe ON pipe.PipelineId =com.PipelineId LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit + LEFT JOIN Person_Persons person on com.ReceiveMan=person.PersonId WHERE com.PipelineId =@PipelineId "; List listStr = new List { }; diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index fb0af38b..390af1f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs @@ -226,8 +226,21 @@ namespace FineUIPro.Web.HJGL.TestPackage parameter3D.ColorModel = colorModel; parameter3D.TagNum = ""; parameter3D.ButtonType = "0,4"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + } + else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage") + { + var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID); + if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId); + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -542,7 +555,21 @@ namespace FineUIPro.Web.HJGL.TestPackage parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; parameter3D.ButtonType = "0,4"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + + } + else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage") + { + var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID); + if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId); + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index 8383230f..3ca4448b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -167,7 +167,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage newNode.CssClass = "tn-color-green"; } newNode.Text = item.PipelineCode+suf; //+ "【" + jotCount.ToString() + " " + "焊口" + "】"; - + newNode.CommandName = "管线"; newNode.NodeID = item.PipelineId; newNode.EnableClickEvent = true; e.Node.Nodes.Add(newNode); @@ -232,8 +232,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage parameter3D.ColorModel = colorModel; parameter3D.TagNum = ""; parameter3D.ButtonType = "0,3"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); + if (model != null && !string.IsNullOrEmpty(model.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); + + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -309,16 +323,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage } protected void Grid1_RowClick(object sender, GridRowClickEventArgs e) { - var model = PipelineMatService.GetPipeLineMat(Grid1.SelectedRowID); - var q = PipelineService.GetPipelineByPipelineId(model.PipelineId); - var pipecode = "/" + q.PipelineCode; Model.Parameter3D parameter3D = new Model.Parameter3D(); Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; - parameter3D.TagNum = pipecode; - parameter3D.ButtonType = "0,2"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.ButtonType = "0,3"; + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + var modelpipe = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); + if (modelpipe != null && !string.IsNullOrEmpty(modelpipe.UnitWorkId)) + { + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId); + var pipecode = "/" + modelpipe.PipelineCode; + parameter3D.TagNum = pipecode; + } + + } ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index dc0f999e..b14a1dc8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; parameter3D.TagNum = ""; - parameter3D.ButtonType = "0,4"; + parameter3D.ButtonType = "0,2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); diff --git a/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs b/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs index ce0dd2dc..fe700660 100644 --- a/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs +++ b/SGGL/Model/APIItem/HJGL/PackagingManageItem.cs @@ -16,7 +16,11 @@ namespace Model public string ContactPhone { get; set; } public string StackingPosition { get; set; } public int? State { get; set; } - + + public string ReceiveMan { get; set; } + public DateTime? ReceiveDate { get; set; } + + } public class PackagingPrepipeItem { diff --git a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs index 51971da6..77bd34f2 100644 --- a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs +++ b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs @@ -16,6 +16,8 @@ namespace Model public int? State { get; set; } public DateTime? PlanStartDate { get; set; } public string QRCode { get; set; } + public string ReceiveMan { get; set; } + public DateTime? ReceiveDate { get; set; } } public class PipelineComponentDetail { diff --git a/SGGL/Model/HJGL/3DParameter.cs b/SGGL/Model/HJGL/3DParameter.cs index 3646d2a3..8542e302 100644 --- a/SGGL/Model/HJGL/3DParameter.cs +++ b/SGGL/Model/HJGL/3DParameter.cs @@ -12,7 +12,9 @@ namespace Model /// 按钮类别 /// public string ButtonType { get; set; } - + /// + /// 主项名称 + /// public string ModelName { get; set; } /// /// 颜色模型 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 9b85e77c..14e57f37 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -347,6 +347,12 @@ namespace Model partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); + partial void InsertConManager_LongList(ConManager_LongList instance); + partial void UpdateConManager_LongList(ConManager_LongList instance); + partial void DeleteConManager_LongList(ConManager_LongList instance); + partial void InsertConManager_SubAchievement(ConManager_SubAchievement instance); + partial void UpdateConManager_SubAchievement(ConManager_SubAchievement instance); + partial void DeleteConManager_SubAchievement(ConManager_SubAchievement instance); partial void InsertCostGoods_CostManage(CostGoods_CostManage instance); partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance); partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance); @@ -752,6 +758,9 @@ namespace Model partial void InsertPerson_Persons(Person_Persons instance); partial void UpdatePerson_Persons(Person_Persons instance); partial void DeletePerson_Persons(Person_Persons instance); + partial void InsertPerson_PersonsCertificate(Person_PersonsCertificate instance); + partial void UpdatePerson_PersonsCertificate(Person_PersonsCertificate instance); + partial void DeletePerson_PersonsCertificate(Person_PersonsCertificate instance); partial void InsertPerson_PersonTrain(Person_PersonTrain instance); partial void UpdatePerson_PersonTrain(Person_PersonTrain instance); partial void DeletePerson_PersonTrain(Person_PersonTrain instance); @@ -2286,6 +2295,22 @@ namespace Model } } + public System.Data.Linq.Table ConManager_LongList + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table ConManager_SubAchievement + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table CostGoods_CostManage { get @@ -3374,6 +3399,14 @@ namespace Model } } + public System.Data.Linq.Table Person_PersonsCertificate + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Person_PersonTrain { get @@ -50000,6 +50033,802 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_LongList")] + public partial class ConManager_LongList : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ConManagerLongListId; + + private System.Nullable _State; + + private string _SubUnitName; + + private string _SubUnitNature; + + private string _Corporate; + + private string _Address; + + private string _CollCropCode; + + private string _RegisteredCapital; + + private string _SubjectNatureLevel; + + private string _OtherNatureLevel; + + private string _MainBusiness; + + private string _OpeningBank_TT; + + private string _BankAccount_TT; + + private string _OpeningBank_electrophore; + + private string _BankAccount_electrophore; + + private string _LineNumber_electrophore; + + private string _LinkUserName; + + private string _LinkUserPosition; + + private string _LinkUserMobile; + + private string _LinkUserEMail; + + private string _Personal_all; + + private string _Personal_Skilled; + + private string _Personal_Manager; + + private string _Personal_Reg; + + private string _AchievementId; + + private string _IsQualifiedSub; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnConManagerLongListIdChanging(string value); + partial void OnConManagerLongListIdChanged(); + partial void OnStateChanging(System.Nullable value); + partial void OnStateChanged(); + partial void OnSubUnitNameChanging(string value); + partial void OnSubUnitNameChanged(); + partial void OnSubUnitNatureChanging(string value); + partial void OnSubUnitNatureChanged(); + partial void OnCorporateChanging(string value); + partial void OnCorporateChanged(); + partial void OnAddressChanging(string value); + partial void OnAddressChanged(); + partial void OnCollCropCodeChanging(string value); + partial void OnCollCropCodeChanged(); + partial void OnRegisteredCapitalChanging(string value); + partial void OnRegisteredCapitalChanged(); + partial void OnSubjectNatureLevelChanging(string value); + partial void OnSubjectNatureLevelChanged(); + partial void OnOtherNatureLevelChanging(string value); + partial void OnOtherNatureLevelChanged(); + partial void OnMainBusinessChanging(string value); + partial void OnMainBusinessChanged(); + partial void OnOpeningBank_TTChanging(string value); + partial void OnOpeningBank_TTChanged(); + partial void OnBankAccount_TTChanging(string value); + partial void OnBankAccount_TTChanged(); + partial void OnOpeningBank_electrophoreChanging(string value); + partial void OnOpeningBank_electrophoreChanged(); + partial void OnBankAccount_electrophoreChanging(string value); + partial void OnBankAccount_electrophoreChanged(); + partial void OnLineNumber_electrophoreChanging(string value); + partial void OnLineNumber_electrophoreChanged(); + partial void OnLinkUserNameChanging(string value); + partial void OnLinkUserNameChanged(); + partial void OnLinkUserPositionChanging(string value); + partial void OnLinkUserPositionChanged(); + partial void OnLinkUserMobileChanging(string value); + partial void OnLinkUserMobileChanged(); + partial void OnLinkUserEMailChanging(string value); + partial void OnLinkUserEMailChanged(); + partial void OnPersonal_allChanging(string value); + partial void OnPersonal_allChanged(); + partial void OnPersonal_SkilledChanging(string value); + partial void OnPersonal_SkilledChanged(); + partial void OnPersonal_ManagerChanging(string value); + partial void OnPersonal_ManagerChanged(); + partial void OnPersonal_RegChanging(string value); + partial void OnPersonal_RegChanged(); + partial void OnAchievementIdChanging(string value); + partial void OnAchievementIdChanged(); + partial void OnIsQualifiedSubChanging(string value); + partial void OnIsQualifiedSubChanged(); + #endregion + + public ConManager_LongList() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConManagerLongListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ConManagerLongListId + { + get + { + return this._ConManagerLongListId; + } + set + { + if ((this._ConManagerLongListId != value)) + { + this.OnConManagerLongListIdChanging(value); + this.SendPropertyChanging(); + this._ConManagerLongListId = value; + this.SendPropertyChanged("ConManagerLongListId"); + this.OnConManagerLongListIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] + public System.Nullable State + { + get + { + return this._State; + } + set + { + if ((this._State != value)) + { + this.OnStateChanging(value); + this.SendPropertyChanging(); + this._State = value; + this.SendPropertyChanged("State"); + this.OnStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="NVarChar(200)")] + public string SubUnitName + { + get + { + return this._SubUnitName; + } + set + { + if ((this._SubUnitName != value)) + { + this.OnSubUnitNameChanging(value); + this.SendPropertyChanging(); + this._SubUnitName = value; + this.SendPropertyChanged("SubUnitName"); + this.OnSubUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitNature", DbType="NVarChar(200)")] + public string SubUnitNature + { + get + { + return this._SubUnitNature; + } + set + { + if ((this._SubUnitNature != value)) + { + this.OnSubUnitNatureChanging(value); + this.SendPropertyChanging(); + this._SubUnitNature = value; + this.SendPropertyChanged("SubUnitNature"); + this.OnSubUnitNatureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Corporate", DbType="NVarChar(200)")] + public string Corporate + { + get + { + return this._Corporate; + } + set + { + if ((this._Corporate != value)) + { + this.OnCorporateChanging(value); + this.SendPropertyChanging(); + this._Corporate = value; + this.SendPropertyChanged("Corporate"); + this.OnCorporateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] + public string Address + { + get + { + return this._Address; + } + set + { + if ((this._Address != value)) + { + this.OnAddressChanging(value); + this.SendPropertyChanging(); + this._Address = value; + this.SendPropertyChanged("Address"); + this.OnAddressChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="NVarChar(200)")] + public string CollCropCode + { + get + { + return this._CollCropCode; + } + set + { + if ((this._CollCropCode != value)) + { + this.OnCollCropCodeChanging(value); + this.SendPropertyChanging(); + this._CollCropCode = value; + this.SendPropertyChanged("CollCropCode"); + this.OnCollCropCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisteredCapital", DbType="NVarChar(50)")] + public string RegisteredCapital + { + get + { + return this._RegisteredCapital; + } + set + { + if ((this._RegisteredCapital != value)) + { + this.OnRegisteredCapitalChanging(value); + this.SendPropertyChanging(); + this._RegisteredCapital = value; + this.SendPropertyChanged("RegisteredCapital"); + this.OnRegisteredCapitalChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubjectNatureLevel", DbType="NVarChar(200)")] + public string SubjectNatureLevel + { + get + { + return this._SubjectNatureLevel; + } + set + { + if ((this._SubjectNatureLevel != value)) + { + this.OnSubjectNatureLevelChanging(value); + this.SendPropertyChanging(); + this._SubjectNatureLevel = value; + this.SendPropertyChanged("SubjectNatureLevel"); + this.OnSubjectNatureLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherNatureLevel", DbType="NVarChar(200)")] + public string OtherNatureLevel + { + get + { + return this._OtherNatureLevel; + } + set + { + if ((this._OtherNatureLevel != value)) + { + this.OnOtherNatureLevelChanging(value); + this.SendPropertyChanging(); + this._OtherNatureLevel = value; + this.SendPropertyChanged("OtherNatureLevel"); + this.OnOtherNatureLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainBusiness", DbType="NVarChar(1000)")] + public string MainBusiness + { + get + { + return this._MainBusiness; + } + set + { + if ((this._MainBusiness != value)) + { + this.OnMainBusinessChanging(value); + this.SendPropertyChanging(); + this._MainBusiness = value; + this.SendPropertyChanged("MainBusiness"); + this.OnMainBusinessChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_TT", DbType="NVarChar(100)")] + public string OpeningBank_TT + { + get + { + return this._OpeningBank_TT; + } + set + { + if ((this._OpeningBank_TT != value)) + { + this.OnOpeningBank_TTChanging(value); + this.SendPropertyChanging(); + this._OpeningBank_TT = value; + this.SendPropertyChanged("OpeningBank_TT"); + this.OnOpeningBank_TTChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_TT", DbType="NVarChar(100)")] + public string BankAccount_TT + { + get + { + return this._BankAccount_TT; + } + set + { + if ((this._BankAccount_TT != value)) + { + this.OnBankAccount_TTChanging(value); + this.SendPropertyChanging(); + this._BankAccount_TT = value; + this.SendPropertyChanged("BankAccount_TT"); + this.OnBankAccount_TTChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_electrophore", DbType="NVarChar(100)")] + public string OpeningBank_electrophore + { + get + { + return this._OpeningBank_electrophore; + } + set + { + if ((this._OpeningBank_electrophore != value)) + { + this.OnOpeningBank_electrophoreChanging(value); + this.SendPropertyChanging(); + this._OpeningBank_electrophore = value; + this.SendPropertyChanged("OpeningBank_electrophore"); + this.OnOpeningBank_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_electrophore", DbType="NVarChar(100)")] + public string BankAccount_electrophore + { + get + { + return this._BankAccount_electrophore; + } + set + { + if ((this._BankAccount_electrophore != value)) + { + this.OnBankAccount_electrophoreChanging(value); + this.SendPropertyChanging(); + this._BankAccount_electrophore = value; + this.SendPropertyChanged("BankAccount_electrophore"); + this.OnBankAccount_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LineNumber_electrophore", DbType="NVarChar(100)")] + public string LineNumber_electrophore + { + get + { + return this._LineNumber_electrophore; + } + set + { + if ((this._LineNumber_electrophore != value)) + { + this.OnLineNumber_electrophoreChanging(value); + this.SendPropertyChanging(); + this._LineNumber_electrophore = value; + this.SendPropertyChanged("LineNumber_electrophore"); + this.OnLineNumber_electrophoreChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserName", DbType="NVarChar(50)")] + public string LinkUserName + { + get + { + return this._LinkUserName; + } + set + { + if ((this._LinkUserName != value)) + { + this.OnLinkUserNameChanging(value); + this.SendPropertyChanging(); + this._LinkUserName = value; + this.SendPropertyChanged("LinkUserName"); + this.OnLinkUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserPosition", DbType="NVarChar(100)")] + public string LinkUserPosition + { + get + { + return this._LinkUserPosition; + } + set + { + if ((this._LinkUserPosition != value)) + { + this.OnLinkUserPositionChanging(value); + this.SendPropertyChanging(); + this._LinkUserPosition = value; + this.SendPropertyChanged("LinkUserPosition"); + this.OnLinkUserPositionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserMobile", DbType="NVarChar(50)")] + public string LinkUserMobile + { + get + { + return this._LinkUserMobile; + } + set + { + if ((this._LinkUserMobile != value)) + { + this.OnLinkUserMobileChanging(value); + this.SendPropertyChanging(); + this._LinkUserMobile = value; + this.SendPropertyChanged("LinkUserMobile"); + this.OnLinkUserMobileChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserEMail", DbType="NVarChar(50)")] + public string LinkUserEMail + { + get + { + return this._LinkUserEMail; + } + set + { + if ((this._LinkUserEMail != value)) + { + this.OnLinkUserEMailChanging(value); + this.SendPropertyChanging(); + this._LinkUserEMail = value; + this.SendPropertyChanged("LinkUserEMail"); + this.OnLinkUserEMailChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_all", DbType="NVarChar(200)")] + public string Personal_all + { + get + { + return this._Personal_all; + } + set + { + if ((this._Personal_all != value)) + { + this.OnPersonal_allChanging(value); + this.SendPropertyChanging(); + this._Personal_all = value; + this.SendPropertyChanged("Personal_all"); + this.OnPersonal_allChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Skilled", DbType="NVarChar(200)")] + public string Personal_Skilled + { + get + { + return this._Personal_Skilled; + } + set + { + if ((this._Personal_Skilled != value)) + { + this.OnPersonal_SkilledChanging(value); + this.SendPropertyChanging(); + this._Personal_Skilled = value; + this.SendPropertyChanged("Personal_Skilled"); + this.OnPersonal_SkilledChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Manager", DbType="NVarChar(200)")] + public string Personal_Manager + { + get + { + return this._Personal_Manager; + } + set + { + if ((this._Personal_Manager != value)) + { + this.OnPersonal_ManagerChanging(value); + this.SendPropertyChanging(); + this._Personal_Manager = value; + this.SendPropertyChanged("Personal_Manager"); + this.OnPersonal_ManagerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Reg", DbType="NVarChar(200)")] + public string Personal_Reg + { + get + { + return this._Personal_Reg; + } + set + { + if ((this._Personal_Reg != value)) + { + this.OnPersonal_RegChanging(value); + this.SendPropertyChanging(); + this._Personal_Reg = value; + this.SendPropertyChanged("Personal_Reg"); + this.OnPersonal_RegChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50)")] + public string AchievementId + { + get + { + return this._AchievementId; + } + set + { + if ((this._AchievementId != value)) + { + this.OnAchievementIdChanging(value); + this.SendPropertyChanging(); + this._AchievementId = value; + this.SendPropertyChanged("AchievementId"); + this.OnAchievementIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualifiedSub", DbType="NVarChar(50)")] + public string IsQualifiedSub + { + get + { + return this._IsQualifiedSub; + } + set + { + if ((this._IsQualifiedSub != value)) + { + this.OnIsQualifiedSubChanging(value); + this.SendPropertyChanging(); + this._IsQualifiedSub = value; + this.SendPropertyChanged("IsQualifiedSub"); + this.OnIsQualifiedSubChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_SubAchievement")] + public partial class ConManager_SubAchievement : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _AchievementId; + + private string _ProjectName; + + private string _Remark; + + private string _HonorAward; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnAchievementIdChanging(string value); + partial void OnAchievementIdChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnHonorAwardChanging(string value); + partial void OnHonorAwardChanged(); + #endregion + + public ConManager_SubAchievement() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string AchievementId + { + get + { + return this._AchievementId; + } + set + { + if ((this._AchievementId != value)) + { + this.OnAchievementIdChanging(value); + this.SendPropertyChanging(); + this._AchievementId = value; + this.SendPropertyChanged("AchievementId"); + this.OnAchievementIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HonorAward", DbType="NVarChar(1000)")] + public string HonorAward + { + get + { + return this._HonorAward; + } + set + { + if ((this._HonorAward != value)) + { + this.OnHonorAwardChanging(value); + this.SendPropertyChanging(); + this._HonorAward = value; + this.SendPropertyChanged("HonorAward"); + this.OnHonorAwardChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")] public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -66062,8 +66891,6 @@ namespace Model private string _ImportType; - private string _DataClassification; - private string _FileName; private string _FilePath; @@ -66082,6 +66909,8 @@ namespace Model private string _CreateDate; + private string _DataClassification; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -66094,8 +66923,6 @@ namespace Model partial void OnUnitWorkIdChanged(); partial void OnImportTypeChanging(string value); partial void OnImportTypeChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); partial void OnFileNameChanging(string value); partial void OnFileNameChanged(); partial void OnFilePathChanging(string value); @@ -66114,6 +66941,8 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(string value); partial void OnCreateDateChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImport() @@ -66201,26 +67030,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="VarChar(500)")] public string FileName { @@ -66401,6 +67210,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -66434,10 +67263,10 @@ namespace Model private string _UnitWorkId; - private string _DataClassification; - private System.Nullable _Version; + private string _DataClassification; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -66448,10 +67277,10 @@ namespace Model partial void OnProjectIdChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); partial void OnVersionChanging(System.Nullable value); partial void OnVersionChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImportVerSionLog() @@ -66519,26 +67348,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] public System.Nullable Version { @@ -66559,6 +67368,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -71538,6 +72367,10 @@ namespace Model private string _Remark; + private string _ReceiveMan; + + private System.Nullable _ReceiveDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -71560,6 +72393,10 @@ namespace Model partial void OnContactPhoneChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnReceiveManChanging(string value); + partial void OnReceiveManChanged(); + partial void OnReceiveDateChanging(System.Nullable value); + partial void OnReceiveDateChanged(); #endregion public HJGL_PackagingManage() @@ -71747,6 +72584,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="VarChar(50)")] + public string ReceiveMan + { + get + { + return this._ReceiveMan; + } + set + { + if ((this._ReceiveMan != value)) + { + this.OnReceiveManChanging(value); + this.SendPropertyChanging(); + this._ReceiveMan = value; + this.SendPropertyChanged("ReceiveMan"); + this.OnReceiveManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveDate", DbType="Date")] + public System.Nullable ReceiveDate + { + get + { + return this._ReceiveDate; + } + set + { + if ((this._ReceiveDate != value)) + { + this.OnReceiveDateChanging(value); + this.SendPropertyChanging(); + this._ReceiveDate = value; + this.SendPropertyChanged("ReceiveDate"); + this.OnReceiveDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -73383,7 +74260,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -74625,6 +75502,10 @@ namespace Model private string _DrawingName; + private string _ReceiveMan; + + private System.Nullable _ReceiveDate; + private EntityRef _HJGL_Pipeline; #region 可扩展性方法定义 @@ -74659,6 +75540,10 @@ namespace Model partial void OnActEndDateChanged(); partial void OnDrawingNameChanging(string value); partial void OnDrawingNameChanged(); + partial void OnReceiveManChanging(string value); + partial void OnReceiveManChanged(); + partial void OnReceiveDateChanging(System.Nullable value); + partial void OnReceiveDateChanged(); #endregion public HJGL_Pipeline_Component() @@ -74951,6 +75836,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="VarChar(50)")] + public string ReceiveMan + { + get + { + return this._ReceiveMan; + } + set + { + if ((this._ReceiveMan != value)) + { + this.OnReceiveManChanging(value); + this.SendPropertyChanging(); + this._ReceiveMan = value; + this.SendPropertyChanged("ReceiveMan"); + this.OnReceiveManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveDate", DbType="Date")] + public System.Nullable ReceiveDate + { + get + { + return this._ReceiveDate; + } + set + { + if ((this._ReceiveDate != value)) + { + this.OnReceiveDateChanging(value); + this.SendPropertyChanging(); + this._ReceiveDate = value; + this.SendPropertyChanged("ReceiveDate"); + this.OnReceiveDateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Component_HJGL_Pipeline", Storage="_HJGL_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)] public HJGL_Pipeline HJGL_Pipeline { @@ -124080,6 +125005,284 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonsCertificate")] + public partial class Person_PersonsCertificate : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _PersonsCertificateId; + + private string _PersonId; + + private string _CertificateId; + + private string _CertificateCode; + + private string _SendUnit; + + private System.Nullable _SendDate; + + private System.Nullable _RegisterDate; + + private string _Major; + + private System.Nullable _ValidityDate; + + private string _Url; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnPersonsCertificateIdChanging(string value); + partial void OnPersonsCertificateIdChanged(); + partial void OnPersonIdChanging(string value); + partial void OnPersonIdChanged(); + partial void OnCertificateIdChanging(string value); + partial void OnCertificateIdChanged(); + partial void OnCertificateCodeChanging(string value); + partial void OnCertificateCodeChanged(); + partial void OnSendUnitChanging(string value); + partial void OnSendUnitChanged(); + partial void OnSendDateChanging(System.Nullable value); + partial void OnSendDateChanged(); + partial void OnRegisterDateChanging(System.Nullable value); + partial void OnRegisterDateChanged(); + partial void OnMajorChanging(string value); + partial void OnMajorChanged(); + partial void OnValidityDateChanging(System.Nullable value); + partial void OnValidityDateChanged(); + partial void OnUrlChanging(string value); + partial void OnUrlChanged(); + #endregion + + public Person_PersonsCertificate() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonsCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string PersonsCertificateId + { + get + { + return this._PersonsCertificateId; + } + set + { + if ((this._PersonsCertificateId != value)) + { + this.OnPersonsCertificateIdChanging(value); + this.SendPropertyChanging(); + this._PersonsCertificateId = value; + this.SendPropertyChanged("PersonsCertificateId"); + this.OnPersonsCertificateIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] + public string PersonId + { + get + { + return this._PersonId; + } + set + { + if ((this._PersonId != value)) + { + this.OnPersonIdChanging(value); + this.SendPropertyChanging(); + this._PersonId = value; + this.SendPropertyChanged("PersonId"); + this.OnPersonIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")] + public string CertificateId + { + get + { + return this._CertificateId; + } + set + { + if ((this._CertificateId != value)) + { + this.OnCertificateIdChanging(value); + this.SendPropertyChanging(); + this._CertificateId = value; + this.SendPropertyChanged("CertificateId"); + this.OnCertificateIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateCode", DbType="NVarChar(50)")] + public string CertificateCode + { + get + { + return this._CertificateCode; + } + set + { + if ((this._CertificateCode != value)) + { + this.OnCertificateCodeChanging(value); + this.SendPropertyChanging(); + this._CertificateCode = value; + this.SendPropertyChanged("CertificateCode"); + this.OnCertificateCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnit", DbType="NVarChar(500)")] + public string SendUnit + { + get + { + return this._SendUnit; + } + set + { + if ((this._SendUnit != value)) + { + this.OnSendUnitChanging(value); + this.SendPropertyChanging(); + this._SendUnit = value; + this.SendPropertyChanged("SendUnit"); + this.OnSendUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendDate", DbType="DateTime")] + public System.Nullable SendDate + { + get + { + return this._SendDate; + } + set + { + if ((this._SendDate != value)) + { + this.OnSendDateChanging(value); + this.SendPropertyChanging(); + this._SendDate = value; + this.SendPropertyChanged("SendDate"); + this.OnSendDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")] + public System.Nullable RegisterDate + { + get + { + return this._RegisterDate; + } + set + { + if ((this._RegisterDate != value)) + { + this.OnRegisterDateChanging(value); + this.SendPropertyChanging(); + this._RegisterDate = value; + this.SendPropertyChanged("RegisterDate"); + this.OnRegisterDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")] + public string Major + { + get + { + return this._Major; + } + set + { + if ((this._Major != value)) + { + this.OnMajorChanging(value); + this.SendPropertyChanging(); + this._Major = value; + this.SendPropertyChanged("Major"); + this.OnMajorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityDate", DbType="DateTime")] + public System.Nullable ValidityDate + { + get + { + return this._ValidityDate; + } + set + { + if ((this._ValidityDate != value)) + { + this.OnValidityDateChanging(value); + this.SendPropertyChanging(); + this._ValidityDate = value; + this.SendPropertyChanged("ValidityDate"); + this.OnValidityDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(2000)")] + public string Url + { + get + { + return this._Url; + } + set + { + if ((this._Url != value)) + { + this.OnUrlChanging(value); + this.SendPropertyChanging(); + this._Url = value; + this.SendPropertyChanged("Url"); + this.OnUrlChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonTrain")] public partial class Person_PersonTrain : INotifyPropertyChanging, INotifyPropertyChanged { @@ -137387,8 +138590,6 @@ namespace Model private System.Nullable _Status; - private string _ContactUnitOfPartyA; - private string _ContactPersonOfPartyA; private string _ContactPersonOfPartyB; @@ -137413,6 +138614,8 @@ namespace Model private System.Nullable _IsItACentralizedPurchaseSupplier; + private string _ContactUnitOfPartyA; + private string _Clause; private string _MainContent; @@ -137499,8 +138702,6 @@ namespace Model partial void OnCreateDateChanged(); partial void OnStatusChanging(System.Nullable value); partial void OnStatusChanged(); - partial void OnContactUnitOfPartyAChanging(string value); - partial void OnContactUnitOfPartyAChanged(); partial void OnContactPersonOfPartyAChanging(string value); partial void OnContactPersonOfPartyAChanged(); partial void OnContactPersonOfPartyBChanging(string value); @@ -137525,6 +138726,8 @@ namespace Model partial void OnSubcontractingMethodChanged(); partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable value); partial void OnIsItACentralizedPurchaseSupplierChanged(); + partial void OnContactUnitOfPartyAChanging(string value); + partial void OnContactUnitOfPartyAChanged(); partial void OnClauseChanging(string value); partial void OnClauseChanged(); partial void OnMainContentChanging(string value); @@ -138252,26 +139455,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] - public string ContactUnitOfPartyA - { - get - { - return this._ContactUnitOfPartyA; - } - set - { - if ((this._ContactUnitOfPartyA != value)) - { - this.OnContactUnitOfPartyAChanging(value); - this.SendPropertyChanging(); - this._ContactUnitOfPartyA = value; - this.SendPropertyChanged("ContactUnitOfPartyA"); - this.OnContactUnitOfPartyAChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")] public string ContactPersonOfPartyA { @@ -138512,6 +139695,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] + public string ContactUnitOfPartyA + { + get + { + return this._ContactUnitOfPartyA; + } + set + { + if ((this._ContactUnitOfPartyA != value)) + { + this.OnContactUnitOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactUnitOfPartyA = value; + this.SendPropertyChanged("ContactUnitOfPartyA"); + this.OnContactUnitOfPartyAChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(1000)")] public string Clause { @@ -179968,6 +181171,8 @@ namespace Model private EntityRef _WBS_UnitWork; + private EntityRef _WBS_WorkPackage; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -180001,6 +181206,7 @@ namespace Model this._Base_Unit = default(EntityRef); this._Solution_LargerHazardList = default(EntityRef); this._WBS_UnitWork = default(EntityRef); + this._WBS_WorkPackage = default(EntityRef); OnCreated(); } @@ -180103,6 +181309,10 @@ namespace Model { if ((this._WorkPackageId != value)) { + if (this._WBS_WorkPackage.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnWorkPackageIdChanging(value); this.SendPropertyChanging(); this._WorkPackageId = value; @@ -180338,6 +181548,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] + public WBS_WorkPackage WBS_WorkPackage + { + get + { + return this._WBS_WorkPackage.Entity; + } + set + { + WBS_WorkPackage previousValue = this._WBS_WorkPackage.Entity; + if (((previousValue != value) + || (this._WBS_WorkPackage.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._WBS_WorkPackage.Entity = null; + previousValue.Solution_LargerHazardListItem.Remove(this); + } + this._WBS_WorkPackage.Entity = value; + if ((value != null)) + { + value.Solution_LargerHazardListItem.Add(this); + this._WorkPackageId = value.WorkPackageId; + } + else + { + this._WorkPackageId = default(string); + } + this.SendPropertyChanged("WBS_WorkPackage"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -202825,7 +204069,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -207266,7 +208510,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -209996,7 +211240,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -210895,7 +212139,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -211272,7 +212516,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -211465,7 +212709,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -211698,7 +212942,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -212528,7 +213772,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -213513,7 +214757,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -215699,7 +216943,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -220491,7 +221735,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -221121,7 +222365,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -221816,7 +223060,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -222399,7 +223643,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] public string PipelineCode { get @@ -231672,6 +232916,8 @@ namespace Model private System.Nullable _Costs; + private EntitySet _Solution_LargerHazardListItem; + private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -231718,6 +232964,7 @@ namespace Model public WBS_WorkPackage() { + this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._WBS_ControlItemAndCycle = new EntitySet(new Action(this.attach_WBS_ControlItemAndCycle), new Action(this.detach_WBS_ControlItemAndCycle)); this._WBS_UnitWork = default(EntityRef); OnCreated(); @@ -232067,6 +233314,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_Solution_LargerHazardListItem", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] + public EntitySet Solution_LargerHazardListItem + { + get + { + return this._Solution_LargerHazardListItem; + } + set + { + this._Solution_LargerHazardListItem.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle { @@ -232134,6 +233394,18 @@ namespace Model } } + private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) + { + this.SendPropertyChanging(); + entity.WBS_WorkPackage = this; + } + + private void detach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) + { + this.SendPropertyChanging(); + entity.WBS_WorkPackage = null; + } + private void attach_WBS_ControlItemAndCycle(WBS_ControlItemAndCycle entity) { this.SendPropertyChanging(); diff --git a/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs b/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs index a289ab92..c6b0f813 100644 --- a/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs @@ -50,12 +50,12 @@ namespace WebAPI.Controllers return responeData; } - public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId) + public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId,string PersonId) { var responeData = new Model.ResponeData(); try { - BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId); + BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId, PersonId); } catch (Exception ex) { diff --git a/SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs b/SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs index ab14e7f6..5c04ea81 100644 --- a/SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs @@ -50,12 +50,12 @@ namespace WebAPI.Controllers return responeData; } - public Model.ResponeData GetComponentConfirmArrival(string PipelineComponentId) + public Model.ResponeData GetComponentConfirmArrival(string PipelineComponentId, string PersonId) { var responeData = new Model.ResponeData(); try { - BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId); + BLL.APIPipelineComponentService.GetComponentConfirmArrival(PipelineComponentId, PersonId); } catch (Exception ex) {