20260528 焊口中焊材修改
This commit is contained in:
@@ -0,0 +1,599 @@
|
|||||||
|
|
||||||
|
CREATE VIEW View_WeldInfoDropDownLists
|
||||||
|
AS
|
||||||
|
/********焊材下拉选择值（去重，相同的WeldName只保留一条）*********/
|
||||||
|
SELECT
|
||||||
|
WeldId,
|
||||||
|
WeldName,
|
||||||
|
WeldTypeName
|
||||||
|
FROM Weld_WeldInfo
|
||||||
|
LEFT JOIN Weld_WeldType
|
||||||
|
ON Weld_WeldType.WeldTypeId = Weld_WeldInfo.WeldTypeId
|
||||||
|
WHERE WeldId IN (
|
||||||
|
SELECT MIN(WeldId)
|
||||||
|
FROM Weld_WeldInfo
|
||||||
|
GROUP BY WeldName
|
||||||
|
)
|
||||||
|
GO
|
||||||
|
|
||||||
|
ALTER TABLE [dbo].[HJGL_PW_JointInfo] DROP CONSTRAINT [FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1]
|
||||||
|
GO
|
||||||
|
ALTER TABLE [dbo].[HJGL_PW_JointInfo] DROP CONSTRAINT [FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial]
|
||||||
|
GO
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='211d1074-ec3a-46d9-a29d-3a7eb5b29261' where JOT_WeldSilk='E7D0D630-ABF9-46AA-A509-E436726EF4FF'--ER347H
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='ff409c90-45cf-4603-ba14-da901de89c99' where JOT_WeldSilk='578F67B1-CD28-4525-8AC6-1302898B304A'--CHW-316LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='4c6d1cb4-7e6e-49ca-aaf4-034dbb61f095' where JOT_WeldSilk='07214B43-4237-4893-86AF-EA0FECDBCDBE' --CHG-309R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='57778744-3da1-41a3-8dfa-34a8d5253556' where JOT_WeldSilk='0B05A9AE-3123-4E1C-95A6-8DB13B64F06A' --CHG-55C1R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='32e22eb6-a4e5-4a4f-b18f-24ae8239b711' where JOT_WeldSilk='568150B7-9989-40DA-AD6F-23B0DC144FA0' --CHS102R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='2d993eb0-5ac2-4e5e-9056-2a082aa33c70' where JOT_WeldSilk='F238D288-DE0D-460E-A660-6FBFCC6EF7CD' --CHG-309LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='2f9d7605-1600-4b26-afcb-c92cd01e99fb' where JOT_WeldSilk='920D9848-3173-41CF-93B8-800B688F3126' --JW-ER308H
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='89fec340-a942-46fe-9473-2a643c46fd9e' where JOT_WeldSilk='156F69C4-46AD-4EB0-B185-47CC8E971BB2' --TG-S9Cb
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='2eba5663-0908-40de-8320-30079adfb813' where JOT_WeldSilk='59406745-3088-44B1-B241-BDB9BD8B7FDC' --CHW-S2R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='046096df-06fc-4cdd-97b2-8c9120659d9a' where JOT_WeldSilk='23596DC5-A27F-4DF4-A483-B65C4E8B82DA' --CHW-308LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='be5390b4-60b5-41ef-abdd-03bb5b68411b' where JOT_WeldSilk='F99D6FA4-BB87-4639-9A85-F0E27B4B6E55' --TGF-2209
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='fde5c346-ffd4-4d2b-9e63-633bb1ea72e9' where JOT_WeldSilk='84AAEC8E-C999-45EB-81B5-C0A2EFC9A238' --JW-ER50-6
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='db97acfc-a56c-4e21-8345-b4c76e71b694' where JOT_WeldSilk='604D464F-EF40-420E-B3B6-2447F08D114B' --JQ.MG70S-6
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='b686b023-d726-4d27-a5af-03aa68afdbd6' where JOT_WeldSilk='9FD2C5F9-9B14-4748-836D-27F78786ACFD' --CHG-55B2R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='88dc44a5-5102-44fd-98ef-0daded3dfd4a' where JOT_WeldSilk='C2208C58-950E-4137-B6BD-35A29FDCFEC2' --CHW-SHA
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='089ecb4a-5893-499f-adfe-8a4d6a7a8971' where JOT_WeldSilk='FF597502-44FA-49CA-992C-04121D7471AB' --TG-S9CM
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='d0c5db56-e727-4232-ab0a-9e1b867a630a' where JOT_WeldSilk='B1D79722-5ABC-4D26-9E66-8A357F8FEF2B' --TGF-316H
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='584a7940-9ab2-4cc9-9589-84d0b399d52a' where JOT_WeldSilk='45411200-ADAF-4A9C-BE90-C04183F08FEC' --CHG-308R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='a96156ee-7e77-4c76-b8d8-8c33ba5f344a' where JOT_WeldSilk='5CD387F2-94A8-4A24-83CC-13128230DDC1' --CHG-347H(R)
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='205b0d63-0a41-4e5e-91df-1fec2da130d4' where JOT_WeldSilk='316C363A-CAF3-4E35-B5C8-1B9EEB5E903E' --CHG-56R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='584a7940-9ab2-4cc9-9589-84d0b399d52a' where JOT_WeldSilk='1801ED2C-A71C-4A98-B738-D6589DF85D26' --CHG-308R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='08d39fe3-9ded-428f-92cc-d80a4e0264e3' where JOT_WeldSilk='E55CA98D-0B37-4660-978B-61350D2B4A4D' --CHG-62B3R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='25fb32d3-e916-4d5e-9cc5-0db13a814b77' where JOT_WeldSilk='D489C197-58F3-4004-A9D9-A5E50A3CBA38' --CHG-SHA
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='9eb5408b-9567-4998-afb4-796fe7e3a18e' where JOT_WeldSilk='FFBDE818-3C05-4FE7-B752-38835155831B' --CHG-55B6R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='58261597-40b4-4f40-9134-4b8a06a732b0' where JOT_WeldSilk='28E2AD5D-EF43-4D72-85ED-A055468E2408' --THQ-50SHA
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='4c4f0991-8a2b-41ca-bde1-074698b57534' where JOT_WeldSilk='1F767AF3-4FFF-4055-8E6E-C29E5E20B5E2' --CHG-308H(R)
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='6ce2d31c-4226-4849-b920-e45575d5c81c' where JOT_WeldSilk='DC477A3A-5106-4CD1-A8CC-6FFFBFE506C7' --TGF-308L
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='901df547-21f6-404b-b2f1-add2e8d58a10' where JOT_WeldSilk='0A6548F4-BFFB-43A9-9046-7415A545C67F' --CHG-347R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='927dba68-fe92-407f-8198-44200419893d' where JOT_WeldSilk='A29FAE30-F43F-4495-AA5A-4942CD4222C9' --CHG-55B2VR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='b2765ccd-e1f6-4773-8bbc-c0a1b52a7351' where JOT_WeldSilk='81763234-5AFC-4BBC-9CD0-99C738027EA0' --JQ. X70
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='50fcd649-5e9d-46bb-8c1c-d0a5f64d07eb' where JOT_WeldSilk='934DA947-4D6B-4E9D-AA01-4886A3A1D0F7' --CHG-316H(R)
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='1f2fb137-b2c3-4f3a-be3e-9e4aabb5bc73' where JOT_WeldSilk='ED801C0A-50B2-43E0-B9FC-44197E77D777' --CHG-308LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='24f45531-1d3a-449e-8e5c-efe9f4859c9c' where JOT_WeldSilk='2DDCA3D4-6D52-444A-A61E-7DB50472EC87' --Thermanit MTs 3
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='382316a0-c32f-49b5-9f50-92bf622d7371' where JOT_WeldSilk='14823F61-3699-43C1-BA5C-22620C276436' --CHT-711
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='c150a2e4-3b1d-4f8e-83dd-cd7ca0afb41a' where JOT_WeldSilk='B46AB3BF-55D3-4D70-A650-80855F7F8E05' --ER308L
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='dc45138c-936c-47cb-9220-18ecb3ccf445' where JOT_WeldSilk='C3F24281-43AD-4C60-ADDB-6B39F6C76A32' --CHM-308LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='be530bfc-c42d-4ecf-877f-e1619535bed6' where JOT_WeldSilk='17C0F765-40D9-4CBD-BA07-2C6339F6BC4D' --Thermanit CG MTS 3
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='35740b66-b837-47fd-9337-bb318c7411da' where JOT_WeldSilk='01BA3977-6684-4C73-B41E-96CBE0022203' --CHG-316R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='aa3d00b2-ba5e-4204-b592-bbc23b2e8db4' where JOT_WeldSilk='CFC43E4B-6C20-4D7E-B1FA-1E13EF22FE58' --GTS-347H
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='4c4f0991-8a2b-41ca-bde1-074698b57534' where JOT_WeldSilk='1B8F2059-8BF0-4EFB-BBE5-E20C4AEC8A76' --CHG-308H
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='046096df-06fc-4cdd-97b2-8c9120659d9a' where JOT_WeldSilk='08D861B1-2853-4190-8BA3-0F2E936B1032' --CHW-308LR
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='70dbd414-ae83-4b8e-abdd-9b273bed7bcd' where JOT_WeldSilk='09072093-A930-4389-847F-F5D18A22BFFB' --ERNiCrMo-3
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='62f36ecf-d3b5-42b7-adcf-ef8ecd1f52af' where JOT_WeldSilk='5AEE9B33-F196-4089-A0EA-D50EF01F12A5' --TGF-316L
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='ab9e5569-22fb-4657-8383-f5120a26711f' where JOT_WeldSilk='E3DCDD24-BD5D-41CC-BF9A-82352937C5F1' --S385
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='aa67fb40-711b-4bfe-833d-33e998b9f72e' where JOT_WeldSilk='3CEEC7DD-6FC8-4B58-A96C-9DBADB0A2335' --TG-S1N
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldSilk='a79285cd-f15d-4757-837a-6ee0fb545cae' where JOT_WeldSilk='842E7D30-6251-4940-BB44-8DB41D1A3F05' --CHG-316LR
|
||||||
|
go
|
||||||
|
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='7978d61b-e41c-4d1f-bed4-451f1ba53a73' where JOT_WeldMat='737FECCD-89BA-45F0-9F30-36448BEE2E5F' --CHS102RH
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='00368091-c0a2-46a2-814c-b16779be1694' where JOT_WeldMat='93D4FD32-4C64-44BB-96AE-2D948C9DECFF' --CHE507R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='edd79842-77d4-479d-b6e7-a40464b6033e' where JOT_WeldMat='4F2AE88D-AF27-455C-982E-9A208448E612' --CHH507R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='b74c294d-05d7-4f22-a160-8eec1765d419' where JOT_WeldMat='36A42779-C74C-4C82-9D08-D2292AFF0999' --CHS022R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='35a50eef-fd36-4b70-be70-98b182f5a58a' where JOT_WeldMat='DBBEAAF4-D85C-4A21-8ABB-2D787ABDAB04' --CM-9cb
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='8bc02bb2-9f73-49d9-91ae-06772f022b97' where JOT_WeldMat='1F1136A0-0AA1-43E6-822C-EB25AC793D5B' --JW E5515-5CMV
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='f4c865b7-338a-4ec4-8bd5-7ce36c9493a7' where JOT_WeldMat='8F1051BB-EA6F-4254-AC6F-69F054F0BEB1' --CM-9
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='11c1ed66-bf68-4968-953e-b45c303e3f2c' where JOT_WeldMat='7F2A9685-331E-46C9-80E6-B5B597B66E3E' --CHH307R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='e31aa275-7e85-43cf-8ec6-17d498f1e2fe' where JOT_WeldMat='E731742F-A56A-4A41-B759-AF3468C4F980' --CHE427SHA
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='05c61807-c019-4a29-96b5-f497b17d9165' where JOT_WeldMat='75C0FD21-0031-4CCA-890B-FBAB4CCF6446' --J427
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='4e9cca8a-f734-40bd-a51a-59222a4d24ff' where JOT_WeldMat='9B4E2379-924D-4796-80CB-7F0E7B7DAAB6' --CHS202R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='32e22eb6-a4e5-4a4f-b18f-24ae8239b711' where JOT_WeldMat='568150B7-9989-40DA-AD6F-23B0DC144FA0' --CHS102R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='53c5811b-bffa-40ce-9f33-90dba1ee3a90' where JOT_WeldMat='24C6B164-5BE8-4B71-97C8-22A50871F7DB' --CHE507RH
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='2cd028ed-e20c-4ea5-9ae7-bb7e2b6e8dfe' where JOT_WeldMat='8BD2FA38-7AA5-41C4-B92F-405314A3D8CB' --CHS132R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='65b2b4c3-c78c-4937-ad7e-cdaecd74c66f' where JOT_WeldMat='78A18FA4-9362-4E88-8E1B-9D8A1065070B' --CHH317R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='0d88218e-50e8-4ca8-b35f-8367774571a1' where JOT_WeldMat='E22AA6E9-4164-4BE5-8FE9-EFE33CEDAC36' --CHE427R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='3456c8ff-66ee-479f-a9a5-b52d67a86bae' where JOT_WeldMat='5DD02DE0-26C2-4DFA-8B38-2F305C10D771' --A002
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='5eb0ae56-721f-4e92-9a75-9df36069b605' where JOT_WeldMat='7322061B-B79D-4E01-AA97-8CBC41B80F22' --CHH517R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='02b960a3-c7f6-47f1-a20d-faa886e9729a' where JOT_WeldMat='3E5C95DE-ACDD-4F02-A8DD-1457A0B968AC' --CHS132RH
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='4ff0fcb7-3787-4455-b480-15f210949714' where JOT_WeldMat='70B6394B-A345-452E-B0D5-BBB19C84D75C' --CHS302R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='8d732899-be7a-4a9f-bdb0-7efc12c32817' where JOT_WeldMat='12A0FCFD-A965-49D6-9393-342DC024631E' --CHS002R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='61b3d4b8-e423-40d0-9bf2-bf293a7d7ddc' where JOT_WeldMat='E060E537-2368-4A4E-9A85-610FAD50C829' --CHE58-1R
|
||||||
|
update HJGL_PW_JointInfo set JOT_WeldMat='c37aefa5-2633-48c2-b16f-9acd389cfce5' where JOT_WeldMat='B62FCB2C-C5FF-4FC0-A07A-796F1B0069F9' --CHE422R
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ALTER VIEW [dbo].[HJGL_View_JointInfo]
|
||||||
|
AS
|
||||||
|
/*管线焊口信息视图*/
|
||||||
|
SELECT
|
||||||
|
JointInfo.JOT_ID,
|
||||||
|
JointInfo.ProjectId,
|
||||||
|
JointInfo.PointType,
|
||||||
|
JointInfo.RT1_RepairFilm,
|
||||||
|
JointInfo.dreportid,
|
||||||
|
IsoInfo.BSU_ID,
|
||||||
|
JointInfo.STE_ID,
|
||||||
|
JOT_JointNo,
|
||||||
|
JOT_DailyReportNo, --日报告号
|
||||||
|
(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
|
||||||
|
ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --焊接日期
|
||||||
|
JointInfo.ISO_ID,
|
||||||
|
ISO_IsoNo, --管线号
|
||||||
|
Unit.UnitCode,
|
||||||
|
Unit.UnitName,
|
||||||
|
Steel.STE_Code AS STE_Name1,--材质1
|
||||||
|
Steel1.STE_Code AS STE_Name2,--材质2
|
||||||
|
Welder.WED_Code AS WED_Code1, --盖面焊工代号
|
||||||
|
Welder.WED_Name AS WED_Name1, --盖面焊工名称
|
||||||
|
FloorWelder.WED_Code AS WED_Code2, --打底焊工代号
|
||||||
|
FloorWelder.WED_Name AS WED_Name2, --打底焊工名称
|
||||||
|
JointInfo.WLO_Code,
|
||||||
|
(CASE WHEN JointInfo.WLO_Code='F' THEN '现场安装' ELSE '预制' END) AS WLO_Name,--焊接区域
|
||||||
|
JOT_DoneDin,
|
||||||
|
IS_Compute,
|
||||||
|
com1.Com_Name AS Component1,--组件1号
|
||||||
|
com1.COM_Code AS COM_Code1,--组件1号
|
||||||
|
com2.COM_Name AS Component2,--组件2号
|
||||||
|
com2.COM_Code AS COM_Code2,--组件1号
|
||||||
|
m1.WeldName AS WeldMat,--焊条
|
||||||
|
WeldMaterial.WeldName AS WeldSilk,--焊丝
|
||||||
|
batchDetail.PointType AS JointStatus,---焊口状态
|
||||||
|
JOT_Dia,
|
||||||
|
JOT_Size,
|
||||||
|
JOT_Sch,
|
||||||
|
JOT_FactSch,
|
||||||
|
JOT_JointFlag,
|
||||||
|
JOT_TrustFlag,
|
||||||
|
ProessTypes,
|
||||||
|
JOT_JointDesc,
|
||||||
|
JointInfo.JOTY_ID,
|
||||||
|
JointType.JOTY_Name,--焊缝类型
|
||||||
|
JointType.JOTY_Code,--焊缝类型
|
||||||
|
JointInfo.WME_ID,
|
||||||
|
WeldMethod.WME_Name AS WME_Name,--焊接方法
|
||||||
|
WeldMethod.WME_Code,--焊接方法代码
|
||||||
|
SlopeType.JST_Name, --坡口类型
|
||||||
|
SlopeType.JST_Code, --坡口类型代码
|
||||||
|
IS_Proess,
|
||||||
|
(CASE WHEN IS_Proess=1 THEN '是' ELSE '否' END) AS IS_ProessName,
|
||||||
|
JOT_PrepareTemp,
|
||||||
|
JOT_CellTemp,
|
||||||
|
JOT_LastTemp,
|
||||||
|
JOT_JointAttribute,
|
||||||
|
JOT_Location,
|
||||||
|
batch.BatchCode AS BatchCode,--批次号
|
||||||
|
batchDetail.PointDate AS PointDate,--点口日期
|
||||||
|
NULL AS CH_TrustCode, NULL AS CH_TrustDate,
|
||||||
|
--NDTType.NDT_Name as NDT_Name,--探伤类型
|
||||||
|
JointInfo.JOT_Remark,
|
||||||
|
JointInfo.RT_States,
|
||||||
|
JointInfo.UT_States,
|
||||||
|
JointInfo.MT_States,
|
||||||
|
JointInfo.PT_States,
|
||||||
|
JointInfo.PAUT_States,
|
||||||
|
(case when (select top 1 IsOK from HJGL_CH_HotProessResult hr where hr.JOT_ID=JointInfo.JOT_ID)=1 then '合格'
|
||||||
|
else '' end) as HotProessResult,
|
||||||
|
Servicess.SER_Code,--介质代号
|
||||||
|
--NDTRate.NDTR_Name as NDTR_Name, --探伤比例
|
||||||
|
--NDTRate.NDTR_Code, --探伤比例
|
||||||
|
isoInfo.ISO_TestPress,--试验压力
|
||||||
|
isoInfo.ISO_DesignPress,--设计压力
|
||||||
|
isoInfo.ISO_DesignTemperature,--设计温度
|
||||||
|
IsoClass.ISC_IsoCode,--管线等级
|
||||||
|
is_hj= CAST((CASE WHEN JointInfo.DReportID IS NULL THEN '0' ELSE '1' END ) AS BIT), --是否焊接
|
||||||
|
if_dk=CAST((CASE WHEN batchDetail.NDT IS NULL THEN '0' ELSE '1' END) AS BIT), --是否点口
|
||||||
|
JointInfo.InstallationId,
|
||||||
|
JointInfo.NDTR_ID,
|
||||||
|
JointInfo.IsSpecial,
|
||||||
|
JointInfo.IsSpecial AS IsSpecialName, --是否特殊
|
||||||
|
Installation.InstallationName,--装置
|
||||||
|
NDTRate.NDTR_Name,
|
||||||
|
JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5
|
||||||
|
,JointType.JOTY_Group
|
||||||
|
FROM HJGL_PW_JointInfo AS JointInfo
|
||||||
|
LEFT JOIN HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID=JointInfo.ISO_ID
|
||||||
|
LEFT JOIN HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID=JointInfo.DReportID
|
||||||
|
LEFT JOIN HJGL_BS_Steel AS Steel ON Steel.STE_ID=JointInfo.STE_ID
|
||||||
|
LEFT JOIN HJGL_BS_Steel AS Steel1 ON Steel1.STE_ID=JointInfo.STE_ID2
|
||||||
|
LEFT JOIN HJGL_BS_Welder AS Welder ON Welder.WED_ID= JointInfo.JOT_CellWelder
|
||||||
|
LEFT JOIN HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=JointInfo.JOT_FloorWelder
|
||||||
|
--LEFT JOIN HJGL_BS_WeldLocation AS WeldLocation ON WeldLocation.WLO_Code =JointInfo.WLO_Code
|
||||||
|
LEFT JOIN HJGL_BS_Component AS com1 ON com1.COM_ID=JointInfo.JOT_Component1
|
||||||
|
LEFT JOIN HJGL_BS_Component AS com2 ON com2.COM_ID=JointInfo.JOT_Component2
|
||||||
|
--LEFT JOIN HJGL_BS_WeldMaterial m1 ON m1.WMT_ID=JointInfo.JOT_WeldMat
|
||||||
|
--LEFT JOIN HJGL_BS_WeldMaterial AS WeldMaterial ON WeldMaterial.WMT_ID=JointInfo.JOT_WeldSilk
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as m1 on m1.WeldId = JointInfo.JOT_WeldMat and m1.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as WeldMaterial on WeldMaterial.WeldId = JointInfo.JOT_WeldSilk and WeldMaterial.WeldTypeName like '%焊丝%'
|
||||||
|
LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=JointInfo.JOTY_ID
|
||||||
|
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod .WME_ID=JointInfo.WME_ID
|
||||||
|
LEFT JOIN HJGL_BS_SlopeType AS SlopeType ON SlopeType.JST_ID=JointInfo.JST_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BO_BatchDetail AS batchDetail ON batchDetail.JOT_ID = JointInfo.JOT_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BO_Batch AS batch ON batch.BatchId = batchDetail.BatchId
|
||||||
|
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=IsoInfo.BSU_ID
|
||||||
|
--left join HJGL_BS_NDTRate AS NDTRate on NDTRate.NDTR_ID=IsoInfo.NDTR_ID
|
||||||
|
LEFT JOIN HJGL_BS_Service AS Servicess ON Servicess.SER_ID=IsoInfo.SER_ID
|
||||||
|
LEFT JOIN HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID=IsoInfo.ISC_ID
|
||||||
|
LEFT JOIN Project_Installation AS Installation ON Installation.InstallationId =JointInfo.InstallationId
|
||||||
|
LEFT JOIN HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID =JointInfo.NDTR_ID
|
||||||
|
|
||||||
|
|
||||||
|
GO
|
||||||
|
|
||||||
|
|
||||||
|
ALTER VIEW [dbo].[HJGL_View_InspectionBatch]
|
||||||
|
AS
|
||||||
|
/**************检测批次样表***********************/
|
||||||
|
SELECT BatchDetail.BatchDetailId
|
||||||
|
,TrustItem.CH_TrustItemID
|
||||||
|
,Trust.ProjectId
|
||||||
|
,Project.ProjectCode --施工号
|
||||||
|
,Project.ProjectName
|
||||||
|
,NDTRate.NDTR_Name --对应检测比例
|
||||||
|
,(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
|
||||||
|
THEN Steel.STE_Code + '/' + Steel2.STE_Code
|
||||||
|
WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
|
||||||
|
ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code --材质
|
||||||
|
,'1-'+IsoClass.ISC_IsoName+'-'+Ser.SER_Code+'-'+Steel.STE_Code AS ISO_Code
|
||||||
|
,IsoInfo.ISO_IsoNo--管道编号
|
||||||
|
,JointInfo.JOT_JointNo --焊缝编号
|
||||||
|
,JointInfo.JOT_Dia --管线直径
|
||||||
|
,jointInfo.JOT_Sch --管线壁厚
|
||||||
|
,(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code --焊工号
|
||||||
|
,WeldReport.JOT_WeldDate --焊接日期
|
||||||
|
,JointInfo.JOT_Location --焊接位置
|
||||||
|
,WeldMethod.WME_Code --焊接方法
|
||||||
|
,CASE WHEN mat.WeldName IS NULL THEN ISNULL(silk.WeldName,'')
|
||||||
|
ELSE (CASE WHEN silk.WeldName IS NULL
|
||||||
|
THEN ISNULL(mat.WeldName,'')
|
||||||
|
ELSE (ISNULL(mat.WeldName,'') +'/'+ ISNULL(silk.WeldName,'')) END) END AS WMT_MatName
|
||||||
|
|
||||||
|
,(CASE WHEN BatchDetail.PointType = '2' THEN 'K' ELSE NULL END) PointType --扩拍号
|
||||||
|
,NDTTpye.NDT_Code --检测类型（RT、PT、UT、MT）
|
||||||
|
,Trust.CH_NDTMethod
|
||||||
|
,(CASE TrustItem.States WHEN '1' THEN '待检测' WHEN '2' THEN '检测合格' WHEN '3' THEN '待重检' WHEN '4' THEN '待返修' ELSE NULL END) AS TrustState --检测状态
|
||||||
|
,BatchDetail.ConfirmDate--确认时间
|
||||||
|
,Trust.CH_TrustDate --委托日期
|
||||||
|
,BatchDetail.VICheckDate --检验时间
|
||||||
|
,(CASE BatchDetail.IsVI WHEN 1 THEN '√' ELSE NULL END) AS IsVI --外观检验
|
||||||
|
,Batch.BatchCode --批次
|
||||||
|
,jointInfo.WeldL --非常规焊缝L(mm)
|
||||||
|
,Batch.BatchId
|
||||||
|
,(CASE WHEN (SELECT TOP 1 IsOK FROM dbo.HJGL_CH_HotProessResult a WHERE a.JOT_ID=BatchDetail.JOT_ID AND a.ProessTypes='4')=1 THEN '√'
|
||||||
|
WHEN (SELECT TOP 1 IsOK FROM dbo.HJGL_CH_HotProessResult a WHERE a.JOT_ID=BatchDetail.JOT_ID AND a.ProessTypes='5')=1 THEN '√'
|
||||||
|
ELSE '' END) AS IsHotProessResult --热处理合格
|
||||||
|
,(CASE WHEN (SELECT TOP 1 IsOK FROM dbo.HJGL_CH_HardTestResult a WHERE a.JOT_ID=BatchDetail.JOT_ID )=1 THEN '√'
|
||||||
|
ELSE '' END) AS IsHardTestResult --硬度合格
|
||||||
|
,BatchDetail.Checker --检验员
|
||||||
|
,JointInfo.ProessTypes--热处理类型
|
||||||
|
,(CASE WHEN (SELECT COUNT(*) FROM dbo.HJGL_CH_HotProessTrustItem a WHERE a.JOT_ID=BatchDetail.JOT_ID AND (a.ProessTypes='4' OR a.ProessTypes='5'))>0
|
||||||
|
THEN '√' ELSE '' END) AS IsHotProessTrustItem --热处理委托
|
||||||
|
,(SELECT TOP 1 RecordChartNo FROM dbo.HJGL_HotProessItem a WHERE a.JOT_ID=BatchDetail.JOT_ID) AS RecordChartNo --热处理报告编号
|
||||||
|
,(CASE WHEN (SELECT COUNT(*) FROM dbo.HJGL_CH_HardTestReportItem a WHERE a.JOT_ID=BatchDetail.JOT_ID)>0
|
||||||
|
THEN '√' ELSE '' END) AS IsHotHard --硬度委托
|
||||||
|
,(SELECT TOP 1 HardTestReportCode FROM dbo.HJGL_CH_HardTestReport WHERE HardTestReportId=(SELECT TOP 1 HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem b WHERE b.JOT_ID=BatchDetail.JOT_ID))
|
||||||
|
AS HotHardCode --硬度报告编号
|
||||||
|
,Iso.ISO_IsoNo AS RepairIsoNo --扩拍对应返修管线号
|
||||||
|
,Joint.JOT_JointNo AS RepairJointNo --扩拍对应返修焊口
|
||||||
|
,'' AS CHT_CheckCode --无损检测报告编号
|
||||||
|
,IsoInfo.PressureTestPackageNo --试压包
|
||||||
|
FROM dbo.HJGL_BO_BatchDetail AS BatchDetail
|
||||||
|
LEFT JOIN dbo.HJGL_CH_TrustItem AS TrustItem ON TrustItem.JOT_ID = BatchDetail.JOT_ID
|
||||||
|
LEFT JOIN dbo.HJGL_CH_Trust AS Trust ON Trust.CH_TrustID = TrustItem.CH_TrustID
|
||||||
|
LEFT JOIN DBO.HJGL_BO_Batch AS Batch ON Batch.BatchId = BatchDetail.BatchId
|
||||||
|
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Batch.ProjectId
|
||||||
|
LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = BatchDetail.JOT_ID
|
||||||
|
LEFT JOIN HJGL_BO_WeldReportMain AS WeldReport ON WeldReport.DReportID=JointInfo.DReportID
|
||||||
|
LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID
|
||||||
|
LEFT JOIN HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID =IsoInfo.ISC_ID
|
||||||
|
LEFT JOIN HJGL_BS_Service AS Ser ON Ser.SER_ID = IsoInfo.SER_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
|
||||||
|
LEFT JOIN DBO.HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID = Batch.NDTR_ID
|
||||||
|
LEFT JOIN DBO.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
|
||||||
|
LEFT JOIN DBO.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_NDTType AS NDTTpye ON NDTTpye.NDT_ID = Trust.CH_NDTMethod
|
||||||
|
LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
|
||||||
|
LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
|
||||||
|
LEFT JOIN DBO.HJGL_CH_HotProessResult AS HotProessResult ON HotProessResult.JOT_ID = BatchDetail.JOT_ID
|
||||||
|
LEFT JOIN DBO.HJGL_CH_HardTestResult AS HardTestResult ON HardTestResult.JOT_ID = BatchDetail.JOT_ID
|
||||||
|
LEFT JOIN DBO.HJGL_TP_TestPackage AS TestPackage ON TestPackage.PTP_ID = IsoInfo.PressureTestPackageNo
|
||||||
|
LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS RepairItemRecord ON RepairItemRecord.RepairItemRecordId = BatchDetail.ToRepairId
|
||||||
|
LEFT JOIN DBO.HJGL_PW_JointInfo AS Joint ON Joint.JOT_ID = RepairItemRecord.JOT_ID
|
||||||
|
LEFT JOIN DBO.HJGL_PW_IsoInfo AS Iso ON Iso.ISO_ID = Joint.ISO_ID
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as mat on mat.WeldId = JointInfo.JOT_WeldMat and mat.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as silk on silk.WeldId = JointInfo.JOT_WeldSilk and silk.WeldTypeName like '%焊丝%'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
GO
|
||||||
|
|
||||||
|
ALTER PROC [dbo].[HJGL_sp_StatisticsSampleTable]
|
||||||
|
@projectId NVARCHAR(50) = NULL,
|
||||||
|
@iso_isoNo VARCHAR(50) = NULL,
|
||||||
|
@isHotPress bit = NULL,
|
||||||
|
@Welded NVARCHAR(50) =NULL,
|
||||||
|
@ndtType NVARCHAR(10) = NULL,
|
||||||
|
@ndtResult NVARCHAR(20)=NULL
|
||||||
|
|
||||||
|
AS
|
||||||
|
/*********统计样表 佘春生修改于2022.11.30********/
|
||||||
|
SELECT
|
||||||
|
JointInfo.JOT_ID,
|
||||||
|
project.ProjectCode, --施工号
|
||||||
|
IsoInfo.PressureTestPackageNo,--试压包编号
|
||||||
|
IsoInfo.ISO_ID,
|
||||||
|
IsoInfo.ISO_IsoNo, --管线号
|
||||||
|
'1-'+IsoClass.ISC_IsoName+'-'+Ser.SER_Code+'-'+Steel.STE_Code AS ISO_Code, --管道编号
|
||||||
|
IsoClass.ISC_IsoName, --管道等级
|
||||||
|
Ser.SER_Name, --介质
|
||||||
|
IsoInfo.ISO_DesignPress, --设计压力
|
||||||
|
IsoInfo.PipeLineClass, --管道类别
|
||||||
|
JointInfo.JOT_JointNo, --焊缝编号
|
||||||
|
JointInfo.JOT_JointDesc, --焊缝规格
|
||||||
|
JointInfo.JOT_Location, --焊接位置
|
||||||
|
WeldMethod.WME_Name, --焊接方法
|
||||||
|
JointType.JOTY_Code, --焊缝类型
|
||||||
|
JointType.JOTY_Group,
|
||||||
|
Sort1,Sort2,Sort3,Sort4,Sort5,
|
||||||
|
IsoInfo.ISO_Insulator, --绝热类别
|
||||||
|
IsoInfo.ISO_DesignTemperature, --设计温度
|
||||||
|
IsoInfo.ISO_TestPress, --耐压试验
|
||||||
|
(CASE WHEN WeldMat.WeldName IS NOT NULL AND WeldSilk.WeldName IS NOT NULL and WeldMat.WeldName!=WeldSilk.WeldName
|
||||||
|
THEN WeldMat.WeldName + '/' + WeldSilk.WeldName
|
||||||
|
WHEN WeldMat.WeldName IS NOT NULL THEN WeldMat.WeldName
|
||||||
|
ELSE ISNULL(WeldSilk.WeldName,'') END) AS WeldMatSilkCode,
|
||||||
|
(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,
|
||||||
|
--Welder1.WED_Code,--焊工号
|
||||||
|
Steel.STE_Code,--材质
|
||||||
|
Steel.STE_Name,--材质类型
|
||||||
|
NDTRate.NDTR_Name,--对应检测比例
|
||||||
|
(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
|
||||||
|
ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --焊接日期
|
||||||
|
JointInfo.JOT_Size,--寸经
|
||||||
|
Batch.BatchCode,--批次
|
||||||
|
BatchDetail.NDT, --检测方式Id
|
||||||
|
(CASE WHEN BatchDetail.PointType=2 THEN 'K' ELSE '' END) AS PointType,--扩拍号
|
||||||
|
JointInfo.JOT_Dia,--直径
|
||||||
|
JointInfo.JOT_Sch, --壁厚
|
||||||
|
(CASE WHEN JointInfo.RT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS RTTrust, --RT委托
|
||||||
|
JointInfo.RT_TrustCode, --RT委托单编号
|
||||||
|
JointInfo.RT_TrustDate AS RTTrustDate, --射线检测委托日期
|
||||||
|
|
||||||
|
JointInfo.RTFeedbackDate, --射线检测反馈日期
|
||||||
|
JointInfo.RT_States AS RTTestResult,--RT检测结果
|
||||||
|
|
||||||
|
(CASE WHEN JointInfo.UT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS UTTrust,--UT委托
|
||||||
|
JointInfo.UT_States AS UTTestResult,--UT检测结果
|
||||||
|
|
||||||
|
(CASE WHEN JointInfo.MT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS MTTrust,--MT委托
|
||||||
|
JointInfo.MT_States AS MTTestResult,--MT检测结果
|
||||||
|
|
||||||
|
(CASE WHEN JointInfo.PT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS PTTrust,--PT委托
|
||||||
|
JointInfo.PT_TrustCode, --PT委托单编号
|
||||||
|
JointInfo.PT_TrustDate, --PT委托日期
|
||||||
|
JointInfo.PT_States AS PTTestResult,--PT检测结果
|
||||||
|
|
||||||
|
(CASE WHEN JointInfo.PAUT_TrustCode IS NOT NULL THEN '√' ELSE '' END) AS PAUTTrust, --PAUT委托
|
||||||
|
JointInfo.PAUT_TrustCode, --PAUT委托单编号
|
||||||
|
JointInfo.PAUT_TrustDate AS PAUTTrustDate, --PAUT检测委托日期
|
||||||
|
JointInfo.PAUT_States AS PAUTTestResult,--PAUT检测结果
|
||||||
|
|
||||||
|
(CASE WHEN (SELECT TOP 1 UnableCheck FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID )=1
|
||||||
|
THEN '√' ELSE '' END) AS UnableCheck,
|
||||||
|
(SELECT TOP 1 UnableCheckReason FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID ) AS UnableCheckReason,
|
||||||
|
|
||||||
|
(CASE WHEN JointInfo.ProessTypes like '%4|5%' Then '消应力热处理,稳定化处理'
|
||||||
|
WHEN JointInfo.ProessTypes like '%4%' Then '消应力热处理'
|
||||||
|
WHEN JointInfo.ProessTypes like '%5%' Then '稳定化处理'
|
||||||
|
ELSE '' END) AS ProessTypes,--热处理类型
|
||||||
|
(case when JointInfo.ProessTypes like '%4%' or JointInfo.ProessTypes like '%5%' then 'Y'
|
||||||
|
else 'N' end) as IS_Proess,
|
||||||
|
(case when JointInfo.ProessTypes like '%1%' then 'Y'
|
||||||
|
else '' end) as IS_Preheating,
|
||||||
|
(select top 1 HotProessTrustCode from HJGL_CH_HotProessTrust t left join HJGL_CH_HotProessTrustItem i on t.HotProessTrustId=i.HotProessTrustId where i.JOT_ID=JointInfo.JOT_ID order by TrustDate desc)
|
||||||
|
as HotProessTrustCode, --热处理委托编号
|
||||||
|
JointInfo.HotProessTrustDate,--热处理委托时间
|
||||||
|
(select top 1 HotStartDate from HJGL_HotProessItem hpi where hpi.JOT_ID=JointInfo.JOT_ID) as HotStartDate, --热处理开始时间
|
||||||
|
JointInfo.HotResultDate,--热处理反馈时间
|
||||||
|
(select top 1 HotHardCode from HJGL_CH_HardTestReport t left join HJGL_CH_HardTestReportItem i on t.HardTestReportId=i.HardTestReportId where i.JOT_ID=JointInfo.JOT_ID order by TestDate desc)
|
||||||
|
as HotHardCode, --硬度委托编号
|
||||||
|
JointInfo.HardTrustDate,--硬度委托时间
|
||||||
|
JointInfo.HardResultDate,--硬度反馈时间
|
||||||
|
(case when JointInfo.HardTestResultOK=1 then '合格' when JointInfo.HardTestResultOK=0 then '不合格' else '' end) as HardResult,--硬度检测结果
|
||||||
|
BatchDetail.BatchDetailId
|
||||||
|
FROM dbo.HJGL_PW_JointInfo AS JointInfo
|
||||||
|
LEFT JOIN DBO.HJGL_BO_BatchDetail AS BatchDetail ON JointInfo.JOT_ID = BatchDetail.JOT_ID
|
||||||
|
LEFT JOIN DBO.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID
|
||||||
|
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
|
||||||
|
LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=JointInfo.JOTY_ID
|
||||||
|
LEFT JOIN DBO.HJGL_BO_Batch AS Batch ON Batch.BatchId = BatchDetail.BatchId
|
||||||
|
LEFT JOIN dbo.Base_Project project ON project.ProjectId=JointInfo.ProjectId
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
|
||||||
|
LEFT JOIN DBO.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
|
||||||
|
LEFT JOIN DBO.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
|
||||||
|
LEFT JOIN DBO.HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID = JointInfo.DReportID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID = JointInfo.NDTR_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID =IsoInfo.ISC_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Service AS Ser ON Ser.SER_ID = IsoInfo.SER_ID
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = JointInfo.JOT_WeldMat and WeldMat.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = JointInfo.JOT_WeldSilk and WeldSilk.WeldTypeName like '%焊丝%'
|
||||||
|
|
||||||
|
|
||||||
|
WHERE (JointInfo.ProjectId=@projectId OR @projectId IS NULL)
|
||||||
|
AND ((CASE WHEN @ndtType='RT' THEN JointInfo.RT_TrustCode
|
||||||
|
WHEN @ndtType='PT' THEN JointInfo.PT_TrustCode
|
||||||
|
WHEN @ndtType='MT' THEN JointInfo.MT_TrustCode
|
||||||
|
WHEN @ndtType='UT' THEN JointInfo.UT_TrustCode
|
||||||
|
WHEN @ndtType='PAUT' THEN JointInfo.PAUT_TrustCode END) IS NOT NULL OR @ndtType IS NULL)
|
||||||
|
AND ((CASE WHEN @ndtType='RT' AND @ndtResult IS NOT NULL THEN JointInfo.RT_States
|
||||||
|
WHEN @ndtType='PT' AND @ndtResult IS NOT NULL THEN JointInfo.PT_States
|
||||||
|
WHEN @ndtType='MT' AND @ndtResult IS NOT NULL THEN JointInfo.MT_States
|
||||||
|
WHEN @ndtType='UT' AND @ndtResult IS NOT NULL THEN JointInfo.UT_States
|
||||||
|
WHEN @ndtType='PAUT' AND @ndtResult IS NOT NULL THEN JointInfo.PAUT_States END) =@ndtResult OR @ndtResult IS NULL)
|
||||||
|
AND ((case when JointInfo.DReportID IS NOT NULL then '1' else '2' end)=@Welded OR @Welded IS NULL)
|
||||||
|
AND (IsoInfo.ISO_IsoNo =@iso_isoNo OR @iso_isoNo IS NULL)
|
||||||
|
AND (((SELECT TOP 1 TrustDate from dbo.HJGL_CH_HotProessTrustItem a
|
||||||
|
WHERE a.JOT_ID=BatchDetail.JOT_ID and (a.ProessTypes='4' OR a.ProessTypes='5')) IS NOT NULL
|
||||||
|
AND @isHotPress=1) OR @isHotPress IS NULL)
|
||||||
|
ORDER BY project.ProjectCode,IsoInfo.ISO_IsoNo,JointInfo.JOT_JointNo
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
GO
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ALTER PROCEDURE [dbo].[HJGL_spJointWorkRecordNew]
|
||||||
|
(
|
||||||
|
@IsoId varchar(50),
|
||||||
|
@Flag CHAR(1)
|
||||||
|
)
|
||||||
|
AS
|
||||||
|
/*管道焊接工作记录查询（新） 存储过程 */
|
||||||
|
IF(@Flag='1')
|
||||||
|
BEGIN
|
||||||
|
SELECT v.* FROM
|
||||||
|
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
|
||||||
|
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--焊工号
|
||||||
|
isoInfo.ISO_IsoNo
|
||||||
|
,j.JOT_JointNo
|
||||||
|
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
|
||||||
|
,j.JOT_JointDesc
|
||||||
|
,(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
|
||||||
|
THEN Steel.STE_Code + '/' + Steel2.STE_Code
|
||||||
|
WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
|
||||||
|
ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code --材质
|
||||||
|
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
|
||||||
|
,j.JOT_Location as weldLocal
|
||||||
|
,weldMethod.WME_Name,
|
||||||
|
CASE WHEN weldMaterial.WeldName IS NULL THEN ISNULL(weldMaterial1.WeldName,'')
|
||||||
|
ELSE (CASE WHEN weldMaterial1.WeldName IS NULL
|
||||||
|
THEN ISNULL(weldMaterial.WeldName,'')
|
||||||
|
ELSE (ISNULL(weldMaterial1.WeldName,'') +'/'+ ISNULL(weldMaterial.WeldName,'')) END) END AS WMT_MatName
|
||||||
|
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
|
||||||
|
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
|
||||||
|
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
|
||||||
|
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
|
||||||
|
,'' as NDTT_CheckCode
|
||||||
|
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
|
||||||
|
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
|
||||||
|
,j.ISO_ID
|
||||||
|
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
|
||||||
|
from dbo.HJGL_pw_jointinfo j
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
|
||||||
|
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
|
||||||
|
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
|
||||||
|
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial on weldMaterial.WeldId = j.JOT_WeldMat and weldMaterial.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial1 on weldMaterial1.WeldId = j.JOT_WeldSilk and weldMaterial1.WeldTypeName like '%焊丝%'
|
||||||
|
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
|
||||||
|
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
|
||||||
|
where (j.DReportID is not null and j.DReportID !='')
|
||||||
|
and j.ISO_ID=@IsoId) v
|
||||||
|
WHERE v.Number<=11
|
||||||
|
END
|
||||||
|
|
||||||
|
else IF(@Flag='2')
|
||||||
|
BEGIN
|
||||||
|
SELECT v.* FROM
|
||||||
|
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
|
||||||
|
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--焊工号
|
||||||
|
isoInfo.ISO_IsoNo
|
||||||
|
,j.JOT_JointNo
|
||||||
|
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
|
||||||
|
,j.JOT_JointDesc
|
||||||
|
,(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
|
||||||
|
THEN Steel.STE_Code + '/' + Steel2.STE_Code
|
||||||
|
WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
|
||||||
|
ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code --材质
|
||||||
|
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
|
||||||
|
,j.JOT_Location as weldLocal
|
||||||
|
,weldMethod.WME_Name,
|
||||||
|
CASE WHEN weldMaterial.WeldName IS NULL THEN ISNULL(weldMaterial1.WeldName,'')
|
||||||
|
ELSE (CASE WHEN weldMaterial1.WeldName IS NULL
|
||||||
|
THEN ISNULL(weldMaterial.WeldName,'')
|
||||||
|
ELSE (ISNULL(weldMaterial1.WeldName,'') +'/'+ ISNULL(weldMaterial.WeldName,'')) END) END AS WMT_MatName
|
||||||
|
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
|
||||||
|
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
|
||||||
|
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
|
||||||
|
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
|
||||||
|
,'' as NDTT_CheckCode
|
||||||
|
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
|
||||||
|
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
|
||||||
|
,j.ISO_ID
|
||||||
|
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
|
||||||
|
from dbo.HJGL_pw_jointinfo j
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
|
||||||
|
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
|
||||||
|
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
|
||||||
|
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial on weldMaterial.WeldId = j.JOT_WeldMat and weldMaterial.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial1 on weldMaterial1.WeldId = j.JOT_WeldSilk and weldMaterial1.WeldTypeName like '%焊丝%'
|
||||||
|
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
|
||||||
|
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
|
||||||
|
where (j.DReportID is not null and j.DReportID !='')
|
||||||
|
and j.ISO_ID=@IsoId) v
|
||||||
|
WHERE v.Number>11
|
||||||
|
END
|
||||||
|
|
||||||
|
ELSE
|
||||||
|
BEGIN
|
||||||
|
SELECT v.* FROM
|
||||||
|
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
|
||||||
|
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--焊工号
|
||||||
|
isoInfo.ISO_IsoNo
|
||||||
|
,j.JOT_JointNo
|
||||||
|
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
|
||||||
|
,j.JOT_JointDesc
|
||||||
|
,(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
|
||||||
|
THEN Steel.STE_Code + '/' + Steel2.STE_Code
|
||||||
|
WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
|
||||||
|
ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code --材质
|
||||||
|
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
|
||||||
|
,j.JOT_Location as weldLocal
|
||||||
|
,weldMethod.WME_Name,
|
||||||
|
CASE WHEN weldMaterial.WeldName IS NULL THEN ISNULL(weldMaterial1.WeldName,'')
|
||||||
|
ELSE (CASE WHEN weldMaterial1.WeldName IS NULL
|
||||||
|
THEN ISNULL(weldMaterial.WeldName,'')
|
||||||
|
ELSE (ISNULL(weldMaterial1.WeldName,'') +'/'+ ISNULL(weldMaterial.WeldName,'')) END) END AS WMT_MatName
|
||||||
|
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
|
||||||
|
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
|
||||||
|
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
|
||||||
|
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
|
||||||
|
,'' as NDTT_CheckCode
|
||||||
|
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
|
||||||
|
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
|
||||||
|
,j.ISO_ID
|
||||||
|
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
|
||||||
|
from dbo.HJGL_pw_jointinfo j
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
|
||||||
|
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
|
||||||
|
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
|
||||||
|
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
|
||||||
|
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial on weldMaterial.WeldId = j.JOT_WeldMat and weldMaterial.WeldTypeName like '%焊条%'
|
||||||
|
LEFT JOIN View_WeldInfoDropDownLists as weldMaterial1 on weldMaterial1.WeldId = j.JOT_WeldSilk and weldMaterial1.WeldTypeName like '%焊丝%'
|
||||||
|
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
|
||||||
|
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
|
||||||
|
where (j.DReportID is not null and j.DReportID !='')
|
||||||
|
and j.ISO_ID=@IsoId) v
|
||||||
|
|
||||||
|
order by v.JOTY_Group,v.Sort1,v.Sort2,v.Sort3,v.Sort4,v.Sort5
|
||||||
|
END
|
||||||
|
|
||||||
|
|
||||||
|
GO
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- SELECT * FROM View_WeldInfoDropDownLists WHERE WeldName='CHE422R'
|
||||||
|
|
||||||
|
|
||||||
|
--select distinct JOT_WeldSilk,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo
|
||||||
|
--left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldSilk = HJGL_BS_WeldMaterial.WMT_ID
|
||||||
|
----where HJGL_BS_WeldMaterial.WMT_MatCode not in (select WeldName from Weld_WeldInfo)
|
||||||
|
|
||||||
|
--select distinct JOT_WeldMat,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo
|
||||||
|
--left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldMat = HJGL_BS_WeldMaterial.WMT_ID
|
||||||
@@ -221,20 +221,20 @@ namespace BLL
|
|||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(item.JOT_WeldMat))
|
if (!string.IsNullOrEmpty(item.JOT_WeldMat))
|
||||||
{
|
{
|
||||||
var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat);
|
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId==item.JOT_WeldMat select x).FirstOrDefault();
|
||||||
if (weldMat!=null)
|
if (weldMat != null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldMat = weldMat.WMT_ID;
|
newWeldReportItem.JOT_WeldMat = weldMat.WeldId;
|
||||||
newWeldReportItem.WeldMatCode = weldMat.WMT_MatCode;
|
newWeldReportItem.WeldMatCode = weldMat.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(item.JOT_WeldSilk))
|
if (!string.IsNullOrEmpty(item.JOT_WeldSilk))
|
||||||
{
|
{
|
||||||
var weldSilk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk);
|
var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId == item.JOT_WeldSilk select x).FirstOrDefault();
|
||||||
if (weldSilk!=null)
|
if (weldSilk!=null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldSilk = weldSilk.WMT_ID;
|
newWeldReportItem.JOT_WeldSilk = weldSilk.WeldId;
|
||||||
newWeldReportItem.WeldSilkCode = weldSilk.WMT_MatCode;
|
newWeldReportItem.WeldSilkCode = weldSilk.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
returnViewMatch.Add(newWeldReportItem);
|
returnViewMatch.Add(newWeldReportItem);
|
||||||
@@ -383,20 +383,32 @@ namespace BLL
|
|||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(jotInfo.JOT_WeldMat))
|
if (!string.IsNullOrEmpty(jotInfo.JOT_WeldMat))
|
||||||
{
|
{
|
||||||
var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(jotInfo.JOT_WeldMat);
|
//var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(jotInfo.JOT_WeldMat);
|
||||||
|
//if (weldMat != null)
|
||||||
|
//{
|
||||||
|
// newWeldReportItem.JOT_WeldMat = weldMat.WMT_ID;
|
||||||
|
// newWeldReportItem.WeldMatCode = weldMat.WMT_MatCode;
|
||||||
|
//}
|
||||||
|
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId == jotInfo.JOT_WeldMat select x).FirstOrDefault();
|
||||||
if (weldMat != null)
|
if (weldMat != null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldMat = weldMat.WMT_ID;
|
newWeldReportItem.JOT_WeldMat = weldMat.WeldId;
|
||||||
newWeldReportItem.WeldMatCode = weldMat.WMT_MatCode;
|
newWeldReportItem.WeldMatCode = weldMat.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(jotInfo.JOT_WeldSilk))
|
if (!string.IsNullOrEmpty(jotInfo.JOT_WeldSilk))
|
||||||
{
|
{
|
||||||
var weldSilk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(jotInfo.JOT_WeldSilk);
|
//var weldSilk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(jotInfo.JOT_WeldSilk);
|
||||||
|
//if (weldSilk != null)
|
||||||
|
//{
|
||||||
|
// newWeldReportItem.JOT_WeldSilk = weldSilk.WMT_ID;
|
||||||
|
// newWeldReportItem.WeldSilkCode = weldSilk.WMT_MatCode;
|
||||||
|
//}
|
||||||
|
var weldSilk = Funs.DB.View_WeldInfoDropDownLists.FirstOrDefault(x => x.WeldId == jotInfo.JOT_WeldSilk);
|
||||||
if (weldSilk != null)
|
if (weldSilk != null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldSilk = weldSilk.WMT_ID;
|
newWeldReportItem.JOT_WeldSilk = weldSilk.WeldId;
|
||||||
newWeldReportItem.WeldSilkCode = weldSilk.WMT_MatCode;
|
newWeldReportItem.WeldSilkCode = weldSilk.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
returnViewMatch.Add(newWeldReportItem);
|
returnViewMatch.Add(newWeldReportItem);
|
||||||
@@ -462,18 +474,18 @@ namespace BLL
|
|||||||
newWeldReportItem.JOT_Sch = item.JOT_Sch; //壁厚
|
newWeldReportItem.JOT_Sch = item.JOT_Sch; //壁厚
|
||||||
if (!string.IsNullOrEmpty(item.JOT_WeldMat))//焊条
|
if (!string.IsNullOrEmpty(item.JOT_WeldMat))//焊条
|
||||||
{
|
{
|
||||||
var WeldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat);
|
var WeldMat = Funs.DB.View_WeldInfoDropDownLists.FirstOrDefault(e => e.WeldId == item.JOT_WeldMat); //BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat);
|
||||||
if (WeldMat != null)
|
if (WeldMat != null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldMat = WeldMat.WMT_MatCode;
|
newWeldReportItem.JOT_WeldMat = WeldMat.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(item.JOT_WeldSilk))//焊丝
|
if (!string.IsNullOrEmpty(item.JOT_WeldSilk))//焊丝
|
||||||
{
|
{
|
||||||
var WeldSilk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk);
|
var WeldSilk = Funs.DB.View_WeldInfoDropDownLists.FirstOrDefault(e => e.WeldId == item.JOT_WeldSilk);// BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk);
|
||||||
if (WeldSilk != null)
|
if (WeldSilk != null)
|
||||||
{
|
{
|
||||||
newWeldReportItem.JOT_WeldSilk = WeldSilk.WMT_MatCode;
|
newWeldReportItem.JOT_WeldSilk = WeldSilk.WeldName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(item.WME_ID))//焊接方法
|
if (!string.IsNullOrEmpty(item.WME_ID))//焊接方法
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
<IISExpressAnonymousAuthentication />
|
<IISExpressAnonymousAuthentication />
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
var slopeTypes = from x in db.HJGL_BS_SlopeType select x;
|
var slopeTypes = from x in db.HJGL_BS_SlopeType select x;
|
||||||
var weldMethods = from x in db.HJGL_BS_WeldMethod select x;
|
var weldMethods = from x in db.HJGL_BS_WeldMethod select x;
|
||||||
var components = from x in db.HJGL_BS_Component select x;
|
var components = from x in db.HJGL_BS_Component select x;
|
||||||
var weldMaterials = from x in db.HJGL_BS_WeldMaterial select x;
|
var weldMaterials = from x in db.View_WeldInfoDropDownLists select x; //from x in db.HJGL_BS_WeldMaterial select x;
|
||||||
var NDTRates = from x in db.HJGL_BS_NDTRate select x;
|
var NDTRates = from x in db.HJGL_BS_NDTRate select x;
|
||||||
var ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
|
var ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
|
||||||
List<string> joints = new List<string>();
|
List<string> joints = new List<string>();
|
||||||
@@ -313,8 +313,8 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
var getWeldMethod = weldMethods.FirstOrDefault(x => x.WME_Name == col9);//焊接方法
|
var getWeldMethod = weldMethods.FirstOrDefault(x => x.WME_Name == col9);//焊接方法
|
||||||
var getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
|
var getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
|
||||||
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
|
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
|
||||||
var getWeldSilk = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "1" && x.WMT_MatCode == col19);//焊丝
|
var getWeldSilk = weldMaterials.FirstOrDefault(x => x.WeldTypeName.Contains("焊丝") && x.WeldName == col19); //weldMaterials.FirstOrDefault(x => x.WMT_MatType == "1" && x.WMT_MatCode == col19);//焊丝
|
||||||
var getWeldMat = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "2" && x.WMT_MatCode == col20);//焊条
|
var getWeldMat = weldMaterials.FirstOrDefault(x => x.WeldTypeName.Contains("焊条") && x.WeldName == col20); //weldMaterials.FirstOrDefault(x => x.WMT_MatType == "2" && x.WMT_MatCode == col20);//焊条
|
||||||
var getNDTRate = NDTRates.FirstOrDefault(x => x.NDTR_Name == col26);//探伤比例
|
var getNDTRate = NDTRates.FirstOrDefault(x => x.NDTR_Name == col26);//探伤比例
|
||||||
var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col27);//合格等级
|
var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col27);//合格等级
|
||||||
if (string.IsNullOrEmpty(col2))
|
if (string.IsNullOrEmpty(col2))
|
||||||
@@ -682,7 +682,7 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
var slopeTypes = from x in db.HJGL_BS_SlopeType select x;
|
var slopeTypes = from x in db.HJGL_BS_SlopeType select x;
|
||||||
var weldMethods = from x in db.HJGL_BS_WeldMethod select x;
|
var weldMethods = from x in db.HJGL_BS_WeldMethod select x;
|
||||||
var components = from x in db.HJGL_BS_Component select x;
|
var components = from x in db.HJGL_BS_Component select x;
|
||||||
var weldMaterials = from x in db.HJGL_BS_WeldMaterial select x;
|
var weldMaterials = from x in db.View_WeldInfoDropDownLists select x; //from x in db.HJGL_BS_WeldMaterial select x;
|
||||||
var NDTRates = from x in db.HJGL_BS_NDTRate select x;
|
var NDTRates = from x in db.HJGL_BS_NDTRate select x;
|
||||||
var ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
|
var ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
|
||||||
var jointInfos = from x in db.HJGL_PW_JointInfo select x;
|
var jointInfos = from x in db.HJGL_PW_JointInfo select x;
|
||||||
@@ -739,8 +739,8 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
var getWeldMethod = weldMethods.FirstOrDefault(x => x.WME_Name == col9);//焊接方法
|
var getWeldMethod = weldMethods.FirstOrDefault(x => x.WME_Name == col9);//焊接方法
|
||||||
var getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
|
var getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
|
||||||
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
|
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
|
||||||
var getWeldSilk = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "1" && x.WMT_MatCode == col19);//焊丝
|
var getWeldSilk = weldMaterials.FirstOrDefault(x => x.WeldTypeName.Contains("焊丝") && x.WeldName == col19); //weldMaterials.FirstOrDefault(x => x.WMT_MatType == "1" && x.WMT_MatCode == col19);//焊丝
|
||||||
var getWeldMat = weldMaterials.FirstOrDefault(x => x.WMT_MatType == "2" && x.WMT_MatCode == col20);//焊条
|
var getWeldMat = weldMaterials.FirstOrDefault(x => x.WeldTypeName.Contains("焊条") && x.WeldName == col20); //weldMaterials.FirstOrDefault(x => x.WMT_MatType == "2" && x.WMT_MatCode == col20);//焊条
|
||||||
var getNDTRate = NDTRates.FirstOrDefault(x => x.NDTR_Name == col26);//探伤比例
|
var getNDTRate = NDTRates.FirstOrDefault(x => x.NDTR_Name == col26);//探伤比例
|
||||||
var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col28);//合格等级
|
var getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col28);//合格等级
|
||||||
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
|
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
|
||||||
@@ -849,11 +849,11 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
}
|
}
|
||||||
if (getWeldSilk != null)
|
if (getWeldSilk != null)
|
||||||
{
|
{
|
||||||
newJointInfo.JOT_WeldSilk = getWeldSilk.WMT_ID;
|
newJointInfo.JOT_WeldSilk = getWeldSilk.WeldId; //getWeldSilk.WMT_ID;
|
||||||
}
|
}
|
||||||
if (getWeldMat != null)
|
if (getWeldMat != null)
|
||||||
{
|
{
|
||||||
newJointInfo.JOT_WeldMat = getWeldMat.WMT_ID;
|
newJointInfo.JOT_WeldMat = getWeldSilk.WeldId; //getWeldMat.WMT_ID;
|
||||||
}
|
}
|
||||||
newJointInfo.JOT_Electricity = col21;
|
newJointInfo.JOT_Electricity = col21;
|
||||||
newJointInfo.JOT_Voltage = col22;
|
newJointInfo.JOT_Voltage = col22;
|
||||||
|
|||||||
@@ -139,16 +139,20 @@
|
|||||||
Funs.FineUIPleaseSelect(this.ddlComponent2);
|
Funs.FineUIPleaseSelect(this.ddlComponent2);
|
||||||
|
|
||||||
///焊丝
|
///焊丝
|
||||||
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
|
this.ddlWeldSilk.DataTextField = "WeldName";
|
||||||
this.ddlWeldSilk.DataValueField = "WMT_ID";
|
this.ddlWeldSilk.DataValueField = "WeldId";
|
||||||
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
|
this.ddlWeldSilk.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
|
||||||
|
where x.WeldTypeName.Contains("焊丝")
|
||||||
|
select x; // BLL.HJGL_ConsumablesService.GetMaterialList("1");
|
||||||
this.ddlWeldSilk.DataBind();
|
this.ddlWeldSilk.DataBind();
|
||||||
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
|
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
|
||||||
|
|
||||||
///焊条
|
///焊条
|
||||||
this.ddlWeldMat.DataTextField = "WMT_MatCode";
|
this.ddlWeldMat.DataTextField = "WeldName";
|
||||||
this.ddlWeldMat.DataValueField = "WMT_ID";
|
this.ddlWeldMat.DataValueField = "WeldId";
|
||||||
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
|
this.ddlWeldMat.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
|
||||||
|
where x.WeldTypeName.Contains("焊条")
|
||||||
|
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("2");
|
||||||
this.ddlWeldMat.DataBind();
|
this.ddlWeldMat.DataBind();
|
||||||
Funs.FineUIPleaseSelect(this.ddlWeldMat);
|
Funs.FineUIPleaseSelect(this.ddlWeldMat);
|
||||||
|
|
||||||
|
|||||||
@@ -184,8 +184,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
CellWelder.WED_Code AS CellWelderCode,
|
CellWelder.WED_Code AS CellWelderCode,
|
||||||
FloorWelder.WED_Code AS FloorWelderCode,
|
FloorWelder.WED_Code AS FloorWelderCode,
|
||||||
WeldMethod.WME_Name AS WeldMethod,
|
WeldMethod.WME_Name AS WeldMethod,
|
||||||
WeldMaterial.WMT_MatName AS WeldMat,
|
m1.WeldName AS WeldMat,
|
||||||
WeldMaterial2.WMT_MatName AS WeldSilk,
|
WeldMaterial.WeldName AS WeldSilk,
|
||||||
User1.UserName AS WelderHardManName,
|
User1.UserName AS WelderHardManName,
|
||||||
User2.UserName AS AuditManName
|
User2.UserName AS AuditManName
|
||||||
FROM dbo.HJGL_BO_PreWeldReportMain AS PreWeld
|
FROM dbo.HJGL_BO_PreWeldReportMain AS PreWeld
|
||||||
@@ -195,8 +195,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=PreWeld.JOT_CellWelderID
|
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=PreWeld.JOT_CellWelderID
|
||||||
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=PreWeld.JOT_FloorWelderID
|
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=PreWeld.JOT_FloorWelderID
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=PreWeld.WME_ID
|
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=PreWeld.WME_ID
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMaterial AS WeldMaterial ON WeldMaterial.WMT_ID=PreWeld.JOT_WeldMat
|
LEFT JOIN View_WeldInfoDropDownLists as m1 on m1.WeldId = JointInfo.JOT_WeldMat and m1.WeldTypeName like '%焊条%'
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMaterial AS WeldMaterial2 ON WeldMaterial2.WMT_ID=PreWeld.JOT_WeldSilk
|
LEFT JOIN View_WeldInfoDropDownLists as WeldMaterial on WeldMaterial.WeldId = JointInfo.JOT_WeldSilk and WeldMaterial.WeldTypeName like '%焊丝%'
|
||||||
LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId=PreWeld.WelderHardMan
|
LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId=PreWeld.WelderHardMan
|
||||||
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = PreWeld.AuditMan
|
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = PreWeld.AuditMan
|
||||||
WHERE iso.ISO_ID=@ISO_ID";
|
WHERE iso.ISO_ID=@ISO_ID";
|
||||||
|
|||||||
@@ -263,15 +263,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
CellWelder.WED_Code AS JOT_CellWelderCode,FloorWelder.WED_Code AS JOT_FloorWelderCode,
|
CellWelder.WED_Code AS JOT_CellWelderCode,FloorWelder.WED_Code AS JOT_FloorWelderCode,
|
||||||
(CASE WHEN JointInfo.WLO_Code ='F' THEN '安装' ELSE '预制' END) AS WLO_CodeName,
|
(CASE WHEN JointInfo.WLO_Code ='F' THEN '安装' ELSE '预制' END) AS WLO_CodeName,
|
||||||
JointInfo.JOT_JointAttribute,JointInfo.JOT_Location,JointInfo.JOT_Size,JointInfo.JOT_DoneDin,
|
JointInfo.JOT_JointAttribute,JointInfo.JOT_Location,JointInfo.JOT_Size,JointInfo.JOT_DoneDin,
|
||||||
JointInfo.JOT_Dia,JointInfo.JOT_Sch,WeldMethod.WME_Name,WeldMat.WMT_MatCode AS WeldMatCode,WeldSilk.WMT_MatCode AS WeldSilkCode
|
JointInfo.JOT_Dia,JointInfo.JOT_Sch,WeldMethod.WME_Name,WeldMat.WeldName AS WeldMatCode,WeldSilk.WeldName AS WeldSilkCode
|
||||||
FROM HJGL_PW_JointInfo AS JointInfo
|
FROM HJGL_PW_JointInfo AS JointInfo
|
||||||
LEFT JOIN HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID =IsoInfo.ISO_ID
|
LEFT JOIN HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID =IsoInfo.ISO_ID
|
||||||
LEFT JOIN HJGL_BS_NDTRate AS NDTRate ON JointInfo.NDTR_ID =NDTRate.NDTR_ID
|
LEFT JOIN HJGL_BS_NDTRate AS NDTRate ON JointInfo.NDTR_ID =NDTRate.NDTR_ID
|
||||||
LEFT JOIN HJGL_BS_Welder AS CellWelder ON JointInfo.JOT_CellWelder =CellWelder.WED_ID
|
LEFT JOIN HJGL_BS_Welder AS CellWelder ON JointInfo.JOT_CellWelder =CellWelder.WED_ID
|
||||||
LEFT JOIN HJGL_BS_Welder AS FloorWelder ON JointInfo.JOT_FloorWelder =FloorWelder.WED_ID
|
LEFT JOIN HJGL_BS_Welder AS FloorWelder ON JointInfo.JOT_FloorWelder =FloorWelder.WED_ID
|
||||||
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
|
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
|
||||||
LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=JointInfo.JOT_WeldMat
|
LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = JointInfo.JOT_WeldMat and WeldMat.WeldTypeName like '%焊条%'
|
||||||
LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=JointInfo.JOT_WeldSilk
|
LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = JointInfo.JOT_WeldSilk and WeldSilk.WeldTypeName like '%焊丝%'
|
||||||
WHERE JointInfo.DReportID=@DReportID";
|
WHERE JointInfo.DReportID=@DReportID";
|
||||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
//listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
|
//listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
|
||||||
|
|||||||
@@ -69,15 +69,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
this.ddlWME_ID.DataSource = BLL.HJGL_WeldingMethodService.GetWeldMethodNameList();
|
this.ddlWME_ID.DataSource = BLL.HJGL_WeldingMethodService.GetWeldMethodNameList();
|
||||||
this.ddlWME_ID.DataBind();
|
this.ddlWME_ID.DataBind();
|
||||||
///焊条
|
///焊条
|
||||||
this.ddlWeldMat.DataTextField = "WMT_MatCode";
|
this.ddlWeldMat.DataTextField = "WeldName";
|
||||||
this.ddlWeldMat.DataValueField = "WMT_MatCode";
|
this.ddlWeldMat.DataValueField = "WeldName";
|
||||||
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
|
this.ddlWeldMat.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
|
||||||
|
where x.WeldTypeName.Contains("焊条")
|
||||||
|
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("2");
|
||||||
this.ddlWeldMat.DataBind();
|
this.ddlWeldMat.DataBind();
|
||||||
Funs.FineUIPleaseSelect(this.ddlWeldMat);
|
Funs.FineUIPleaseSelect(this.ddlWeldMat);
|
||||||
///焊丝
|
///焊丝
|
||||||
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
|
this.ddlWeldSilk.DataTextField = "WeldName";
|
||||||
this.ddlWeldSilk.DataValueField = "WMT_MatCode";
|
this.ddlWeldSilk.DataValueField = "WeldName";
|
||||||
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
|
this.ddlWeldSilk.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
|
||||||
|
where x.WeldTypeName.Contains("焊丝")
|
||||||
|
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("1");
|
||||||
this.ddlWeldSilk.DataBind();
|
this.ddlWeldSilk.DataBind();
|
||||||
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
|
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
|
||||||
|
|
||||||
@@ -1241,11 +1245,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
item.WME_Name = weldingMethod.WME_Name;
|
item.WME_Name = weldingMethod.WME_Name;
|
||||||
item.WME_ID = weldingMethod.WME_ID;
|
item.WME_ID = weldingMethod.WME_ID;
|
||||||
}
|
}
|
||||||
var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
|
//var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
|
||||||
|
//if (weldMat != null)
|
||||||
|
//{
|
||||||
|
// item.JOT_WeldMat = weldMat.WMT_ID;
|
||||||
|
// item.WeldMatCode = weldMat.WMT_MatCode;
|
||||||
|
//}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// item.JOT_WeldMat = null;
|
||||||
|
// item.WeldMatCode = null;
|
||||||
|
//}
|
||||||
|
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
|
||||||
if (weldMat != null)
|
if (weldMat != null)
|
||||||
{
|
{
|
||||||
item.JOT_WeldMat = weldMat.WMT_ID;
|
item.JOT_WeldMat = weldMat.WeldId;
|
||||||
item.WeldMatCode = weldMat.WMT_MatCode;
|
item.WeldMatCode = weldMat.WeldName;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1253,11 +1268,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
item.WeldMatCode = null;
|
item.WeldMatCode = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
|
//var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
|
||||||
|
//if (weldSilk != null)
|
||||||
|
//{
|
||||||
|
// item.JOT_WeldSilk = weldSilk.WMT_ID;
|
||||||
|
// item.WeldSilkCode = weldSilk.WMT_MatCode;
|
||||||
|
//}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// item.JOT_WeldSilk = null;
|
||||||
|
// item.WeldSilkCode = null;
|
||||||
|
//}
|
||||||
|
var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
|
||||||
if (weldSilk != null)
|
if (weldSilk != null)
|
||||||
{
|
{
|
||||||
item.JOT_WeldSilk = weldSilk.WMT_ID;
|
item.JOT_WeldSilk = weldSilk.WeldId;
|
||||||
item.WeldSilkCode = weldSilk.WMT_MatCode;
|
item.WeldSilkCode = weldSilk.WeldName;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -212,7 +212,7 @@
|
|||||||
//List<Model.HJGL_SpRpWeldReportItem> toDoMatterList = BLL.HJGL_WeldReportService.GetWeldReportItemFind(this.ProjectId, this.DReportID, isoId);
|
//List<Model.HJGL_SpRpWeldReportItem> toDoMatterList = BLL.HJGL_WeldReportService.GetWeldReportItemFind(this.ProjectId, this.DReportID, isoId);
|
||||||
string strSql = @"SELECT jot.JOT_ID,jot.JOT_JointNo,jot.JOT_JointAttribute,jot.InstallationId,ins.InstallationName,jot.STE_ID,
|
string strSql = @"SELECT jot.JOT_ID,jot.JOT_JointNo,jot.JOT_JointAttribute,jot.InstallationId,ins.InstallationName,jot.STE_ID,
|
||||||
(CASE WHEN jot.STE_ID!=jot.STE_ID2 THEN ste1.STE_Code+'/'+ste2.STE_Code ELSE ste1.STE_Code END) AS STE_Code,
|
(CASE WHEN jot.STE_ID!=jot.STE_ID2 THEN ste1.STE_Code+'/'+ste2.STE_Code ELSE ste1.STE_Code END) AS STE_Code,
|
||||||
jot.JOT_Dia,jot.JOT_Sch,mat.WMT_MatCode AS JOT_WeldMat,silk.WMT_MatCode AS JOT_WeldSilk,
|
jot.JOT_Dia,jot.JOT_Sch,mat.WeldName AS JOT_WeldMat,silk.WeldName AS JOT_WeldSilk,
|
||||||
method.WME_Code AS WME_Name,jot.IS_Proess,jot.ProessTypes
|
method.WME_Code AS WME_Name,jot.IS_Proess,jot.ProessTypes
|
||||||
FROM dbo.HJGL_PW_JointInfo jot
|
FROM dbo.HJGL_PW_JointInfo jot
|
||||||
LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = jot.ISO_ID
|
LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = jot.ISO_ID
|
||||||
@@ -220,8 +220,8 @@
|
|||||||
LEFT JOIN dbo.Project_Installation ins ON ins.InstallationId = jot.InstallationId
|
LEFT JOIN dbo.Project_Installation ins ON ins.InstallationId = jot.InstallationId
|
||||||
LEFT JOIN dbo.HJGL_BS_Steel ste1 ON ste1.STE_ID = jot.STE_ID
|
LEFT JOIN dbo.HJGL_BS_Steel ste1 ON ste1.STE_ID = jot.STE_ID
|
||||||
LEFT JOIN dbo.HJGL_BS_Steel ste2 ON ste2.STE_ID = jot.STE_ID2
|
LEFT JOIN dbo.HJGL_BS_Steel ste2 ON ste2.STE_ID = jot.STE_ID2
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMaterial mat ON mat.WMT_ID = jot.JOT_WeldMat
|
LEFT JOIN View_WeldInfoDropDownLists as mat on mat.WeldId = jot.JOT_WeldMat and mat.WeldTypeName like '%焊条%'
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMaterial silk ON silk.WMT_ID = jot.JOT_WeldSilk
|
LEFT JOIN View_WeldInfoDropDownLists as silk on silk.WeldId = jot.JOT_WeldSilk and silk.WeldTypeName like '%焊丝%'
|
||||||
LEFT JOIN dbo.HJGL_BS_WeldMethod method ON method.WME_ID = jot.WME_ID
|
LEFT JOIN dbo.HJGL_BS_WeldMethod method ON method.WME_ID = jot.WME_ID
|
||||||
WHERE jot.InstallationId IS NOT NULL AND jot.JOTY_ID IS NOT NULL
|
WHERE jot.InstallationId IS NOT NULL AND jot.JOTY_ID IS NOT NULL
|
||||||
AND jot.NDTR_ID IS NOT NULL AND jot.IsSpecial IS NOT NULL
|
AND jot.NDTR_ID IS NOT NULL AND jot.IsSpecial IS NOT NULL
|
||||||
|
|||||||
@@ -73,8 +73,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
jointInfo.JOT_Dia,
|
jointInfo.JOT_Dia,
|
||||||
jointInfo.JOT_Sch,
|
jointInfo.JOT_Sch,
|
||||||
WeldMethod.WME_Name AS WME_Name,--焊接方法
|
WeldMethod.WME_Name AS WME_Name,--焊接方法
|
||||||
m1.WMT_MatCode AS WeldMat,--焊条
|
m1.WeldName AS WeldMat,--焊条
|
||||||
WeldMaterial.WMT_MatCode AS WeldSilk,--焊丝
|
WeldMaterial.WeldName AS WeldSilk,--焊丝
|
||||||
weldReport.JOT_WeldDate,
|
weldReport.JOT_WeldDate,
|
||||||
weldReport.CHT_Tabler,
|
weldReport.CHT_Tabler,
|
||||||
weldReport.JOT_WeldDate,
|
weldReport.JOT_WeldDate,
|
||||||
@@ -91,9 +91,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||||||
LEFT JOIN HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID =jointInfo.NDTR_ID
|
LEFT JOIN HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID =jointInfo.NDTR_ID
|
||||||
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=IsoInfo.BSU_ID
|
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=IsoInfo.BSU_ID
|
||||||
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod .WME_ID=jointInfo.WME_ID
|
LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod .WME_ID=jointInfo.WME_ID
|
||||||
LEFT JOIN HJGL_BS_WeldMaterial m1 ON m1.WMT_ID=jointInfo.JOT_WeldMat
|
LEFT JOIN View_WeldInfoDropDownLists as m1 on m1.WeldId = JointInfo.JOT_WeldMat and m1.WeldTypeName like '%焊条%'
|
||||||
LEFT JOIN HJGL_BS_WeldMaterial AS WeldMaterial ON WeldMaterial.WMT_ID=jointInfo.JOT_WeldSilk
|
LEFT JOIN View_WeldInfoDropDownLists as WeldMaterial on WeldMaterial.WeldId = JointInfo.JOT_WeldSilk and WeldMaterial.WeldTypeName like '%焊丝%'
|
||||||
LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=jointInfo.JOTY_ID
|
LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=jointInfo.JOTY_ID
|
||||||
left join Sys_User as u on u.UserId = weldReport.CHT_Tabler
|
left join Sys_User as u on u.UserId = weldReport.CHT_Tabler
|
||||||
where jointInfo.DReportID is not null and jointInfo.ProjectId=@proId";
|
where jointInfo.DReportID is not null and jointInfo.ProjectId=@proId";
|
||||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
<Toolbars>
|
<Toolbars>
|
||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
|
||||||
<Items>
|
<Items>
|
||||||
<f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoId_SelectedIndexChanged"></f:DropDownList>
|
<f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoId_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
|
||||||
<f:DropDownList ID="drpJointType" runat="server" Label="焊缝类型" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoId_SelectedIndexChanged">
|
<f:DropDownList ID="drpJointType" runat="server" Label="焊缝类型" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoId_SelectedIndexChanged">
|
||||||
<f:ListItem Value="" Text="-请选择-" />
|
<f:ListItem Value="" Text="-请选择-" />
|
||||||
<f:ListItem Value="1" Text="对接焊缝" />
|
<f:ListItem Value="1" Text="对接焊缝" />
|
||||||
|
|||||||
@@ -111,6 +111,8 @@ namespace FineUIPro.Web.JGZL
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 数据绑定
|
#region 数据绑定
|
||||||
|
|
||||||
|
private static DataTable tb = null;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 数据绑定
|
/// 数据绑定
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -149,7 +151,7 @@ namespace FineUIPro.Web.JGZL
|
|||||||
}
|
}
|
||||||
|
|
||||||
SqlParameter[] parameter = listStr.ToArray();
|
SqlParameter[] parameter = listStr.ToArray();
|
||||||
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_WeldInspectionCheckRecord", parameter);
|
tb = SQLHelper.GetDataTableRunProc("HJGL_sp_WeldInspectionCheckRecord", parameter);
|
||||||
this.Grid1.RecordCount = tb.Rows.Count;
|
this.Grid1.RecordCount = tb.Rows.Count;
|
||||||
//tb = GetFilteredTable(Grid1.FilteredData, tb);
|
//tb = GetFilteredTable(Grid1.FilteredData, tb);
|
||||||
var table = this.GetPagedDataTable(Grid1, tb);
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
@@ -378,13 +380,14 @@ namespace FineUIPro.Web.JGZL
|
|||||||
if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
|
if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
|
||||||
{
|
{
|
||||||
BindGrid();
|
BindGrid();
|
||||||
|
|
||||||
this.drpWeldingDate.Items.Clear();
|
this.drpWeldingDate.Items.Clear();
|
||||||
List<string> lists = new List<string>();
|
List<string> lists = new List<string>();
|
||||||
for (int i = 0; i < this.Grid1.Rows.Count; i++)
|
for (int i = 0; i < tb.Rows.Count; i++)
|
||||||
{
|
{
|
||||||
lists.Add(string.Format("{0:yyyy-MM-dd}", this.Grid1.Rows[i].Values[4]));
|
lists.Add(string.Format("{0:yyyy-MM-dd}", tb.Rows[i]["JOT_WeldDate"]));
|
||||||
}
|
}
|
||||||
lists = lists.Distinct().ToList();
|
lists = lists.Distinct().OrderBy(x => x).ToList();
|
||||||
|
|
||||||
this.drpWeldingDate.DataTextField = "Text";
|
this.drpWeldingDate.DataTextField = "Text";
|
||||||
this.drpWeldingDate.DataValueField = "Value";
|
this.drpWeldingDate.DataValueField = "Value";
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<!--连接字符串-->
|
<!--连接字符串-->
|
||||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||||
<!--系统名称-->
|
<!--系统名称-->
|
||||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||||
|
|||||||
+71
-138
@@ -2893,6 +2893,14 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public System.Data.Linq.Table<View_WeldInfoDropDownLists> View_WeldInfoDropDownLists
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this.GetTable<View_WeldInfoDropDownLists>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public System.Data.Linq.Table<Weld_ProjectPlan> Weld_ProjectPlan
|
public System.Data.Linq.Table<Weld_ProjectPlan> Weld_ProjectPlan
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -28441,10 +28449,6 @@ namespace Model
|
|||||||
|
|
||||||
private EntitySet<HJGL_EMInventoryRecords> _HJGL_EMInventoryRecords;
|
private EntitySet<HJGL_EMInventoryRecords> _HJGL_EMInventoryRecords;
|
||||||
|
|
||||||
private EntitySet<HJGL_PW_JointInfo> _HJGL_PW_JointInfo;
|
|
||||||
|
|
||||||
private EntitySet<HJGL_PW_JointInfo> _HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1;
|
|
||||||
|
|
||||||
#region 可扩展性方法定义
|
#region 可扩展性方法定义
|
||||||
partial void OnLoaded();
|
partial void OnLoaded();
|
||||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||||
@@ -28468,8 +28472,6 @@ namespace Model
|
|||||||
this._HJGL_BS_MaterialCompare = new EntitySet<HJGL_BS_MaterialCompare>(new Action<HJGL_BS_MaterialCompare>(this.attach_HJGL_BS_MaterialCompare), new Action<HJGL_BS_MaterialCompare>(this.detach_HJGL_BS_MaterialCompare));
|
this._HJGL_BS_MaterialCompare = new EntitySet<HJGL_BS_MaterialCompare>(new Action<HJGL_BS_MaterialCompare>(this.attach_HJGL_BS_MaterialCompare), new Action<HJGL_BS_MaterialCompare>(this.detach_HJGL_BS_MaterialCompare));
|
||||||
this._HJGL_EMaterialRegistItem = new EntitySet<HJGL_EMaterialRegistItem>(new Action<HJGL_EMaterialRegistItem>(this.attach_HJGL_EMaterialRegistItem), new Action<HJGL_EMaterialRegistItem>(this.detach_HJGL_EMaterialRegistItem));
|
this._HJGL_EMaterialRegistItem = new EntitySet<HJGL_EMaterialRegistItem>(new Action<HJGL_EMaterialRegistItem>(this.attach_HJGL_EMaterialRegistItem), new Action<HJGL_EMaterialRegistItem>(this.detach_HJGL_EMaterialRegistItem));
|
||||||
this._HJGL_EMInventoryRecords = new EntitySet<HJGL_EMInventoryRecords>(new Action<HJGL_EMInventoryRecords>(this.attach_HJGL_EMInventoryRecords), new Action<HJGL_EMInventoryRecords>(this.detach_HJGL_EMInventoryRecords));
|
this._HJGL_EMInventoryRecords = new EntitySet<HJGL_EMInventoryRecords>(new Action<HJGL_EMInventoryRecords>(this.attach_HJGL_EMInventoryRecords), new Action<HJGL_EMInventoryRecords>(this.detach_HJGL_EMInventoryRecords));
|
||||||
this._HJGL_PW_JointInfo = new EntitySet<HJGL_PW_JointInfo>(new Action<HJGL_PW_JointInfo>(this.attach_HJGL_PW_JointInfo), new Action<HJGL_PW_JointInfo>(this.detach_HJGL_PW_JointInfo));
|
|
||||||
this._HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1 = new EntitySet<HJGL_PW_JointInfo>(new Action<HJGL_PW_JointInfo>(this.attach_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1), new Action<HJGL_PW_JointInfo>(this.detach_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1));
|
|
||||||
OnCreated();
|
OnCreated();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28638,32 +28640,6 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial", Storage="_HJGL_PW_JointInfo", ThisKey="WMT_ID", OtherKey="JOT_WeldMat", DeleteRule="NO ACTION")]
|
|
||||||
public EntitySet<HJGL_PW_JointInfo> HJGL_PW_JointInfo
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._HJGL_PW_JointInfo;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
this._HJGL_PW_JointInfo.Assign(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1", Storage="_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1", ThisKey="WMT_ID", OtherKey="JOT_WeldSilk", DeleteRule="NO ACTION")]
|
|
||||||
public EntitySet<HJGL_PW_JointInfo> HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
this._HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1.Assign(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangingEventHandler PropertyChanging;
|
public event PropertyChangingEventHandler PropertyChanging;
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
@@ -28743,30 +28719,6 @@ namespace Model
|
|||||||
this.SendPropertyChanging();
|
this.SendPropertyChanging();
|
||||||
entity.HJGL_BS_WeldMaterial = null;
|
entity.HJGL_BS_WeldMaterial = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void attach_HJGL_PW_JointInfo(HJGL_PW_JointInfo entity)
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
entity.HJGL_BS_WeldMaterial = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void detach_HJGL_PW_JointInfo(HJGL_PW_JointInfo entity)
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
entity.HJGL_BS_WeldMaterial = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void attach_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1(HJGL_PW_JointInfo entity)
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
entity.JOT_WeldSilkHJGL_BS_WeldMaterial = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void detach_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1(HJGL_PW_JointInfo entity)
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
entity.JOT_WeldSilkHJGL_BS_WeldMaterial = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_BS_WeldMethod")]
|
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_BS_WeldMethod")]
|
||||||
@@ -48767,10 +48719,6 @@ namespace Model
|
|||||||
|
|
||||||
private EntityRef<HJGL_BS_Welder> _JOT_FloorWelderHJGL_BS_Welder;
|
private EntityRef<HJGL_BS_Welder> _JOT_FloorWelderHJGL_BS_Welder;
|
||||||
|
|
||||||
private EntityRef<HJGL_BS_WeldMaterial> _HJGL_BS_WeldMaterial;
|
|
||||||
|
|
||||||
private EntityRef<HJGL_BS_WeldMaterial> _JOT_WeldSilkHJGL_BS_WeldMaterial;
|
|
||||||
|
|
||||||
private EntityRef<HJGL_BS_WeldMethod> _HJGL_BS_WeldMethod;
|
private EntityRef<HJGL_BS_WeldMethod> _HJGL_BS_WeldMethod;
|
||||||
|
|
||||||
private EntityRef<HJGL_PW_IsoInfo> _HJGL_PW_IsoInfo;
|
private EntityRef<HJGL_PW_IsoInfo> _HJGL_PW_IsoInfo;
|
||||||
@@ -49011,8 +48959,6 @@ namespace Model
|
|||||||
this._STE_ID2HJGL_BS_Steel = default(EntityRef<HJGL_BS_Steel>);
|
this._STE_ID2HJGL_BS_Steel = default(EntityRef<HJGL_BS_Steel>);
|
||||||
this._HJGL_BS_Welder = default(EntityRef<HJGL_BS_Welder>);
|
this._HJGL_BS_Welder = default(EntityRef<HJGL_BS_Welder>);
|
||||||
this._JOT_FloorWelderHJGL_BS_Welder = default(EntityRef<HJGL_BS_Welder>);
|
this._JOT_FloorWelderHJGL_BS_Welder = default(EntityRef<HJGL_BS_Welder>);
|
||||||
this._HJGL_BS_WeldMaterial = default(EntityRef<HJGL_BS_WeldMaterial>);
|
|
||||||
this._JOT_WeldSilkHJGL_BS_WeldMaterial = default(EntityRef<HJGL_BS_WeldMaterial>);
|
|
||||||
this._HJGL_BS_WeldMethod = default(EntityRef<HJGL_BS_WeldMethod>);
|
this._HJGL_BS_WeldMethod = default(EntityRef<HJGL_BS_WeldMethod>);
|
||||||
this._HJGL_PW_IsoInfo = default(EntityRef<HJGL_PW_IsoInfo>);
|
this._HJGL_PW_IsoInfo = default(EntityRef<HJGL_PW_IsoInfo>);
|
||||||
this._HJGL_WeldingProcedure_WeldRepairCard = new EntitySet<HJGL_WeldingProcedure_WeldRepairCard>(new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.attach_HJGL_WeldingProcedure_WeldRepairCard), new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.detach_HJGL_WeldingProcedure_WeldRepairCard));
|
this._HJGL_WeldingProcedure_WeldRepairCard = new EntitySet<HJGL_WeldingProcedure_WeldRepairCard>(new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.attach_HJGL_WeldingProcedure_WeldRepairCard), new Action<HJGL_WeldingProcedure_WeldRepairCard>(this.detach_HJGL_WeldingProcedure_WeldRepairCard));
|
||||||
@@ -49386,10 +49332,6 @@ namespace Model
|
|||||||
{
|
{
|
||||||
if ((this._JOT_WeldMat != value))
|
if ((this._JOT_WeldMat != value))
|
||||||
{
|
{
|
||||||
if (this._HJGL_BS_WeldMaterial.HasLoadedOrAssignedValue)
|
|
||||||
{
|
|
||||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
|
||||||
}
|
|
||||||
this.OnJOT_WeldMatChanging(value);
|
this.OnJOT_WeldMatChanging(value);
|
||||||
this.SendPropertyChanging();
|
this.SendPropertyChanging();
|
||||||
this._JOT_WeldMat = value;
|
this._JOT_WeldMat = value;
|
||||||
@@ -49570,10 +49512,6 @@ namespace Model
|
|||||||
{
|
{
|
||||||
if ((this._JOT_WeldSilk != value))
|
if ((this._JOT_WeldSilk != value))
|
||||||
{
|
{
|
||||||
if (this._JOT_WeldSilkHJGL_BS_WeldMaterial.HasLoadedOrAssignedValue)
|
|
||||||
{
|
|
||||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
|
||||||
}
|
|
||||||
this.OnJOT_WeldSilkChanging(value);
|
this.OnJOT_WeldSilkChanging(value);
|
||||||
this.SendPropertyChanging();
|
this.SendPropertyChanging();
|
||||||
this._JOT_WeldSilk = value;
|
this._JOT_WeldSilk = value;
|
||||||
@@ -51633,74 +51571,6 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial", Storage="_HJGL_BS_WeldMaterial", ThisKey="JOT_WeldMat", OtherKey="WMT_ID", IsForeignKey=true)]
|
|
||||||
public HJGL_BS_WeldMaterial HJGL_BS_WeldMaterial
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._HJGL_BS_WeldMaterial.Entity;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
HJGL_BS_WeldMaterial previousValue = this._HJGL_BS_WeldMaterial.Entity;
|
|
||||||
if (((previousValue != value)
|
|
||||||
|| (this._HJGL_BS_WeldMaterial.HasLoadedOrAssignedValue == false)))
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
if ((previousValue != null))
|
|
||||||
{
|
|
||||||
this._HJGL_BS_WeldMaterial.Entity = null;
|
|
||||||
previousValue.HJGL_PW_JointInfo.Remove(this);
|
|
||||||
}
|
|
||||||
this._HJGL_BS_WeldMaterial.Entity = value;
|
|
||||||
if ((value != null))
|
|
||||||
{
|
|
||||||
value.HJGL_PW_JointInfo.Add(this);
|
|
||||||
this._JOT_WeldMat = value.WMT_ID;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this._JOT_WeldMat = default(string);
|
|
||||||
}
|
|
||||||
this.SendPropertyChanged("HJGL_BS_WeldMaterial");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1", Storage="_JOT_WeldSilkHJGL_BS_WeldMaterial", ThisKey="JOT_WeldSilk", OtherKey="WMT_ID", IsForeignKey=true)]
|
|
||||||
public HJGL_BS_WeldMaterial JOT_WeldSilkHJGL_BS_WeldMaterial
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._JOT_WeldSilkHJGL_BS_WeldMaterial.Entity;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
HJGL_BS_WeldMaterial previousValue = this._JOT_WeldSilkHJGL_BS_WeldMaterial.Entity;
|
|
||||||
if (((previousValue != value)
|
|
||||||
|| (this._JOT_WeldSilkHJGL_BS_WeldMaterial.HasLoadedOrAssignedValue == false)))
|
|
||||||
{
|
|
||||||
this.SendPropertyChanging();
|
|
||||||
if ((previousValue != null))
|
|
||||||
{
|
|
||||||
this._JOT_WeldSilkHJGL_BS_WeldMaterial.Entity = null;
|
|
||||||
previousValue.HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1.Remove(this);
|
|
||||||
}
|
|
||||||
this._JOT_WeldSilkHJGL_BS_WeldMaterial.Entity = value;
|
|
||||||
if ((value != null))
|
|
||||||
{
|
|
||||||
value.HJGL_PW_JointInfo_HJGL_BS_WeldMaterial1.Add(this);
|
|
||||||
this._JOT_WeldSilk = value.WMT_ID;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this._JOT_WeldSilk = default(string);
|
|
||||||
}
|
|
||||||
this.SendPropertyChanged("JOT_WeldSilkHJGL_BS_WeldMaterial");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMethod", Storage="_HJGL_BS_WeldMethod", ThisKey="WME_ID", OtherKey="WME_ID", IsForeignKey=true)]
|
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PW_JointInfo_HJGL_BS_WeldMethod", Storage="_HJGL_BS_WeldMethod", ThisKey="WME_ID", OtherKey="WME_ID", IsForeignKey=true)]
|
||||||
public HJGL_BS_WeldMethod HJGL_BS_WeldMethod
|
public HJGL_BS_WeldMethod HJGL_BS_WeldMethod
|
||||||
{
|
{
|
||||||
@@ -133212,6 +133082,69 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WeldInfoDropDownLists")]
|
||||||
|
public partial class View_WeldInfoDropDownLists
|
||||||
|
{
|
||||||
|
|
||||||
|
private string _WeldId;
|
||||||
|
|
||||||
|
private string _WeldName;
|
||||||
|
|
||||||
|
private string _WeldTypeName;
|
||||||
|
|
||||||
|
public View_WeldInfoDropDownLists()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
|
||||||
|
public string WeldId
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._WeldId;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if ((this._WeldId != value))
|
||||||
|
{
|
||||||
|
this._WeldId = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldName", DbType="NVarChar(50)")]
|
||||||
|
public string WeldName
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._WeldName;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if ((this._WeldName != value))
|
||||||
|
{
|
||||||
|
this._WeldName = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldTypeName", DbType="NVarChar(20)")]
|
||||||
|
public string WeldTypeName
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._WeldTypeName;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if ((this._WeldTypeName != value))
|
||||||
|
{
|
||||||
|
this._WeldTypeName = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_ProjectPlan")]
|
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_ProjectPlan")]
|
||||||
public partial class Weld_ProjectPlan : INotifyPropertyChanging, INotifyPropertyChanged
|
public partial class Weld_ProjectPlan : INotifyPropertyChanging, INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||||
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
|
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
|
|||||||
Reference in New Issue
Block a user