diff --git a/CreateModel.bat b/CreateModel.bat index 2f27853..27ceb4a 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo 设置.net控制台环境 @echo. -@call "%VS100COMNTOOLS%"vsvars32.bat +@call "%VS150%" -SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 67d9141..8f418e8 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -256,6 +256,14 @@ + + + + + + + + diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj index 87fc54c..e26ba02 100644 --- a/HJGL/BLL/BLL.csproj +++ b/HJGL/BLL/BLL.csproj @@ -163,6 +163,7 @@ + diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index 35bb526..8f3f0c9 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -527,12 +527,21 @@ namespace BLL #endregion + + #region PMI 澶勭悊 + + public const string PMIDelegationId = "A6FB44C3-0920-4F77-862F-D814FD5E5D23"; + #endregion + + #region 鐑鐞/纭害濮旀墭 /// /// 鐑鐞嗗鎵樺強鏁版嵁褰曞叆 /// public const string HotProessTrustMenuId = "90579BE7-E38C-4CD2-A3BC-755169FF3BB2"; + + /// /// 鐑鐞嗗弽棣堝強纭害濮旀墭 /// diff --git a/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs new file mode 100644 index 0000000..1ce0380 --- /dev/null +++ b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs @@ -0,0 +1,61 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public class PMIDelegation_Service + { + /// + /// 鏌ユ壘鍚庤繑鍥為泦鍚堝鍔犲埌鍒楄〃 + /// + /// + /// + public static List GetPMI_DelegationAddItem(string hdItemsString) + { + var jointInfos = from x in Funs.DB.View_Pipeline_WeldJoint select x; + List returnViewMatch = new List(); + if (!string.IsNullOrEmpty(hdItemsString)) + { + List jotIds = Funs.GetStrListByStr(hdItemsString, '|'); + foreach (var jotItem in jotIds) + { + string[] strs = jotItem.Split(','); + var jotInfo = jointInfos.FirstOrDefault(x => x.WeldJointId == strs[0]); + Model.View_PMI_DelegationDetails newItem = new Model.View_PMI_DelegationDetails(); + newItem.Id = SQLHelper.GetNewID(typeof(Model.View_PMI_DelegationDetails)); + newItem.WeldJointId = jotInfo.WeldJointId; + newItem.WeldJointCode = jotInfo.WeldJointCode; + newItem.PipelineCode = jotInfo.PipelineCode; + newItem.Specification = jotInfo.Specification; + newItem.MaterialCode = jotInfo.Material1Code; + newItem.QualityNo = string.Empty; + newItem.Acceptance = string.Empty; + newItem.Status = 0; + newItem.PMIId = string.Empty; + newItem.WorkAreaId = jotInfo.WorkAreaId; + newItem.CreatedTime = DateTime.Now; + newItem.DelegationDate= DateTime.Now; + newItem.DelegationNo = string.Empty; + returnViewMatch.Add(newItem); + } + } + return returnViewMatch; + } + /// + /// 杩斿洖瑙嗗浘鍒楄〃闆嗗悎 + /// + + public static List GetPMI_DelegationItem(string projectId, string pmiId) + { + List returnViewMatch = (from x in Funs.DB.View_PMI_DelegationDetails + where x.ProjectId == projectId && x.PMIId == pmiId + select x).ToList(); + return returnViewMatch; + } + + + } +} diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index d964084..7dd4fd5 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -145,6 +145,7 @@ namespace BLL newWeldJoint.PrepareTemp = weldJoint.PrepareTemp; newWeldJoint.Electricity = weldJoint.Electricity; newWeldJoint.Voltage = weldJoint.Voltage; + newWeldJoint.IsPMI= weldJoint.IsPMI; newWeldJoint.TestPackageNo = weldJoint.TestPackageNo; newWeldJoint.WeldingDailyCode = weldJoint.WeldingDailyCode; newWeldJoint.BackingWelderId = weldJoint.BackingWelderId; diff --git a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql new file mode 100644 index 0000000..f6c4b0e --- /dev/null +++ b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024-05-10.sql @@ -0,0 +1,66 @@ +use HJGLDB_ZJBSF +go +create table PMI_Delegation +( + Id nvarchar(50) not null primary key, + DelegationNo nvarchar(50) not null, + DelegationDate datetime, + ProjectId nvarchar(50) not null, + InstallationId nvarchar(50), + UnitId nvarchar(50), + DetectionStandard nvarchar(50), + Remark nvarchar(255), + CreatedTime datetime default getdate() +) +go +create table PMI_DelegationDetails +( + Id nvarchar(50) not null primary key, + PMIId nvarchar(50) not null, + JointId nvarchar(50) not null, + QualityNo nvarchar(255), + Acceptance nvarchar(255), + Status int not null, + CreatedTime datetime default getdate() +) +go + +-- 管线焊工 增加是否 PMI处理 +alter table Pipeline_WeldJoint add isPMI bit null +update Pipeline_WeldJoint set isPMI=0 +-- 插入PMI委托菜单 +insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1) +insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) + + + +CREATE VIEW [dbo].[View_PMI_DelegationDetails] +AS +/*******硬度委托明细***********/ +SELECT +B.PMIId, +B.JointId, +B.QualityNo, +B.Acceptance, +B.CreatedTime, +B.status, +Pipeline.PipelineCode, +WeldJoint.WeldJointCode, +WeldJoint.Specification, +WeldJoint.Remark, +Pipeline.SingleNumber, +(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL + THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode + ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, --焊工 + (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL + THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code + ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode --材质 +FROM PMI_Delegation AS A INNER JOIN +PMI_DelegationDetails AS B ON A.Id=B.PMIId +LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId + +GO + + diff --git a/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql new file mode 100644 index 0000000..97535ae --- /dev/null +++ b/HJGL/DataBase/鐗堟湰鏃ュ織/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql @@ -0,0 +1,117 @@ +USE [HJGLDB_ZJBSF] +GO + +/****** Object: View [dbo].[View_Pipeline_WeldJoint] Script Date: 2024-5-11 14:44:42 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +ALTER VIEW [dbo].[View_Pipeline_WeldJoint] +AS +/************焊口信息视图*****************/ +SELECT WeldJoint.WeldJointId, +WeldJoint.ProjectId, +WeldJoint.PipelineId, +WeldJoint.WeldJointCode, +dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, +WeldJoint.WeldTypeId, +WeldJoint.Material1Id, +WeldJoint.Material2Id, +WeldJoint.ANSISCH, +WeldJoint.Thickness, +WeldJoint.Dia, +WeldJoint.Size, +WeldJoint.JointAttribute, +WeldJoint.JointArea, +WeldJoint.WeldingMethodId, +WeldJoint.IsHotProess, +WeldJoint.WeldingLocationId, +WeldJoint.WeldMatId, +WeldJoint.WeldSilkId, +WeldJoint.GrooveTypeId, +WeldJoint.PipeSegment, +WeldJoint.PipeAssembly1Id, +WeldJoint.PipeAssembly2Id, +WeldJoint.PipeAssemblyCount, +WeldJoint.HeartNo1, +WeldJoint.HeartNo2, +WeldJoint.LastTemp, +WeldJoint.CellTemp, +WeldJoint.PrepareTemp, +WeldJoint.Electricity, +WeldJoint.SystemNumber, +WeldJoint.Remark, +WeldJoint.DoneDin, +WeldJoint.Voltage, +WeldJoint.TestPackageNo, +WeldJoint.WeldingDailyCode, +WeldJoint.WeldingDailyId, +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId, +WeldJoint.PipingClassId, +WeldJoint.Specification, +WeldJoint.CancelResult, +Project.ProjectCode, +Project.ProjectName, +Pipeline.PipelineCode, +Pipeline.InstallationId, +Pipeline.UnitId, +Pipeline.SingleNumber, +Pipeline.WorkAreaId, +WeldType.WeldTypeCode, +Material1.MaterialCode AS Material1Code, +Material2.MaterialCode AS Material2Code, +WeldingMethod.WeldingMethodCode, +WeldingLocation.WeldingLocationCode, +WeldMat.ConsumablesCode AS WeldMatCode, +--WeldSilk.ConsumablesCode AS WeldSilkCode, +'' AS WeldSilkCode, +GrooveType.GrooveTypeCode, +CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS Is_hjName, +CASE WHEN WeldJoint.IsHotProess=1 THEN '是' ELSE '否' END AS IsHotProessStr, +Components1.ComponentsCode AS ComponentsCode1, +Components2.ComponentsCode AS ComponentsCode2, +BackingWelder.WelderCode AS BackingWelderCode, +BackingWelder.WelderName AS BackingWelderName, +CoverWelder.WelderCode AS CoverWelderCode, +CoverWelder.WelderName AS CoverWelderName, +(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL + THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode + ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --焊工 + (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL + THEN Material1.MaterialCode + '/' + Material2.MaterialCode + ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, --材质 +pipingClass.PipingClassCode, +CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, +WeldJoint.IsCancel, +WeldJoint.IsPMI, +WeldJoint.IsGoldJoint, +WeldJoint.WPQId,wps.WPQCode, +WeldJoint.DetectionType, +WeldJoint.PageNum +FROM Pipeline_WeldJoint AS WeldJoint +LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id +LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id +LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId +LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId +LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId +--LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId +LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId +LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id +LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id +LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId +LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId +LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId +LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId + + +GO + + diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs index 753f470..d59c98f 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs @@ -69,6 +69,15 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 鍒堕/楠屾敹鏍囧噯 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string Acceptance { + get { + return ResourceManager.GetString("Acceptance", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 璐﹀彿 鐨勬湰鍦板寲瀛楃涓层 /// @@ -1221,6 +1230,15 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 妫娴嬫棩鏈 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string DelegationDate { + get { + return ResourceManager.GetString("DelegationDate", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 鍒犻櫎 鐨勬湰鍦板寲瀛楃涓层 /// @@ -1311,6 +1329,15 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 纭畾瑕佸垹闄MI濮旀墭鍚 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string DeletePMITrust { + get { + return ResourceManager.GetString("DeletePMITrust", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 鍒犻櫎椤圭洰淇℃伅 鐨勬湰鍦板寲瀛楃涓层 /// @@ -1419,6 +1446,24 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 妫娴嬫柟娉 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string DetectionMethod { + get { + return ResourceManager.GetString("DetectionMethod", resourceCulture); + } + } + + /// + /// 鏌ユ壘绫讳技 妫娴嬫爣鍑 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string DetectionStandard { + get { + return ResourceManager.GetString("DetectionStandard", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 瀵稿緞 鐨勬湰鍦板寲瀛楃涓层 /// @@ -3651,6 +3696,42 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 PMI濮旀墭鍗曞彿宸插瓨鍦 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string PMICodeExists { + get { + return ResourceManager.GetString("PMICodeExists", resourceCulture); + } + } + + /// + /// 鏌ユ壘绫讳技 涓嶅瓨鍦ㄦPMI濮旀墭 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string PMICodeNotExists { + get { + return ResourceManager.GetString("PMICodeNotExists", resourceCulture); + } + } + + /// + /// 鏌ユ壘绫讳技 PMI澶勭悊濮旀墭 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string PMIDelegationTrust { + get { + return ResourceManager.GetString("PMIDelegationTrust", resourceCulture); + } + } + + /// + /// 鏌ユ壘绫讳技 PMI濮旀墭鍗曚繚瀛樺け璐 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string PMIError { + get { + return ResourceManager.GetString("PMIError", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 鐐瑰彛缂栧彿 鐨勬湰鍦板寲瀛楃涓层 /// @@ -4119,6 +4200,15 @@ namespace Resources { } } + /// + /// 鏌ユ壘绫讳技 璐ㄩ噺璇佹槑鏂囦欢缂栧彿 鐨勬湰鍦板寲瀛楃涓层 + /// + internal static string QualityNo { + get { + return ResourceManager.GetString("QualityNo", resourceCulture); + } + } + /// /// 鏌ユ壘绫讳技 杩斾慨鍘熷洜 鐨勬湰鍦板寲瀛楃涓层 /// diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 7c175f6..a1589a9 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -2106,4 +2106,34 @@ 棣栭〉 + + 妫娴嬫棩鏈 + + + 妫娴嬫柟娉 + + + 妫娴嬫爣鍑 + + + 鍒堕/楠屾敹鏍囧噯 + + + 璐ㄩ噺璇佹槑鏂囦欢缂栧彿 + + + PMI澶勭悊濮旀墭 + + + PMI濮旀墭鍗曞彿宸插瓨鍦 + + + PMI濮旀墭鍗曚繚瀛樺け璐 + + + 纭畾瑕佸垹闄MI濮旀墭鍚 + + + 涓嶅瓨鍦ㄦPMI濮旀墭 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index ef34884..4fa0577 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -395,6 +395,10 @@ + + + + @@ -4445,6 +4449,33 @@ DataInEdit.aspx + + PMIDelegation.aspx + ASPXCodeBehind + + + PMIDelegation.aspx + + + PMIDelegationEdit.aspx + ASPXCodeBehind + + + PMIDelegationEdit.aspx + + + PMIDetectionEntry.aspx + + + PMIDetectionEntry.aspx + + + PMISelectList.aspx + ASPXCodeBehind + + + PMISelectList.aspx + AItemEndCheck.aspx ASPXCodeBehind @@ -4871,6 +4902,7 @@ GlobalResourceProxyGenerator Lan.Designer.cs + Designer diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 8d0cdf2..f9b03fb 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -35,7 +35,7 @@ True 0 / - http://localhost:13960/ + http://localhost:57613/ False False diff --git a/HJGL/FineUIPro.Web/HotProcessHard/HotProessTrustEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/HotProcessHard/HotProessTrustEdit.aspx.designer.cs index 722a3ca..375c91e 100644 --- a/HJGL/FineUIPro.Web/HotProcessHard/HotProessTrustEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/HotProcessHard/HotProessTrustEdit.aspx.designer.cs @@ -2,16 +2,18 @@ // <鑷姩鐢熸垚> // 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 // -// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋 -// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便 +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HotProcessHard { - - - public partial class HotProessTrustEdit { - +namespace FineUIPro.Web.HotProcessHard +{ + + + public partial class HotProessTrustEdit + { + /// /// form1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// hdItemsString 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.HiddenField hdItemsString; - + /// /// ToolbarFill1 鎺т欢銆 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 鎺т欢銆 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnSave; - + /// /// SimpleForm1 鎺т欢銆 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtHotProessTrustNo 鎺т欢銆 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtHotProessTrustNo; - + /// /// txtProessDate 鎺т欢銆 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DatePicker txtProessDate; - + /// /// drpInstallationId 鎺т欢銆 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpInstallationId; - + /// /// drpUnitId 鎺т欢銆 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtProessMethod 鎺т欢銆 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtProessMethod; - + /// /// txtProessEquipment 鎺т欢銆 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtProessEquipment; - + /// /// txtTabler 鎺т欢銆 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtTabler; - + /// /// txtRemark 鎺т欢銆 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// Grid1 鎺т欢銆 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 鎺т欢銆 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnDelete 鎺т欢銆 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnDelete; - + /// /// ckSelect 鎺т欢銆 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button ckSelect; - + /// /// Window1 鎺т欢銆 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 鎺т欢銆 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HotProcessHard { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuDelete 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx new file mode 100644 index 0000000..0e754d0 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx @@ -0,0 +1,199 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegation.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegation" %> + + + + + PMI澶勭悊濮旀墭 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs new file mode 100644 index 0000000..7f8e72d --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs @@ -0,0 +1,388 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + public partial class PMIDelegation : PageBase + { + #region 瀹氫箟椤 + /// + /// PMI濮旀墭涓婚敭 + /// + public string PMIDelegationId + { + get + { + return (string)ViewState["PMIDelegationId"]; + } + set + { + ViewState["PMIDelegationId"] = value; + } + } + #endregion + + #region 鍔犺浇椤甸潰 + /// + /// 鍔犺浇椤甸潰 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.PMIDelegationId = string.Empty; + this.InitTreeMenu();//鍔犺浇鏍 + } + } + #endregion + + #region 鍔犺浇鏍 + /// + /// 鍔犺浇鏍 + /// + private void InitTreeMenu() + { + string projectName = string.Empty; + var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (pro != null) + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "[" + pro.ProjectCode + "]" + pro.ProjectName; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + + List trustLists = new List(); ///PMI濮旀墭鍗 + + if (!string.IsNullOrEmpty(this.txtSearchNo.Text.Trim())) + { + trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId && x.DelegationNo.Contains(this.txtSearchNo.Text.Trim()) orderby x.DelegationNo select x).ToList(); + } + else + { + trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId orderby x.DelegationNo select x).ToList(); + } + this.BindNodes(rootNode, trustLists); + } + } + #endregion + + #region 缁戝畾鏍戣妭鐐 + /// + /// 缁戝畾鏍戣妭鐐 + /// + /// + private void BindNodes(TreeNode node, List trustList) + { + foreach (var item in trustList) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item.DelegationNo; + newNode.NodeID = item.Id; + newNode.ToolTip = item.DelegationNo; + newNode.CommandName = Resources.Lan.RequestSheetNumber; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + } + #endregion + + #region 鐐瑰嚮TreeView + /// + /// 鐐瑰嚮TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + if (this.tvControlItem.SelectedNodeID != "0") + { + this.PMIDelegationId = tvControlItem.SelectedNodeID; + this.BindGrid(); + } + } + #endregion + + #region DropDownList涓嬫媺閫夋嫨浜嬩欢 + /// + /// 椤圭洰涓嬫媺閫夋嫨浜嬩欢 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + + #region 鏁版嵁缁戝畾 + /// + /// 鏁版嵁缁戝畾 + /// + private void BindGrid() + { + string strSql = string.Empty; + List listStr = new List(); + this.SetTextTemp(); + this.PageInfoLoad(); ///椤甸潰杈撳叆鎻愪氦淇℃伅 + + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + var result = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.tvControlItem.SelectedNodeID); + if (result != null) + { + this.PMIDelegationId = result.Id; + strSql = @"SELECT *FROM [View_PMI_DelegationDetails] WHERE ProjectId= @ProjectId AND PMIID=@PMIDelegationId "; + + listStr.Add(new SqlParameter("@ProjectId", result != null ? result.ProjectId : this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@PMIDelegationId", this.PMIDelegationId)); + + if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim())) + { + strSql += @" and PipelineCode like '%'+@PipelineCode+'%' "; + listStr.Add(new SqlParameter("@PipelineCode", this.txtIsoNo.Text.Trim())); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + } + } + + /// + /// 鏌ヨ + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 + /// + /// 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 + /// + private void PageInfoLoad() + { + var trust =Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId); + if (trust != null) + { + this.txtDelegationNo.Text = trust.DelegationNo; + if (trust.DelegationDate.HasValue) + { + this.txtDelegationDate.Text = string.Format("{0:yyyy-MM-dd}", trust.DelegationDate); + } + if (!string.IsNullOrEmpty(trust.InstallationId)) + { + this.txtInstallationName.Text = BLL.Project_InstallationService.GetProject_InstallationNameByInstallationId(trust.InstallationId); + } + if (!string.IsNullOrEmpty(trust.UnitId)) + { + this.txtUnitName.Text = BLL.Base_UnitService.GetUnitNameByUnitId(trust.UnitId); + } + this.txtDetectionMethod.Text = "PMI鍏夎氨鍒嗘瀽"; + this.txtDetectionStandard.Text = trust.DetectionStandard; + if (!string.IsNullOrEmpty(trust.Tabler)) + { + this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(trust.Tabler); + } + this.txtRemark.Text = trust.Remark; + } + } + #endregion + + #region 娓呯┖鏂囨湰 + /// + /// 娓呯┖鏂囨湰 + /// + private void SetTextTemp() + { + this.txtDelegationNo.Text = string.Empty; + this.txtDelegationDate.Text = string.Empty; + this.txtInstallationName.Text = string.Empty; + this.txtUnitName.Text = string.Empty; + this.txtDetectionMethod.Text = string.Empty; + this.txtDetectionStandard.Text = string.Empty; + this.txtTabler.Text = string.Empty; + this.txtRemark.Text = string.Empty; + } + #endregion + #endregion + + #region 鍒嗛〉鎺掑簭 + #region 椤电储寮曟敼鍙樹簨浠 + /// + /// 椤电储寮曟敼鍙樹簨浠 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 鎺掑簭 + /// + /// 鎺掑簭 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢 + /// + /// 鍒嗛〉閫夋嫨涓嬫媺鏀瑰彉浜嬩欢 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region PMI濮旀墭 缁存姢浜嬩欢 + /// + /// 澧炲姞PMI濮旀墭 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd)) + { + this.SetTextTemp(); + string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "鏂板 - ") ; + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hdPMIDelegationId.ClientID) + + Window2.GetShowReference(window)); + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + } + } + + #region 缂栬緫PMI濮旀墭 + /// + /// 缂栬緫PMI濮旀墭 + /// + /// + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave)) + { + var trustManage = Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId); + if (trustManage != null) + { + string openUrl = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", this.PMIDelegationId, "缂栬緫 - "); + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hdPMIDelegationId.ClientID) + + Window2.GetShowReference(openUrl)); + } + else + { + ShowNotify(Resources.Lan.PleaseSelectModifyHotProessTrust, MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + } + } + #endregion + + #region 鍒犻櫎PMI濮旀墭 + /// + /// 鍒犻櫎PMI濮旀墭 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnDelete)) + { + var trustManage =Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId); + if (trustManage != null) + { + //鍒犻櫎涓昏〃鏁版嵁 + Funs.DB.PMI_Delegation.DeleteOnSubmit(trustManage); + //鍒犻櫎 鏄庣粏琛 + + Funs.DB.SubmitChanges(); + Alert.ShowInTop(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success); + this.InitTreeMenu(); + SetTextTemp(); + this.Grid1.DataSource = null; + this.Grid1.DataBind(); + } + else + { + ShowNotify(Resources.Lan.PleaseSelectDeleteHotProessTrust, MessageBoxIcon.Warning); + } + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + #endregion + #endregion + + #region 鍏抽棴寮瑰嚭绐楀彛鍙婂埛鏂伴〉闈 + /// + /// 鍏抽棴寮瑰嚭绐楀彛 + /// + /// + /// + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + this.InitTreeMenu(); + this.BindGrid(); + + } + + #region 鏌ヨ + /// + /// 鏌ヨ + /// + /// + /// + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + #endregion + + + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs new file mode 100644 index 0000000..432558e --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs @@ -0,0 +1,314 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + + + public partial class PMIDelegation + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtSearchNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtSearchNo; + + /// + /// tvControlItem 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// hdPMIDelegationId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hdPMIDelegationId; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnEdit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnEdit; + + /// + /// btnDelete 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtDelegationNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtDelegationNo; + + /// + /// txtDelegationDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtDelegationDate; + + /// + /// txtInstallationName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtInstallationName; + + /// + /// txtUnitName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtUnitName; + + /// + /// txtDetectionMethod 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtDetectionMethod; + + /// + /// txtDetectionStandard 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtDetectionStandard; + + /// + /// txtTabler 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtTabler; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label txtRemark; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtIsoNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtIsoNo; + + /// + /// ToolbarFill2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + + /// + /// tbxEditorQualityNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox tbxEditorQualityNo; + + /// + /// txtEditorAcceptance 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtEditorAcceptance; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window2; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx new file mode 100644 index 0000000..138bc7c --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx @@ -0,0 +1,177 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegationEdit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegationEdit" %> + + + + + + 缂栬緫PMI澶勭悊濮旀墭 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs new file mode 100644 index 0000000..f587eaf --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs @@ -0,0 +1,339 @@ +锘縰sing BLL; +using Model; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.Services.Description; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + public partial class PMIDelegationEdit : PageBase + { + #region 瀹氫箟椤 + /// + /// PMI濮旀墭涓婚敭 + /// + public string PMIDelegationId + { + get + { + return (string)ViewState["PMIDelegationId"]; + } + set + { + ViewState["PMIDelegationId"] = value; + } + } + + + #endregion + + #region 鍔犺浇椤甸潰 + /// + /// 鍔犺浇椤甸潰 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.PMIDelegationId = Request.QueryString["PMIDelegationId"]; + BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallationId, true, this.CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);//瑁呯疆 + BLL.Base_UnitService.InitUnitDropDownList(this.drpUnitId, true, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//鍗曚綅 + + this.PageInfoLoad(); ///鍔犺浇椤甸潰 + this.txtDetectionMethod.Text = "PMI鍏夎氨鍒嗘瀽"; + this.txtDetectionMethod.Enabled = false; + var viewData=Funs.DB.View_PMI_DelegationDetails.Where(t=>t.PMIId==this.PMIDelegationId).ToList(); + this.BindGrid(viewData); ////鍒濆鍖栭〉闈 + this.txtDelegationDate.Text = DateTime.Now.ToString("yyyy-MM-dd"); + } + } + + #endregion + + #region 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 + /// + /// 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 + /// + private void PageInfoLoad() + { + var trust = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId); + if (trust != null) + { + //this.ProjectId = trust.ProjectId; + this.txtDelegationNo.Text = trust.DelegationNo; + if (trust.DelegationDate.HasValue) + { + this.txtDelegationDate.Text = string.Format("{0:yyyy-MM-dd}", trust.DelegationDate); + } + if (!string.IsNullOrEmpty(trust.InstallationId)) + { + this.drpInstallationId.SelectedValue = trust.InstallationId; + } + if (!string.IsNullOrEmpty(trust.UnitId)) + { + this.drpUnitId.SelectedValue = trust.UnitId; + } + this.txtDetectionMethod.Text = "PMI鍏夎氨鍒嗘瀽"; + this.txtDetectionStandard.Text = trust.DetectionStandard; + if (!string.IsNullOrEmpty(trust.Tabler)) + { + this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(trust.Tabler); + } + this.txtRemark.Text = trust.Remark; + } + else + { + this.txtTabler.Text = this.CurrUser.UserName; + this.SimpleForm1.Reset(); //閲嶇疆鎵鏈夊瓧娈 + } + } + #endregion + + #region 鏁版嵁缁戝畾 + + /// + /// 鏁版嵁缁戝畾 + /// + private void BindGrid(List lists) + { + DataTable tb = this.LINQToDataTable(lists); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 鏌ユ壘闇瑕佺儹澶勭悊鐨勭剨鍙 + /// + /// 鏌ユ壘闇瑕丳MI澶勭悊鐨勭剨鍙 + /// + /// + /// + protected void ckSelect_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.drpUnitId.SelectedValue) && this.drpUnitId.SelectedValue != BLL.Const._Null) + { + string weldJointIds = string.Empty; + for (int i = 0; i < Grid1.Rows.Count; i++) + { + string jotId = Grid1.DataKeys[i][0].ToString(); + weldJointIds += jotId + "|"; + } + if (weldJointIds != string.Empty) + { + weldJointIds = weldJointIds.Substring(0, weldJointIds.Length - 1); + } + + //url鏌ヨ + string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}", "缂栬緫 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window)); + } + else + { + Alert.ShowInTop(Resources.Lan.PleaseSelectCompany, MessageBoxIcon.Warning); + } + } + #endregion + + #region Grid 鍏抽棴寮瑰嚭绐楀彛浜嬩欢 + /// + /// 鍏抽棴寮瑰嚭绐楀彛 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + string weldJointIds = string.Empty; + if (!string.IsNullOrEmpty(hdItemsString.Text)) + { + weldJointIds = hdItemsString.Text.Substring(0, hdItemsString.Text.LastIndexOf('|')); + + List lists = BLL.PMIDelegation_Service.GetPMI_DelegationAddItem(weldJointIds); + this.BindGrid(lists); + //鑾峰彇鍗曚綅 + string unitCode = Funs.DB.Base_Unit.FirstOrDefault(t => t.UnitId == drpUnitId.SelectedValue)?.UnitCode; + //鑾峰彇鍖哄煙code + var workdAreaIdList = lists.Select(t => t.WorkAreaId).ToList(); + + var workAreaCode = Funs.DB.Project_WorkArea.AsQueryable().Where(t => workdAreaIdList.Contains(t.WorkAreaId)).Distinct().FirstOrDefault()?.WorkAreaCode; + + this.txtDelegationNo.Text = $"PMI-{unitCode}-{workAreaCode}-PI-"; + } + } + #endregion + + #region PMI濮旀墭 鎻愪氦浜嬩欢 + /// + /// 缂栬緫PMI濮旀墭 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnSave)) + { + + try + { + SaveData(); + } + catch (Exception ex) + { + BLL.ErrLogInfo.WriteLog(ex); + ShowNotify(Resources.Lan.PMIError, MessageBoxIcon.Error); + return; + } + + ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId) + + ActiveWindow.GetHideReference()); + } + else + { + ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + return; + } + } + + void SaveData() + { + + if (!string.IsNullOrEmpty(this.PMIDelegationId)) + { + + var isExists = Funs.DB.PMI_Delegation.Any(t => t.DelegationNo == this.txtDelegationNo.Text.Trim() + && t.ProjectId == this.CurrUser.LoginProjectId && t.Id!=this.PMIDelegationId); + if (isExists) + { + ShowNotify(Resources.Lan.PMICodeExists, MessageBoxIcon.Warning); + return; + } + var result = Funs.DB.PMI_Delegation.FirstOrDefault(t => t.Id == this.PMIDelegationId); + if(result==null) + { + ShowNotify(Resources.Lan.PMICodeNotExists, MessageBoxIcon.Warning); + return; + } + result.DelegationNo = txtDelegationNo.Text.Trim(); + result.DelegationDate = !string.IsNullOrEmpty(txtDelegationDate.Text.Trim()) ? DateTime.Parse(txtDelegationDate.Text.Trim()) : DateTime.Now; + result.InstallationId = drpInstallationId.SelectedValue; + result.UnitId = drpUnitId.SelectedValue; + result.ProjectId = this.CurrUser.LoginProjectId; + result.Remark = txtRemark.Text.Trim(); + result.DetectionStandard = txtDetectionStandard.Text.Trim(); + result.Tabler = this.CurrUser.UserId; + + } + else + { + var isExists = Funs.DB.PMI_Delegation.Any(t => t.DelegationNo == this.txtDelegationNo.Text.Trim() && t.ProjectId == this.CurrUser.LoginProjectId); + if (isExists) + { + ShowNotify(Resources.Lan.PMICodeExists, MessageBoxIcon.Warning); + return; + } + var pmiModel = new Model.PMI_Delegation(); + pmiModel.DelegationNo = txtDelegationNo.Text.Trim(); + pmiModel.DelegationDate = !string.IsNullOrEmpty(txtDelegationDate.Text.Trim()) ? DateTime.Parse(txtDelegationDate.Text.Trim()) : DateTime.Now; + pmiModel.InstallationId = drpInstallationId.SelectedValue; + pmiModel.UnitId = drpUnitId.SelectedValue; + pmiModel.ProjectId = this.CurrUser.LoginProjectId; + pmiModel.Remark = txtRemark.Text.Trim(); + pmiModel.DetectionStandard = txtDetectionStandard.Text.Trim(); + pmiModel.Tabler = this.CurrUser.UserId; + pmiModel.Id = SQLHelper.GetNewID(typeof(Model.PMI_Delegation)); + this.PMIDelegationId = pmiModel.Id; + pmiModel.CreatedTime = DateTime.Now; + Funs.DB.PMI_Delegation.InsertOnSubmit(pmiModel); + } + + //鍏堝垹闄ゆ槑缁嗚〃 + var deleteEntity = Funs.DB.PMI_DelegationDetails.Where(t => t.PMIId == this.PMIDelegationId).ToList(); + if (deleteEntity.Any()) + { + Funs.DB.PMI_DelegationDetails.DeleteAllOnSubmit(deleteEntity); + } + //鍐嶆彃鍏ユ槑缁嗚〃 + this.CollectGridJointInfo(); + Funs.DB.SubmitChanges(); + } + #endregion + + #region 鏀堕泦Grid椤甸潰淇℃伅,鎻愪氦鏄庣粏 + /// + /// 鏀堕泦Grid椤甸潰淇℃伅,鎻愪氦鏄庣粏 + /// + /// + private void CollectGridJointInfo() + { + var listData = new List(); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + JObject values = mergedRow.Value("values"); + Model.PMI_DelegationDetails newTrustItem = new Model.PMI_DelegationDetails(); + newTrustItem.Id = SQLHelper.GetNewID(typeof(PMI_DelegationDetails)); + newTrustItem.JointId = values.Value("WeldJointId").ToString(); + newTrustItem.Acceptance = values.Value("Acceptance").ToString(); + newTrustItem.QualityNo = values.Value("QualityNo").ToString(); + newTrustItem.Status = 0; + newTrustItem.CreatedTime = DateTime.Now; + newTrustItem.PMIId = this.PMIDelegationId; + listData.Add(newTrustItem); + } + Funs.DB.PMI_DelegationDetails.InsertAllOnSubmit(listData); + + } + #endregion + + #region 鍙抽敭鍒犻櫎浜嬩欢 + /// + /// 鍙抽敭鍒犻櫎浜嬩欢 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.hdItemsString.Text)) + { + this.hdItemsString.Text = this.hdItemsString.Text.Substring(0, this.hdItemsString.Text.LastIndexOf('|')); + } + var trust = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId); + if (Grid1.SelectedRowIndexArray.Length > 0) + { + List GetHotProessTrustItem = new List(); + if (!string.IsNullOrEmpty(this.hdItemsString.Text)) + { + GetHotProessTrustItem = BLL.PMIDelegation_Service.GetPMI_DelegationAddItem(this.hdItemsString.Text); + } + else if (string.IsNullOrEmpty(this.hdItemsString.Text) && this.PMIDelegationId != null) + { + GetHotProessTrustItem = BLL.PMIDelegation_Service.GetPMI_DelegationItem(this.CurrUser.LoginProjectId, this.PMIDelegationId); + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var item = GetHotProessTrustItem.FirstOrDefault(x => x.WeldJointId == rowID); + if (item != null) + { + GetHotProessTrustItem.Remove(item); + } + } + BindGrid(GetHotProessTrustItem); + ShowNotify(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success); + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs new file mode 100644 index 0000000..de5ebfd --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs @@ -0,0 +1,251 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + + + public partial class PMIDelegationEdit + { + + /// + /// 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; + + /// + /// hdItemsString 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hdItemsString; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtDelegationNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtDelegationNo; + + /// + /// txtDelegationDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtDelegationDate; + + /// + /// drpInstallationId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpInstallationId; + + /// + /// drpUnitId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// txtDetectionMethod 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtDetectionMethod; + + /// + /// txtDetectionStandard 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtDetectionStandard; + + /// + /// txtTabler 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtTabler; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnDelete 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// ckSelect 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button ckSelect; + + /// + /// tbxEditorQualityNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox tbxEditorQualityNo; + + /// + /// txtEditorAcceptance 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtEditorAcceptance; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDelete 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx index 79410dd..23776b0 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx @@ -42,7 +42,7 @@ + AutoLeafIdentification="true" EnableTextSelection="true"> @@ -107,12 +107,23 @@ - + + + + + + + + + + + @@ -132,10 +143,20 @@ DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px"> - + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs index 92ae0a2..48fd5fd 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs @@ -8,6 +8,7 @@ using System.Web; using System.Collections; using Model; using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using FineUIPro.Web.common.ProjectSet; namespace FineUIPro.Web.WeldingProcess.PMI { @@ -48,8 +49,6 @@ namespace FineUIPro.Web.WeldingProcess.PMI { if (!string.IsNullOrEmpty(this.txtNDEDateMonth.Text.Trim())) { - DateTime startTime = Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01"); - DateTime endTime = startTime.AddMonths(1); this.tvControlItem.Nodes.Clear(); List units = new List(); Model.Project_Unit pUnit = BLL.Project_UnitService.GetProject_UnitByProjectIdUnitId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); @@ -96,30 +95,20 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// private void BindNodes(TreeNode node) { + DateTime startTime = Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01"); + DateTime endTime = startTime.AddMonths(1); + string searchCode = this.txtSearchCode.Text.Trim(); if (node.ToolTip == "Unit") { - ///瑁呯疆 - var install = (from x in Funs.DB.Project_Installation - join y in Funs.DB.PMI_Delegation on x.InstallationId equals y.InstallationId - where y.UnitId == node.NodeID && x.ProjectId == this.CurrUser.LoginProjectId - orderby x.InstallationCode - select x).Distinct(); - foreach (var q in install) - { - TreeNode newNode = new TreeNode(); - newNode.Text = q.InstallationName; - newNode.NodeID = q.InstallationId + "|" + node.NodeID; - newNode.ToolTip = "Installation"; - node.Nodes.Add(newNode); - BindNodes(newNode); - } - } - else if (node.ToolTip == "Installation") - { - string[] unitAndInstallationArr= node.NodeID.Split('|'); - var ndt = from x in Funs.DB.PMI_Delegation where x.UnitId == unitAndInstallationArr[1] - && x.InstallationId == unitAndInstallationArr[0] - && x.ProjectId == this.CurrUser.LoginProjectId select x; + string unitId = node.NodeID; + var ndt = from x in Funs.DB.PMI_Delegation + where x.UnitId == unitId + && x.ProjectId == this.CurrUser.LoginProjectId + && x.DelegationDate >= startTime && x.DelegationDate <= endTime + &&( x.DelegationNo.Contains(searchCode)|| searchCode=="") + select x; + //if (!string.IsNullOrWhiteSpace(searchCode)) + // ndt = ndt.Where(q => q.DelegationNo.Contains(searchCode)); foreach (var q in ndt) { @@ -130,8 +119,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI newNode.EnableClickEvent = true; node.Nodes.Add(newNode); BindNodes(newNode); - } - } + } + } } #endregion @@ -162,12 +151,51 @@ namespace FineUIPro.Web.WeldingProcess.PMI { if (!string.IsNullOrWhiteSpace(this.hdPMIId.Text) && this.tvControlItem.SelectedNode.ToolTip == "DelegationNo") { + string strSql = string.Empty; + List listStr = new List(); this.SetTextTemp(); this.PageInfoLoad(); ///椤甸潰杈撳叆鎻愪氦淇℃伅 - + + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + var result = Funs.DB.PMI_Delegation.FirstOrDefault(t => t.Id == this.tvControlItem.SelectedNodeID); + if (result != null) + { + this.PMIID = result.Id; + strSql = @"SELECT *, + (case status when 0 then '鍚堟牸' else '涓嶅悎鏍' end) StatusText + FROM [View_PMI_DelegationDetails] WHERE ProjectId= @ProjectId AND PMIID=@PMIDelegationId "; + + listStr.Add(new SqlParameter("@ProjectId", result != null ? result.ProjectId : this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@PMIDelegationId", this.PMIID)); + + if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim())) + { + strSql += @" and PipelineCode like '%'+@PipelineCode+'%' "; + listStr.Add(new SqlParameter("@PipelineCode", this.txtIsoNo.Text.Trim())); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + } } } + private string StatusText(int status) { + if (status == 0) + return "鍚堟牸"; + else + return "涓嶅悎鏍"; + } + #region 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 /// /// 鍔犺浇椤甸潰杈撳叆鎻愪氦淇℃伅 @@ -185,9 +213,10 @@ namespace FineUIPro.Web.WeldingProcess.PMI DelegationDate=x.DelegationDate, InstallationName=n.InstallationName, UnitName=y.UnitName, - DetectionMethod="寰呭畾", + DetectionMethod="PMI鍏夎氨鍒嗘瀽", Tabler=x.Tabler, Remark=x.Remark, + DetectionStandard=x.DetectionStandard, }).ToList(); if (pageInfo.Count>0) { @@ -198,6 +227,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod; this.txtTabler.Text = pageInfo[0].Tabler; this.txtRemark.Text = pageInfo[0].Remark; + this.txtDetectionStandard.Text= pageInfo[0].DetectionStandard; } } #endregion @@ -214,6 +244,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI this.txtDetectionMethod.Text = string.Empty; this.txtTabler.Text = string.Empty; this.txtRemark.Text = string.Empty; + this.txtDetectionStandard.Text = string.Empty; } #endregion diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs index 76a035a..76109ee 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs @@ -221,6 +221,33 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// protected global::FineUIPro.Grid Grid1; + /// + /// Toolbar3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtIsoNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtIsoNo; + + /// + /// ToolbarFill2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + /// /// ToolbarSeparator1 鎺т欢銆 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx new file mode 100644 index 0000000..1e4efae --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx @@ -0,0 +1,100 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMISelectList.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMISelectList" %> + + + + + + 鏌ユ壘绠＄嚎鐒婂彛淇℃伅 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs new file mode 100644 index 0000000..1693b43 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs @@ -0,0 +1,230 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + public partial class PMISelectList : PageBase + { + string UnitId = string.Empty; + string ProjectId = string.Empty; + string PMIId = string.Empty; + string weldJointIds=string.Empty; + #region 鍔犺浇椤甸潰 + /// + /// 鍔犺浇椤甸潰 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.UnitId = Request.Params["unitId"] ??""; + this.ProjectId = this.CurrUser.LoginProjectId; + this.PMIId = Request.Params["PMIId"]??""; + this.weldJointIds = Request.Params["weldJointIds"] ?? ""; + this.InitTreeMenu();//鍔犺浇鏍 + this.BindGrid(); + } + } + #endregion + + #region 鍔犺浇绠＄嚎淇℃伅 + /// + /// 鍔犺浇鏍 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = Resources.Lan.PipelineCode; + rootNode.NodeID = "0"; + rootNode.ToolTip = Resources.Lan.SeachTip; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + //鎺掗櫎宸茬粡濮旀墭杩囩殑 + var listData= (from a in Funs.DB.PMI_Delegation.AsQueryable() join + b in Funs.DB.PMI_DelegationDetails.AsQueryable() on + a.Id equals b.PMIId + select b.JointId + ).Distinct().ToList(); + + //鏌ヨ甯︽湁PMI澶勭悊鐨勭绾挎暟鎹 + var iso = from x in Funs.DB.View_Pipeline_WeldJoint + where x.ProjectId == this.ProjectId && x.IsPMI == true && x.UnitId == this.UnitId + select new { x.PipelineCode, x.PipelineId,x.WeldJointId }; //from x in Funs.DB.Pipeline_Pipeline where x.ProjectId == this.ProjectId && x.UnitId == this.UnitId select x; + + if (listData.Count > 0) + { + iso = iso.Where(e => !listData.Contains(e.WeldJointId)); + } + if (!string.IsNullOrEmpty(this.txtIsono.Text)) + { + iso = iso.Where(e => e.PipelineCode.Contains(this.txtIsono.Text.Trim())); + } + var isoList = iso.Select(x => new {x.PipelineId,x.PipelineCode }).OrderBy(x => x.PipelineCode).Distinct().ToList(); + if (isoList.Count > 0) + { + foreach (var q in isoList) + { + TreeNode newNode = new TreeNode(); + newNode.NodeID = q.PipelineId; + newNode.Text = q.PipelineCode; + newNode.EnableClickEvent = true; + rootNode.Nodes.Add(newNode); + } + } + } + #endregion + + #region 绠＄嚎鏌ヨ + /// + /// 鏌ヨ + /// + /// + /// + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + protected void Tree2_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + #endregion + + + #region 鐐瑰嚮TreeView + /// + /// 鐐瑰嚮TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 鏁版嵁缁戝畾 + /// + /// 鏁版嵁缁戝畾 + /// + private void BindGrid() + { + var listData = (from a in Funs.DB.PMI_Delegation.AsQueryable() + join + b in Funs.DB.PMI_DelegationDetails.AsQueryable() on + a.Id equals b.PMIId + select b.JointId + ).Distinct().ToList(); + + // string sql = @"SELECT WeldJointId,ProjectId,PipelineId,WeldJointCode,WPQCode,DetectionType, + // convert(int,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJointNo, + //dbo.Fun_GetParseString(WeldJointCode) AS PreJotNo, + // PipingClassCode,PipeSegment,JointAttribute,PageNum, + // ComponentsCode1,ComponentsCode2,Is_hjName,IsHotProessStr,Material1Code,Material2Code, + // WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode, + // WeldingMethodCode,WeldSilkId,WeldMatCode,WeldingDate,WeldingDailyCode,DoneDin, + // BackingWelderCode,CoverWelderCode,SystemNumber,TestPackageNo,Remark, + // MaterialCode,WeldingDate, + // (CASE WHEN IsCancel=1 THEN '鏄' ELSE '鍚' END) AS IsCancel,isPMI + // FROM View_Pipeline_WeldJoint WHERE isPMI=1 "; + + + // List paramsList = new List(); + // if (!string.IsNullOrEmpty(this.txtJointNo.Text)) + // { + // sql += @" and WeldJointCode=@WeldJointCode"; + // paramsList.Add(new SqlParameter("@WeldJointCode", txtJointNo.Text.Trim())); + // } + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // sql += @" and PipelineId=@PipelineId "; + // paramsList.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + // } + // var dt = SQLHelper.GetDataTableRunText(sql, paramsList.ToArray()); + var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true); + if (listData.Count > 0) + { + query = query.Where(t => !listData.Contains(t.WeldJointId)); + } + if (!string.IsNullOrEmpty(this.txtJointNo.Text)) + { + query = query.Where(t => t.WeldJointCode == this.txtJointNo.Text); + } + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID); + } + Grid1.DataSource = query.ToList(); + Grid1.DataBind(); + } + #endregion + + #region 鎺掑簭 + /// + /// 鎺掑簭 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 鎻愪氦鎸夐挳 + /// + /// 鎻愪氦鎸夐挳 + /// + /// + /// + protected void btnAccept_Click(object sender, EventArgs e) + { + string itemsString = ""; + string[] selectRowId = Grid1.SelectedRowIDArray; + int n = 0; + int j = 0; + int[] selections = new int[selectRowId.Count()]; + foreach (GridRow row in Grid1.Rows) + { + if (selectRowId.Contains(row.DataKeys[0])) + { + selections[n] = j; + n++; + } + j++; + } + var select = selections.Distinct(); + string jotIds = Request.Params["jotIds"]; + if (!string.IsNullOrEmpty(jotIds)) + { + string[] jots = jotIds.Split('|'); + foreach (string jotId in jots) + { + itemsString += jotId + "|"; + } + } + foreach (int i in select) + { + string rowID = Grid1.DataKeys[i][0].ToString(); + if (!itemsString.Contains(rowID)) + { + itemsString += rowID + "|"; + } + } + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(itemsString) + + ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs new file mode 100644 index 0000000..067c153 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs @@ -0,0 +1,143 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + + + public partial class PMISelectList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtIsono 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtIsono; + + /// + /// tvControlItem 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtJointNo 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtJointNo; + + /// + /// ww 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label ww; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnAccept 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAccept; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx index 2c7eff2..9124302 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx @@ -137,11 +137,13 @@ - + - + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs index 32d7690..67f4019 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs @@ -329,6 +329,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { this.drpIsHotProess.SelectedValue = BLL.Const._False; } + //鏄惁PMI澶勭悊 + ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false; if (jointInfo.IsCancel == true) { @@ -501,6 +503,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { newJointInfo.IsCancel = true; } + //鏄惁PMI澶勭悊 + newJointInfo.IsPMI = ckbIsPMI.Checked; if (ckbIsGoldJoint.Checked == true) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs index d07bd20..e47bd9b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.WeldingManage { - - - public partial class JointInfoEdit { - +namespace FineUIPro.Web.WeldingProcess.WeldingManage +{ + + + public partial class JointInfoEdit + { + /// /// form1 鎺т欢銆 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 鎺т欢銆 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 鎺т欢銆 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 鎺т欢銆 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnSave 鎺т欢銆 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnSave; - + /// /// txtWeldJointCode 鎺т欢銆 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtWeldJointCode; - + /// /// drpPipingClass 鎺т欢銆 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpPipingClass; - + /// /// drpWeldType 鎺т欢銆 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWeldType; - + /// /// txtPipeSegment 鎺т欢銆 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtPipeSegment; - + /// /// drpMaterial1 鎺т欢銆 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpMaterial1; - + /// /// drpMaterial2 鎺т欢銆 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpMaterial2; - + /// /// drpWeldingMethod 鎺т欢銆 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWeldingMethod; - + /// /// drpJointAttribute 鎺т欢銆 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpJointAttribute; - + /// /// txtSize 鎺т欢銆 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.NumberBox txtSize; - + /// /// drpANSISCH 鎺т欢銆 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpANSISCH; - + /// /// txtDia 鎺т欢銆 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.NumberBox txtDia; - + /// /// txtThickness 鎺т欢銆 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.NumberBox txtThickness; - + /// /// txtSpecification 鎺т欢銆 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtSpecification; - + /// /// drpGrooveType 鎺т欢銆 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpGrooveType; - + /// /// drpWeldingLocation 鎺т欢銆 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWeldingLocation; - + /// /// drpWPS 鎺т欢銆 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWPS; - + /// /// btnSelectWps 鎺т欢銆 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnSelectWps; - + /// /// txtPageNum 鎺т欢銆 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtPageNum; - + /// /// drpIsHotProess 鎺т欢銆 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpIsHotProess; - + /// /// txtTestPackageNo 鎺т欢銆 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtTestPackageNo; - + /// /// txtSystemNumber 鎺т欢銆 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtSystemNumber; - + /// /// txtHeartNo1 鎺т欢銆 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtHeartNo1; - + /// /// txtHeartNo2 鎺т欢銆 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtHeartNo2; - + /// /// drpPipeAssembly1 鎺т欢銆 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpPipeAssembly1; - + /// /// drpPipeAssembly2 鎺т欢銆 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpPipeAssembly2; - + /// /// drpWeldSilk 鎺т欢銆 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWeldSilk; - + /// /// drpWeldMat 鎺т欢銆 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpWeldMat; - + /// /// txtPrepareTemp 鎺т欢銆 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtPrepareTemp; - + /// /// ckbIsGoldJoint 鎺т欢銆 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.CheckBox ckbIsGoldJoint; - + /// /// drpNDTType 鎺т欢銆 /// @@ -326,7 +328,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.DropDownList drpNDTType; - + + /// + /// ckbIsPMI 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.CheckBox ckbIsPMI; + /// /// ckbIsCancel 鎺т欢銆 /// @@ -335,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.CheckBox ckbIsCancel; - + /// /// txtCancelResult 鎺т欢銆 /// @@ -344,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtCancelResult; - + /// /// btnCancel 鎺т欢銆 /// @@ -353,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Button btnCancel; - + /// /// txtRemark 鎺т欢銆 /// @@ -362,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// SimpleForm2 鎺т欢銆 /// @@ -371,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Form SimpleForm2; - + /// /// txtReport 鎺т欢銆 /// @@ -380,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtReport; - + /// /// txtPoint 鎺т欢銆 /// @@ -389,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtPoint; - + /// /// ddlTrustFlag 鎺т欢銆 /// @@ -398,7 +409,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label ddlTrustFlag; - + /// /// ddlCheckFlag 鎺т欢銆 /// @@ -407,7 +418,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label ddlCheckFlag; - + /// /// lbUnitName 鎺т欢銆 /// @@ -416,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lbUnitName; - + /// /// lbInstallationName 鎺т欢銆 /// @@ -425,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label lbInstallationName; - + /// /// txtWorkAreaId 鎺т欢銆 /// @@ -434,7 +445,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtWorkAreaId; - + /// /// txtPipelineCode 鎺т欢銆 /// @@ -443,7 +454,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtPipelineCode; - + /// /// txtSingleNumber 鎺т欢銆 /// @@ -452,7 +463,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtSingleNumber; - + /// /// ddlReportCode 鎺т欢銆 /// @@ -461,7 +472,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label ddlReportCode; - + /// /// txtReportDate 鎺т欢銆 /// @@ -470,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtReportDate; - + /// /// ddlJointStatus 鎺т欢銆 /// @@ -479,7 +490,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label ddlJointStatus; - + /// /// txtBackingWelder 鎺т欢銆 /// @@ -488,7 +499,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtBackingWelder; - + /// /// txtBackingWelderName 鎺т欢銆 /// @@ -497,7 +508,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtBackingWelderName; - + /// /// txtCoverWelder 鎺т欢銆 /// @@ -506,7 +517,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// protected global::FineUIPro.Label txtCoverWelder; - + /// /// txtCoverWelderName 鎺т欢銆 /// diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index e404c2b..c89fb8c 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -173,6 +173,12 @@ namespace Model partial void InsertPipeline_WeldJoint(Pipeline_WeldJoint instance); partial void UpdatePipeline_WeldJoint(Pipeline_WeldJoint instance); partial void DeletePipeline_WeldJoint(Pipeline_WeldJoint instance); + partial void InsertPMI_Delegation(PMI_Delegation instance); + partial void UpdatePMI_Delegation(PMI_Delegation instance); + partial void DeletePMI_Delegation(PMI_Delegation instance); + partial void InsertPMI_DelegationDetails(PMI_DelegationDetails instance); + partial void UpdatePMI_DelegationDetails(PMI_DelegationDetails instance); + partial void DeletePMI_DelegationDetails(PMI_DelegationDetails instance); partial void InsertProject_Installation(Project_Installation instance); partial void UpdateProject_Installation(Project_Installation instance); partial void DeleteProject_Installation(Project_Installation instance); @@ -664,6 +670,22 @@ namespace Model } } + public System.Data.Linq.Table PMI_Delegation + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table PMI_DelegationDetails + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Project_Installation { get @@ -1048,6 +1070,14 @@ namespace Model } } + public System.Data.Linq.Table View_PMI_DelegationDetails + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_PTP_TestPackageAudit { get @@ -19353,6 +19383,8 @@ namespace Model private string _ANSISCH; + private System.Nullable _IsPMI; + private EntitySet _Batch_BatchTrustItem; private EntitySet _Batch_PointBatchItem; @@ -19491,6 +19523,8 @@ namespace Model partial void OnPageNumChanged(); partial void OnANSISCHChanging(string value); partial void OnANSISCHChanged(); + partial void OnIsPMIChanging(System.Nullable value); + partial void OnIsPMIChanged(); #endregion public Pipeline_WeldJoint() @@ -20525,6 +20559,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this.OnIsPMIChanging(value); + this.SendPropertyChanging(); + this._IsPMI = value; + this.SendPropertyChanged("IsPMI"); + this.OnIsPMIChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet Batch_BatchTrustItem { @@ -21129,6 +21183,490 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_Delegation")] + public partial class PMI_Delegation : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _DelegationNo; + + private System.Nullable _DelegationDate; + + private string _ProjectId; + + private string _InstallationId; + + private string _UnitId; + + private string _DetectionStandard; + + private string _Remark; + + private System.Nullable _CreatedTime; + + private string _Tabler; + + #region 鍙墿灞曟ф柟娉曞畾涔 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnDelegationNoChanging(string value); + partial void OnDelegationNoChanged(); + partial void OnDelegationDateChanging(System.Nullable value); + partial void OnDelegationDateChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnDetectionStandardChanging(string value); + partial void OnDetectionStandardChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); + partial void OnTablerChanging(string value); + partial void OnTablerChanged(); + #endregion + + public PMI_Delegation() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string DelegationNo + { + get + { + return this._DelegationNo; + } + set + { + if ((this._DelegationNo != value)) + { + this.OnDelegationNoChanging(value); + this.SendPropertyChanging(); + this._DelegationNo = value; + this.SendPropertyChanged("DelegationNo"); + this.OnDelegationNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")] + public System.Nullable DelegationDate + { + get + { + return this._DelegationDate; + } + set + { + if ((this._DelegationDate != value)) + { + this.OnDelegationDateChanging(value); + this.SendPropertyChanging(); + this._DelegationDate = value; + this.SendPropertyChanged("DelegationDate"); + this.OnDelegationDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionStandard", DbType="NVarChar(50)")] + public string DetectionStandard + { + get + { + return this._DetectionStandard; + } + set + { + if ((this._DetectionStandard != value)) + { + this.OnDetectionStandardChanging(value); + this.SendPropertyChanging(); + this._DetectionStandard = value; + this.SendPropertyChanged("DetectionStandard"); + this.OnDetectionStandardChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] + 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="_CreatedTime", DbType="DateTime")] + public System.Nullable CreatedTime + { + get + { + return this._CreatedTime; + } + set + { + if ((this._CreatedTime != value)) + { + this.OnCreatedTimeChanging(value); + this.SendPropertyChanging(); + this._CreatedTime = value; + this.SendPropertyChanged("CreatedTime"); + this.OnCreatedTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] + public string Tabler + { + get + { + return this._Tabler; + } + set + { + if ((this._Tabler != value)) + { + this.OnTablerChanging(value); + this.SendPropertyChanging(); + this._Tabler = value; + this.SendPropertyChanged("Tabler"); + this.OnTablerChanged(); + } + } + } + + 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.PMI_DelegationDetails")] + public partial class PMI_DelegationDetails : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _PMIId; + + private string _JointId; + + private string _QualityNo; + + private string _Acceptance; + + private System.Nullable _CreatedTime; + + private int _Status; + + #region 鍙墿灞曟ф柟娉曞畾涔 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnPMIIdChanging(string value); + partial void OnPMIIdChanged(); + partial void OnJointIdChanging(string value); + partial void OnJointIdChanged(); + partial void OnQualityNoChanging(string value); + partial void OnQualityNoChanged(); + partial void OnAcceptanceChanging(string value); + partial void OnAcceptanceChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); + partial void OnStatusChanging(int value); + partial void OnStatusChanged(); + #endregion + + public PMI_DelegationDetails() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string PMIId + { + get + { + return this._PMIId; + } + set + { + if ((this._PMIId != value)) + { + this.OnPMIIdChanging(value); + this.SendPropertyChanging(); + this._PMIId = value; + this.SendPropertyChanged("PMIId"); + this.OnPMIIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string JointId + { + get + { + return this._JointId; + } + set + { + if ((this._JointId != value)) + { + this.OnJointIdChanging(value); + this.SendPropertyChanging(); + this._JointId = value; + this.SendPropertyChanged("JointId"); + this.OnJointIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityNo", DbType="NVarChar(255)")] + public string QualityNo + { + get + { + return this._QualityNo; + } + set + { + if ((this._QualityNo != value)) + { + this.OnQualityNoChanging(value); + this.SendPropertyChanging(); + this._QualityNo = value; + this.SendPropertyChanged("QualityNo"); + this.OnQualityNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Acceptance", DbType="NVarChar(255)")] + public string Acceptance + { + get + { + return this._Acceptance; + } + set + { + if ((this._Acceptance != value)) + { + this.OnAcceptanceChanging(value); + this.SendPropertyChanging(); + this._Acceptance = value; + this.SendPropertyChanged("Acceptance"); + this.OnAcceptanceChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] + public System.Nullable CreatedTime + { + get + { + return this._CreatedTime; + } + set + { + if ((this._CreatedTime != value)) + { + this.OnCreatedTimeChanging(value); + this.SendPropertyChanging(); + this._CreatedTime = value; + this.SendPropertyChanged("CreatedTime"); + this.OnCreatedTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] + public int Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + 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.Project_Installation")] public partial class Project_Installation : INotifyPropertyChanging, INotifyPropertyChanged { @@ -31057,7 +31595,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(52)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(51)")] public string WeldJointCode { get @@ -31696,7 +32234,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(52)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(51)")] public string WeldJointCode { get @@ -36728,6 +37266,8 @@ namespace Model private string _ProjectId; + private System.Nullable _IsPMI; + private string _PipelineCode; private string _PipelineId; @@ -36858,6 +37398,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this._IsPMI = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -38870,6 +39426,8 @@ namespace Model private System.Nullable _IsCancel; + private System.Nullable _IsPMI; + private System.Nullable _IsGoldJoint; private string _WPQId; @@ -40004,6 +40562,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this._IsPMI = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsGoldJoint", DbType="Bit")] public System.Nullable IsGoldJoint { @@ -40085,6 +40659,285 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PMI_DelegationDetails")] + public partial class View_PMI_DelegationDetails + { + + private string _Id; + + private string _Acceptance; + + private System.Nullable _CreatedTime; + + private string _WeldJointId; + + private int _Status; + + private string _QualityNo; + + private string _PMIId; + + private string _ProjectId; + + private string _DelegationNo; + + private System.Nullable _DelegationDate; + + private string _WeldJointCode; + + private string _PipelineCode; + + private string _Specification; + + private string _MaterialCode; + + private string _WorkAreaId; + + public View_PMI_DelegationDetails() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this._Id = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Acceptance", DbType="NVarChar(255)")] + public string Acceptance + { + get + { + return this._Acceptance; + } + set + { + if ((this._Acceptance != value)) + { + this._Acceptance = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] + public System.Nullable CreatedTime + { + get + { + return this._CreatedTime; + } + set + { + if ((this._CreatedTime != value)) + { + this._CreatedTime = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string WeldJointId + { + get + { + return this._WeldJointId; + } + set + { + if ((this._WeldJointId != value)) + { + this._WeldJointId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] + public int Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this._Status = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityNo", DbType="NVarChar(255)")] + public string QualityNo + { + get + { + return this._QualityNo; + } + set + { + if ((this._QualityNo != value)) + { + this._QualityNo = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string PMIId + { + get + { + return this._PMIId; + } + set + { + if ((this._PMIId != value)) + { + this._PMIId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50)")] + public string DelegationNo + { + get + { + return this._DelegationNo; + } + set + { + if ((this._DelegationNo != value)) + { + this._DelegationNo = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")] + public System.Nullable DelegationDate + { + get + { + return this._DelegationDate; + } + set + { + if ((this._DelegationDate != value)) + { + this._DelegationDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")] + public string WeldJointCode + { + get + { + return this._WeldJointCode; + } + set + { + if ((this._WeldJointCode != value)) + { + this._WeldJointCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] + public string PipelineCode + { + get + { + return this._PipelineCode; + } + set + { + if ((this._PipelineCode != value)) + { + this._PipelineCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Specification", DbType="NVarChar(50)")] + public string Specification + { + get + { + return this._Specification; + } + set + { + if ((this._Specification != value)) + { + this._Specification = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + public string MaterialCode + { + get + { + return this._MaterialCode; + } + set + { + if ((this._MaterialCode != value)) + { + this._MaterialCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this._WorkAreaId = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PTP_TestPackageAudit")] public partial class View_PTP_TestPackageAudit {