From 487dc0dbcc4d43e01d76efa5de3cc78d8c47b748 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 3 Jul 2026 14:53:04 +0800 Subject: [PATCH] =?UTF-8?q?20260703=20=E8=AF=95=E5=8E=8B=E5=8C=85=E5=88=92?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-07-03_bwj.sql | 99 +++ HJGL_DS/BLL/BLL.csproj | 2 + HJGL_DS/BLL/SYBData/CoverService.cs | 12 + .../BLL/SYBData/TestPackageDivisionService.cs | 63 ++ HJGL_DS/BLL/SYBData/ToIsoListService.cs | 31 + HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 8 + HJGL_DS/FineUIPro.Web/SYBData/Cover.aspx.cs | 65 +- .../FineUIPro.Web/SYBData/SYBDataList.aspx.cs | 75 +- .../SYBData/TestPackageDivision.aspx | 139 ++++ .../SYBData/TestPackageDivision.aspx.cs | 264 +++++++ .../TestPackageDivision.aspx.designer.cs | 152 ++++ HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx | 129 ++-- HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs | 57 ++ .../common/mainGdaz.aspx.designer.cs | 36 + HJGL_DS/Model/Model.cs | 659 ++++++++++++++++++ HJGL_DS/WebAPI/WebAPI.csproj.user | 4 +- 16 files changed, 1727 insertions(+), 68 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-07-03_bwj.sql create mode 100644 HJGL_DS/BLL/SYBData/TestPackageDivisionService.cs create mode 100644 HJGL_DS/BLL/SYBData/ToIsoListService.cs create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.designer.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2026-07-03_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-07-03_bwj.sql new file mode 100644 index 0000000..d4f9c12 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-07-03_bwj.sql @@ -0,0 +1,99 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('33509812-66CE-41BC-81BA-1EF5E779EE8D','ѹ','SYBData/TestPackageDivision.aspx',5,'3EAFF140-E5CA-4978-B83D-D2C9F36E0D52','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('4D6F0D04-C9B1-46F0-BAB6-DC12EE82EB45','33509812-66CE-41BC-81BA-1EF5E779EE8D','',1) +go + +CREATE TABLE [dbo].[SYBData_TestPackageDivision]( + [TestPackageDivisionId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [TestPackageCode] [nvarchar](50) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_SYBData_TestPackageDivision] PRIMARY KEY CLUSTERED +( + [TestPackageDivisionId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SYBData_TestPackageDivision] WITH CHECK ADD CONSTRAINT [FK_SYBData_TestPackageDivision_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[SYBData_TestPackageDivision] CHECK CONSTRAINT [FK_SYBData_TestPackageDivision_Base_Project] +GO + +ALTER TABLE [dbo].[SYBData_TestPackageDivision] WITH CHECK ADD CONSTRAINT [FK_SYBData_TestPackageDivision_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[SYBData_TestPackageDivision] CHECK CONSTRAINT [FK_SYBData_TestPackageDivision_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision', @level2type=N'COLUMN',@level2name=N'TestPackageDivisionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision', @level2type=N'COLUMN',@level2name=N'TestPackageCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹֱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_TestPackageDivision' +GO + + +CREATE TABLE [dbo].[SYBData_ToIsoList]( + [ToIsoId] [nvarchar](50) NOT NULL, + [TestPackageDivisionId] [nvarchar](50) NOT NULL, + [ISO_ID] [varchar](50) NOT NULL, + CONSTRAINT [PK_SYBData_ToIsoList] PRIMARY KEY CLUSTERED +( + [ToIsoId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SYBData_ToIsoList] WITH CHECK ADD CONSTRAINT [FK_SYBData_ToIsoList_HJGL_PW_IsoInfo] FOREIGN KEY([ISO_ID]) +REFERENCES [dbo].[HJGL_PW_IsoInfo] ([ISO_ID]) +GO + +ALTER TABLE [dbo].[SYBData_ToIsoList] CHECK CONSTRAINT [FK_SYBData_ToIsoList_HJGL_PW_IsoInfo] +GO + +ALTER TABLE [dbo].[SYBData_ToIsoList] WITH CHECK ADD CONSTRAINT [FK_SYBData_ToIsoList_SYBData_TestPackageDivision] FOREIGN KEY([TestPackageDivisionId]) +REFERENCES [dbo].[SYBData_TestPackageDivision] ([TestPackageDivisionId]) +GO + +ALTER TABLE [dbo].[SYBData_ToIsoList] CHECK CONSTRAINT [FK_SYBData_ToIsoList_SYBData_TestPackageDivision] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ToIsoList', @level2type=N'COLUMN',@level2name=N'ToIsoId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ToIsoList', @level2type=N'COLUMN',@level2name=N'TestPackageDivisionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ToIsoList', @level2type=N'COLUMN',@level2name=N'ISO_ID' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹб' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SYBData_ToIsoList' +GO + +alter table SYBData_Cover add TestPackageDivisionId nvarchar(50) +go + +ALTER TABLE [dbo].[SYBData_Cover] WITH CHECK ADD CONSTRAINT [FK_SYBData_Cover_SYBData_TestPackageDivision] FOREIGN KEY([TestPackageDivisionId]) +REFERENCES [dbo].[SYBData_TestPackageDivision] ([TestPackageDivisionId]) +GO + +ALTER TABLE [dbo].[SYBData_Cover] CHECK CONSTRAINT [FK_SYBData_Cover_SYBData_TestPackageDivision] +GO \ No newline at end of file diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 994c2d6..54be333 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -316,6 +316,8 @@ + + diff --git a/HJGL_DS/BLL/SYBData/CoverService.cs b/HJGL_DS/BLL/SYBData/CoverService.cs index 756d09d..b55566c 100644 --- a/HJGL_DS/BLL/SYBData/CoverService.cs +++ b/HJGL_DS/BLL/SYBData/CoverService.cs @@ -22,6 +22,16 @@ namespace BLL return Funs.DB.SYBData_Cover.FirstOrDefault(e => e.ProjectId == projectId); } + /// + /// 根据试压包id获取封面信息 + /// + /// + /// + public static Model.SYBData_Cover GetConverByTestPackageDivisionId(string testPackageDivisionId) + { + return Funs.DB.SYBData_Cover.FirstOrDefault(e => e.TestPackageDivisionId == testPackageDivisionId); + } + /// /// 添加封面 /// @@ -37,6 +47,7 @@ namespace BLL newCovert.PressureTestPackageCode = cover.PressureTestPackageCode; newCovert.TestPressure = cover.TestPressure; newCovert.TestDate = cover.TestDate; + newCovert.TestPackageDivisionId=cover.TestPackageDivisionId; db.SYBData_Cover.InsertOnSubmit(newCovert); db.SubmitChanges(); } @@ -56,6 +67,7 @@ namespace BLL newCovert.PressureTestPackageCode = cover.PressureTestPackageCode; newCovert.TestPressure = cover.TestPressure; newCovert.TestDate = cover.TestDate; + newCovert.TestPackageDivisionId = cover.TestPackageDivisionId; db.SubmitChanges(); } } diff --git a/HJGL_DS/BLL/SYBData/TestPackageDivisionService.cs b/HJGL_DS/BLL/SYBData/TestPackageDivisionService.cs new file mode 100644 index 0000000..fbbca1f --- /dev/null +++ b/HJGL_DS/BLL/SYBData/TestPackageDivisionService.cs @@ -0,0 +1,63 @@ +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 试压包划分 + /// + public class TestPackageDivisionService + { + /// + /// 根据主键获取试压包信息 + /// + /// + /// + public static Model.SYBData_TestPackageDivision GetTestPackageDivisionById(string testPackageDivisionId) + { + return Funs.DB.SYBData_TestPackageDivision.FirstOrDefault(e => e.TestPackageDivisionId == testPackageDivisionId); + } + + /// + /// 根据试压包号获取试压包信息 + /// + /// + /// + /// + public static Model.SYBData_TestPackageDivision GetTestPackageDivisionByCode(string projectId,string code) + { + return Funs.DB.SYBData_TestPackageDivision.FirstOrDefault(e => e.ProjectId == projectId && e.TestPackageCode == code); + } + + /// + /// 根据项目id获取试压包信息列表 + /// + /// + /// + public static List GetTestPackageDivisionListByProjectId(string projectId) + { + return (from x in Funs.DB.SYBData_TestPackageDivision where x.ProjectId == projectId select x).ToList(); + } + + /// + /// 添加 + /// + /// + public static void AddTestPackageDivision(Model.SYBData_TestPackageDivision testPackageDivision) + { + SGGLDB db = Funs.DB; + Model.SYBData_TestPackageDivision newData = new SYBData_TestPackageDivision(); + newData.TestPackageDivisionId = testPackageDivision.TestPackageDivisionId; + newData.ProjectId = testPackageDivision.ProjectId; + newData.TestPackageCode = testPackageDivision.TestPackageCode; + newData.CompileMan = testPackageDivision.CompileMan; + newData.CompileDate = testPackageDivision.CompileDate; + db.SYBData_TestPackageDivision.InsertOnSubmit(newData); + db.SubmitChanges(); + } + } +} diff --git a/HJGL_DS/BLL/SYBData/ToIsoListService.cs b/HJGL_DS/BLL/SYBData/ToIsoListService.cs new file mode 100644 index 0000000..06621ec --- /dev/null +++ b/HJGL_DS/BLL/SYBData/ToIsoListService.cs @@ -0,0 +1,31 @@ +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 试压包管线列表 + /// + public class ToIsoListService + { + /// + /// 增加试压包管线列表 + /// + /// + + public static void AddToIsoList(Model.SYBData_ToIsoList toIsoList) + { + SGGLDB db = Funs.DB; + Model.SYBData_ToIsoList newToIsoList = new SYBData_ToIsoList(); + newToIsoList.ToIsoId = toIsoList.ToIsoId; + newToIsoList.TestPackageDivisionId= toIsoList.TestPackageDivisionId; + newToIsoList.ISO_ID = toIsoList.ISO_ID; + db.SYBData_ToIsoList.InsertOnSubmit(newToIsoList); + db.SubmitChanges(); + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 67d3094..573455b 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1604,6 +1604,7 @@ + @@ -7733,6 +7734,13 @@ SYBDataList.aspx + + TestPackageDivision.aspx + ASPXCodeBehind + + + TestPackageDivision.aspx + WebService1.asmx Component diff --git a/HJGL_DS/FineUIPro.Web/SYBData/Cover.aspx.cs b/HJGL_DS/FineUIPro.Web/SYBData/Cover.aspx.cs index 9881605..24407f4 100644 --- a/HJGL_DS/FineUIPro.Web/SYBData/Cover.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/SYBData/Cover.aspx.cs @@ -1,5 +1,7 @@ using Aspose.Words; +using Aspose.Words.Notes; using BLL; +using FineUIPro.Web.common.BaseInfo; using System; using System.Collections.Generic; using System.Data; @@ -45,6 +47,21 @@ namespace FineUIPro.Web.SYBData ViewState["ProjectId"] = value; } } + + /// + /// 试压包号 + /// + private string TestPackageDivisionId + { + get + { + return (string)ViewState["TestPackageDivisionId"]; + } + set + { + ViewState["TestPackageDivisionId"] = value; + } + } #endregion #region 加载页面 @@ -65,9 +82,9 @@ namespace FineUIPro.Web.SYBData this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - this.ProjectId = this.tvControlItem.SelectedNodeID; - DataInfo(); + //this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + //this.ProjectId = this.tvControlItem.SelectedNodeID; + //DataInfo(); } } @@ -81,9 +98,9 @@ namespace FineUIPro.Web.SYBData this.txtTestPressure.Text = string.Empty; this.txtTestDate.Text = string.Empty; - if (!string.IsNullOrEmpty(this.ProjectId)) + if (!string.IsNullOrEmpty(this.TestPackageDivisionId)) { - var data = BLL.CoverService.GetConverByProjectId(this.ProjectId); + var data = BLL.CoverService.GetConverByTestPackageDivisionId(this.TestPackageDivisionId); if (data != null) { this.CoverId = data.CoverId; @@ -99,6 +116,11 @@ namespace FineUIPro.Web.SYBData //默认值 this.txtProjectName.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName; this.txtUnitWorkName.Text = "管道安装工程"; + var tp = BLL.TestPackageDivisionService.GetTestPackageDivisionById(this.TestPackageDivisionId); + if (tp != null) + { + this.txtPressureTestPackageCode.Text = tp.TestPackageCode; + } } } } @@ -133,6 +155,19 @@ namespace FineUIPro.Web.SYBData rootProjectNode.ToolTip = item.ProjectName; rootProjectNode.CommandName = "项目名称"; rootNode.Nodes.Add(rootProjectNode); + + var testpackageList = BLL.TestPackageDivisionService.GetTestPackageDivisionListByProjectId(item.ProjectId); + foreach (var tp in testpackageList) + { + TreeNode newNode = new TreeNode();//定义根节点 + newNode.Text = tp.TestPackageCode; + newNode.NodeID = tp.TestPackageDivisionId; + newNode.EnableClickEvent = true; + newNode.Expanded = true; + newNode.ToolTip = tp.TestPackageCode; + newNode.CommandName = "试压包号"; + rootProjectNode.Nodes.Add(newNode); + } } } #endregion @@ -147,8 +182,16 @@ namespace FineUIPro.Web.SYBData { if (this.tvControlItem.SelectedNodeID != "0") { - this.ProjectId = this.tvControlItem.SelectedNodeID; - DataInfo(); + if (this.tvControlItem.SelectedNode.CommandName == "项目名称") + { + this.ProjectId = this.tvControlItem.SelectedNodeID; + } + else if (this.tvControlItem.SelectedNode.CommandName == "试压包号") + { + this.TestPackageDivisionId = this.tvControlItem.SelectedNodeID; + this.ProjectId = this.tvControlItem.SelectedNode.ParentNode.NodeID; + DataInfo(); + } } } #endregion @@ -163,7 +206,7 @@ namespace FineUIPro.Web.SYBData { this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - this.tvControlItem.SelectedNodeID = this.ProjectId; + //this.tvControlItem.SelectedNodeID = this.ProjectId; } #endregion @@ -172,7 +215,13 @@ namespace FineUIPro.Web.SYBData { if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.SYBData_CoverMenuId, Const.BtnSave)) { + if(string.IsNullOrEmpty(this.TestPackageDivisionId)) + { + Alert.ShowInTop("请选择试压包号！", MessageBoxIcon.Warning); + return; + } Model.SYBData_Cover newData = new Model.SYBData_Cover(); + newData.TestPackageDivisionId = this.TestPackageDivisionId; newData.ProjectId = this.ProjectId; newData.InstallationName = this.txtInstallationName.Text.Trim(); newData.UnitWorkName = this.txtUnitWorkName.Text.Trim(); diff --git a/HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.cs b/HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.cs index fd5f54b..da58034 100644 --- a/HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/SYBData/SYBDataList.aspx.cs @@ -13,6 +13,38 @@ namespace FineUIPro.Web.SYBData { public partial class SYBDataList : PageBase { + #region 定义项 + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 试压包号 + /// + private string TestPackageDivisionId + { + get + { + return (string)ViewState["TestPackageDivisionId"]; + } + set + { + ViewState["TestPackageDivisionId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -31,8 +63,8 @@ namespace FineUIPro.Web.SYBData this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - this.BindGrid(); + //this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + //this.BindGrid(); } } #endregion @@ -66,6 +98,19 @@ namespace FineUIPro.Web.SYBData rootProjectNode.ToolTip = item.ProjectName; rootProjectNode.CommandName = "项目名称"; rootNode.Nodes.Add(rootProjectNode); + + var testpackageList = BLL.TestPackageDivisionService.GetTestPackageDivisionListByProjectId(item.ProjectId); + foreach (var tp in testpackageList) + { + TreeNode newNode = new TreeNode();//定义根节点 + newNode.Text = tp.TestPackageCode; + newNode.NodeID = tp.TestPackageDivisionId; + newNode.EnableClickEvent = true; + newNode.Expanded = true; + newNode.ToolTip = tp.TestPackageCode; + newNode.CommandName = "试压包号"; + rootProjectNode.Nodes.Add(newNode); + } } } #endregion @@ -80,7 +125,16 @@ namespace FineUIPro.Web.SYBData { if (this.tvControlItem.SelectedNodeID != "0") { - this.BindGrid(); + if (this.tvControlItem.SelectedNode.CommandName == "项目名称") + { + this.ProjectId = this.tvControlItem.SelectedNodeID; + } + else if (this.tvControlItem.SelectedNode.CommandName == "试压包号") + { + this.TestPackageDivisionId = this.tvControlItem.SelectedNodeID; + this.ProjectId = this.tvControlItem.SelectedNode.ParentNode.NodeID; + this.BindGrid(); + } } } #endregion @@ -155,9 +209,10 @@ namespace FineUIPro.Web.SYBData /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.drpProjectId.SelectedValue; + //this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - BindGrid(); + //BindGrid(); } #endregion @@ -237,9 +292,7 @@ namespace FineUIPro.Web.SYBData /// protected void btnPrint_Click(object sender, EventArgs e) { - string projectId = this.tvControlItem.SelectedNodeID; - - if (projectId != null) + if (!string.IsNullOrEmpty(this.ProjectId)) { string initTemplatePath = ""; string rootPath = Server.MapPath("~/"); @@ -271,7 +324,11 @@ namespace FineUIPro.Web.SYBData BLL.Common.FastReportService.AddFastreportTable(dt); Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("PressureTestPackageCode", ""); + var tp = BLL.TestPackageDivisionService.GetTestPackageDivisionById(this.TestPackageDivisionId); + if (tp != null) + { + keyValuePairs.Add("PressureTestPackageCode", tp.TestPackageCode); + } BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\SYBData\\试压包资料目录.frx"; diff --git a/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx new file mode 100644 index 0000000..9aeb7e3 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx @@ -0,0 +1,139 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageDivision.aspx.cs" Inherits="FineUIPro.Web.SYBData.TestPackageDivision" %> + + + + + + + 试压包划分 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.cs b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.cs new file mode 100644 index 0000000..05ccb54 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.cs @@ -0,0 +1,264 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; + +namespace FineUIPro.Web.SYBData +{ + public partial class TestPackageDivision : PageBase + { + #region 定义变量 + /// + /// 选中项 + /// + public string SelectedList + { + get + { + return (string)ViewState["SelectedList"]; + } + set + { + ViewState["SelectedList"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.CurrUser.LoginProjectId); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + + BindGrid(); + } + } + + /// + /// 数据绑定 + /// + private void BindGrid() + { + string strSql = @"SELECT ProjectId,ISO_ID,STE_ID,SER_ID,SERName,ISO_IsoNo,ISO_TotalDin + ,ISO_Insulator,STECode,ISO_Executive,ISO_Specification,ISO_JointQty,IDName + ,ISO_DesignPress,ISO_DesignTemperature,ISO_TestPress,ISO_TestTemperature + ,ISO_Remark,MaterialStandardId,PressureTestPackageNo,OperatingPressure + ,OperatingTemperature,PipeLineClass,PipeLineLength,LeakageTest + ,TestCategoryNum,MaterialStandardCode + FROM HJGL_View_IsoInfo WHERE ProjectId= @ProjectId + and NOT EXISTS (SELECT 1 FROM SYBData_ToIsoList toIsoList WHERE toIsoList.ISO_ID = HJGL_View_IsoInfo.ISO_ID)"; + List listStr = new List(); + + if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue)) + { + listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + } + if (!string.IsNullOrEmpty(this.drpIsoId.SelectedValue) && this.drpIsoId.SelectedValue != BLL.Const._Null) + { + strSql += " AND ISO_ID = @isoId"; + listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue)); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region DropDownLists下拉选择事件 + /// + /// 项目下拉选择事件 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.drpIsoId.Items.Clear(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue)) + { + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.drpProjectId.SelectedValue); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpProjectId.SelectedIndex = 0; + } + BindGrid(); + } + #endregion + + #region 保存 + /// + /// 保存 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + string testPackageDivisionId = string.Empty; + if (string.IsNullOrWhiteSpace(SelectedList)) + { + Alert.Show("请先勾选要划分试压包的管线！"); + return; + } + else + { + SelectedList = SelectedList.Substring(0, SelectedList.LastIndexOf('|')); + } + if (string.IsNullOrEmpty(this.txtTestPackageCode.Text.Trim())) + { + Alert.Show("请输入试压包号！"); + return; + } + var tp = BLL.TestPackageDivisionService.GetTestPackageDivisionByCode(this.drpProjectId.SelectedValue, this.txtTestPackageCode.Text.Trim()); + if (tp == null) + { + Model.SYBData_TestPackageDivision newTestPackage = new Model.SYBData_TestPackageDivision(); + testPackageDivisionId = SQLHelper.GetNewID(); + newTestPackage.TestPackageDivisionId = testPackageDivisionId; + newTestPackage.ProjectId = this.drpProjectId.SelectedValue; + newTestPackage.TestPackageCode = this.txtTestPackageCode.Text.Trim(); + newTestPackage.CompileMan = this.CurrUser.UserId; + newTestPackage.CompileDate = DateTime.Now; + BLL.TestPackageDivisionService.AddTestPackageDivision(newTestPackage); + } + else + { + testPackageDivisionId = tp.TestPackageDivisionId; + } + + List list = Funs.GetStrListByStr(SelectedList, '|'); + foreach (var isoId in list) + { + Model.SYBData_ToIsoList newToIsoList = new Model.SYBData_ToIsoList(); + newToIsoList.ToIsoId = SQLHelper.GetNewID(); + newToIsoList.TestPackageDivisionId = testPackageDivisionId; + newToIsoList.ISO_ID = isoId; + BLL.ToIsoListService.AddToIsoList(newToIsoList); + } + SelectedList = string.Empty; + ShowNotify("保存成功！", MessageBoxIcon.Success); + BindGrid(); + } + #endregion + + #region 关闭弹出窗体 + /// + /// 关闭弹出窗体 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid选择事件 + /// + /// Grid选择事件 + /// + /// + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "selected") + { + CheckBoxField checkField = (CheckBoxField)Grid1.FindColumn(e.ColumnIndex); + bool checkState = checkField.GetCheckedState(e.RowIndex); + string isoId = Grid1.DataKeys[e.RowIndex][0].ToString(); + if (checkState) + { + // 追加选中ID，分隔符| + if (!string.IsNullOrEmpty(SelectedList)) + { + if (!SelectedList.Contains(isoId)) + { + SelectedList += isoId + "|"; + } + } + else + { + SelectedList += isoId + "|"; + } + } + else + { + // 取消勾选，移除对应ID + SelectedList = SelectedList.Replace(isoId + "|", ""); + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.designer.cs new file mode 100644 index 0000000..00e23a4 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/SYBData/TestPackageDivision.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.SYBData +{ + + + public partial class TestPackageDivision + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// drpIsoId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsoId; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// txtTestPackageCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestPackageCode; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx index 8c9e66b..4150290 100644 --- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx +++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx @@ -133,55 +133,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs index 57cb8ff..1f85712 100644 --- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs @@ -34,6 +34,7 @@ namespace FineUIPro.Web.common Funs.FineUIPleaseSelect(this.drpPro); this.drpPro.SelectedValue = this.CurrUser.LoginProjectId; + //委托单不为null且 对应批明细的委托单明细状态为2 List Allbatch = (from x in Funs.DB.HJGL_BO_Batch where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue @@ -409,6 +410,7 @@ namespace FineUIPro.Web.common BindBatch(); } + #region 返修超期未焊接 private void BindRepair() { string strSql = @"select repairItemRecord.RepairItemRecordId,repairItemRecord.ProjectId,repairItemRecord.ISO_ID,repairItemRecord.JOT_ID,repairItemRecord.FilmNum,repairItemRecord.FeedbackDate, @@ -442,5 +444,60 @@ namespace FineUIPro.Web.common { BindRepair(); } + #endregion + + #region 返修超期已焊接未委托 + private void BindRepairNoTrust() + { + string strSql = @"select repairItemRecord.RepairItemRecordId,repairItemRecord.ProjectId,repairItemRecord.ISO_ID,repairItemRecord.JOT_ID,repairItemRecord.FilmNum,repairItemRecord.FeedbackDate, + jointInfo.JOT_JointNo,isoInfo.ISO_IsoNo,project.ProjectCode from HJGL_CH_RepairItemRecord repairItemRecord + left join HJGL_PW_JointInfo jointInfo on jointInfo.JOT_ID = repairItemRecord.JOT_ID + left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID = jointInfo.ISO_ID + left join Base_Project project on project.ProjectId = repairItemRecord.ProjectId + where repairItemRecord.ProjectId = @projectId"; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.drpProject2.SelectedValue) && this.drpProject2.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@projectId", this.drpPro.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + } + strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 3 and repairItemRecord.IsWeld = 1 and NOT EXISTS (SELECT 1 FROM HJGL_CH_RepairItem repairItem WHERE repairItem.RepairItemRecordId = repairItemRecord.RepairItemRecordId) order by repairItemRecord.FeedbackDate,repairItemRecord.FilmNum asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + this.GridRepairNoTrust.DataSource = tb; + this.GridRepairNoTrust.DataBind(); + } + + protected void GridRepairNoTrust_Sort(object sender, GridSortEventArgs e) + { + BindRepairNoTrust(); + } + + protected void drpProject2_SelectedIndexChanged(object sender, EventArgs e) + { + BindRepairNoTrust(); + } + #endregion + + protected void TabStrip1_TabIndexChanged(object sender, EventArgs e) + { + if (TabStrip1.ActiveTabIndex == 1)//返修超期已焊接未委托 + { + this.drpProject2.DataTextField = "ProjectCode"; + this.drpProject2.DataValueField = "ProjectId"; + this.drpProject2.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); + this.drpProject2.DataBind(); + Funs.FineUIPleaseSelect(this.drpProject2); + this.drpProject2.SelectedValue = this.CurrUser.LoginProjectId; + BindRepairNoTrust(); + } + else //返修超期未焊接 + { + BindRepair(); + } + } } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs index ea6fbc9..2064ec8 100644 --- a/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs @@ -293,6 +293,42 @@ namespace FineUIPro.Web.common /// protected global::FineUIPro.ToolbarFill ToolbarFill3; + /// + /// GridRepairNoTrust 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GridRepairNoTrust; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// drpProject2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject2; + + /// + /// ToolbarFill4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill4; + /// /// Window1 控件。 /// diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index d10e837..6d60ea3 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -620,6 +620,12 @@ namespace Model partial void InsertSYBData_SpringSupportHangBracket(SYBData_SpringSupportHangBracket instance); partial void UpdateSYBData_SpringSupportHangBracket(SYBData_SpringSupportHangBracket instance); partial void DeleteSYBData_SpringSupportHangBracket(SYBData_SpringSupportHangBracket instance); + partial void InsertSYBData_TestPackageDivision(SYBData_TestPackageDivision instance); + partial void UpdateSYBData_TestPackageDivision(SYBData_TestPackageDivision instance); + partial void DeleteSYBData_TestPackageDivision(SYBData_TestPackageDivision instance); + partial void InsertSYBData_ToIsoList(SYBData_ToIsoList instance); + partial void UpdateSYBData_ToIsoList(SYBData_ToIsoList instance); + partial void DeleteSYBData_ToIsoList(SYBData_ToIsoList instance); partial void InsertSys_ButtonPower(Sys_ButtonPower instance); partial void UpdateSys_ButtonPower(Sys_ButtonPower instance); partial void DeleteSys_ButtonPower(Sys_ButtonPower instance); @@ -2605,6 +2611,22 @@ namespace Model } } + public System.Data.Linq.Table SYBData_TestPackageDivision + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table SYBData_ToIsoList + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Sys_ButtonPower { get @@ -4978,6 +5000,8 @@ namespace Model private EntitySet _SYBData_SpringSupportHangBracket; + private EntitySet _SYBData_TestPackageDivision; + private EntitySet _Sys_DataInTemp; private EntitySet _Weld_ProjectPlan; @@ -5138,6 +5162,7 @@ namespace Model this._SYBData_PressureTestPackageList = new EntitySet(new Action(this.attach_SYBData_PressureTestPackageList), new Action(this.detach_SYBData_PressureTestPackageList)); this._SYBData_SlidingFixed = new EntitySet(new Action(this.attach_SYBData_SlidingFixed), new Action(this.detach_SYBData_SlidingFixed)); this._SYBData_SpringSupportHangBracket = new EntitySet(new Action(this.attach_SYBData_SpringSupportHangBracket), new Action(this.detach_SYBData_SpringSupportHangBracket)); + this._SYBData_TestPackageDivision = new EntitySet(new Action(this.attach_SYBData_TestPackageDivision), new Action(this.detach_SYBData_TestPackageDivision)); this._Sys_DataInTemp = new EntitySet(new Action(this.attach_Sys_DataInTemp), new Action(this.detach_Sys_DataInTemp)); this._Weld_ProjectPlan = new EntitySet(new Action(this.attach_Weld_ProjectPlan), new Action(this.detach_Weld_ProjectPlan)); this._Weld_RecycleMat = new EntitySet(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); @@ -6886,6 +6911,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_TestPackageDivision_Base_Project", Storage="_SYBData_TestPackageDivision", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet SYBData_TestPackageDivision + { + get + { + return this._SYBData_TestPackageDivision; + } + set + { + this._SYBData_TestPackageDivision.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Base_Project", Storage="_Sys_DataInTemp", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Sys_DataInTemp { @@ -8027,6 +8065,18 @@ namespace Model entity.Base_Project = null; } + private void attach_SYBData_TestPackageDivision(SYBData_TestPackageDivision entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_SYBData_TestPackageDivision(SYBData_TestPackageDivision entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_Sys_DataInTemp(Sys_DataInTemp entity) { this.SendPropertyChanging(); @@ -46865,6 +46915,8 @@ namespace Model private EntitySet _HJGL_PW_JointInfo; + private EntitySet _SYBData_ToIsoList; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -46971,6 +47023,7 @@ namespace Model this._HJGL_BS_Steel = default(EntityRef); this._Project_WorkArea = default(EntityRef); this._HJGL_PW_JointInfo = new EntitySet(new Action(this.attach_HJGL_PW_JointInfo), new Action(this.detach_HJGL_PW_JointInfo)); + this._SYBData_ToIsoList = new EntitySet(new Action(this.attach_SYBData_ToIsoList), new Action(this.detach_SYBData_ToIsoList)); OnCreated(); } @@ -48183,6 +48236,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_ToIsoList_HJGL_PW_IsoInfo", Storage="_SYBData_ToIsoList", ThisKey="ISO_ID", OtherKey="ISO_ID", DeleteRule="NO ACTION")] + public EntitySet SYBData_ToIsoList + { + get + { + return this._SYBData_ToIsoList; + } + set + { + this._SYBData_ToIsoList.Assign(value); + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -48334,6 +48400,18 @@ namespace Model this.SendPropertyChanging(); entity.HJGL_PW_IsoInfo = null; } + + private void attach_SYBData_ToIsoList(SYBData_ToIsoList entity) + { + this.SendPropertyChanging(); + entity.HJGL_PW_IsoInfo = this; + } + + private void detach_SYBData_ToIsoList(SYBData_ToIsoList entity) + { + this.SendPropertyChanging(); + entity.HJGL_PW_IsoInfo = null; + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_PW_JointChange")] @@ -118017,8 +118095,12 @@ namespace Model private System.Nullable _TestDate; + private string _TestPackageDivisionId; + private EntityRef _Base_Project; + private EntityRef _SYBData_TestPackageDivision; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -118037,11 +118119,14 @@ namespace Model partial void OnTestPressureChanged(); partial void OnTestDateChanging(System.Nullable value); partial void OnTestDateChanged(); + partial void OnTestPackageDivisionIdChanging(string value); + partial void OnTestPackageDivisionIdChanged(); #endregion public SYBData_Cover() { this._Base_Project = default(EntityRef); + this._SYBData_TestPackageDivision = default(EntityRef); OnCreated(); } @@ -118189,6 +118274,30 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageDivisionId", DbType="NVarChar(50)")] + public string TestPackageDivisionId + { + get + { + return this._TestPackageDivisionId; + } + set + { + if ((this._TestPackageDivisionId != value)) + { + if (this._SYBData_TestPackageDivision.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnTestPackageDivisionIdChanging(value); + this.SendPropertyChanging(); + this._TestPackageDivisionId = value; + this.SendPropertyChanged("TestPackageDivisionId"); + this.OnTestPackageDivisionIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_Cover_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -118223,6 +118332,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_Cover_SYBData_TestPackageDivision", Storage="_SYBData_TestPackageDivision", ThisKey="TestPackageDivisionId", OtherKey="TestPackageDivisionId", IsForeignKey=true)] + public SYBData_TestPackageDivision SYBData_TestPackageDivision + { + get + { + return this._SYBData_TestPackageDivision.Entity; + } + set + { + SYBData_TestPackageDivision previousValue = this._SYBData_TestPackageDivision.Entity; + if (((previousValue != value) + || (this._SYBData_TestPackageDivision.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SYBData_TestPackageDivision.Entity = null; + previousValue.SYBData_Cover.Remove(this); + } + this._SYBData_TestPackageDivision.Entity = value; + if ((value != null)) + { + value.SYBData_Cover.Add(this); + this._TestPackageDivisionId = value.TestPackageDivisionId; + } + else + { + this._TestPackageDivisionId = default(string); + } + this.SendPropertyChanged("SYBData_TestPackageDivision"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -119671,6 +119814,494 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SYBData_TestPackageDivision")] + public partial class SYBData_TestPackageDivision : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TestPackageDivisionId; + + private string _ProjectId; + + private string _TestPackageCode; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private EntitySet _SYBData_Cover; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + private EntitySet _SYBData_ToIsoList; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTestPackageDivisionIdChanging(string value); + partial void OnTestPackageDivisionIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTestPackageCodeChanging(string value); + partial void OnTestPackageCodeChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public SYBData_TestPackageDivision() + { + this._SYBData_Cover = new EntitySet(new Action(this.attach_SYBData_Cover), new Action(this.detach_SYBData_Cover)); + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + this._SYBData_ToIsoList = new EntitySet(new Action(this.attach_SYBData_ToIsoList), new Action(this.detach_SYBData_ToIsoList)); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageDivisionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TestPackageDivisionId + { + get + { + return this._TestPackageDivisionId; + } + set + { + if ((this._TestPackageDivisionId != value)) + { + this.OnTestPackageDivisionIdChanging(value); + this.SendPropertyChanging(); + this._TestPackageDivisionId = value; + this.SendPropertyChanged("TestPackageDivisionId"); + this.OnTestPackageDivisionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageCode", DbType="NVarChar(50)")] + public string TestPackageCode + { + get + { + return this._TestPackageCode; + } + set + { + if ((this._TestPackageCode != value)) + { + this.OnTestPackageCodeChanging(value); + this.SendPropertyChanging(); + this._TestPackageCode = value; + this.SendPropertyChanged("TestPackageCode"); + this.OnTestPackageCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_Cover_SYBData_TestPackageDivision", Storage="_SYBData_Cover", ThisKey="TestPackageDivisionId", OtherKey="TestPackageDivisionId", DeleteRule="NO ACTION")] + public EntitySet SYBData_Cover + { + get + { + return this._SYBData_Cover; + } + set + { + this._SYBData_Cover.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_TestPackageDivision_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.SYBData_TestPackageDivision.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.SYBData_TestPackageDivision.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_TestPackageDivision_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.SYBData_TestPackageDivision.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.SYBData_TestPackageDivision.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_ToIsoList_SYBData_TestPackageDivision", Storage="_SYBData_ToIsoList", ThisKey="TestPackageDivisionId", OtherKey="TestPackageDivisionId", DeleteRule="NO ACTION")] + public EntitySet SYBData_ToIsoList + { + get + { + return this._SYBData_ToIsoList; + } + set + { + this._SYBData_ToIsoList.Assign(value); + } + } + + 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)); + } + } + + private void attach_SYBData_Cover(SYBData_Cover entity) + { + this.SendPropertyChanging(); + entity.SYBData_TestPackageDivision = this; + } + + private void detach_SYBData_Cover(SYBData_Cover entity) + { + this.SendPropertyChanging(); + entity.SYBData_TestPackageDivision = null; + } + + private void attach_SYBData_ToIsoList(SYBData_ToIsoList entity) + { + this.SendPropertyChanging(); + entity.SYBData_TestPackageDivision = this; + } + + private void detach_SYBData_ToIsoList(SYBData_ToIsoList entity) + { + this.SendPropertyChanging(); + entity.SYBData_TestPackageDivision = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SYBData_ToIsoList")] + public partial class SYBData_ToIsoList : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ToIsoId; + + private string _TestPackageDivisionId; + + private string _ISO_ID; + + private EntityRef _HJGL_PW_IsoInfo; + + private EntityRef _SYBData_TestPackageDivision; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnToIsoIdChanging(string value); + partial void OnToIsoIdChanged(); + partial void OnTestPackageDivisionIdChanging(string value); + partial void OnTestPackageDivisionIdChanged(); + partial void OnISO_IDChanging(string value); + partial void OnISO_IDChanged(); + #endregion + + public SYBData_ToIsoList() + { + this._HJGL_PW_IsoInfo = default(EntityRef); + this._SYBData_TestPackageDivision = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToIsoId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ToIsoId + { + get + { + return this._ToIsoId; + } + set + { + if ((this._ToIsoId != value)) + { + this.OnToIsoIdChanging(value); + this.SendPropertyChanging(); + this._ToIsoId = value; + this.SendPropertyChanged("ToIsoId"); + this.OnToIsoIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageDivisionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string TestPackageDivisionId + { + get + { + return this._TestPackageDivisionId; + } + set + { + if ((this._TestPackageDivisionId != value)) + { + if (this._SYBData_TestPackageDivision.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnTestPackageDivisionIdChanging(value); + this.SendPropertyChanging(); + this._TestPackageDivisionId = value; + this.SendPropertyChanged("TestPackageDivisionId"); + this.OnTestPackageDivisionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISO_ID", DbType="VarChar(50) NOT NULL", CanBeNull=false)] + public string ISO_ID + { + get + { + return this._ISO_ID; + } + set + { + if ((this._ISO_ID != value)) + { + if (this._HJGL_PW_IsoInfo.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnISO_IDChanging(value); + this.SendPropertyChanging(); + this._ISO_ID = value; + this.SendPropertyChanged("ISO_ID"); + this.OnISO_IDChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_ToIsoList_HJGL_PW_IsoInfo", Storage="_HJGL_PW_IsoInfo", ThisKey="ISO_ID", OtherKey="ISO_ID", IsForeignKey=true)] + public HJGL_PW_IsoInfo HJGL_PW_IsoInfo + { + get + { + return this._HJGL_PW_IsoInfo.Entity; + } + set + { + HJGL_PW_IsoInfo previousValue = this._HJGL_PW_IsoInfo.Entity; + if (((previousValue != value) + || (this._HJGL_PW_IsoInfo.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._HJGL_PW_IsoInfo.Entity = null; + previousValue.SYBData_ToIsoList.Remove(this); + } + this._HJGL_PW_IsoInfo.Entity = value; + if ((value != null)) + { + value.SYBData_ToIsoList.Add(this); + this._ISO_ID = value.ISO_ID; + } + else + { + this._ISO_ID = default(string); + } + this.SendPropertyChanged("HJGL_PW_IsoInfo"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_ToIsoList_SYBData_TestPackageDivision", Storage="_SYBData_TestPackageDivision", ThisKey="TestPackageDivisionId", OtherKey="TestPackageDivisionId", IsForeignKey=true)] + public SYBData_TestPackageDivision SYBData_TestPackageDivision + { + get + { + return this._SYBData_TestPackageDivision.Entity; + } + set + { + SYBData_TestPackageDivision previousValue = this._SYBData_TestPackageDivision.Entity; + if (((previousValue != value) + || (this._SYBData_TestPackageDivision.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SYBData_TestPackageDivision.Entity = null; + previousValue.SYBData_ToIsoList.Remove(this); + } + this._SYBData_TestPackageDivision.Entity = value; + if ((value != null)) + { + value.SYBData_ToIsoList.Add(this); + this._TestPackageDivisionId = value.TestPackageDivisionId; + } + else + { + this._TestPackageDivisionId = default(string); + } + this.SendPropertyChanged("SYBData_TestPackageDivision"); + } + } + } + + 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.Sys_ButtonPower")] public partial class Sys_ButtonPower : INotifyPropertyChanging, INotifyPropertyChanged { @@ -123416,6 +124047,8 @@ namespace Model private EntitySet _Project_UserPower; + private EntitySet _SYBData_TestPackageDivision; + private EntitySet _Sys_DataInTemp; private EntitySet _Sys_Log; @@ -123527,6 +124160,7 @@ namespace Model this._Project_User = new EntitySet(new Action(this.attach_Project_User), new Action(this.detach_Project_User)); this._Project_UserButtonPower = new EntitySet(new Action(this.attach_Project_UserButtonPower), new Action(this.detach_Project_UserButtonPower)); this._Project_UserPower = new EntitySet(new Action(this.attach_Project_UserPower), new Action(this.detach_Project_UserPower)); + this._SYBData_TestPackageDivision = new EntitySet(new Action(this.attach_SYBData_TestPackageDivision), new Action(this.detach_SYBData_TestPackageDivision)); this._Sys_DataInTemp = new EntitySet(new Action(this.attach_Sys_DataInTemp), new Action(this.detach_Sys_DataInTemp)); this._Sys_Log = new EntitySet(new Action(this.attach_Sys_Log), new Action(this.detach_Sys_Log)); this._Base_Depart = default(EntityRef); @@ -124605,6 +125239,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SYBData_TestPackageDivision_Sys_User", Storage="_SYBData_TestPackageDivision", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet SYBData_TestPackageDivision + { + get + { + return this._SYBData_TestPackageDivision; + } + set + { + this._SYBData_TestPackageDivision.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Sys_User", Storage="_Sys_DataInTemp", ThisKey="UserId", OtherKey="UserId", DeleteRule="NO ACTION")] public EntitySet Sys_DataInTemp { @@ -125354,6 +126001,18 @@ namespace Model entity.Sys_User = null; } + private void attach_SYBData_TestPackageDivision(SYBData_TestPackageDivision entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_SYBData_TestPackageDivision(SYBData_TestPackageDivision entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_Sys_DataInTemp(Sys_DataInTemp entity) { this.SendPropertyChanging(); diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index a48b337..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - + - Debug|Any CPU + Release|Any CPU FolderProfile true