gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2026-06-14 14:16:06 +08:00
parent 9e4689636b 08d3555783
commit 914d1b4df0
42 changed files with 5564 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/HJGLDB_DS_2026-05-28_bwj.sql
+728
View File
@@ -0,0 +1,728 @@
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
go
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
ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecord]
(
@ProjectId NVARCHAR(50)=null,
@ISO_ID VARCHAR(1000)=NULL,
@VICheckDate DATETIME=NULL,
@NDTR_ID VARCHAR(50)=NULL,
@JOTY_Group NCHAR(1)=NULL,
@WeldingDate datetime =null
)
AS
--管道对接焊接接头报检/检查记录
SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%18 AS Num,NEWID() as New_ID,
Project.ProjectId,Project.ProjectCode,Project.ProjectName,batchDetail.JOT_ID,
joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code, --焊工号
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_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, --材质
(CASE batchDetail.IsVI WHEN 1 THEN '√' ELSE NULL END) AS PassVI,
(CASE batchDetail.IsVI WHEN 0 THEN '√' ELSE NULL END) AS NoPassVI,
(CASE WHEN v.CH_TrustItemID IS NOT NULL THEN '√' ELSE NULL END) AS IsTrust,
(CASE v.States WHEN '2' THEN '√' ELSE NULL END ) AS TrustState,
(SELECT TOP 1 ReportCode FROM dbo.HJGL_CH_TestingReportPrint report
WHERE report.BatchId=batchDetail.BatchId
AND report.ISO_ID=batchDetail.ISO_ID AND report.NDT_ID=v.NDT_ID
AND report.Specifications=joint.JOT_JointDesc) AS ReportCode,
joint.JOT_Location --焊接位置
,WeldMethod.WME_Name --焊接方法
,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
ELSE (CASE WHEN WeldSilk.WeldName IS NULL
THEN ISNULL(WeldMat.WeldName,'')
ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --焊材牌号
,joint.JOT_PrepareTemp --预热温度
,batchDetail.Remark
,jointType.JOTY_Group,joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
,weldReport.JOT_WeldDate
FROM dbo.HJGL_BO_BatchDetail batchDetail
LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
LEFT JOIN (SELECT top 1 trustItem.CH_TrustItemID,trust.CH_NDTMethod AS NDT_ID, trustItem.JOT_ID, trustItem.States
FROM dbo.HJGL_CH_TrustItem trustItem
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = trustItem.CH_TrustID
LEFT JOIN dbo.HJGL_BS_NDTType ndtType on ndtType.NDT_ID=trust.CH_NDTMethod
WHERE ndtType.NDT_Code LIKE '%RT%') v ON v.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%焊条%'
LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%焊丝%'
left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID = joint.DReportID
WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND
(joint.ProjectId=@projectId OR @projectId IS NULL) AND
--(joint.ISO_ID in(select Id from dbo.StrToTable(@ISO_ID)) OR @ISO_ID IS NULL)
(joint.ISO_ID=@ISO_ID or @ISO_ID is null)
AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
AND batchDetail.VICheckDate IS NOT NULL
and(weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
GO
ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecordNew]
(
@ProjectId NVARCHAR(50)=null,
@ISO_ID VARCHAR(1000)=NULL,
@VICheckDate DATETIME=NULL,
@NDTR_ID VARCHAR(50)=NULL,
@JOTY_Group NCHAR(1)=NULL,
@WeldingDate datetime=null
)
AS
--管道对接焊接接头报检/检查记录
SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%12 AS Num,
NEWID() as New_ID, Project.ProjectId,Project.ProjectCode,Project.ProjectName,
batchDetail.JOT_ID, joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code, --焊工号
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_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, --材质
(CASE batchDetail.IsVI WHEN 1 THEN '√' ELSE NULL END) AS PassVI,
(CASE batchDetail.IsVI WHEN 0 THEN '√' ELSE NULL END) AS NoPassVI,
joint.JOT_Location --焊接位置
,WeldMethod.WME_Name --焊接方法
,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
ELSE (CASE WHEN WeldSilk.WeldName IS NULL
THEN ISNULL(WeldMat.WeldName,'')
ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --焊材牌号
,joint.JOT_PrepareTemp --预热温度
,batchDetail.Remark
,jointType.JOTY_Group
,weldReport.JOT_WeldDate
,joint.Sort1
,joint.Sort2
,joint.Sort3
,joint.Sort4
,joint.Sort5
FROM dbo.HJGL_BO_BatchDetail batchDetail
LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%焊条%'
LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%焊丝%'
left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID= joint.DReportID
WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND
(joint.ProjectId=@projectId OR @projectId IS NULL) AND
(joint.ISO_ID in(select Id from dbo.StrToTable(@ISO_ID)) OR @ISO_ID IS NULL)
AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
--AND batchDetail.VICheckDate IS NOT NULL
and weldReport.JOT_WeldDate is not null
and (weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
GO
DataBase/版本日志/HJGLDB_DS_2026-06-03_bwj.sql
+104
View File
@@ -0,0 +1,104 @@
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
values('E5880846-4CBF-4CC7-ACDA-5931AD3A9C7A','생箕보왯渡쒸','HJGL/WeldingReport/OverdueWeldJointWarning.aspx',260,'F3B157B7-9BEE-4150-6666-087828F1C51D','3')
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
values('4B31C72B-FF76-4853-9B51-EAD3CF639A46','보묏데휑묏鱗좆嫩끽渡쒸','HJGL/WeldingReport/WelderDailyWorkExceptionWarning.aspx',270,'F3B157B7-9BEE-4150-6666-087828F1C51D','3')
go
CREATE PROCEDURE [dbo].[Sp_WeekWelding]
(
@ProjectId nvarchar(50),
@WeldingDate DATETIME,
@WelderCode NVARCHAR(20) = NULL
)
AS
SELECT t.WED_Code as WelderCode, t.WeldingSize AS TotalSize, ISNULL(t1.WeldingSize,0) AS week1,ISNULL(t2.WeldingSize,0) AS week2, ISNULL(t3.WeldingSize,0) AS week3,
ISNULL(t4.WeldingSize,0) AS week4,ISNULL(t5.WeldingSize,0) AS week5,ISNULL(t6.WeldingSize,0) AS week6,ISNULL(t7.WeldingSize,0) AS week7
FROM
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate>=@WeldingDate and daily.JOT_WeldDate<=DATEADD(DAY,6,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId, welder.WED_Code)t
LEFT JOIN
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
where daily.JOT_WeldDate=@WeldingDate and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t1
ON t1.ProjectId = t.ProjectId AND t1.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId, welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,1,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t2
ON t2.ProjectId = t.ProjectId AND t2.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,2,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t3
ON t3.ProjectId = t.ProjectId AND t3.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,3,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t4
ON t4.ProjectId = t.ProjectId AND t4.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId, welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,4,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t5
ON t5.ProjectId = t.ProjectId AND t5.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,5,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t6
ON t6.ProjectId = t.ProjectId AND t6.WED_Code = t.WED_Code
LEFT JOIN
(SELECT pipe.ProjectId,welder.WED_Code, sum(isnull(jot.JOT_DoneDin,0)) as WeldingSize
FROM HJGL_PW_JointInfo jot
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
left join HJGL_BO_WeldReportMain daily on jot.DReportID=daily.DReportID
left join dbo.HJGL_BS_Welder welder ON welder.WED_ID = jot.JOT_FloorWelder
WHERE daily.JOT_WeldDate=DATEADD(DAY,6,@WeldingDate) and jot.JOT_Size <> jot.JOT_DoneDin
GROUP BY pipe.ProjectId,welder.WED_Code)t7
ON t7.ProjectId = t.ProjectId AND t7.WED_Code = t.WED_Code
WHERE t.ProjectId=@ProjectId
AND (t.WED_Code LIKE '%'+@WelderCode+'%' OR @WelderCode IS NULl)
GO
HJGL_DS/BLL/Common/FastReportService.cs
+10 -2
View File
@@ -127,8 +127,16 @@ namespace BLL.Common
}
}
FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport();
report.Export(exp, path);
if (printType == "1")
{
FastReport.Export.Pdf.PDFExport exp = new FastReport.Export.Pdf.PDFExport();
report.Export(exp, path);
}
else if (printType == "2")
{
FastReport.Export.OoXML.Word2007Export exportBase = new FastReport.Export.OoXML.Word2007Export();
report.Export(export: exportBase, fileName: path.Replace(oldValue: "pdf", newValue: "docx"));
}
}
}
}
HJGL_DS/BLL/HJGL/WeldingManage/HJGL_WeldReportService.cs
+29 -17
View File
@@ -221,20 +221,20 @@ namespace BLL
}
if (!string.IsNullOrEmpty(item.JOT_WeldMat))
{
var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat);
if (weldMat!=null)
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId==item.JOT_WeldMat select x).FirstOrDefault();
if (weldMat != null)
{
newWeldReportItem.JOT_WeldMat = weldMat.WMT_ID;
newWeldReportItem.WeldMatCode = weldMat.WMT_MatCode;
newWeldReportItem.JOT_WeldMat = weldMat.WeldId;
newWeldReportItem.WeldMatCode = weldMat.WeldName;
}
}
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)
{
newWeldReportItem.JOT_WeldSilk = weldSilk.WMT_ID;
newWeldReportItem.WeldSilkCode = weldSilk.WMT_MatCode;
newWeldReportItem.JOT_WeldSilk = weldSilk.WeldId;
newWeldReportItem.WeldSilkCode = weldSilk.WeldName;
}
}
returnViewMatch.Add(newWeldReportItem);
@@ -383,20 +383,32 @@ namespace BLL
}
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)
{
newWeldReportItem.JOT_WeldMat = weldMat.WMT_ID;
newWeldReportItem.WeldMatCode = weldMat.WMT_MatCode;
newWeldReportItem.JOT_WeldMat = weldMat.WeldId;
newWeldReportItem.WeldMatCode = weldMat.WeldName;
}
}
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)
{
newWeldReportItem.JOT_WeldSilk = weldSilk.WMT_ID;
newWeldReportItem.WeldSilkCode = weldSilk.WMT_MatCode;
newWeldReportItem.JOT_WeldSilk = weldSilk.WeldId;
newWeldReportItem.WeldSilkCode = weldSilk.WeldName;
}
}
returnViewMatch.Add(newWeldReportItem);
@@ -462,18 +474,18 @@ namespace BLL
newWeldReportItem.JOT_Sch = item.JOT_Sch; //壁厚
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)
{
newWeldReportItem.JOT_WeldMat = WeldMat.WMT_MatCode;
newWeldReportItem.JOT_WeldMat = WeldMat.WeldName;
}
}
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)
{
newWeldReportItem.JOT_WeldSilk = WeldSilk.WMT_MatCode;
newWeldReportItem.JOT_WeldSilk = WeldSilk.WeldName;
}
}
if (!string.IsNullOrEmpty(item.WME_ID))//焊接方法
HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx
+1 -1
View File
@@ -78,7 +78,7 @@
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items>
<f:Button ID="btnWeldingRecord" BoxConfigAlign="Center" Icon="Printer" runat="server" EnableAjax="false" DisableControlBeforePostBack="false" Text="焊接接头报检检查记录打印" ToolTip="焊接接头报检检查记录打印" OnClick="btnWeldingRecord_Click"></f:Button>
<f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="txtWeldingDate_TextChanged" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpIsoId_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
<%--<f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtWeldingDate_TextChanged" Width="220px"></f:DatePicker>--%>
<f:DropDownList ID="drpWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="txtWeldingDate_TextChanged" Width="220px" EnableEdit="true"></f:DropDownList>
</Items>
HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+70 -31
View File
@@ -22,11 +22,6 @@ namespace FineUIPro.Web.ContinuousPrint
{
if (!IsPostBack)
{
this.drpIsoId.DataTextField = "ISO_IsoNo";
this.drpIsoId.DataValueField = "ISO_ID";
Funs.FineUIPleaseSelect(this.drpIsoId);
this.drpIsoId.SelectedValue = BLL.Const._Null;
BindGrid();
}
}
@@ -56,21 +51,6 @@ namespace FineUIPro.Web.ContinuousPrint
/// </summary>
public void BindGrid1(string ProjectId)
{
//string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
// (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
// WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
// v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
// FROM
// (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
// FROM dbo.HJGL_BO_BatchDetail batchDetail
// LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
// LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
// LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
// WHERE BatchDetail.VICheckDate IS NOT NULL
// GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
// LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
// LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
// where v.ProjectId= @ProjectId";
string strSql = @" select distinct batch.ProjectId,
Project.ProjectCode,
Project.ProjectName,
@@ -99,7 +79,7 @@ namespace FineUIPro.Web.ContinuousPrint
strSql += " AND isoInfo.ISO_ID=@isoId";
listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue));
}
if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue))
if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue) && this.drpWeldingDate.SelectedValue != BLL.Const._Null)
{
strSql += " AND weldReport.JOT_WeldDate=@weldingDate";
listStr.Add(new SqlParameter("@weldingDate", this.drpWeldingDate.SelectedValue));
@@ -156,25 +136,56 @@ namespace FineUIPro.Web.ContinuousPrint
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
this.drpIsoId.Items.Clear();
this.drpIsoId.DataSource = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.Grid1.SelectedRowID orderby x.ISO_IsoNo select x;
var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID
join z in Funs.DB.HJGL_PW_IsoInfo on y.ISO_ID equals z.ISO_ID
where y.ProjectId == this.Grid1.SelectedRowID
select new { z.ISO_ID, z.ISO_IsoNo }).Distinct().ToList();
this.drpIsoId.DataTextField = "ISO_IsoNo";
this.drpIsoId.DataValueField = "ISO_ID";
this.drpIsoId.DataSource = isoList;
this.drpIsoId.DataBind();
Funs.FineUIPleaseSelect(this.drpIsoId);
this.drpIsoId.SelectedValue = BLL.Const._Null;
BindGrid1(this.Grid1.SelectedRowID);
//焊接日期
////焊接日期
List<string> dateLists = new List<string>();
this.drpWeldingDate.Items.Clear();
this.drpWeldingDate.DataTextField = "Date";
this.drpWeldingDate.DataValueField = "Date";
List<string> dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID
join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID
where y.ProjectId== this.Grid1.SelectedRowID
select w.JOT_WeldDate.ToShortDateString()).Distinct().ToList();
if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
{
dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID
join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID
where y.ProjectId == this.Grid1.SelectedRowID
&& z.ISO_ID == this.drpIsoId.SelectedValue
select w.JOT_WeldDate)
.Distinct()
.OrderBy(d => d)
.Select(d => d.ToShortDateString())
.ToList();
}
else
{
dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID
join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID
where y.ProjectId == this.Grid1.SelectedRowID
select w.JOT_WeldDate)
.Distinct()
.OrderBy(d => d) // 按日期升序
.Select(d => d.ToShortDateString())
.ToList();
}
this.drpWeldingDate.DataSource = dateLists;
this.drpWeldingDate.DataBind();
Funs.FineUIPleaseSelect(this.drpWeldingDate);
this.drpWeldingDate.SelectedValue = BLL.Const._Null;
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion
@@ -862,5 +873,33 @@ namespace FineUIPro.Web.ContinuousPrint
{
BindGrid1(this.Grid1.SelectedRowID);
}
protected void drpIsoId_SelectedIndexChanged(object sender, EventArgs e)
{
////焊接日期
List<string> dateLists = new List<string>();
this.drpWeldingDate.Items.Clear();
this.drpWeldingDate.DataTextField = "Date";
this.drpWeldingDate.DataValueField = "Date";
if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
{
dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID
join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID
where y.ProjectId == this.Grid1.SelectedRowID
&& z.ISO_ID == this.drpIsoId.SelectedValue
select w.JOT_WeldDate)
.Distinct()
.OrderBy(d => d)
.Select(d => d.ToShortDateString())
.ToList();
}
this.drpWeldingDate.DataSource = dateLists;
this.drpWeldingDate.DataBind();
Funs.FineUIPleaseSelect(this.drpWeldingDate);
this.drpWeldingDate.SelectedValue = BLL.Const._Null;
BindGrid1(this.Grid1.SelectedRowID);
}
}
}
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+19
View File
@@ -63,6 +63,9 @@
<Reference Include="Aspose.Words, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.dll</HintPath>
</Reference>
<Reference Include="Aspose.Words.Pdf2Word, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.Pdf2Word.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
@@ -1443,6 +1446,7 @@
<Content Include="HJGL\WeldingReport\IsoCmprehensive.aspx" />
<Content Include="HJGL\WeldingReport\IsoCompreInfo.aspx" />
<Content Include="HJGL\WeldingReport\NDTReport.aspx" />
<Content Include="HJGL\WeldingReport\OverdueWeldJointWarning.aspx" />
<Content Include="HJGL\WeldingReport\RTCheckRateConfirm.aspx" />
<Content Include="HJGL\WeldingReport\RTTestingResult.aspx" />
<Content Include="HJGL\WeldingReport\StatisticsSampleTable.aspx" />
@@ -1450,6 +1454,7 @@
<Content Include="HJGL\WeldingReport\UnitWorkAreaQuality.aspx" />
<Content Include="HJGL\WeldingReport\WelderCheckStatistic.aspx" />
<Content Include="HJGL\WeldingReport\WelderCoverageQuery.aspx" />
<Content Include="HJGL\WeldingReport\WelderDailyWorkExceptionWarning.aspx" />
<Content Include="HJGL\WeldingReport\WelderPerformance.aspx" />
<Content Include="HJGL\WeldingReport\WelderPerformancePAUT.aspx" />
<Content Include="HJGL\WeldingReport\WeldInspectionCheckRecord.aspx" />
@@ -6900,6 +6905,13 @@
<Compile Include="HJGL\WeldingReport\NDTReport.aspx.designer.cs">
<DependentUpon>NDTReport.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\WeldingReport\OverdueWeldJointWarning.aspx.cs">
<DependentUpon>OverdueWeldJointWarning.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\WeldingReport\OverdueWeldJointWarning.aspx.designer.cs">
<DependentUpon>OverdueWeldJointWarning.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\WeldingReport\RTCheckRateConfirm.aspx.cs">
<DependentUpon>RTCheckRateConfirm.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -6949,6 +6961,13 @@
<Compile Include="HJGL\WeldingReport\WelderCoverageQuery.aspx.designer.cs">
<DependentUpon>WelderCoverageQuery.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\WeldingReport\WelderDailyWorkExceptionWarning.aspx.cs">
<DependentUpon>WelderDailyWorkExceptionWarning.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\WeldingReport\WelderDailyWorkExceptionWarning.aspx.designer.cs">
<DependentUpon>WelderDailyWorkExceptionWarning.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\WeldingReport\WelderPerformance.aspx.cs">
<DependentUpon>WelderPerformance.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -1,4 +1,4 @@
<?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">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
+5 -4
View File
@@ -239,10 +239,11 @@ namespace FineUIPro.Web.HJGL.DataIn
}
} Funs.DB.SubmitChanges();
//保存文件到附件
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineManageMenuId, isoInfo.ISO_ID);
}
Funs.DB.SubmitChanges();
//保存文件到附件
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(outputPath.Replace(rootPath, ""), 10, null), outputPath.Replace(rootPath, ""), Const.HJGL_PipelineManageMenuId, isoInfo.ISO_ID);
}
}
}
HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
+8 -8
View File
@@ -257,7 +257,7 @@ namespace FineUIPro.Web.HJGL.DataIn
var slopeTypes = from x in db.HJGL_BS_SlopeType 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 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 ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
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 getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
var getWeldSilk = 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 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.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 getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col27);//合格等级
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 weldMethods = from x in db.HJGL_BS_WeldMethod 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 ndtClssItems = BLL.DropListService.HJGL_NDTClassItem();
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 getComponent1 = components.FirstOrDefault(x => x.COM_Name == col14);//组件1
var getComponent2 = components.FirstOrDefault(x => x.COM_Name == col15);//组件2
var getWeldSilk = 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 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.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 getNDTClass = ndtClssItems.FirstOrDefault(x => x.Value == col28);//合格等级
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
@@ -849,11 +849,11 @@ namespace FineUIPro.Web.HJGL.DataIn
}
if (getWeldSilk != null)
{
newJointInfo.JOT_WeldSilk = getWeldSilk.WMT_ID;
newJointInfo.JOT_WeldSilk = getWeldSilk.WeldId; //getWeldSilk.WMT_ID;
}
if (getWeldMat != null)
{
newJointInfo.JOT_WeldMat = getWeldMat.WMT_ID;
newJointInfo.JOT_WeldMat = getWeldSilk.WeldId; //getWeldMat.WMT_ID;
}
newJointInfo.JOT_Electricity = col21;
newJointInfo.JOT_Voltage = col22;
HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+4 -4
View File
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.HJGL.DataIn
Console.WriteLine(csvContent);
// 3. 上传到服务器
string uploadUrl = "http://localhost:8000/api/table/clean"; // 替换为实际上传地址
string uploadUrl = "http://47.104.102.122:8000/api/table/clean"; // 替换为实际上传地址
string fileName = $"data_{DateTime.Now:yyyyMMddHHmmss}.csv";
//"管线号", "公称直径", "管道等级", "管道材料", "主要介质", "起止点", "操作参数温度", "操作参数压力", "设计参数温度", "设计参数压力", "隔热工程代号", "隔热材料", "厚度", "介质", "压力", "比例", "方法", "合格等级", "PID尾号", "压力管道类别", "应力分析题号", "备注"
@@ -254,7 +254,7 @@ namespace FineUIPro.Web.HJGL.DataIn
Region1.Items.Add(grid1);
setAfterProcess.Tables.Add(dtAfterProcess);
string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
string urlHeaderCorrespondence = "http://47.104.102.122:8000/api/table/head";
string data = @"{
""source_headers"": " + dynamicObj["headers"].ToString() + @" ,
""target_fields"": [
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.HJGL.DataIn
""热处理类型"",
""备注""
],
""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射执行标准，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出""
""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射管道类别，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出""
}
";
string resHeaderCorrespondence = HeaderCorrespondence(urlHeaderCorrespondence, data, "POST", "application/json;charset=utf-8");
@@ -414,7 +414,7 @@ namespace FineUIPro.Web.HJGL.DataIn
{
if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
{
isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
//isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
isoInfo.IsHot = "1";
}
}
HJGL_DS/FineUIPro.Web/HJGL/DataIn/ocrz-app.css
+1 -1
View File
File diff suppressed because one or more lines are too long
HJGL_DS/FineUIPro.Web/HJGL/DataIn/ocrz-app.js
+29 -29
View File
File diff suppressed because one or more lines are too long
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEditImport.aspx.cs
+24 -7
View File
@@ -80,7 +80,8 @@ namespace FineUIPro.Web.HJGL.HotProessManage
protected void btnAudit_Click(object sender, EventArgs e)
{
bool isEmptyPostHeatingDate = false;
bool isEmptyPostHeatingDate = false;//后热日期是否为空
bool isEmptyHotData = false;//热处理数据
string message = string.Empty;
errorInfos = string.Empty;
try
@@ -179,7 +180,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{
errorInfos += (i + 2) + "行, [施工号、管线号和焊口号] 不能为空|";
}
if(ds.Tables[0].Rows[i]["后热日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["后热日期"].ToString()))
if (ds.Tables[0].Rows[i]["后热日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["后热日期"].ToString()))
{
try
{
@@ -188,17 +189,17 @@ namespace FineUIPro.Web.HJGL.HotProessManage
}
catch (Exception)
{
errorInfos += (i + 2) + "行, [热处理开始时间] 必须为日期型|";
errorInfos += (i + 2) + "行, [后热日期] 必须为日期型|";
}
}
else
{
isEmptyPostHeatingDate = false;
errorInfos += (i + 2) + "行, [后热日期]或热处理数据，不能为空|";
//isEmptyPostHeatingDate = false;
//errorInfos += (i + 2) + "行, [后热日期]或热处理数据，不能为空|";
}
if (ds.Tables[0].Rows[i]["测温点编号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["测温点编号"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -210,6 +211,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["热处理温度℃(要求)"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理温度℃(要求)"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -221,6 +223,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["热处理温度℃(实际)"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理温度℃(实际)"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -232,6 +235,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["恒温时间h（要求）"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["恒温时间h（要求）"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -243,6 +247,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["恒温时间h（实际）"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["恒温时间h（实际）"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -257,10 +262,11 @@ namespace FineUIPro.Web.HJGL.HotProessManage
try
{
DateTime date = Convert.ToDateTime(ds.Tables[0].Rows[i]["热处理日期"].ToString());
isEmptyHotData = true;
}
catch (Exception)
{
errorInfos += (i + 2) + "行, [热处理日期] 必须为日期型|";
errorInfos += (i + 2) + "行, [热处理日期] 必须为日期型|";
}
}
else
@@ -273,6 +279,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["记录曲线图编号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["记录曲线图编号"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -284,6 +291,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["热电偶数量/个"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热电偶数量/个"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -295,6 +303,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["加热范围/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["加热范围/mm"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -306,6 +315,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["保温范围/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["保温范围/mm"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -317,6 +327,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
if (ds.Tables[0].Rows[i]["保温厚度/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["保温厚度/mm"].ToString()))
{
isEmptyHotData = true;
}
else
{
@@ -332,6 +343,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{
DateTime date = Convert.ToDateTime(ds.Tables[0].Rows[i]["热处理开始时间"].ToString());
stockIn.ReviewDate = date;
isEmptyHotData = true;
}
catch (Exception)
{
@@ -352,6 +364,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{
DateTime date = Convert.ToDateTime(ds.Tables[0].Rows[i]["热处理完成时间"].ToString());
stockIn.ReviewDate = date;
isEmptyHotData = true;
}
catch (Exception)
{
@@ -365,6 +378,10 @@ namespace FineUIPro.Web.HJGL.HotProessManage
errorInfos += (i + 2) + "行, [热处理完成时间] 不能为空|";
}
}
if (isEmptyPostHeatingDate == false && isEmptyHotData == false)
{
errorInfos += (i + 2) + "行, [后热日期或热处理数据] 不能为空|";
}
#endregion
}
if (!string.IsNullOrEmpty(errorInfos))
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
+22 -17
View File
@@ -30,10 +30,15 @@
EnableCollapse="true" Width="300px" Title="焊口信息" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="显示项目" Width="250px" LabelWidth="80px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelAlign="Right"></f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtIsono" runat="server" Label="管线" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="Tree_TextChanged" Width="210px" LabelWidth="50px">
OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:HiddenField runat="server" ID="hdPageMax"></f:HiddenField>
</Items>
@@ -74,7 +79,7 @@
</f:Button>
<f:Button ID="btnFileName" Text="文档名" ToolTip="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click">
</f:Button>
<f:HiddenField ID="hdColumn" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
@@ -118,7 +123,7 @@
<f:RadioItem Text="全部" Value="0" Selected="true" />
<f:RadioItem Text="合格" Value="1" />
</f:RadioButtonList>
</Items>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@@ -152,7 +157,7 @@
<f:ListItem Text="待返修" Value="待返修" />
<f:ListItem Text="待重检" Value="待重检" />
</f:DropDownList>
</Items>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
@@ -161,13 +166,13 @@
EnableColumnLines="true" ClicksToEdit="2" DataIDField="JOT_ID" AllowSorting="true"
SortField="JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand"
EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound" >
EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
<Columns>
<%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center"
TextAlign="Center" />--%>
<f:CheckBoxField ColumnID="ckbIsSelected" Width="80px" RenderAsStaticField="false" TextAlign="Center"
AutoPostBack="true" CommandName="IsSelected" DataField="JOT_ID" HeaderText="选择删除" HeaderTextAlign="Center" Locked="true"/>
AutoPostBack="true" CommandName="IsSelected" DataField="JOT_ID" HeaderText="选择删除" HeaderTextAlign="Center" Locked="true" />
<f:WindowField ColumnID="JOT_JointNo" HeaderTextAlign="Center" TextAlign="Left" Width="100px"
WindowID="Window1" HeaderText="焊口代号" DataTextField="JOT_JointNo" DataIFrameUrlFields="JOT_ID"
DataIFrameUrlFormatString="JointInfoEdit.aspx?JOT_ID={0}" Title="焊口代号" ToolTip="着色表示该焊口已热处理或所在批已封，不能删除和修改！"
@@ -301,25 +306,25 @@
<f:RenderField HeaderText="焊接电压" ColumnID="JOT_Voltage" DataField="JOT_Voltage" SortField="JOT_Voltage"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="是否特殊" ColumnID="IsSpecialName" DataField="IsSpecialName"
<f:RenderField HeaderText="是否特殊" ColumnID="IsSpecialName" DataField="IsSpecialName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="RT检测结果" ColumnID="RT_States" DataField="RT_States"
<f:RenderField HeaderText="RT检测结果" ColumnID="RT_States" DataField="RT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="UT检测结果" ColumnID="UT_States" DataField="UT_States"
<f:RenderField HeaderText="UT检测结果" ColumnID="UT_States" DataField="UT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="MT检测结果" ColumnID="MT_States" DataField="MT_States"
<f:RenderField HeaderText="MT检测结果" ColumnID="MT_States" DataField="MT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="PT检测结果" ColumnID="PT_States" DataField="PT_States"
<f:RenderField HeaderText="PT检测结果" ColumnID="PT_States" DataField="PT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="PAUT检测结果" ColumnID="PAUT_States" DataField="PAUT_States"
<f:RenderField HeaderText="PAUT检测结果" ColumnID="PAUT_States" DataField="PAUT_States"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField>
<f:RenderField HeaderText="热处理结果反馈" ColumnID="HotProessResult" DataField="HotProessResult"
<f:RenderField HeaderText="热处理结果反馈" ColumnID="HotProessResult" DataField="HotProessResult"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</Columns>
@@ -371,7 +376,7 @@
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Width="1024px"
Height="620px">
</f:Window>
<f:Window ID="Window8" Title="更改日报信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window8" Title="更改日报信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window8_Close"
Width="600px" Height="300px">
</f:Window>
@@ -385,8 +390,8 @@
runat="server" Text="编辑" Icon="TableEdit">
</f:MenuButton>
<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true"
runat="server" Text="增口" Icon="PageCopy">
</f:MenuButton>
runat="server" Text="增口" Icon="PageCopy">
</f:MenuButton>
<f:MenuButton ID="btnMenuUpdate" OnClick="btnMenuUpdate_Click" EnablePostBack="true"
runat="server" Text="更改日报信息" Icon="TableEdit">
</f:MenuButton>
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+54 -20
View File
@@ -14,6 +14,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class JointInfo : PageBase
{
/// <summary>
/// 项目id
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary>
/// 定义集合
/// </summary>
@@ -30,6 +45,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpProjectId.DataTextField = "ProjectCode";
this.drpProjectId.DataValueField = "ProjectId";
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
this.ProjectId = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.ProjectId;
this.InitTreeMenu();//加载树
Funs.FineUIPleaseSelect(this.drpRTState);
Funs.FineUIPleaseSelect(this.drpUTState);
@@ -113,8 +137,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
rootNode.NodeID = "0";
rootNode.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode);
// var joints = from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.CurrUser.LoginProjectId select x;
var iso = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.CurrUser.LoginProjectId select x;
var iso = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x;
if (!string.IsNullOrEmpty(this.txtIsono.Text))
{
iso = iso.Where(e => e.ISO_IsoNo.Contains(this.txtIsono.Text.Trim()));
@@ -202,7 +225,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,(CASE WHEN IsSpecial=1 THEN '是' ELSE '否' END) AS IsSpecialName
FROM HJGL_View_JointInfo WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (rbIsHj.SelectedValue == "0")
{
strSql += " AND ISO_ID =@ISO_ID";
@@ -350,7 +373,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?JOT_ID={0}", Grid1.SelectedRowID, "编辑 - ")));
}
@@ -367,12 +390,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
{
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "新增 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoEdit.aspx?ISO_ID={0}&&projectId={1}", this.tvControlItem.SelectedNodeID,this.ProjectId, "新增 - ")));
}
else
{
@@ -392,13 +415,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnBatchAdd_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnAdd))
{
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null)
{
this.hdPageMax.Text = "1";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoBatchEdit.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "新增 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JointInfoBatchEdit.aspx?ISO_ID={0}&&projectId={1}", this.tvControlItem.SelectedNodeID,this.ProjectId, "新增 - ")));
}
else
{
@@ -418,7 +441,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -435,7 +458,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void btnMenuUpdate_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -486,7 +509,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -526,7 +549,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]");
}
else
{
@@ -596,8 +619,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Directory.CreateDirectory(filePath);
}
string ReportFileName = filePath + "out.xlsx";
var project = Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
var isoList = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.CurrUser.LoginProjectId select x;
var project = Base_ProjectService.GetProjectByProjectId(this.ProjectId);
var isoList = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x;
if (isoList != null && isoList.Count() > 0)
{
int rowIndex = 0;
@@ -878,7 +901,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (q != null)
{
string projectName = string.Empty;
var project = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
var project = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId);
if (project != null)
{
projectName = project.ProjectName;
@@ -1074,6 +1097,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.InitTreeMenu();
this.BindGrid();
}
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
{
this.ProjectId = this.drpProjectId.SelectedValue;
InitTreeMenu();
BindGrid();
}
}
#endregion
#region 判断是否可删除
@@ -1130,7 +1163,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(this.tvControlItem.SelectedNodeID);
if (iso != null)
{
var set = BLL.Project_SysSetService.GetSysSetBySetId("4", this.CurrUser.LoginProjectId);
var set = BLL.Project_SysSetService.GetSysSetBySetId("4", this.ProjectId);
if (set != null && set.IsAuto == true) ///是PDMS格式
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("JointInfoOut2.aspx?ISO_ID={0}", this.tvControlItem.SelectedNodeID, "导出 - ")));
@@ -1275,7 +1308,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary>
private void CopyData()
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -1328,7 +1361,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnBatchDel_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
{
// 第一次点击：只打开复选框
if (this.Grid1.Columns[0].Hidden)
@@ -1373,7 +1406,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
db.SubmitChanges();
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "删除焊口信息");
}
else
{
@@ -1452,7 +1485,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnBatchModify_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnModify))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnModify))
{
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(tvControlItem.SelectedNodeID);
if (isoInfo != null)
@@ -1469,5 +1502,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.designer.cs
Generated
+18
View File
@@ -59,6 +59,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar6;
/// <summary>
/// drpProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// Toolbar1 控件。
/// </summary>
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
+22 -6
View File
@@ -7,6 +7,21 @@
public partial class JointInfoBatchEdit : PageBase
{
#region 定义项
/// <summary>
/// 项目id
/// </summary>
private string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary>
/// 管线主键
/// </summary>
@@ -34,6 +49,7 @@
if (!IsPostBack)
{
this.ISO_ID = Request.Params["ISO_ID"];
this.ProjectId = Request.Params["projectId"];
///初始化下拉框
this.LoadDropDownList();
///初始化显示信息
@@ -100,7 +116,7 @@
this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.CurrUser.LoginProjectId);
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId);
@@ -233,7 +249,7 @@
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
{
if (this.drpInstallationId.SelectedValue == BLL.Const._Null)
{
@@ -284,7 +300,7 @@
}
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
newJointInfo.ProjectId = this.CurrUser.LoginProjectId;
newJointInfo.ProjectId = this.ProjectId;
newJointInfo.ISO_ID = this.ISO_ID;
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim();
newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim();
@@ -409,7 +425,7 @@
// newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i);
//}
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim() + Convert.ToString(i);
if (!BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.CurrUser.LoginProjectId, newJointInfo.JOT_JointNo, this.ISO_ID, null))
if (!BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.ProjectId, newJointInfo.JOT_JointNo, this.ISO_ID, null))
{
try
{
@@ -445,7 +461,7 @@
THEN ISNULL(TRY_CAST(SUBSTRING(JOT_JointNo,2,len(JOT_JointNo)-1) as int),0) ELSE 0 END)
WHERE JOT_ID='" + newJointInfo.JOT_ID + "'";
SQLHelper.ExecutSql(strSort);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊口信息！");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "添加焊口信息！");
}
catch
{
@@ -475,7 +491,7 @@
{
if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID))
{
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.CurrUser.LoginProjectId);
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.ProjectId);
if (jointInfo != null)
{
//this.txtJointNo.Text = jointInfo.JOT_JointNo;
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+41 -13
View File
@@ -10,6 +10,21 @@
public partial class JointInfoEdit : PageBase
{
#region 定义项
/// <summary>
/// 项目id
/// </summary>
private string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary>
/// 管线主键
/// </summary>
@@ -52,11 +67,13 @@
{
this.JOT_ID = Request.Params["JOT_ID"];
this.ISO_ID = Request.Params["ISO_ID"];
this.ProjectId = Request.Params["projectId"];
///初始化下拉框
this.LoadDropDownList();
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(this.JOT_ID);
if (jointInfo != null)
{
this.ProjectId = jointInfo.ProjectId;
this.ISO_ID = jointInfo.ISO_ID;
// 初始化显示信息
this.LoadShowInfo(jointInfo);
@@ -139,16 +156,20 @@
Funs.FineUIPleaseSelect(this.ddlComponent2);
///焊丝
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
this.ddlWeldSilk.DataValueField = "WMT_ID";
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataTextField = "WeldName";
this.ddlWeldSilk.DataValueField = "WeldId";
this.ddlWeldSilk.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊丝")
select x; // BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
///焊条
this.ddlWeldMat.DataTextField = "WMT_MatCode";
this.ddlWeldMat.DataValueField = "WMT_ID";
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataTextField = "WeldName";
this.ddlWeldMat.DataValueField = "WeldId";
this.ddlWeldMat.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊条")
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldMat);
@@ -168,7 +189,7 @@
this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.CurrUser.LoginProjectId);
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId);
@@ -374,6 +395,7 @@
{
if (jointInfo != null)
{
this.ProjectId = jointInfo.ProjectId;
this.txtJointNo.Text = jointInfo.JOT_JointNo;
this.txtJointDesc.Text = jointInfo.JOT_JointDesc;
if (!string.IsNullOrEmpty(jointInfo.DReportID))
@@ -486,6 +508,12 @@
this.txtRemark.Text = jointInfo.JOT_Remark;
if (!string.IsNullOrEmpty(jointInfo.InstallationId))
{
this.drpInstallationId.Items.Clear();
this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.ProjectId);
this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId);
this.drpInstallationId.SelectedValue = jointInfo.InstallationId;
}
if (!string.IsNullOrEmpty(jointInfo.NDTR_ID))
@@ -597,16 +625,16 @@
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
{
if (BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.CurrUser.LoginProjectId, this.txtJointNo.Text.Trim(), this.ISO_ID, this.JOT_ID))
if (BLL.HJGL_PW_JointInfoService.IsExistJointInfoCode(this.ProjectId, this.txtJointNo.Text.Trim(), this.ISO_ID, this.JOT_ID))
{
Alert.ShowInTop("该管线焊口号已存在！", MessageBoxIcon.Warning);
return;
}
Model.HJGL_PW_JointInfo newJointInfo = new Model.HJGL_PW_JointInfo();
newJointInfo.ProjectId = this.CurrUser.LoginProjectId;
newJointInfo.ProjectId =this.ProjectId;
newJointInfo.ISO_ID = this.ISO_ID;
newJointInfo.JOT_JointNo = this.txtJointNo.Text.Trim();
newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim();
@@ -765,7 +793,7 @@
newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
this.JOT_ID = newJointInfo.JOT_ID;
BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
}
catch
{
@@ -818,7 +846,7 @@
{
BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add);
}
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.ProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
}
// 更新排序字段
string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET
@@ -1079,7 +1107,7 @@
{
if (!string.IsNullOrEmpty(this.txtJointNoS.Text.Trim()) && !string.IsNullOrEmpty(this.ISO_ID))
{
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.CurrUser.LoginProjectId);
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJointNoAndIsoId(this.txtJointNoS.Text.Trim(), this.ISO_ID, this.ProjectId);
if (jointInfo != null)
{
//this.txtJointNo.Text = jointInfo.JOT_JointNo;
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportMain.aspx.cs
+4 -4
View File
@@ -184,8 +184,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
CellWelder.WED_Code AS CellWelderCode,
FloorWelder.WED_Code AS FloorWelderCode,
WeldMethod.WME_Name AS WeldMethod,
WeldMaterial.WMT_MatName AS WeldMat,
WeldMaterial2.WMT_MatName AS WeldSilk,
m1.WeldName AS WeldMat,
WeldMaterial.WeldName AS WeldSilk,
User1.UserName AS WelderHardManName,
User2.UserName AS AuditManName
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 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_WeldMaterial AS WeldMaterial ON WeldMaterial.WMT_ID=PreWeld.JOT_WeldMat
LEFT JOIN dbo.HJGL_BS_WeldMaterial AS WeldMaterial2 ON WeldMaterial2.WMT_ID=PreWeld.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 dbo.Sys_User AS User1 ON User1.UserId=PreWeld.WelderHardMan
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = PreWeld.AuditMan
WHERE iso.ISO_ID=@ISO_ID";
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+3 -3
View File
@@ -263,15 +263,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
CellWelder.WED_Code AS JOT_CellWelderCode,FloorWelder.WED_Code AS JOT_FloorWelderCode,
(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_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
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_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_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 HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=JointInfo.JOT_WeldSilk
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.DReportID=@DReportID";
List<SqlParameter> listStr = new List<SqlParameter>();
//listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+44 -17
View File
@@ -1,11 +1,12 @@
using System;
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI;
using BLL;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.HJGL.WeldingManage
{
@@ -69,15 +70,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.ddlWME_ID.DataSource = BLL.HJGL_WeldingMethodService.GetWeldMethodNameList();
this.ddlWME_ID.DataBind();
///焊条
this.ddlWeldMat.DataTextField = "WMT_MatCode";
this.ddlWeldMat.DataValueField = "WMT_MatCode";
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataTextField = "WeldName";
this.ddlWeldMat.DataValueField = "WeldName";
this.ddlWeldMat.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊条")
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldMat);
///焊丝
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
this.ddlWeldSilk.DataValueField = "WMT_MatCode";
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataTextField = "WeldName";
this.ddlWeldSilk.DataValueField = "WeldName";
this.ddlWeldSilk.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊丝")
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
@@ -345,13 +350,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
//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.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
//if (weldMat == null)
//{
// ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
// return;
//}
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.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊丝") && x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk == null)
{
ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
@@ -1241,11 +1246,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
item.WME_Name = weldingMethod.WME_Name;
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.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
if (weldMat != null)
{
item.JOT_WeldMat = weldMat.WMT_ID;
item.WeldMatCode = weldMat.WMT_MatCode;
item.JOT_WeldMat = weldMat.WeldId;
item.WeldMatCode = weldMat.WeldName;
}
else
{
@@ -1253,11 +1269,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
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.WeldTypeName.Contains("焊丝") && x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk != null)
{
item.JOT_WeldSilk = weldSilk.WMT_ID;
item.WeldSilkCode = weldSilk.WMT_MatCode;
item.JOT_WeldSilk = weldSilk.WeldId;
item.WeldSilkCode = weldSilk.WeldName;
}
else
{
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs
+3 -3
View File
@@ -212,7 +212,7 @@
//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,
(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
FROM dbo.HJGL_PW_JointInfo jot
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.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_WeldMaterial mat ON mat.WMT_ID = jot.JOT_WeldMat
LEFT JOIN dbo.HJGL_BS_WeldMaterial silk ON silk.WMT_ID = jot.JOT_WeldSilk
LEFT JOIN View_WeldInfoDropDownLists as mat on mat.WeldId = jot.JOT_WeldMat and mat.WeldTypeName like '%焊条%'
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
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
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportOut.aspx.cs
+5 -5
View File
@@ -73,8 +73,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
jointInfo.JOT_Dia,
jointInfo.JOT_Sch,
WeldMethod.WME_Name AS WME_Name,--焊接方法
m1.WMT_MatCode AS WeldMat,--焊条
WeldMaterial.WMT_MatCode AS WeldSilk,--焊丝
m1.WeldName AS WeldMat,--焊条
WeldMaterial.WeldName AS WeldSilk,--焊丝
weldReport.JOT_WeldDate,
weldReport.CHT_Tabler,
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 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_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 HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=jointInfo.JOTY_ID
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 Sys_User as u on u.UserId = weldReport.CHT_Tabler
where jointInfo.DReportID is not null and jointInfo.ProjectId=@proId";
List<SqlParameter> listStr = new List<SqlParameter>();
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/OverdueWeldJointWarning.aspx
+139
View File
@@ -0,0 +1,139 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OverdueWeldJointWarning.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.OverdueWeldJointWarning" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>积压焊口预警</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row.color1,
.f-grid-row.color1 .f-icon,
.f-grid-row.color1 a {
background-color: red;
color: #fff;
}
.f-grid-row.color2,
.f-grid-row.color2 .f-icon,
.f-grid-row.color2 a {
background-color: yellow;
color: #000;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="积压焊口"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="CH_TrustItemID"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2"
DataIDField="CH_TrustItemID" AllowSorting="true" SortField="TrustDate"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="25" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
OnRowDataBound="Grid1_RowDataBound">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:RadioButtonList ID="rbWarn" runat="server" Width="200px">
<f:RadioItem Text="全部" Value="0" Selected="true" />
<f:RadioItem Text="预警" Value="1" />
<f:RadioItem Text="报警" Value="2" />
</f:RadioButtonList>
<f:DropDownList ID="drpProjectId" runat="server" Label="施工号"
LabelAlign="Right" EnableEdit="true" Width="220" LabelWidth="90px">
</f:DropDownList>
<f:TextBox ID="txtPipeLineCode" runat="server" Label="管线号"
LabelAlign="Right" Width="240px" LabelWidth="90">
</f:TextBox>
<f:TextBox ID="txtWeldJointCode" runat="server" Label="焊口号"
LabelAlign="Right" Width="150px" LabelWidth="80">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="查询" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="120px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="Left"
SortField="ProjectCode">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
HeaderText="管线号" HeaderTextAlign="Center" TextAlign="Left"
SortField="ISO_IsoNo">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
HeaderText="焊口号" HeaderTextAlign="Center"
TextAlign="Left" SortField="JOT_JointNo">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="WLO_Code" DataField="WLO_Code" FieldType="String"
HeaderText="焊接区域" HeaderTextAlign="Center" TextAlign="Left"
SortField="WLO_Code">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="STE_Code" DataField="STE_Code" FieldType="String"
HeaderText="材质" HeaderTextAlign="Center" TextAlign="Left"
SortField="STE_Code">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Size" DataField="Size" FieldType="Double"
HeaderText="寸径" HeaderTextAlign="Center" TextAlign="Left"
SortField="Size">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="Thickness" DataField="Thickness" FieldType="Double"
HeaderText="壁厚" HeaderTextAlign="Center" TextAlign="Left"
SortField="Thickness">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="JOTY_Name" DataField="JOTY_Name" FieldType="String"
HeaderText="焊缝类型" HeaderTextAlign="Center" TextAlign="Left"
SortField="JOTY_Name">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WelderCode" DataField="WelderCode" FieldType="String"
HeaderText="焊工号" HeaderTextAlign="Center" TextAlign="Left"
SortField="WelderCode">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WME_Code" DataField="WME_Code"
HeaderText="焊接方法" HeaderTextAlign="Center" TextAlign="Left"
SortField="WME_Code" FieldType="String">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="NDTR_Name" DataField="NDTR_Name"
HeaderText="检测比例" HeaderTextAlign="Center" TextAlign="Left"
SortField="NDTR_Name" FieldType="String">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="AcceptLevel" DataField="AcceptLevel" FieldType="String" HeaderText="合格等级"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="TrustDate" DataField="TrustDate"
HeaderText="委托日期" HeaderTextAlign="Center" TextAlign="Left"
SortField="TrustDate" FieldType="String">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="30" Value="30" />
<f:ListItem Text="50" Value="50" />
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="所有行" Value="10000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</form>
</body>
</html>
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/OverdueWeldJointWarning.aspx.cs
+224
View File
@@ -0,0 +1,224 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class OverdueWeldJointWarning : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpProjectId.DataTextField = "ProjectCode";
this.drpProjectId.DataValueField = "ProjectId";
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
BindGrid();
}
}
private void BindGrid()
{
string strSql = @"SELECT BatchTrustItem.CH_TrustItemID, BatchTrust.CH_TrustType,project.ProjectCode,
BatchTrust.ProjectId, CONVERT(varchar(10),BatchTrust.CH_TrustDate,120) AS TrustDate,
pipe.ISO_IsoNo,jot.JOT_JointNo,
(case when steel.STE_Code is not null
then (case when steel2.STE_Code is not null and steel.STE_Code<>steel2.STE_Code
then steel.STE_Code + '/' + steel2.STE_Code
else steel.STE_Code end) else steel2.STE_Code end) as STE_Code,
(case when cellWelder.WED_Code is not null
then (case when floorWelder.WED_Code is not null and cellWelder.WED_Code<>floorWelder.WED_Code
then cellWelder.WED_Code + '/' + floorWelder.WED_Code
else cellWelder.WED_Code end) else floorWelder.WED_Code end) AS WelderCode,
(case when jot.WLO_Code='F' then '安装' else '预制' end) as WLO_Code,weldType.JOTY_Name,
convert(float,jot.JOT_Dia) AS Dia,
convert(float,jot.JOT_Size) AS Size,
convert(float,jot.JOT_Sch) AS Thickness,
method.WME_Code, jot.JOT_JointDesc,rate.NDTR_Name,
point.PointDate,
(CASE WHEN BatchTrust.CH_AcceptGrade ='1' THEN 'Ⅰ' WHEN BatchTrust.CH_AcceptGrade ='2' THEN 'Ⅱ'
WHEN BatchTrust.CH_AcceptGrade ='3' THEN 'Ⅲ' WHEN BatchTrust.CH_AcceptGrade ='4' THEN 'Ⅳ'
WHEN BatchTrust.CH_AcceptGrade ='5' THEN 'Ⅴ' END) AS AcceptLevel
FROM HJGL_CH_TrustItem AS BatchTrustItem
LEFT JOIN dbo.HJGL_CH_Trust AS BatchTrust ON BatchTrust.CH_TrustID=BatchTrustItem.CH_TrustID
LEFT JOIN dbo.HJGL_BS_NDTType dtype ON dtype.NDT_ID = BatchTrust.CH_NDTMethod
LEFT JOIN dbo.HJGL_PW_JointInfo jot ON jot.JOT_ID = BatchTrustItem.JOT_ID
LEFT JOIN dbo.HJGL_PW_IsoInfo pipe ON pipe.ISO_ID = jot.ISO_ID
LEFT JOIN dbo.HJGL_BO_BatchDetail point ON point.JOT_ID = jot.JOT_ID
LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = BatchTrust.CH_NDTRate
LEFT JOIN dbo.HJGL_BS_JointType weldType ON weldType.JOTY_ID = jot.JOTY_ID
LEFT JOIN dbo.HJGL_BS_Welder cellWelder ON cellWelder.WED_ID = jot.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder floorWelder ON floorWelder.WED_ID = jot.JOT_FloorWelder
LEFT JOIN dbo.HJGL_BS_WeldMethod method ON method.WME_ID = jot.WME_ID
LEFT JOIN HJGL_BS_Steel steel on steel.STE_ID = jot.STE_ID
LEFT JOIN HJGL_BS_Steel steel2 on steel2.STE_ID = jot.STE_ID2
LEFT JOIN Base_Project project on project.ProjectId=BatchTrust.ProjectId
WHERE BatchTrust.ProjectId=@ProjectId
AND BatchTrust.CH_TrustDate is not null
AND (jot.RT_States='待检测' or jot.PT_States='待检测' or jot.UT_States='待检测' or jot.MT_States='待检测' or jot.PAUT_States='待检测')";
List<SqlParameter> listStr = new List<SqlParameter>();
if(this.drpProjectId.SelectedValue!=BLL.Const._Null&&!string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
{
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
}
if (!string.IsNullOrEmpty(txtPipeLineCode.Text))
{
strSql += " AND pipe.ISO_IsoNo LIKE @ISO_IsoNo";
listStr.Add(new SqlParameter("@ISO_IsoNo", "%" + this.txtPipeLineCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text))
{
strSql += " AND jot.JOT_JointNo = @JOT_JointNo";
listStr.Add(new SqlParameter("@JOT_JointNo", this.txtWeldJointCode.Text));
}
if (rbWarn.SelectedValue != "0")
{
if (rbWarn.SelectedValue == "1")
{
strSql += " AND DateDiff (d,BatchTrust.CH_TrustDate,GETDATE()) >=3 AND DateDiff (d,BatchTrust.CH_TrustDate,GETDATE()) <=5 ";
}
else
{
strSql += " AND DateDiff(d, BatchTrust.CH_TrustDate, GETDATE()) > 5 ";
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
this.Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
if (row["TrustDate"].ToString() != "")
{
DateTime trustDate = Convert.ToDateTime(row["TrustDate"]);
if (DateTime.Now.AddDays(-6).Date > trustDate.Date)
{
e.RowCssClass = "color1";
}
else if (DateTime.Now.AddDays(-4) >= trustDate.Date && DateTime.Now.AddDays(-6).Date <= trustDate.Date)
{
e.RowCssClass = "color2";
}
}
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
this.BindGrid();
}
#region 统计按钮事件
/// <summary>
/// 统计
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 导出
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("积压焊口预警" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
grid.PageSize = 1000000;
BindGrid();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string jot = row.Values[column.ColumnIndex].ToString();
string html = string.Empty;
if (column.ColumnID == "JOT_JointNo" && jot.Split('-').Length > 1)
{
html = "'" + row.Values[column.ColumnIndex].ToString();
}
else
{
html = row.Values[column.ColumnIndex].ToString();
}
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("labNumber") as AspNet.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#endregion
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/OverdueWeldJointWarning.aspx.designer.cs
Generated
+152
View File
@@ -0,0 +1,152 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class OverdueWeldJointWarning
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// rbWarn 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbWarn;
/// <summary>
/// drpProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// txtPipeLineCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipeLineCode;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderDailyWorkExceptionWarning.aspx
+117
View File
@@ -0,0 +1,117 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderDailyWorkExceptionWarning.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WelderDailyWorkExceptionWarning" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>焊工单日工作量异常预警</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.color1 {
color: red;
font-weight: bold;
}
.color2 {
color: yellowgreen;
font-weight: bold;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
AllowSorting="true" SortField="WelderCode" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="施工号" EnableEdit="true"
LabelAlign="Right" Width="280px">
</f:DropDownList>
<f:DatePicker runat="server" Label="焊接日期" ID="txtWeldingDate" LabelAlign="Right"
LabelWidth="100px" Width="240px">
</f:DatePicker>
<f:TextBox ID="txtWelderCode" runat="server" Label="焊工号" Width="240px" LabelAlign="Right"></f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊工号" ColumnID="WelderCode" DataField="WelderCode"
SortField="WelderCode" FieldType="String" HeaderTextAlign="Center" Width="140px">
</f:RenderField>
<f:RenderField HeaderText="第一天" ColumnID="week1"
DataField="week1" SortField="week1" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第二天" ColumnID="week2"
DataField="week2" SortField="week2" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第三天" ColumnID="week3"
DataField="week3" SortField="week3" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第四天" ColumnID="week4"
DataField="week4" SortField="week4" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第五天" ColumnID="week5"
DataField="week5" SortField="week5" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第六天" ColumnID="week6"
DataField="week6" SortField="week6" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="第七天" ColumnID="week7"
DataField="week7" SortField="week2" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="总寸口量" ColumnID="TotalSize"
DataField="TotalSize" SortField="TotalSize" FieldType="Float" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</form>
</body>
</html>
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderDailyWorkExceptionWarning.aspx.cs
+325
View File
@@ -0,0 +1,325 @@
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using BLL;
using System.Text;
using AspNet = System.Web.UI.WebControls;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System.IO;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
using FineUIPro.Web.common;
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class WelderDailyWorkExceptionWarning : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpProjectId.DataTextField = "ProjectCode";
this.drpProjectId.DataValueField = "ProjectId";
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.drpProjectId.SelectedValue) && this.drpProjectId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
}
else
{
Alert.ShowInTop("请选择施工号！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim()))
{
listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text.Trim()));
}
else
{
Alert.ShowInTop("请选择焊接日期！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtWelderCode.Text.Trim()))
{
listStr.Add(new SqlParameter("@WelderCode", this.txtWelderCode.Text.Trim()));
}
else
{
listStr.Add(new SqlParameter("@WelderCode", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Sp_WeekWelding", parameter);
this.Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
foreach (GridColumn column in Grid1.Columns)
{
if (column.ColumnID == "week1")
{
column.HeaderText = txtWeldingDate.Text;
}
if (column.ColumnID == "week2")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(1));
}
if (column.ColumnID == "week3")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(2));
}
if (column.ColumnID == "week4")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(3));
}
if (column.ColumnID == "week5")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(4));
}
if (column.ColumnID == "week6")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(5));
}
if (column.ColumnID == "week7")
{
column.HeaderText = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(txtWeldingDate.Text).AddDays(6));
}
}
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
double week1Num = Convert.ToDouble(row["week1"]);
RenderField week1 = Grid1.FindColumn("week1") as RenderField;
if (week1Num >= 50 && week1Num < 60)
{
e.CellCssClasses[week1.ColumnIndex] = "color2";
}
if (week1Num >= 60)
{
e.CellCssClasses[week1.ColumnIndex] = "color1";
}
double week2Num = Convert.ToDouble(row["week2"]);
RenderField week2 = Grid1.FindColumn("week2") as RenderField;
if (week2Num >= 50 && week2Num < 60)
{
e.CellCssClasses[week2.ColumnIndex] = "color2";
}
if (week2Num >= 60)
{
e.CellCssClasses[week2.ColumnIndex] = "color1";
}
double week3Num = Convert.ToDouble(row["week3"]);
RenderField week3 = Grid1.FindColumn("week3") as RenderField;
if (week3Num >= 50 && week3Num < 60)
{
e.CellCssClasses[week3.ColumnIndex] = "color2";
}
if (week3Num >= 60)
{
e.CellCssClasses[week3.ColumnIndex] = "color1";
}
double week4Num = Convert.ToDouble(row["week4"]);
RenderField week4 = Grid1.FindColumn("week4") as RenderField;
if (week4Num >= 50 && week4Num < 60)
{
e.CellCssClasses[week4.ColumnIndex] = "color2";
}
if (week4Num >= 60)
{
e.CellCssClasses[week4.ColumnIndex] = "color1";
}
double week5Num = Convert.ToDouble(row["week5"]);
RenderField week5 = Grid1.FindColumn("week5") as RenderField;
if (week5Num >= 50 && week5Num < 60)
{
e.CellCssClasses[week5.ColumnIndex] = "color2";
}
if (week5Num >= 60)
{
e.CellCssClasses[week5.ColumnIndex] = "color1";
}
double week6Num = Convert.ToDouble(row["week6"]);
RenderField week6 = Grid1.FindColumn("week6") as RenderField;
if (week6Num >= 50 && week6Num < 60)
{
e.CellCssClasses[week6.ColumnIndex] = "color2";
}
if (week6Num >= 60)
{
e.CellCssClasses[week6.ColumnIndex] = "color1";
}
double week7Num = Convert.ToDouble(row["week7"]);
RenderField week7 = Grid1.FindColumn("week7") as RenderField;
if (week7Num >= 50 && week7Num < 60)
{
e.CellCssClasses[week7.ColumnIndex] = "color2";
}
if (week7Num >= 60)
{
e.CellCssClasses[week7.ColumnIndex] = "color1";
}
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
this.BindGrid();
}
#region 统计按钮事件
/// <summary>
/// 统计
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊工单日工作量异常预警" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
grid.PageSize = 10000;
BindGrid();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("labNumber") as AspNet.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#endregion
#region NPOI私有方法
private XSSFSheet ExcelCreateRow(XSSFSheet ws, XSSFWorkbook hssfworkbook, int sRows, int eRows, ICellStyle style, int cStart, int cEnd, bool istitle = false)
{
for (int i = sRows; i <= eRows; i++)
{
ws.CreateRow(i);
if (istitle)
{
ws.GetRow(i).HeightInPoints =
i == sRows ? 49.75f :
i == (sRows + 1) ? 13.75f :
38f;
}
else
{
ws.GetRow(i).HeightInPoints = 38f;
}
for (int j = cStart; j <= cEnd; j++)
{
ws.GetRow(i).CreateCell(j);
ws.GetRow(i).GetCell(j).CellStyle = style;
}
}
return ws;
}
private ICellStyle SetStyle(XSSFWorkbook ws, BorderStyle top, BorderStyle bottom, BorderStyle left, BorderStyle right)
{
ICellStyle style = ws.CreateCellStyle();
style.BorderLeft = left;
style.BorderRight = right;
style.BorderTop = top;
style.BorderBottom = bottom;
return style;
}
#endregion
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderDailyWorkExceptionWarning.aspx.designer.cs
Generated
+152
View File
@@ -0,0 +1,152 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class WelderDailyWorkExceptionWarning
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// txtWeldingDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtWeldingDate;
/// <summary>
/// txtWelderCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWelderCode;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// labNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx
+13
View File
@@ -35,6 +35,19 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="封面"
TitleToolTip="封面" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<f:DropDownList ID="drpIsoId" runat="server" Label="管线号" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpPrintType" runat="server" Label="格式" LabelAlign="Right" LabelWidth="120px" Width="200px" Hidden="false">
<f:ListItem Value="1" Text="PDF" />
<f:ListItem Value="2" Text="Word" Selected="true" />
</f:DropDownList>
<f:Button ID="btnPrintAll" Text="交工资料打印" ToolTip="交工资料打印" Icon="Printer" runat="server" EnablePostBack="true" EnableAjax="false" OnClick="btnPrintAll_Click">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
+2862
View File
File diff suppressed because it is too large Load Diff
HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.designer.cs
Generated
+45
View File
@@ -86,6 +86,51 @@ namespace FineUIPro.Web.JGZL
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// drpIsoId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsoId;
/// <summary>
/// drpPrintType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPrintType;
/// <summary>
/// btnPrintAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrintAll;
/// <summary>
/// Toolbar2 控件。
/// </summary>
HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs
+4 -4
View File
@@ -211,18 +211,18 @@ namespace FineUIPro.Web.JGZL
newItem.WeldingJointNo = item.JOT_JointNo; //焊口编号
if (!string.IsNullOrEmpty(item.JOT_WeldSilk))
{
var silk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk);
var silk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId == item.JOT_WeldSilk && x.WeldTypeName.Contains("焊丝") select x).FirstOrDefault(); //BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk);
if (silk != null)
{
newItem.WeldingWire = silk.WMT_MatCode;//所用焊丝牌号
newItem.WeldingWire = silk.WeldName;//所用焊丝牌号
}
}
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 && x.WeldTypeName.Contains("焊条") select x).FirstOrDefault(); //BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat);
if (weldMat != null)
{
newItem.WeldingRod = weldMat.WMT_MatCode;//所用焊条牌号
newItem.WeldingRod = weldMat.WeldName;//所用焊条牌号
}
}
itemLists.Add(newItem);
HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
+1 -1
View File
@@ -37,7 +37,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<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:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="1" Text="对接焊缝" />
HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs
+7 -4
View File
@@ -111,6 +111,8 @@ namespace FineUIPro.Web.JGZL
#endregion
#region 数据绑定
private static DataTable tb = null;
/// <summary>
/// 数据绑定
/// </summary>
@@ -149,7 +151,7 @@ namespace FineUIPro.Web.JGZL
}
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;
//tb = GetFilteredTable(Grid1.FilteredData, 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))
{
BindGrid();
this.drpWeldingDate.Items.Clear();
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.DataValueField = "Value";
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;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="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx
+66 -33
View File
@@ -10,7 +10,7 @@
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
}
</style>
</head>
<body>
@@ -30,6 +30,9 @@
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询"
Width="250px" LabelWidth="70px">
</f:TextBox>
<f:TextBox ID="txtProjectName" runat="server" Label="项目名称" EmptyText="输入项目名称查询"
Width="250px" LabelWidth="70px">
</f:TextBox>
<f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
@@ -41,7 +44,7 @@
<f:Grid ID="GridProject" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
ShowGridHeader="false" runat="server" BoxFlex="0" DataKeyNames="ProjectId"
AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GridProject_PageIndexChange"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GridProject_PageIndexChange"
EnableColumnLines="false" EnableRowLines="false" DataIDField="ProjectId" OnRowCommand="GridProject_RowCommand">
<Columns>
<f:LinkButtonField EnableAjax="false" Width="90px" CommandName="project" DataTextField="ProjectCode"
@@ -51,18 +54,18 @@
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="60px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="50" Value="50" />
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="500" Value="500" />
</f:DropDownList>
</PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="60px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="50" Value="50" />
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="500" Value="500" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
@@ -70,7 +73,6 @@
<Items>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Panel ID="Panel5" BoxFlex="1" runat="server" ShowBorder="false" ShowHeader="false"
@@ -94,19 +96,19 @@
<f:Button runat="server" ID="btnSelect2" Icon="Find" OnClick="btnSelect2_Click" ToolTip="根据所选条件查询">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="200px">
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="BatchCode" DataField="BatchCode" FieldType="String"
HeaderText="批编号" HeaderTextAlign="Center" TextAlign="left" Width="160px">
HeaderText="批编号" HeaderTextAlign="Center" TextAlign="left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="焊缝类型" ColumnID="JOTY_Name" DataField="JOTY_Name" SortField="JOTY_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="105px">
@@ -115,24 +117,55 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="75px">
</f:RenderField>
<f:RenderField ColumnID="AskCompleteDate" DataField="AskCompleteDate" FieldType="Date"
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" Width="160px" RendererArgument="yyyy-MM-dd">
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" Width="120px" RendererArgument="yyyy-MM-dd">
</f:RenderField>
<f:RenderField HeaderText="完成报告反馈" ColumnID="ReportFeedback" DataField="ReportFeedback"
SortField="ReportFeedback" HeaderTextAlign="Center" TextAlign="Left" Width="105px"
RendererArgument="yyyy-MM-dd" FieldType="Date" Renderer="Date">
</f:RenderField>
SortField="ReportFeedback" HeaderTextAlign="Center" TextAlign="Left" Width="105px"
RendererArgument="yyyy-MM-dd" FieldType="Date" Renderer="Date">
</f:RenderField>
<f:WindowField ColumnID="myWindowFieldSelected" Width="50px" WindowID="Window1" HeaderText="编辑"
Icon="Pencil" ToolTipType="Title" ToolTip="编辑完成报告反馈时间" DataTextFormatString="{0}" DataIFrameUrlFields="BatchId"
DataIFrameUrlFormatString="../HJGL/WeldingManage/CompleteReportDateEdit.aspx?batchId={0}" DataWindowTitleFormatString="编辑 - {1}"
HeaderTextAlign="Center" TextAlign="Center" />
Icon="Pencil" ToolTipType="Title" ToolTip="编辑完成报告反馈时间" DataTextFormatString="{0}" DataIFrameUrlFields="BatchId"
DataIFrameUrlFormatString="../HJGL/WeldingManage/CompleteReportDateEdit.aspx?batchId={0}" DataWindowTitleFormatString="编辑 - {1}"
HeaderTextAlign="Center" TextAlign="Center" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
<f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true">
<f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true" Title="焊口返修超期未处理预警" AutoScroll="true">
<Items>
<f:Label ID="Label5" runat="server" Text="">
</f:Label>
<f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill3" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
</f:RenderField>
<f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
@@ -140,9 +173,9 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑完成报告反馈时间" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="420px" Height="280px">
</f:Window>
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="420px" Height="280px">
</f:Window>
</form>
</body>
</html>
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs
+64 -16
View File
@@ -25,6 +25,15 @@ namespace FineUIPro.Web.common
this.drpProject.DataBind();
Funs.FineUIPleaseSelect(this.drpProject);
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
this.drpPro.DataTextField = "ProjectCode";
this.drpPro.DataValueField = "ProjectId";
this.drpPro.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpPro.DataBind();
Funs.FineUIPleaseSelect(this.drpPro);
this.drpPro.SelectedValue = this.CurrUser.LoginProjectId;
//委托单不为null且 对应批明细的委托单明细状态为2
List<Model.HJGL_BO_Batch> Allbatch = (from x in Funs.DB.HJGL_BO_Batch
where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
@@ -35,18 +44,18 @@ namespace FineUIPro.Web.common
select x; //获取所以批明细
var trustdetails = from x in Funs.DB.HJGL_CH_TrustItem
join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchDetailId equals y.BatchDetailId
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
where z.ProjectId == this.drpProject.SelectedValue && !z.AskCompleteDate.HasValue
select x; //获取所有批明细对应委托明细
List<Model.HJGL_BO_Batch> batchLists2 = (from x in Allbatch
join m in Funs.DB.HJGL_BS_NDTRate on x.NDTR_ID equals m.NDTR_ID
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
from t in g.DefaultIfEmpty()
where m.NDTR_Rate.Value==0 && t==null
where m.NDTR_Rate.Value == 0 && t == null
select x).Distinct().ToList(); //获取委托单为null且检测比例是0的
var batchLists = (from x in Allbatch
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
select x).Distinct().ToList();
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
select x).Distinct().ToList();
var batchdetailsList = batchdetails.ToList();
var trustdetailsList = trustdetails.ToList();
var batchLists4 = (
@@ -58,14 +67,14 @@ namespace FineUIPro.Web.common
select g.First().x
).Distinct().ToList();
batchLists2.AddRange(batchLists4);
batchLists2= batchLists2.Distinct().ToList();
batchLists2 = batchLists2.Distinct().ToList();
foreach (var item in batchLists2)
{
{
var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId; //获取批次详情ID
var trustdetail = from x in trustdetails where batchdetail.Contains(x.BatchDetailId) orderby x.FeedbackDate descending select x;
//检测合格，更新要求完成日期
if ( item.BatchIsClosed == true)
if (item.BatchIsClosed == true)
{
DateTime date = DateTime.Now;
@@ -141,6 +150,7 @@ namespace FineUIPro.Web.common
BindProject();
BindBatch();
BindRepair();
//BindGetWelder();
//BindGetWelderLimitDate();
//BindPointNoTrust();
@@ -149,17 +159,21 @@ namespace FineUIPro.Web.common
//BindCheckNoAudit();
}
}
#region 绑定数据
#region 绑定数据
/// <summary>
/// 绑定项目数据
/// </summary>
private void BindProject()
{
var project = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1");
if (!string.IsNullOrEmpty(txtProjectCode.Text))
if (!string.IsNullOrEmpty(txtProjectCode.Text.Trim()))
{
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList();
}
if (!string.IsNullOrEmpty(txtProjectName.Text.Trim()))
{
project = project.Where(e => e.ProjectName.Contains(txtProjectName.Text.Trim())).ToList();
}
GridProject.RecordCount = project.Count;
var table = GetPagedDataTable(GridProject, project);
this.GridProject.DataSource = table;
@@ -212,13 +226,13 @@ namespace FineUIPro.Web.common
// left join dbo.Base_Project p on p.ProjectId=b.ProjectId";
//DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
// 这个字段不要了
//(case when(select Count(*) from dbo.HJGL_CH_TrustItem item
//(case when(select Count(*) from dbo.HJGL_CH_TrustItem item
// --left
// join dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId = item.BatchDetailId
// -- where item.States != '2' and batchDetail.BatchId = v.BatchId) > 0 OR
// --(SELECT COUNT(*) FROM dbo.HJGL_BO_Batch b WHERE b.BatchId = v.BatchId AND b.BatchIsClosed = 1) = 0
// -- THEN '否' else '是' end) as IsPass,
// --left
// join dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId = item.BatchDetailId
// -- where item.States != '2' and batchDetail.BatchId = v.BatchId) > 0 OR
// --(SELECT COUNT(*) FROM dbo.HJGL_BO_Batch b WHERE b.BatchId = v.BatchId AND b.BatchIsClosed = 1) = 0
// -- THEN '否' else '是' end) as IsPass,
string strSql = @"select project.ProjectCode, v.BatchId,batch.BatchCode,ty.JOTY_Name,rate.NDTR_Name,
batch.SubmitAskDate, batch.AskCompleteDate,
@@ -394,5 +408,39 @@ namespace FineUIPro.Web.common
{
BindBatch();
}
private void BindRepair()
{
string strSql = @"select repairItemRecord.RepairItemRecordId,repairItemRecord.ProjectId,repairItemRecord.ISO_ID,repairItemRecord.JOT_ID,repairItemRecord.FilmNum,repairItemRecord.FeedbackDate,
jointInfo.JOT_JointNo,isoInfo.ISO_IsoNo,project.ProjectCode from HJGL_CH_RepairItemRecord repairItemRecord
left join HJGL_PW_JointInfo jointInfo on jointInfo.JOT_ID = repairItemRecord.JOT_ID
left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID = jointInfo.ISO_ID
left join Base_Project project on project.ProjectId = repairItemRecord.ProjectId
where repairItemRecord.ProjectId = @projectId";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.drpPro.SelectedValue) && this.drpPro.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@projectId", this.drpPro.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
}
strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 7 order by repairItemRecord.FeedbackDate asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
this.GridRepair.DataSource = tb;
this.GridRepair.DataBind();
}
protected void GridRepair_Sort(object sender, GridSortEventArgs e)
{
BindRepair();
}
protected void drpPro_SelectedIndexChanged(object sender, EventArgs e)
{
BindRepair();
}
}
}
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
Generated
+71 -33
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
public partial class mainGdaz {
namespace FineUIPro.Web.common
{
public partial class mainGdaz
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel2 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Panel3 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtProjectCode 控件。
/// </summary>
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// btnSelect 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelect;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// GridProject 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridProject;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Panel4 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// Panel5 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel5;
/// <summary>
/// Panel7 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel7;
/// <summary>
/// GridBatch 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridBatch;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpProject 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// cbIsReportFeedback 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsReportFeedback;
/// <summary>
/// btnSelect2 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelect2;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// Panel8 控件。
/// </summary>
@@ -236,16 +247,43 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel8;
/// <summary>
/// Label5 控件。
/// GridRepair 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
protected global::FineUIPro.Grid GridRepair;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// drpPro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPro;
/// <summary>
/// ToolbarFill3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill3;
/// <summary>
/// Window1 控件。
/// </summary>
HJGL_DS/Model/Model.cs
+71 -138
View File
@@ -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
{
get
@@ -28441,10 +28449,6 @@ namespace Model
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 可扩展性方法定义
partial void OnLoaded();
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_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_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();
}
@@ -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 PropertyChangedEventHandler PropertyChanged;
@@ -28743,30 +28719,6 @@ namespace Model
this.SendPropertyChanging();
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")]
@@ -48767,10 +48719,6 @@ namespace Model
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_PW_IsoInfo> _HJGL_PW_IsoInfo;
@@ -49011,8 +48959,6 @@ namespace Model
this._STE_ID2HJGL_BS_Steel = default(EntityRef<HJGL_BS_Steel>);
this._HJGL_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_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));
@@ -49386,10 +49332,6 @@ namespace Model
{
if ((this._JOT_WeldMat != value))
{
if (this._HJGL_BS_WeldMaterial.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnJOT_WeldMatChanging(value);
this.SendPropertyChanging();
this._JOT_WeldMat = value;
@@ -49570,10 +49512,6 @@ namespace Model
{
if ((this._JOT_WeldSilk != value))
{
if (this._JOT_WeldSilkHJGL_BS_WeldMaterial.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnJOT_WeldSilkChanging(value);
this.SendPropertyChanging();
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)]
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")]
public partial class Weld_ProjectPlan : INotifyPropertyChanging, INotifyPropertyChanged
{
HJGL_DS/WebAPI/WebAPI.csproj.user
+1 -1
View File
@@ -1,4 +1,4 @@
<?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">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>