Compare commits
9 Commits
3d00fd9831
...
debd6973a7
| Author | SHA1 | Date |
|---|---|---|
 高飞
|
debd6973a7 | |
|
高飞
|
fd35988a76 | |
|
高飞
|
68884b7f73 | |
|
高飞
|
1bb7ef4578 | |
|
高飞
|
d3ecc94350 | |
|
高飞
|
0fae631d6d | |
 毕文静
|
773e8459d5 | |
|
毕文静
|
9c80220cfe | |
|
高飞
|
9930aa01d0 |
|
|
@ -20,4 +20,5 @@ bin-release/
|
|||
/HJGL_DS/FineUIPro.Web/FileUploadHJGLHotProessManage
|
||||
/HJGL_DS/FineUIPro.Web/File/Excel
|
||||
/HJGL_DS/.vs/
|
||||
/HJGL_DS/.vs/config/applicationhost.config
|
||||
/HJGL_DS/.vs/config/applicationhost.config
|
||||
/HJGL_DS/FineUIPro.Web/FileUpload/Sign
|
||||
|
|
|
|||
|
|
@ -138,3 +138,384 @@ WHERE
|
|||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
||||
ALTER PROC [dbo].[HJGL_sp_rpt_welderStatistics]
|
||||
@unitcode varchar(50) = NULL,
|
||||
@WED_ID nvarchar(50) = NULL,
|
||||
@projectId NVARCHAR(50) = NULL
|
||||
AS
|
||||
/*焊工焊接检测统计表*/
|
||||
SELECT
|
||||
welder.ProjectId,
|
||||
project.ProjectCode,--施工号
|
||||
wld.wed_code,-- 焊工代码
|
||||
wld.wed_name,--焊工名称
|
||||
|
||||
ISNULL(totalJoint.totalJoint,0) AS totalJoint, --已焊焊缝数
|
||||
ISNULL(TrustJointNum.TrustJointNum,0) AS TrustJointNum, --已委托焊缝数
|
||||
CAST((CASE ISNULL(TrustJointNum.TrustJointNum,0) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL(TrustJointNum.TrustJointNum,0)/(1.0 * totalJoint.totalJoint) END) AS DECIMAL(19,3))
|
||||
AS OneCheckRate , ---一次检测比例
|
||||
|
||||
ISNULL(FixedJoint.FixedJoint,0) AS FixedJoint, --已焊固定口数
|
||||
ISNULL(TrustFixedJoint.TrustFixedJoint,0) AS TrustFixedJoint, --已委托固定口数
|
||||
CAST((CASE ISNULL(TrustFixedJoint.TrustFixedJoint,0) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL(TrustFixedJoint.TrustFixedJoint,0)/(1.0 * FixedJoint.FixedJoint) END) AS DECIMAL(19,3))
|
||||
AS FixedJointCheckRate , ---固定口检测比例
|
||||
|
||||
ISNULL(ButtJoint.ButtJoint,0) AS ButtJoint, --已焊对接焊缝数
|
||||
ISNULL(TrustButtJoint.TrustButtJoint,0) AS TrustButtJoint, --已委托对接焊缝数
|
||||
CAST((CASE ISNULL(TrustButtJoint.TrustButtJoint,0) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL(TrustButtJoint.TrustButtJoint,0)/(1.0 * ButtJoint.ButtJoint) END) AS DECIMAL(19,3))
|
||||
AS ButtJointCheckRate , ---对接焊缝检测比例
|
||||
|
||||
ISNULL(FilletJoint.FilletJoint,0) AS FilletJoint, --已焊角焊缝数
|
||||
ISNULL(TrustFilletJoint.TrustFilletJoint,0) AS TrustFilletJoint, --已委托角焊缝数
|
||||
CAST((CASE ISNULL(TrustFilletJoint.TrustFilletJoint,0) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL(TrustFilletJoint.TrustFilletJoint,0)/(1.0 * FilletJoint.FilletJoint) END) AS DECIMAL(19,3))
|
||||
AS FilletJointCheckRate
|
||||
|
||||
FROM dbo.Project_Welder AS welder
|
||||
LEFT JOIN Base_Project project on welder.ProjectId=project.ProjectId
|
||||
LEFT JOIN dbo.HJGL_BS_Welder wld on wld.WED_ID=welder.WED_ID
|
||||
--已焊焊口数
|
||||
LEFT JOIN (SELECT COUNT(*) AS totalJoint,HJGL_pw_jointinfo.JOT_CellWelder,ProjectId
|
||||
FROM HJGL_PW_JointInfo
|
||||
WHERE HJGL_pw_jointinfo.DReportID is not null
|
||||
GROUP BY HJGL_pw_jointinfo.JOT_CellWelder,ProjectId) AS totalJoint ON totalJoint.JOT_CellWelder = welder.WED_ID and totalJoint.ProjectId=welder.ProjectId
|
||||
|
||||
--已焊固定口数
|
||||
LEFT JOIN (SELECT COUNT(*) AS FixedJoint,JOT_CellWelder,ProjectId
|
||||
FROM HJGL_PW_JointInfo
|
||||
WHERE DReportID is not null AND JOT_JointAttribute='固定'
|
||||
GROUP BY HJGL_pw_jointinfo.JOT_CellWelder,ProjectId) AS FixedJoint ON FixedJoint.JOT_CellWelder = welder.WED_ID and FixedJoint.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
--已焊对接焊缝数
|
||||
LEFT JOIN (SELECT COUNT(*) AS ButtJoint,joint.JOT_CellWelder,ProjectId
|
||||
FROM HJGL_PW_JointInfo joint
|
||||
LEFT JOIN dbo.HJGL_BS_JointType jointType on jointType.JOTY_ID=joint.JOTY_ID
|
||||
WHERE DReportID is not null AND jointType.JOTY_Group='1'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS ButtJoint ON ButtJoint.JOT_CellWelder = welder.WED_ID and ButtJoint.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
--已焊角焊缝数
|
||||
LEFT JOIN (SELECT COUNT(*) AS FilletJoint,joint.JOT_CellWelder,ProjectId
|
||||
FROM HJGL_PW_JointInfo joint
|
||||
LEFT JOIN dbo.HJGL_BS_JointType jointType on jointType.JOTY_ID=joint.JOTY_ID
|
||||
WHERE DReportID is not null AND jointType.JOTY_Group='2'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS FilletJoint ON FilletJoint.JOT_CellWelder = welder.WED_ID and FilletJoint.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
--已委托焊口数
|
||||
LEFT JOIN (SELECT COUNT(*) AS TrustJointNum,joint.JOT_CellWelder,ProjectId
|
||||
FROM dbo.HJGL_BO_BatchDetail batchDetail
|
||||
LEFT JOIN HJGL_pw_jointinfo joint ON joint.jot_id=batchDetail.jot_id
|
||||
WHERE (batchDetail.NDT is not null OR batchDetail.NDT!='') and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustJointNum ON TrustJointNum.JOT_CellWelder = welder.WED_ID and TrustJointNum.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
--已委托固定口数
|
||||
LEFT JOIN (SELECT COUNT(*) AS TrustFixedJoint,joint.JOT_CellWelder,ProjectId
|
||||
FROM dbo.HJGL_BO_BatchDetail batchDetail
|
||||
LEFT JOIN HJGL_pw_jointinfo joint ON joint.jot_id=batchDetail.jot_id
|
||||
WHERE (batchDetail.NDT is not null OR batchDetail.NDT!='')
|
||||
AND joint.JOT_JointAttribute='固定' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustFixedJoint ON TrustFixedJoint.JOT_CellWelder = welder.WED_ID and TrustFixedJoint.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
--已委托对接焊缝数
|
||||
LEFT JOIN (SELECT COUNT(*) AS TrustButtJoint,joint.JOT_CellWelder,ProjectId
|
||||
FROM dbo.HJGL_BO_BatchDetail batchDetail
|
||||
LEFT JOIN 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.NDT is not null OR batchDetail.NDT!='')
|
||||
AND jointType.JOTY_Group='1' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustButtJoint ON TrustButtJoint.JOT_CellWelder = welder.WED_ID and TrustButtJoint.ProjectId=welder.ProjectId
|
||||
|
||||
--已委托角焊缝数
|
||||
LEFT JOIN (SELECT COUNT(*) AS TrustFilletJoint,joint.JOT_CellWelder,ProjectId
|
||||
FROM dbo.HJGL_BO_BatchDetail batchDetail
|
||||
LEFT JOIN 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.NDT is not null OR batchDetail.NDT!='')
|
||||
AND jointType.JOTY_Group='2' and joint.JOT_JointNo not like '%A%' and joint.JOT_JointNo not like '%B%' and batchDetail.PointType!='2'
|
||||
GROUP BY joint.JOT_CellWelder,ProjectId) AS TrustFilletJoint ON TrustFilletJoint.JOT_CellWelder = welder.WED_ID and TrustFilletJoint.ProjectId=welder.ProjectId
|
||||
|
||||
|
||||
WHERE (welder.ProjectId = @projectId OR @projectId IS NULL)
|
||||
AND (wld.WED_Unit=@unitcode OR @unitcode IS NULL)
|
||||
AND (wld.WED_ID=@WED_ID OR @WED_ID is null)
|
||||
order BY wld.WED_Code
|
||||
|
||||
|
||||
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.WMT_MatCode AS WeldMat,--焊条
|
||||
WeldMaterial.WMT_MatCode 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 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 PROC [dbo].[HJGL_sp_rpt_welderPerformance]
|
||||
@unitcode VARCHAR(50) = NULL,
|
||||
@steel VARCHAR(50) = NULL,
|
||||
@WED_ID NVARCHAR(50) = NULL,
|
||||
@date1 DATETIME = NULL,
|
||||
@date2 DATETIME = NULL,
|
||||
@projectId NVARCHAR(500) = NULL,
|
||||
@installationId NVARCHAR(50)=NULL
|
||||
AS
|
||||
/*焊工业绩分析*/
|
||||
SELECT
|
||||
NEWID() AS Id,
|
||||
total.ProjectId,
|
||||
project.ProjectCode,--施工号
|
||||
total.Welder,
|
||||
wld.wed_code,-- 焊工代码
|
||||
wld.wed_name,--焊工名称
|
||||
wld.WED_Sex, --性别
|
||||
-------------本期start
|
||||
CAST(ISNULL(total.totalSize,0) AS DECIMAL(19,2)) AS totalSize, --总寸径
|
||||
ISNULL(total.totalJoint,0) AS totalJoint, --总焊口
|
||||
ISNULL(JointNum1.JointNum1,0) AS JointNum1, --一次拍片焊口数
|
||||
|
||||
ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS JointPassNum1, --一次拍片合格焊口数
|
||||
ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS RepairJoint1, --一次返修焊口数
|
||||
ISNULL(RepairJoint2.RepairJoint2,0) AS RepairJoint2, --二次返修焊口数
|
||||
ISNULL(RepairJoint3.RepairJoint3,0) AS RepairJoint3, --三次返修焊口数
|
||||
|
||||
CAST((CASE ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0) WHEN 0 THEN 0
|
||||
ELSE (CASE(ISNULL(JointNum1.JointNum1,0)) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0)/(1.0 * JointNum1.JointNum1)
|
||||
END)END) AS DECIMAL(19,3)) AS JointPassRate , ---一次拍片焊口合格率
|
||||
|
||||
ISNULL(JointNum1.totalfilm,0) AS totalfilm, --一次拍片数
|
||||
(ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) AS totalPassfilm, --一次拍片合格数
|
||||
ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0) AS repairFilm1, --一次返修片子数
|
||||
|
||||
ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --二次返修片子数
|
||||
ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --三次返修片子数
|
||||
|
||||
CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) WHEN 0 THEN 0
|
||||
ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0
|
||||
ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0))/(1.0 * JointNum1.totalfilm)
|
||||
END) END) AS DECIMAL(19,3)) AS JointFilmPassRate ---一次拍片合格率
|
||||
|
||||
FROM
|
||||
--总达因值 --总焊口
|
||||
(SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
|
||||
,joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder
|
||||
FROM View_JointWelder joint
|
||||
LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID
|
||||
WHERE joint.DReportID IS NOT NULL
|
||||
AND (report.JOT_WeldDate >= @date1 OR @date1 IS NULL) AND (report.JOT_WeldDate <= @date2 OR @date2 IS NULL)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS total
|
||||
|
||||
|
||||
--一次拍片焊口数 , 一次拍片总数,一次拍片合格总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm,
|
||||
joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT_FilmNum IS NOT NULL and joint.RT_FilmNum>0 and (select COUNT(*) from dbo.HJGL_BO_QualityRating where JOT_ID=joint.JOT_ID and FilmNum is not null)>0
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS JointNum1
|
||||
ON JointNum1.ProjectId=total.ProjectId AND JointNum1.InstallationId = total.InstallationId
|
||||
AND JointNum1.BSU_ID = total.BSU_ID AND JointNum1.Welder = total.Welder
|
||||
|
||||
--一次拍片不合格焊口数
|
||||
LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1,
|
||||
joint.ProjectId,joint.InstallationId,joint.BSU_ID,rr.JOT_CellWelder as Welder
|
||||
FROM dbo.HJGL_CH_RepairItemRecord rr
|
||||
left join dbo.HJGL_View_JointInfo joint on rr.JOT_ID=joint.JOT_ID
|
||||
WHERE joint.PointType='点口' AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, rr.JOT_CellWelder) AS JointNoPassNum1
|
||||
ON JointNoPassNum1.ProjectId=total.ProjectId AND JointNoPassNum1.InstallationId = total.InstallationId
|
||||
AND JointNoPassNum1.BSU_ID = total.BSU_ID AND JointNoPassNum1.Welder = total.Welder
|
||||
--一次拍片不合格拍片数
|
||||
LEFT JOIN (SELECT count(rr.RepairItemRecordId) as JointNoPassFilmNum2,
|
||||
joint.ProjectId,joint.InstallationId,joint.BSU_ID,rr.JOT_CellWelder as Welder
|
||||
FROM dbo.HJGL_CH_RepairItemRecord rr
|
||||
left join dbo.HJGL_View_JointInfo joint on rr.JOT_ID=joint.JOT_ID
|
||||
WHERE joint.PointType='点口'
|
||||
--AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, rr.JOT_CellWelder) AS JointNoPassNum2
|
||||
ON JointNoPassNum2.ProjectId=total.ProjectId AND JointNoPassNum2.InstallationId = total.InstallationId
|
||||
AND JointNoPassNum2.BSU_ID = total.BSU_ID AND JointNoPassNum2.Welder = total.Welder
|
||||
--二次返修拍片焊口数,二次返修拍片总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2,
|
||||
joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT2_RepairFilm IS NOT NULL
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS RepairJoint2
|
||||
ON RepairJoint2.ProjectId=total.ProjectId AND RepairJoint2.InstallationId = total.InstallationId
|
||||
AND RepairJoint2.BSU_ID = total.BSU_ID AND RepairJoint2.Welder = total.Welder
|
||||
|
||||
|
||||
|
||||
--三次返修拍片焊口数,三次返修拍片总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3,
|
||||
joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT3_RepairFilm IS NOT NULL
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS RepairJoint3
|
||||
ON RepairJoint3.ProjectId=total.ProjectId AND RepairJoint3.InstallationId = total.InstallationId
|
||||
AND RepairJoint3.BSU_ID = total.BSU_ID AND RepairJoint3.Welder = total.Welder
|
||||
|
||||
LEFT JOIN Base_Project project ON total.ProjectId=project.ProjectId
|
||||
LEFT JOIN dbo.HJGL_BS_Welder wld ON wld.WED_ID=total.Welder
|
||||
|
||||
WHERE
|
||||
(CHARINDEX(total.ProjectId,@projectId)>0 OR @projectId IS NULL)
|
||||
AND (total.InstallationId = @installationId OR @installationId IS NULL)
|
||||
AND (wld.WED_Unit=@unitcode OR @unitcode IS NULL)
|
||||
AND (total.Welder = @WED_ID OR @WED_ID IS NULL)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
|
||||
CREATE PROC [dbo].[HJGL_sp_rpt_welderPerformance2]
|
||||
@unitcode VARCHAR(50) = NULL,
|
||||
@steel VARCHAR(50) = NULL,
|
||||
@WED_ID NVARCHAR(50) = NULL,
|
||||
@date1 DATETIME = NULL,
|
||||
@date2 DATETIME = NULL,
|
||||
@projectId NVARCHAR(500) = NULL,
|
||||
@installationId NVARCHAR(50)=NULL
|
||||
AS
|
||||
/*焊工业绩分析*/
|
||||
SELECT
|
||||
NEWID() AS Id,
|
||||
--total.ProjectId,
|
||||
--project.ProjectCode,--施工号
|
||||
'' as ProjectCode,
|
||||
total.Welder,
|
||||
wld.wed_code,-- 焊工代码
|
||||
wld.wed_name,--焊工名称
|
||||
wld.WED_Sex, --性别
|
||||
-------------本期start
|
||||
CAST(ISNULL(total.totalSize,0) AS DECIMAL(19,2)) AS totalSize, --总寸径
|
||||
ISNULL(total.totalJoint,0) AS totalJoint, --总焊口
|
||||
ISNULL(JointNum1.JointNum1,0) AS JointNum1, --一次拍片焊口数
|
||||
|
||||
ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS JointPassNum1, --一次拍片合格焊口数
|
||||
ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS RepairJoint1, --一次返修焊口数
|
||||
ISNULL(RepairJoint2.RepairJoint2,0) AS RepairJoint2, --二次返修焊口数
|
||||
ISNULL(RepairJoint3.RepairJoint3,0) AS RepairJoint3, --三次返修焊口数
|
||||
|
||||
CAST((CASE ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0) WHEN 0 THEN 0
|
||||
ELSE (CASE(ISNULL(JointNum1.JointNum1,0)) WHEN 0 THEN 0
|
||||
ELSE 1.0 * ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0)/(1.0 * JointNum1.JointNum1)
|
||||
END)END) AS DECIMAL(19,3)) AS JointPassRate , ---一次拍片焊口合格率
|
||||
|
||||
ISNULL(JointNum1.totalfilm,0) AS totalfilm, --一次拍片数
|
||||
(ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) AS totalPassfilm, --一次拍片合格数
|
||||
ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0) AS repairFilm1, --一次返修片子数
|
||||
|
||||
ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --二次返修片子数
|
||||
ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --三次返修片子数
|
||||
|
||||
CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) WHEN 0 THEN 0
|
||||
ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0
|
||||
ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0))/(1.0 * JointNum1.totalfilm)
|
||||
END) END) AS DECIMAL(19,3)) AS JointFilmPassRate ---一次拍片合格率
|
||||
|
||||
FROM
|
||||
--总达因值 --总焊口
|
||||
(SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
|
||||
,joint.Welder
|
||||
FROM View_JointWelder joint
|
||||
LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID
|
||||
WHERE joint.DReportID IS NOT NULL
|
||||
AND (report.JOT_WeldDate >= @date1 OR @date1 IS NULL) AND (report.JOT_WeldDate <= @date2 OR @date2 IS NULL)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL)
|
||||
GROUP BY joint.Welder) AS total
|
||||
|
||||
|
||||
--一次拍片焊口数 , 一次拍片总数,一次拍片合格总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm,
|
||||
joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT_FilmNum IS NOT NULL and joint.RT_FilmNum>0 and (select COUNT(*) from dbo.HJGL_BO_QualityRating where JOT_ID=joint.JOT_ID and FilmNum is not null)>0
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.Welder) AS JointNum1
|
||||
ON JointNum1.Welder = total.Welder
|
||||
|
||||
--一次拍片不合格焊口数
|
||||
LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1,
|
||||
rr.JOT_CellWelder as Welder
|
||||
FROM dbo.HJGL_CH_RepairItemRecord rr
|
||||
left join dbo.HJGL_View_JointInfo joint on rr.JOT_ID=joint.JOT_ID
|
||||
WHERE joint.PointType='点口' AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY rr.JOT_CellWelder) AS JointNoPassNum1
|
||||
ON JointNoPassNum1.Welder = total.Welder
|
||||
--一次拍片不合格拍片数
|
||||
LEFT JOIN (SELECT count(rr.RepairItemRecordId) as JointNoPassFilmNum2,
|
||||
rr.JOT_CellWelder as Welder
|
||||
FROM dbo.HJGL_CH_RepairItemRecord rr
|
||||
left join dbo.HJGL_View_JointInfo joint on rr.JOT_ID=joint.JOT_ID
|
||||
WHERE joint.PointType='点口'
|
||||
--AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null)
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL and rr.RepairMark='R1'
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY rr.JOT_CellWelder) AS JointNoPassNum2
|
||||
ON JointNoPassNum2.Welder = total.Welder
|
||||
--二次返修拍片焊口数,二次返修拍片总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2,
|
||||
joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT2_RepairFilm IS NOT NULL
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.Welder) AS RepairJoint2
|
||||
ON RepairJoint2.Welder = total.Welder
|
||||
|
||||
|
||||
|
||||
--三次返修拍片焊口数,三次返修拍片总数
|
||||
LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3,
|
||||
joint.Welder
|
||||
FROM dbo.View_JointWelder joint
|
||||
WHERE joint.PointType='点口' AND joint.RT3_RepairFilm IS NOT NULL
|
||||
AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')>= @date1 OR @date1 IS NULL)
|
||||
AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')<= @date2 OR @date2 IS NULL)
|
||||
GROUP BY joint.Welder) AS RepairJoint3
|
||||
ON RepairJoint3.Welder = total.Welder
|
||||
|
||||
--LEFT JOIN Base_Project project ON total.ProjectId=project.ProjectId
|
||||
LEFT JOIN dbo.HJGL_BS_Welder wld ON wld.WED_ID=total.Welder
|
||||
|
||||
WHERE
|
||||
-- (CHARINDEX(total.ProjectId,@projectId)>0 OR @projectId IS NULL)
|
||||
--AND (total.InstallationId = @installationId OR @installationId IS NULL)
|
||||
(wld.WED_Unit=@unitcode OR @unitcode IS NULL)
|
||||
AND (total.Welder = @WED_ID OR @WED_ID IS NULL)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
update Sys_Menu set SortIndex=10,MenuName='焊工业绩分析(RT)' where MenuId='41C22E63-36B7-4C44-6666-F765BFBB7C55'
|
||||
GO
|
||||
|
||||
INSERT INTO dbo.Sys_Menu(MenuId, MenuName, Url, SortIndex, SuperMenu,MenuModule)
|
||||
VALUES('9C7129AB-4557-4D03-BE7E-9A3311F02990','焊工业绩分析(PAUT)','HJGL/WeldingReport/WelderPerformancePAUT.aspx',20,'F3B157B7-9BEE-4150-6666-087828F1C51D','3')
|
||||
GO
|
||||
INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('70929397-A461-45F2-81EA-D40D20D3C232','9C7129AB-4557-4D03-BE7E-9A3311F02990','统计',1)
|
||||
INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('87309E05-7C92-4439-A8E4-537833BC90A0','9C7129AB-4557-4D03-BE7E-9A3311F02990','导出',2)
|
||||
go
|
||||
|
||||
alter table Weld_Storeman add UnitStoreId nvarchar(50) null
|
||||
GO
|
||||
|
|
@ -43,6 +43,7 @@
|
|||
newStoreman.StoreCode = storeMan.StoreCode;
|
||||
newStoreman.StoreName = storeMan.StoreName;
|
||||
newStoreman.UserId = storeMan.UserId;
|
||||
newStoreman.UnitStoreId = storeMan.UnitStoreId;
|
||||
db.Weld_Storeman.InsertOnSubmit(newStoreman);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
|
@ -62,6 +63,7 @@
|
|||
// newStoreman.UserId = storeMan.UserId;
|
||||
newStoreman.IdentityCard = storeMan.IdentityCard;
|
||||
newStoreman.SignatureUrl = storeMan.SignatureUrl;
|
||||
newStoreman.UnitStoreId = storeMan.UnitStoreId;
|
||||
//newStoreman.MyFinger = storeMan.MyFinger;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,6 +102,37 @@ namespace BLL
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改焊材入库
|
||||
/// </summary>
|
||||
/// <param name="stockIn"></param>
|
||||
public static void UpdateStockIn2(Model.Weld_StockIn stockIn)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockIn.StockInId);
|
||||
if (newStockIn != null)
|
||||
{
|
||||
newStockIn.WeldId = stockIn.WeldId;
|
||||
newStockIn.Amount = stockIn.Amount;
|
||||
newStockIn.Weight = stockIn.Weight;
|
||||
//newStockIn.RecycleAmount = stockIn.RecycleAmount;
|
||||
//newStockIn.RecycleWeight = stockIn.RecycleWeight;
|
||||
//newStockIn.Materialman = stockIn.Materialman;
|
||||
//newStockIn.InStockDate = stockIn.InStockDate;
|
||||
newStockIn.IsReview = stockIn.IsReview;
|
||||
//newStockIn.ReviewMan = stockIn.ReviewMan;
|
||||
newStockIn.ReviewDate = stockIn.ReviewDate;
|
||||
//newStockIn.ReviewResult = stockIn.ReviewResult;
|
||||
newStockIn.AttachUrl = stockIn.AttachUrl;
|
||||
//newStockIn.UsingAmount = stockIn.UsingAmount;
|
||||
newStockIn.Warrantybook = stockIn.Warrantybook;
|
||||
newStockIn.HeartNo = stockIn.HeartNo;
|
||||
newStockIn.SupplierId = stockIn.SupplierId;
|
||||
newStockIn.UnitStoreId = stockIn.UnitStoreId;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新附件
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<Items>
|
||||
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
|
||||
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true">
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true" EnableMultiSelect="false">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
|
||||
<Items>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ namespace FineUIPro.Web.ContinuousPrint
|
|||
SqlParameter[] parameter = listStr.ToArray();
|
||||
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid2.DataBind();
|
||||
Grid2.SelectAllRows();
|
||||
//Grid2.SelectAllRows();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -343,7 +343,7 @@ namespace FineUIPro.Web.ContinuousPrint
|
|||
keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString());
|
||||
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx";
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<Items>
|
||||
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
|
||||
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true">
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true" EnableMultiSelect="false">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
|
||||
<Items>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace FineUIPro.Web.ContinuousPrint
|
|||
SqlParameter[] parameter = listStr.ToArray();
|
||||
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid2.DataBind();
|
||||
Grid2.SelectAllRows();
|
||||
//Grid2.SelectAllRows();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<Items>
|
||||
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
|
||||
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true">
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true" EnableMultiSelect="false">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
|
||||
<Items>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ namespace FineUIPro.Web.ContinuousPrint
|
|||
SqlParameter[] parameter = listStr.ToArray();
|
||||
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid2.DataBind();
|
||||
Grid2.SelectAllRows();
|
||||
//Grid2.SelectAllRows();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId"
|
||||
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableRowSelectEvent="true" EnableRowClickEvent="true"
|
||||
OnRowClick="Grid1_RowClick">
|
||||
EnableRowSelectEvent="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
|
||||
<Items>
|
||||
|
|
@ -73,7 +72,7 @@
|
|||
<Items>
|
||||
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
|
||||
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true">
|
||||
SortDirection="ASC" EnableCheckBoxSelect="true" EnableMultiSelect="false">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
|
||||
<Items>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ namespace FineUIPro.Web.ContinuousPrint
|
|||
SqlParameter[] parameter = listStr.ToArray();
|
||||
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid2.DataBind();
|
||||
Grid2.SelectAllRows();
|
||||
//Grid2.SelectAllRows();
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/19/2024 10:28:42" ReportInfo.Modified="04/29/2025 16:16:31" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/19/2024 10:28:42" ReportInfo.Modified="05/19/2025 10:16:09" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<ScriptText>using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -50,7 +50,7 @@ namespace FastReport
|
|||
}
|
||||
</ScriptText>
|
||||
<Dictionary>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJ5i+2Ctv8ItL002ud+v5oNQ==">
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJtyFmUqnsDXf7HxDjLoIsxg==">
|
||||
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
|
||||
<Column Name="ISO_IsoNo" DataType="System.String" PropName="attach_image_id"/>
|
||||
<Column Name="JOT_JointNo" DataType="System.String" PropName="image_series"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/09/2025 17:37:32" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/19/2025 10:16:59" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<ScriptText>using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -42,7 +42,7 @@ namespace FastReport
|
|||
}
|
||||
</ScriptText>
|
||||
<Dictionary>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJYkylh3TFKXnBuJv63PwUGw==">
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJrkzKcYjz9mb1lmrtWQLLEw==">
|
||||
<TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
|
||||
<Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
|
||||
<Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="05/06/2025 14:37:26" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="11/20/2024 09:40:31" ReportInfo.Modified="05/19/2025 10:16:46" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<ScriptText>using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -41,7 +41,7 @@ namespace FastReport
|
|||
}
|
||||
</ScriptText>
|
||||
<Dictionary>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJY/MvafqAdTl9i5gdg1bNxg==">
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJVqzzkU8wvfVCg4+SuIh3TA==">
|
||||
<TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
|
||||
<Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
|
||||
<Column Name="InstallastionName" DataType="System.String" PropName="image_series"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,171 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="05/16/2025 16:25:24" ReportInfo.Modified="05/16/2025 16:58:58" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Dictionary/>
|
||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="784.35,963.9,0,321.3,151.2,75.6,56.7,37.8,189,264.6,330.75,406.35,425.25,378,434.7,510.3,604.8,699.3,793.8,841.05,916.65,320.96,109.13,61.88,80.78,69.17,178.3,240.18">
|
||||
<PageHeaderBand Name="PageHeader1" Width="971.46" Height="94.5" Guides="9.45,28.35,94.5,0,66.15">
|
||||
<TextObject Name="Text1" Left="784.35" Top="9.45" Width="179.55" Height="18.9" Text="ZDS-T6.38.039.A/1.2022" Font="宋体, 11pt, style=Bold"/>
|
||||
<TableObject Name="Table1" Top="28.35" Width="321.3" Height="66.15">
|
||||
<TableColumn Name="Column1" Width="37.8"/>
|
||||
<TableColumn Name="Column2" Width="151.2"/>
|
||||
<TableColumn Name="Column3" Width="75.6"/>
|
||||
<TableColumn Name="Column4" Width="56.7"/>
|
||||
<TableRow Name="Row1" Height="28.35">
|
||||
<TableCell Name="Cell1" Border.Lines="All" Text="材料清单" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt, style=Bold" ColSpan="4"/>
|
||||
<TableCell Name="Cell2" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
<TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
<TableCell Name="Cell4" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row2" Height="37.8">
|
||||
<TableCell Name="Cell6" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell7" Border.Lines="All" Text="描述" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell8" Border.Lines="All" Text="公称直径" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell9" Border.Lines="All" Text="数量" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
<TableObject Name="Table2" Left="330.75" Top="28.35" Width="633.15" Height="66.15">
|
||||
<TableColumn Name="Column5" Width="103.95"/>
|
||||
<TableColumn Name="Column6" Width="75.6"/>
|
||||
<TableColumn Name="Column7" Width="94.5"/>
|
||||
<TableColumn Name="Column8" Width="94.5"/>
|
||||
<TableColumn Name="Column9" Width="94.5"/>
|
||||
<TableColumn Name="Column10" Width="47.25"/>
|
||||
<TableColumn Name="Column11" Width="75.6"/>
|
||||
<TableColumn Name="Column12" Width="47.25"/>
|
||||
<TableRow Name="Row3" Height="28.35">
|
||||
<TableCell Name="Cell10" Border.Lines="All" Text="焊口清单" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt, style=Bold" ColSpan="8"/>
|
||||
<TableCell Name="Cell11" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
<TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
<TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt, style=Bold"/>
|
||||
<TableCell Name="Cell18" Border.Lines="All" Font="宋体, 9pt, style=Bold"/>
|
||||
<TableCell Name="Cell20" Border.Lines="All" Font="宋体, 9pt, style=Bold"/>
|
||||
<TableCell Name="Cell22" Border.Lines="All" Font="宋体, 9pt, style=Bold"/>
|
||||
<TableCell Name="Cell24" Font="宋体, 9pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row4" Height="37.8">
|
||||
<TableCell Name="Cell14" Border.Lines="All" Text="管道编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell15" Border.Lines="All" Text="焊口编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell16" Border.Lines="All" Text="焊工代号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell17" Border.Lines="All" Text="规格mm" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell19" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell21" Border.Lines="All" Text="焊接位置" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell23" Border.Lines="All" Text="热处理" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell25" Border.Lines="All" Text="检测方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
</PageHeaderBand>
|
||||
<DataBand Name="Data1" Top="98.5" Width="971.46" Height="37.8" Guides="0,37.8">
|
||||
<TableObject Name="Table3" Width="321.3" Height="37.8">
|
||||
<TableColumn Name="Column13" Width="37.8"/>
|
||||
<TableColumn Name="Column14" Width="151.2"/>
|
||||
<TableColumn Name="Column15" Width="75.6"/>
|
||||
<TableColumn Name="Column16" Width="56.7"/>
|
||||
<TableRow Name="Row6" Height="37.8">
|
||||
<TableCell Name="Cell30" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
|
||||
<TableCell Name="Cell31" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
|
||||
<TableCell Name="Cell32" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
|
||||
<TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
<TableObject Name="Table4" Left="330.75" Width="633.15" Height="37.8">
|
||||
<TableColumn Name="Column17" Width="103.95"/>
|
||||
<TableColumn Name="Column18" Width="75.6"/>
|
||||
<TableColumn Name="Column19" Width="94.5"/>
|
||||
<TableColumn Name="Column20" Width="94.5"/>
|
||||
<TableColumn Name="Column21" Width="94.5"/>
|
||||
<TableColumn Name="Column22" Width="47.25"/>
|
||||
<TableColumn Name="Column23" Width="75.6"/>
|
||||
<TableColumn Name="Column24" Width="47.25"/>
|
||||
<TableRow Name="Row8" Height="37.8">
|
||||
<TableCell Name="Cell42" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell43" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell46" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell47" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell48" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
<TableCell Name="Cell49" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
</DataBand>
|
||||
<ColumnFooterBand Name="ColumnFooter1" Top="182.1" Width="971.46">
|
||||
<ChildBand Name="Child1" Top="140.3" Width="971.46" Height="37.8" Guides="0,37.8" FillUnusedSpace="true">
|
||||
<TableObject Name="Table5" Width="321.3" Height="37.8">
|
||||
<TableColumn Name="Column25" Width="37.8"/>
|
||||
<TableColumn Name="Column26" Width="151.2"/>
|
||||
<TableColumn Name="Column27" Width="75.6"/>
|
||||
<TableColumn Name="Column28" Width="56.7"/>
|
||||
<TableRow Name="Row9" Height="37.8">
|
||||
<TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell51" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
<TableObject Name="Table6" Left="330.75" Width="633.15" Height="37.8">
|
||||
<TableColumn Name="Column29" Width="103.95"/>
|
||||
<TableColumn Name="Column30" Width="75.6"/>
|
||||
<TableColumn Name="Column31" Width="94.5"/>
|
||||
<TableColumn Name="Column32" Width="94.5"/>
|
||||
<TableColumn Name="Column33" Width="94.5"/>
|
||||
<TableColumn Name="Column34" Width="47.25"/>
|
||||
<TableColumn Name="Column35" Width="75.6"/>
|
||||
<TableColumn Name="Column36" Width="47.25"/>
|
||||
<TableRow Name="Row10" Height="37.8">
|
||||
<TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell55" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell56" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell57" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell58" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell59" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell60" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
<TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
</ChildBand>
|
||||
</ColumnFooterBand>
|
||||
<PageFooterBand Name="PageFooter1" Top="186.1" Width="971.46" Height="188.24" Guides="0,188.24,84.29,112.64,28.35,131.54,18.9,150.44,169.34">
|
||||
<TableObject Name="Table7" Width="320.96" Height="188.24" Border.Lines="All">
|
||||
<TableColumn Name="Column37" Width="69.17"/>
|
||||
<TableColumn Name="Column38" Width="109.13"/>
|
||||
<TableColumn Name="Column39" Width="61.88"/>
|
||||
<TableColumn Name="Column40" Width="80.78"/>
|
||||
<TableRow Name="Row11" Height="84.29">
|
||||
<TableCell Name="Cell62" Text="说明：" Font="宋体, 11pt" ColSpan="4"/>
|
||||
<TableCell Name="Cell63" Font="宋体, 11pt"/>
|
||||
<TableCell Name="Cell64" Font="宋体, 11pt"/>
|
||||
<TableCell Name="Cell65" Font="宋体, 11pt"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row12" Height="28.35">
|
||||
<TableCell Name="Cell67" Border.Lines="All" Text="浙江鼎盛石化工程有限公司" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt, style=Bold" ColSpan="4"/>
|
||||
<TableCell Name="Cell68" Border.Lines="All"/>
|
||||
<TableCell Name="Cell69" Border.Lines="All"/>
|
||||
<TableCell Name="Cell70" Border.Lines="All"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row13">
|
||||
<TableCell Name="Cell72" Border.Lines="All" Text="工程名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell73" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="3"/>
|
||||
<TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row14">
|
||||
<TableCell Name="Cell77" Border.Lines="All" Text="施工图号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell78" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="3"/>
|
||||
<TableCell Name="Cell79" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell80" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row15">
|
||||
<TableCell Name="Cell82" Border.Lines="All" Text="管线编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell83" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell84" Border.Lines="All" Text="绘 制" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell85" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row16">
|
||||
<TableCell Name="Cell86" Border.Lines="All" Text="管 道 轴 测 图 附 页" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="2"/>
|
||||
<TableCell Name="Cell87" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
<TableCell Name="Cell88" Border.Lines="All" Text="共[TotalPages#]页 第[Page#]页" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="2"/>
|
||||
<TableCell Name="Cell89" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
|
||||
</TableRow>
|
||||
</TableObject>
|
||||
</PageFooterBand>
|
||||
</ReportPage>
|
||||
</Report>
|
||||
|
|
@ -1221,6 +1221,7 @@
|
|||
<Content Include="HJGL\WeldingReport\WelderCheckStatistic.aspx" />
|
||||
<Content Include="HJGL\WeldingReport\WelderCoverageQuery.aspx" />
|
||||
<Content Include="HJGL\WeldingReport\WelderPerformance.aspx" />
|
||||
<Content Include="HJGL\WeldingReport\WelderPerformancePAUT.aspx" />
|
||||
<Content Include="HJGL\WeldingReport\WeldInspectionCheckRecord.aspx" />
|
||||
<Content Include="HJGL\WeldingReport\WeldInspectionCheckRecordItem.aspx" />
|
||||
<Content Include="Images\dlu.gif" />
|
||||
|
|
@ -1448,6 +1449,34 @@
|
|||
<Content Include="File\Excel\焊剂烘烤记录导入模板.xlsx" />
|
||||
<Content Include="File\Excel\焊材库温度湿度记录导入模板.xlsx" />
|
||||
<Content Include="File\Excel\焊条烘烤记录导入模板.xlsx" />
|
||||
<Content Include="File\Fastreport\射线检测报告%28新%29.frx" />
|
||||
<Content Include="File\Fastreport\射线检测报告.frx" />
|
||||
<Content Include="File\Fastreport\射线检测记录.frx" />
|
||||
<Content Include="File\Fastreport\材料标签.frx" />
|
||||
<Content Include="File\Fastreport\渗透检测报告%28新%29.frx" />
|
||||
<Content Include="File\Fastreport\渗透检测报告.frx" />
|
||||
<Content Include="File\Fastreport\热处理委托单.frx" />
|
||||
<Content Include="File\Fastreport\焊丝发放记录.frx" />
|
||||
<Content Include="File\Fastreport\焊剂发放记录.frx" />
|
||||
<Content Include="File\Fastreport\焊剂烘烤记录.frx" />
|
||||
<Content Include="File\Fastreport\焊材库温湿度记录.frx" />
|
||||
<Content Include="File\Fastreport\焊材库温湿度记录_电子签.frx" />
|
||||
<Content Include="File\Fastreport\焊条发放回收记录.frx" />
|
||||
<Content Include="File\Fastreport\焊条烘烤记录.frx" />
|
||||
<Content Include="File\Fastreport\硬度试验委托单.frx" />
|
||||
<Content Include="File\Fastreport\磁粉检测报告%28新%29.frx" />
|
||||
<Content Include="File\Fastreport\磁粉检测报告.frx" />
|
||||
<Content Include="File\Fastreport\管道对接焊接接头报检检查记录.frx" />
|
||||
<Content Include="File\Fastreport\管道焊口检测委托单.frx" />
|
||||
<Content Include="File\Fastreport\管道焊接工作记录.frx" />
|
||||
<Content Include="File\Fastreport\管道焊接接头报检检查记录.frx" />
|
||||
<Content Include="File\Fastreport\管道焊接接头热处理报告.frx" />
|
||||
<Content Include="File\Fastreport\管道焊缝检测委托单.frx" />
|
||||
<Content Include="File\Fastreport\管道轴测图附页.frx" />
|
||||
<Content Include="File\Fastreport\管道返修焊接工作记录.frx" />
|
||||
<Content Include="File\Fastreport\超声检测报告%28新%29.frx" />
|
||||
<Content Include="File\Fastreport\超声检测报告.frx" />
|
||||
<Content Include="File\Fastreport\项目管理部焊缝检测委托单.frx" />
|
||||
<None Include="File\OfficeControl.rar" />
|
||||
<None Include="File\Word\Unqualified\工程复工报告.doc" />
|
||||
<None Include="File\人脸扫描手动注册.rar" />
|
||||
|
|
@ -6449,6 +6478,13 @@
|
|||
<Compile Include="HJGL\WeldingReport\WelderPerformance.aspx.designer.cs">
|
||||
<DependentUpon>WelderPerformance.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingReport\WelderPerformancePAUT.aspx.cs">
|
||||
<DependentUpon>WelderPerformancePAUT.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingReport\WelderPerformancePAUT.aspx.designer.cs">
|
||||
<DependentUpon>WelderPerformancePAUT.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingReport\WeldInspectionCheckRecord.aspx.cs">
|
||||
<DependentUpon>WeldInspectionCheckRecord.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
using System.Threading;
|
||||
using System.Web;
|
||||
using BLL;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
|
||||
public class Global : System.Web.HttpApplication
|
||||
{
|
||||
|
|
@ -464,6 +467,88 @@
|
|||
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedProject(updateQue);
|
||||
}
|
||||
}
|
||||
|
||||
bool b = false;
|
||||
string orderTime = string.Empty;
|
||||
if (intHour == 8)
|
||||
{
|
||||
orderTime = "7:00 - 8:00";
|
||||
}
|
||||
else if (intHour == 9)
|
||||
{
|
||||
orderTime = "8:00 - 9:00";
|
||||
}
|
||||
else if (intHour == 10)
|
||||
{
|
||||
orderTime = "9:00 - 10:00";
|
||||
}
|
||||
else if (intHour == 11)
|
||||
{
|
||||
orderTime = "10:00 - 11:00";
|
||||
}
|
||||
else if (intHour == 12)
|
||||
{
|
||||
orderTime = "11:00 - 12:00";
|
||||
}
|
||||
else if (intHour == 13)
|
||||
{
|
||||
orderTime = "12:00 - 13:00";
|
||||
}
|
||||
else if (intHour == 14)
|
||||
{
|
||||
orderTime = "13:00 - 14:00";
|
||||
}
|
||||
else if (intHour == 15)
|
||||
{
|
||||
orderTime = "14:00 - 15:00";
|
||||
}
|
||||
else if (intHour == 16)
|
||||
{
|
||||
orderTime = "15:00 - 16:00";
|
||||
}
|
||||
else if (intHour == 17)
|
||||
{
|
||||
orderTime = "16:00 - 17:00";
|
||||
}
|
||||
else if (intHour == 18)
|
||||
{
|
||||
orderTime = "17:00 - 18:00";
|
||||
}
|
||||
else if (intHour == 19)
|
||||
{
|
||||
orderTime = "18:00 - 19:00";
|
||||
}
|
||||
else if (intHour == 20)
|
||||
{
|
||||
orderTime = "19:00 - 20:00";
|
||||
}
|
||||
else if (intHour == 21)
|
||||
{
|
||||
orderTime = "20:00 - 21:00";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(orderTime))
|
||||
{
|
||||
b = true;
|
||||
}
|
||||
if (b)
|
||||
{
|
||||
string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p
|
||||
WHERE p.OrderDate<CONVERT(char(10),GetDate(),120)
|
||||
AND p.IsCancel=0 AND OrderTime=@OrderTime
|
||||
AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@OrderTime", orderTime));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(lastPlan, parameter);
|
||||
if (dt.Rows.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < dt.Rows.Count; i++)
|
||||
{
|
||||
string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString();
|
||||
BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void Session_Start(object sender, EventArgs e)
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@
|
|||
</f:Label>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="BtnAnalyse2" Text="按焊工统计" Icon="ChartPie" runat="server" Hidden="true" OnClick="BtnAnalyse2_Click"></f:Button>
|
||||
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
|
||||
<f:Button ID="BtnAnalyse2" Text="按焊工统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse2_Click"></f:Button>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -398,6 +398,7 @@
|
|||
/// <param name="e"></param>
|
||||
protected void BtnAnalyse_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Grid1.Columns[1].Hidden = false;
|
||||
BindGrid();
|
||||
OutputSummaryData();
|
||||
}
|
||||
|
|
@ -409,8 +410,10 @@
|
|||
/// <param name="e"></param>
|
||||
protected void BtnAnalyse2_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Grid1.Columns[1].Hidden = true;
|
||||
BindGrid2();
|
||||
OutputSummaryData();
|
||||
this.Grid1.SummaryData = null;
|
||||
//OutputSummaryData();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,163 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderPerformancePAUT.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WelderPerformancePAUT" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head id="Head1" runat="server">
|
||||
<title>焊工业绩分析</title>
|
||||
<style>
|
||||
.f-grid-row-summary .f-grid-cell-inner {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" />
|
||||
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
|
||||
<Regions>
|
||||
<f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
|
||||
BodyPadding="0 5 0 0" Layout="VBox" runat="server" EnableCollapse="true" BoxConfigAlign="Stretch" BoxConfigPosition="Left">
|
||||
<Items>
|
||||
<f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server" LabelAlign="Right">
|
||||
<Rows>
|
||||
<f:FormRow ColumnWidths="39% 18% 18% 18%">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpProject" runat="server" LabelWidth="80px" Label="项目" EnableEdit="true"
|
||||
EnableMultiSelect="true" EnableCheckBoxSelect="true"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="drpProject_OnSelectedIndexChanged">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpIns" runat="server" LabelWidth="80px" Label="装置" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpWloName" runat="server" LabelWidth="80px" Label="焊工" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow ColumnWidths="25% 18% 20% 20%">
|
||||
<Items>
|
||||
<f:DatePicker runat="server" Label="反馈日期" ID="txtStarTime" LabelWidth="80px" Width="200px"></f:DatePicker>
|
||||
<f:DatePicker runat="server" Label="至" ID="txtEndTime" LabelWidth="30px" Width="130px"></f:DatePicker>
|
||||
<f:DropDownList ID="drpSteel" runat="server" LabelWidth="80px" Label="材质" EnableEdit="true" Width="200px">
|
||||
</f:DropDownList>
|
||||
<f:Label ID="Label1" runat="server" Width="100px">
|
||||
</f:Label>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="BtnAnalyse2" Text="按焊工统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse2_Click"></f:Button>
|
||||
<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:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</Items>
|
||||
</f:Region>
|
||||
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
|
||||
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊工业绩分析" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
|
||||
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ProjectCode,wed_code"
|
||||
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
|
||||
OnPageIndexChange="Grid1_PageIndexChange" EnableSummary="true" SummaryPosition="Flow">
|
||||
<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="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="130px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊工代码" ColumnID="wed_code" DataField="wed_code" SortField="wed_code"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊工名称" ColumnID="wed_name" DataField="wed_name" SortField="wed_name"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="性别" ColumnID="WED_Sex" DataField="WED_Sex" SortField="WED_Sex"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px" RendererFunction="renderGenderSex">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="本期总寸径值" ColumnID="totalSize" DataField="totalSize" SortField="totalSize"
|
||||
FieldType="Double" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="本期总焊口" ColumnID="totalJoint" DataField="totalJoint" SortField="totalJoint"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次拍片道数" ColumnID="JointNum1" DataField="JointNum1" SortField="JointNum1"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次拍片数" ColumnID="totalfilm" DataField="totalfilm" SortField="totalfilm"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次合格道数" ColumnID="JointPassNum1" DataField="JointPassNum1" SortField="JointPassNum1"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次拍片合格数" ColumnID="totalPassfilm" DataField="totalPassfilm" SortField="totalPassfilm"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次返修道数" ColumnID="RepairJoint1" DataField="RepairJoint1" SortField="RepairJoint1"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次返修片子数" ColumnID="repairFilm1" DataField="repairFilm1" SortField="repairFilm1"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="二次返修道数" ColumnID="RepairJoint2" DataField="RepairJoint2" SortField="RepairJoint2"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="二次返修片子数" ColumnID="repairFilm2" DataField="repairFilm2" SortField="repairFilm2"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="三次返修道数" ColumnID="RepairJoint3" DataField="RepairJoint3" SortField="RepairJoint3"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="三次返修片子数" ColumnID="repairFilm3" DataField="repairFilm3" SortField="repairFilm3"
|
||||
FieldType="Int" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次合格道数合格率" ColumnID="JointPassRate" DataField="JointPassRate" SortField="JointPassRate"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Right" Width="150px" RendererFunction="renderGender">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="一次拍片合格率" ColumnID="JointFilmPassRate" DataField="JointFilmPassRate" SortField="JointFilmPassRate"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Right" Width="150px" RendererFunction="renderGender">
|
||||
</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="15" Value="15" />
|
||||
<f:ListItem Text="30" Value="30" />
|
||||
<f:ListItem Text="50" Value="50" />
|
||||
<f:ListItem Text="所有行" Value="100000" />
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Region>
|
||||
</Regions>
|
||||
</f:RegionPanel>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
function renderGender(value) {
|
||||
var returnValue = null;
|
||||
if (value != null) {
|
||||
returnValue = (value * 100).toFixed(1).toString() + "%";
|
||||
}
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
function renderGenderSex(value) {
|
||||
return value == "2" ? "女" : "男";
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,548 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Text;
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Linq;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingReport
|
||||
{
|
||||
public partial class WelderPerformancePAUT : PageBase
|
||||
{
|
||||
#region 加载页面
|
||||
/// <summary>
|
||||
/// 加载页面
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
|
||||
var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4);
|
||||
///单位
|
||||
this.drpUnit.DataTextField = "UnitName";
|
||||
this.drpUnit.DataValueField = "UnitId";
|
||||
this.drpUnit.DataSource = pUnit;
|
||||
this.drpUnit.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpUnit);
|
||||
|
||||
///项目
|
||||
this.drpProject.DataTextField = "ProjectCode";
|
||||
this.drpProject.DataValueField = "ProjectId";
|
||||
this.drpProject.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
|
||||
this.drpProject.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProject);
|
||||
///焊工
|
||||
this.drpWloName.DataTextField = "Text";
|
||||
this.drpWloName.DataValueField = "Value";
|
||||
this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetWelderCodeList();
|
||||
this.drpWloName.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpWloName);
|
||||
////材质
|
||||
this.drpSteel.DataTextField = "STE_Code";
|
||||
this.drpSteel.DataValueField = "STE_ID";
|
||||
this.drpSteel.DataSource = BLL.HJGL_MaterialService.GetSteelList();
|
||||
this.drpSteel.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpSteel);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 全部行合计
|
||||
/// </summary>
|
||||
private void OutputSummaryData()
|
||||
{
|
||||
if (tb != null)
|
||||
{
|
||||
double totalSize = 0.0f;
|
||||
int totalJoint = 0;
|
||||
int JointNum1 = 0;
|
||||
int totalfilm = 0;
|
||||
int JointPassNum1 = 0;
|
||||
int totalPassfilm = 0;
|
||||
int RepairJoint1 = 0;
|
||||
int repairFilm1 = 0;
|
||||
int RepairJoint2 = 0;
|
||||
int repairFilm2 = 0;
|
||||
int RepairJoint3 = 0;
|
||||
int repairFilm3 = 0;
|
||||
string filmPassRate = "";
|
||||
string jointPassRate = "";
|
||||
|
||||
//foreach (DataRow row in tb.Rows)
|
||||
//{
|
||||
// totalSize += Convert.ToDouble(row["totalSize"]);
|
||||
// totalJoint += Convert.ToInt32(row["totalJoint"]);
|
||||
// JointNum1 += Convert.ToInt32(row["JointNum1"]);
|
||||
// totalfilm += Convert.ToInt32(row["totalfilm"]);
|
||||
// JointPassNum1 += Convert.ToInt32(row["JointPassNum1"]);
|
||||
// totalPassfilm += Convert.ToInt32(row["totalPassfilm"]);
|
||||
|
||||
// RepairJoint1 += Convert.ToInt32(row["RepairJoint1"]);
|
||||
// repairFilm1 += Convert.ToInt32(row["repairFilm1"]);
|
||||
// RepairJoint2 += Convert.ToInt32(row["RepairJoint2"]);
|
||||
// repairFilm2 += Convert.ToInt32(row["repairFilm2"]);
|
||||
// RepairJoint3 += Convert.ToInt32(row["RepairJoint3"]);
|
||||
// repairFilm3 += Convert.ToInt32(row["repairFilm3"]);
|
||||
//}
|
||||
//if (totalfilm != 0)
|
||||
//{
|
||||
// filmPassRate = (totalPassfilm * 100.0 / totalfilm * 1.0).ToString("0.00") + "%";
|
||||
//}
|
||||
//if (JointNum1 != 0)
|
||||
//{
|
||||
// jointPassRate = (JointPassNum1 * 100.0 / JointNum1 * 1.0).ToString("0.00") + "%";
|
||||
//}
|
||||
string projectIds = String.Join(",", drpProject.SelectedValueArray);
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
if (this.drpIns.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", null));
|
||||
}
|
||||
|
||||
if (this.drpUnit.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", null));
|
||||
}
|
||||
|
||||
if (this.drpSteel.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", null));
|
||||
}
|
||||
if (this.drpWloName.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtStarTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", null));
|
||||
}
|
||||
|
||||
if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", projectIds));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", null));
|
||||
}
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tbSum = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformanceSum", parameter);
|
||||
if (tbSum.Rows.Count > 0)
|
||||
{
|
||||
JObject summary = new JObject();
|
||||
summary.Add("tfNumber", "合计");
|
||||
summary.Add("totalJoint", tbSum.Rows[0]["totalJoint"].ToString());
|
||||
summary.Add("totalSize", tbSum.Rows[0]["totalSize"].ToString());
|
||||
summary.Add("JointNum1", tbSum.Rows[0]["JointNum1"].ToString());
|
||||
summary.Add("totalfilm", tbSum.Rows[0]["totalfilm"].ToString());
|
||||
summary.Add("JointPassNum1", tbSum.Rows[0]["JointPassNum1"].ToString());
|
||||
summary.Add("totalPassfilm", tbSum.Rows[0]["totalPassfilm"].ToString());
|
||||
|
||||
summary.Add("RepairJoint1", tbSum.Rows[0]["RepairJoint1"].ToString());
|
||||
summary.Add("repairFilm1", tbSum.Rows[0]["repairFilm1"].ToString());
|
||||
summary.Add("RepairJoint2", tbSum.Rows[0]["RepairJoint2"].ToString());
|
||||
summary.Add("repairFilm2", tbSum.Rows[0]["repairFilm2"].ToString());
|
||||
summary.Add("RepairJoint3", tbSum.Rows[0]["RepairJoint3"].ToString());
|
||||
summary.Add("repairFilm3", tbSum.Rows[0]["repairFilm3"].ToString());
|
||||
summary.Add("JointPassRate", (Funs.GetNewDecimalOrZero(tbSum.Rows[0]["JointPassRate"].ToString()) * 100).ToString("0.00") + "%");
|
||||
summary.Add("JointFilmPassRate", (Funs.GetNewDecimalOrZero(tbSum.Rows[0]["JointFilmPassRate"].ToString()) * 100).ToString("0.00") + "%");
|
||||
|
||||
Grid1.SummaryData = summary;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 数据表
|
||||
/// </summary>
|
||||
private DataTable tb = null;
|
||||
|
||||
#region 绑定数据
|
||||
/// <summary>
|
||||
/// 绑定数据
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string projectIds = String.Join(",", drpProject.SelectedValueArray);
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
if (this.drpIns.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", null));
|
||||
}
|
||||
|
||||
if (this.drpUnit.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", null));
|
||||
}
|
||||
|
||||
if (this.drpSteel.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", null));
|
||||
}
|
||||
if (this.drpWloName.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtStarTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", null));
|
||||
}
|
||||
|
||||
if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", projectIds));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", null));
|
||||
}
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT", parameter);
|
||||
this.Grid1.RecordCount = tb.Rows.Count;
|
||||
tb = GetFilteredTable(Grid1.FilteredData, tb);
|
||||
var table = this.GetPagedDataTable(Grid1, tb);
|
||||
Grid1.DataSource = table;
|
||||
Grid1.DataBind();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 绑定数据
|
||||
/// </summary>
|
||||
private void BindGrid2()
|
||||
{
|
||||
string projectIds = String.Join(",", drpProject.SelectedValueArray);
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
if (this.drpIns.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@installationId", null));
|
||||
}
|
||||
|
||||
if (this.drpUnit.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@unitcode", null));
|
||||
}
|
||||
|
||||
if (this.drpSteel.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@steel", null));
|
||||
}
|
||||
if (this.drpWloName.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WED_ID", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtStarTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date1", null));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1)));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@date2", null));
|
||||
}
|
||||
|
||||
if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", projectIds));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@projectId", null));
|
||||
}
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT2", parameter);
|
||||
this.Grid1.RecordCount = tb.Rows.Count;
|
||||
tb = GetFilteredTable(Grid1.FilteredData, tb);
|
||||
var table = this.GetPagedDataTable(Grid1, tb);
|
||||
Grid1.DataSource = table;
|
||||
Grid1.DataBind();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 分页
|
||||
/// <summary>
|
||||
/// 分页
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||
{
|
||||
this.BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分页显示条数下拉框
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
|
||||
this.BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 排序
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
|
||||
{
|
||||
this.BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 统计按钮事件
|
||||
/// <summary>
|
||||
/// 统计
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void BtnAnalyse_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Grid1.Columns[1].Hidden = false;
|
||||
BindGrid();
|
||||
OutputSummaryData();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 统计
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void BtnAnalyse2_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Grid1.Columns[1].Hidden = true;
|
||||
BindGrid2();
|
||||
this.Grid1.SummaryData = null;
|
||||
//OutputSummaryData();
|
||||
}
|
||||
#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;
|
||||
Grid1.PageSize = 100000;
|
||||
BindGrid();
|
||||
Response.Write(GetGridTableHtml(Grid1));
|
||||
Response.End();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 导出方法
|
||||
/// </summary>
|
||||
/// <param name="grid"></param>
|
||||
/// <returns></returns>
|
||||
private string GetGridTableHtml(Grid grid)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
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 下拉框联动事件
|
||||
/// <summary>
|
||||
/// 项目下拉框变化事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void drpProject_OnSelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
drpIns.Items.Clear();
|
||||
this.drpUnit.Items.Clear(); ///单位
|
||||
this.drpWloName.Items.Clear(); ///焊工
|
||||
if (drpProject.SelectedValueArray.Length > 1)
|
||||
{
|
||||
drpProject.Items[0].Selected = false;
|
||||
}
|
||||
if (drpProject.SelectedValueArray.Length == 0)
|
||||
{
|
||||
drpProject.Items[0].Selected = true;
|
||||
}
|
||||
if (drpProject.SelectedValueArray.Length == 1 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null)
|
||||
{
|
||||
var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(drpProject.SelectedValueArray[0], BLL.Const.UnitType_4);
|
||||
this.drpUnit.DataSource = pUnit;
|
||||
this.drpUnit.DataBind();
|
||||
|
||||
this.drpIns.Items.Clear();
|
||||
this.drpIns.DataTextField = "Text";
|
||||
this.drpIns.DataValueField = "Value";
|
||||
this.drpIns.DataSource = BLL.Project_InstallationService.GetInstallationList(drpProject.SelectedValueArray[0]);
|
||||
this.drpIns.DataBind();
|
||||
|
||||
}
|
||||
Funs.FineUIPleaseSelect(this.drpIns);
|
||||
this.drpIns.SelectedValue = BLL.Const._Null;
|
||||
Funs.FineUIPleaseSelect(this.drpUnit);
|
||||
this.drpUnit.SelectedValue = BLL.Const._Null;
|
||||
this.drpWloName.DataTextField = "Text";
|
||||
this.drpWloName.DataValueField = "Value";
|
||||
if (drpProject.SelectedValueArray.Length == 1 && this.drpProject.SelectedValueArray[0] == BLL.Const._Null)
|
||||
{
|
||||
this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetWelderCodeList();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetProjectWelderCodeList2(drpProject.SelectedValueArray[0]);
|
||||
}
|
||||
this.drpWloName.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpWloName);
|
||||
this.drpWloName.SelectedValue = BLL.Const._Null;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 单位下拉框变化事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void drpUnit_OnSelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.drpWloName.Items.Clear(); ///焊工
|
||||
if (this.drpUnit.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
this.drpWloName.DataTextField = "Text";
|
||||
this.drpWloName.DataValueField = "Value";
|
||||
this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetProjectWelderCodeListByUnitId(this.drpProject.SelectedValue, this.drpUnit.SelectedValue);
|
||||
this.drpWloName.DataBind();
|
||||
}
|
||||
Funs.FineUIPleaseSelect(this.drpWloName);
|
||||
this.drpWloName.SelectedValue = BLL.Const._Null;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
231
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.designer.cs
generated
Normal file
231
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.designer.cs
generated
Normal file
|
|
@ -0,0 +1,231 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingReport {
|
||||
|
||||
|
||||
public partial class WelderPerformancePAUT {
|
||||
|
||||
/// <summary>
|
||||
/// Head1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// RegionPanel1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RegionPanel RegionPanel1;
|
||||
|
||||
/// <summary>
|
||||
/// Region1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Region Region1;
|
||||
|
||||
/// <summary>
|
||||
/// Form2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form Form2;
|
||||
|
||||
/// <summary>
|
||||
/// drpProject 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpProject;
|
||||
|
||||
/// <summary>
|
||||
/// drpIns 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpIns;
|
||||
|
||||
/// <summary>
|
||||
/// drpUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnit;
|
||||
|
||||
/// <summary>
|
||||
/// drpWloName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWloName;
|
||||
|
||||
/// <summary>
|
||||
/// txtStarTime 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtStarTime;
|
||||
|
||||
/// <summary>
|
||||
/// txtEndTime 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtEndTime;
|
||||
|
||||
/// <summary>
|
||||
/// drpSteel 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpSteel;
|
||||
|
||||
/// <summary>
|
||||
/// Label1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label1;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// BtnAnalyse2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button BtnAnalyse2;
|
||||
|
||||
/// <summary>
|
||||
/// BtnAnalyse 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button BtnAnalyse;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnOut;
|
||||
|
||||
/// <summary>
|
||||
/// Region2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Region Region2;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <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;
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||
<appSettings>
|
||||
<!--连接字符串-->
|
||||
<add key="ConnectionString" value="Server=.\SQL2019;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=.\MSSQLSERVER01;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/;"/>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<%-- <f:RenderField Width="150px" ColumnID="StoreCode" DataField="StoreCode" FieldType="String"
|
||||
HeaderText="代号" HeaderTextAlign="Center" TextAlign="Left" SortField="StoreCode">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField Width="150px" ColumnID="StoreName" DataField="StoreName" FieldType="String"
|
||||
<f:RenderField Width="100px" ColumnID="StoreName" DataField="StoreName" FieldType="String"
|
||||
HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left" SortField="StoreName">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="200px" ColumnID="IdentityCard" DataField="IdentityCard" FieldType="String"
|
||||
|
|
@ -53,6 +53,9 @@
|
|||
<f:ImageField ID="imgUrl" runat="server" DataImageUrlField="SignatureUrl" Width="180px"
|
||||
HeaderText="电子签名" ImageHeight="30px" ImageWidth="140px" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:ImageField>
|
||||
<f:RenderField Width="200px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String" ExpandUnusedSpace="true"
|
||||
HeaderText="负责焊材库" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<%--<f:Listener Event="rowselect" Handler="onGridRowSelect" />--%>
|
||||
|
|
@ -84,11 +87,14 @@
|
|||
</f:TextBox>
|
||||
<f:TextBox ID="txtIdentityCard" Label="身份证" runat="server" LabelAlign="right" MaxLength="18">
|
||||
</f:TextBox>
|
||||
<f:DropDownList ID="drpUnitStore" runat="server" ShowRedStar="true" Required="true" Label="负责焊材库" LabelAlign="Right">
|
||||
</f:DropDownList>
|
||||
<f:FileUpload ID="filePhoto" runat="server" ButtonText="上传电子签名" ButtonOnly="true"
|
||||
AutoPostBack="true" OnFileSelected="filePhoto_FileSelected">
|
||||
</f:FileUpload>
|
||||
<f:Image ID="imgPhoto" CssClass="userphoto" runat="server" BoxFlex="1">
|
||||
</f:Image>
|
||||
|
||||
</Items>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
|
||||
|
|
|
|||
|
|
@ -19,7 +19,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
|
|||
if (!IsPostBack)
|
||||
{
|
||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
|
||||
BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, string.Empty, true);
|
||||
if (this.CurrUser.UserId == BLL.Const.GlyId || this.CurrUser.UserId == "32da7c11-0869-4b9a-8db4-4e51a4a91f31")
|
||||
{
|
||||
this.drpUnitStore.Enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.drpUnitStore.Enabled = false;
|
||||
}
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
}
|
||||
|
|
@ -32,10 +40,12 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
|
|||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT StoremanId, StoreCode, StoreName, IdentityCard,SignatureUrl"
|
||||
+ @" FROM Weld_Storeman WHERE 1=1 ";
|
||||
string strSql = @"SELECT StoremanId, StoreCode, StoreName, IdentityCard,SignatureUrl,us.UnitStoreName"
|
||||
+ @" FROM Weld_Storeman a
|
||||
left join Weld_UnitStore us on a.UnitStoreId=us.UnitStoreId
|
||||
WHERE 1=1 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND StoreName LIKE @StoreName";
|
||||
|
|
@ -204,12 +214,17 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
|
|||
}
|
||||
string Id = Grid1.SelectedRowID;
|
||||
var storemanInfo = BLL.StoremanInfoService.GetStoremanById(Id);
|
||||
this.drpUnitStore.SelectedValue = BLL.Const._Null;
|
||||
if (storemanInfo != null)
|
||||
{
|
||||
//this.txtStoreCode.Text = storemanInfo.StoreCode;
|
||||
this.txtStoreName.Text = storemanInfo.StoreName;
|
||||
this.txtIdentityCard.Text = storemanInfo.IdentityCard;
|
||||
imgPhoto.ImageUrl = storemanInfo.SignatureUrl;
|
||||
if (!string.IsNullOrEmpty(storemanInfo.UnitStoreId))
|
||||
{
|
||||
this.drpUnitStore.SelectedValue = storemanInfo.UnitStoreId;
|
||||
}
|
||||
hfFormID.Text = Id;
|
||||
this.btnDelete.Enabled = true;
|
||||
}
|
||||
|
|
@ -242,6 +257,10 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
|
|||
storeman.StoreName = this.txtStoreName.Text.Trim();
|
||||
storeman.IdentityCard = this.txtIdentityCard.Text.Trim();
|
||||
storeman.SignatureUrl = imgPhoto.ImageUrl;
|
||||
if (this.drpUnitStore.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
storeman.UnitStoreId = this.drpUnitStore.SelectedValue;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(strRowID))
|
||||
{
|
||||
storeman.StoremanId = strRowID;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -165,6 +165,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtIdentityCard;
|
||||
|
||||
/// <summary>
|
||||
/// drpUnitStore 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnitStore;
|
||||
|
||||
/// <summary>
|
||||
/// filePhoto 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@
|
|||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>编辑焊材入库录入</title>
|
||||
<style>
|
||||
.customlabel span {
|
||||
color: red;
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
|
|
@ -49,10 +55,16 @@
|
|||
<Items>
|
||||
<f:NumberBox ID="txtWeight" runat="server" Label="重量(公斤)" LabelAlign="Right" NoNegative="true" AutoPostBack="true" OnTextChanged="txtWeight_TextChanged">
|
||||
</f:NumberBox>
|
||||
<f:NumberBox ID="txtAmount" runat="server" Label="数量(根)" LabelAlign="Right" NoNegative="true">
|
||||
<f:NumberBox ID="txtAmount" runat="server" Label="数量(根)" LabelAlign="Right" NoNegative="true" AutoPostBack="true" OnTextChanged="txtAmount_TextChanged">
|
||||
</f:NumberBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow Hidden="true" runat="server" ID="trRemainingAmount">
|
||||
<Items>
|
||||
<f:Label runat="server" ID="lbRemainingAmount" Text="库存重量(公斤)：" CssClass="customlabel"></f:Label>
|
||||
<f:Label runat="server" ID="lbReAmount" Label="库存数量(根)" CssClass="customlabel" LabelAlign="Right"></f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpUnitStore" runat="server" Label="单位仓库" LabelAlign="Right" EnableGroup="true" Required="true" ShowRedStar="true">
|
||||
|
|
|
|||
|
|
@ -116,6 +116,20 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
{
|
||||
this.drpUnitStore.SelectedValue = stockIn.UnitStoreId;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(Request.Params["RemainingAmount"]))
|
||||
{
|
||||
this.trRemainingAmount.Hidden = false;
|
||||
decimal remainingAmount = (stockIn.Amount ?? 0) - (stockIn.UsingAmount ?? 0);
|
||||
this.lbReAmount.Text = remainingAmount.ToString("0.####");
|
||||
if (weld.ConvertValue > 0)
|
||||
{
|
||||
this.lbRemainingAmount.Text = "库存重量(公斤)：" + (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
|
||||
}
|
||||
else
|
||||
{
|
||||
this.lbRemainingAmount.Text = stockIn.Weight.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -191,8 +205,15 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
var mat = from x in Funs.DB.Weld_UsingMat where x.StockInId == this.StockInId select x;
|
||||
if (mat.Count() > 0)
|
||||
{
|
||||
// 焊材已有领用，不更新数量
|
||||
BLL.StockInService.UpdateStockIn1(stockIn);
|
||||
if (!string.IsNullOrEmpty(Request.Params["RemainingAmount"]))
|
||||
{
|
||||
BLL.StockInService.UpdateStockIn2(stockIn);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 焊材已有领用，不更新数量
|
||||
BLL.StockInService.UpdateStockIn1(stockIn);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -317,6 +338,37 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void txtAmount_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (this.trRemainingAmount.Hidden == false)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
|
||||
{
|
||||
var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text.Trim());
|
||||
if (weld != null)
|
||||
{
|
||||
Model.Weld_StockIn stockIn = BLL.StockInService.GetStockInById(this.StockInId);
|
||||
decimal remainingAmount = Funs.GetNewDecimalOrZero(this.txtAmount.Text.Trim()) - (stockIn.UsingAmount ?? 0);
|
||||
if (weld.ConvertValue > 0)
|
||||
{
|
||||
this.lbRemainingAmount.Text = "库存重量(公斤)：" + (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
|
||||
}
|
||||
this.lbReAmount.Text = remainingAmount.ToString("0.####");
|
||||
//if (weld.ConvertValue.HasValue)
|
||||
//{
|
||||
// decimal? amountCov = Funs.GetNewDecimal(this.txtWeight.Text.Trim()) / weld.ConvertValue;
|
||||
// int amount = Convert.ToInt32(Math.Floor(amountCov.Value));
|
||||
// this.txtAmount.Text = amount.ToString();
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// this.txtAmount.Text = this.txtWeight.Text.Trim();
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
//protected void rblIsReview_SelectedIndexChanged(object sender, EventArgs e)
|
||||
|
|
|
|||
|
|
@ -129,6 +129,33 @@ namespace FineUIPro.Web.WeldMat.Stock {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtAmount;
|
||||
|
||||
/// <summary>
|
||||
/// trRemainingAmount 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FormRow trRemainingAmount;
|
||||
|
||||
/// <summary>
|
||||
/// lbRemainingAmount 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbRemainingAmount;
|
||||
|
||||
/// <summary>
|
||||
/// lbReAmount 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbReAmount;
|
||||
|
||||
/// <summary>
|
||||
/// drpUnitStore 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@
|
|||
HeaderText="剩余数量（Kg）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="140px" ColumnID="ReAmount" DataField="ReAmount" FieldType="Double"
|
||||
HeaderText="剩余数量（根/Kg）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
HeaderText="剩余数量（根）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="RecycleAmount" DataField="RecycleAmount" FieldType="Double"
|
||||
HeaderText="回收数量（Kg）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="140px" ColumnID="RecAmount" DataField="RecAmount" FieldType="Double"
|
||||
HeaderText="回收数量（根/Kg）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
HeaderText="回收数量（根）" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="180px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
|
||||
HeaderText="单位仓库" HeaderTextAlign="Center" TextAlign="Center" ExpandUnusedSpace="true">
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @" SELECT v.WeldId+v.UnitStoreId as WeldId, weld.WeldCode, weld.WeldName,weld.WeldSpec,wType.WeldTypeName,'Kg' as WeldUnit,(unit.UnitName+'('+store.UnitStoreName+')') AS UnitStoreName,
|
||||
string strSql = @" SELECT v.WeldId+','+v.UnitStoreId as WeldId, weld.WeldCode, weld.WeldName,weld.WeldSpec,wType.WeldTypeName,'Kg' as WeldUnit,(unit.UnitName+'('+store.UnitStoreName+')') AS UnitStoreName,
|
||||
v.RemainingAmount as ReAmount,
|
||||
(CASE WHEN weld.ConvertValue>0
|
||||
THEN v.RemainingAmount*weld.ConvertValue
|
||||
|
|
@ -57,7 +57,7 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
LEFT JOIN dbo.Weld_WeldType AS wType ON wType.WeldTypeId = weld.WeldTypeId
|
||||
WHERE 1=1";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND weld.WeldName LIKE @WeldName";
|
||||
|
|
@ -172,10 +172,15 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
string id = Grid1.SelectedRowID;
|
||||
string id = Grid1.SelectedRowID.Split(',')[0];
|
||||
if (!string.IsNullOrEmpty(id))
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}", id, "编辑 - ")));
|
||||
string unitStoreId = string.Empty;
|
||||
if (this.drpUnitStore.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
unitStoreId = this.drpUnitStore.SelectedValue;
|
||||
}
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}&UnitStoreId={1}", id, unitStoreId, "编辑 - ")));
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="库存明细" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="StockInId" AllowCellEditing="true" ClicksToEdit="2"
|
||||
DataIDField="StockInId" AllowSorting="true" SortField="WeldCode" SortDirection="ASC"
|
||||
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
|
||||
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
|
||||
OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
|
||||
EnableTextSelection="True">
|
||||
<Toolbars>
|
||||
|
|
@ -75,8 +75,10 @@
|
|||
<f:RenderField Width="90px" ColumnID="InStockDate" DataField="InStockDate" FieldType="Date"
|
||||
Renderer="Date" HeaderText="入库时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
</Listeners>
|
||||
<PageItems>
|
||||
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||
</f:ToolbarSeparator>
|
||||
|
|
@ -92,6 +94,27 @@
|
|||
</f:Grid>
|
||||
</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="800px" Height="350px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
|
||||
runat="server" Text="修正库存" Icon="Pencil">
|
||||
</f:MenuButton>
|
||||
</f:Menu>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var menuID = '<%= Menu1.ClientID %>';
|
||||
// 返回false，来阻止浏览器右键菜单
|
||||
function onRowContextMenu(event, rowId) {
|
||||
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||
return false;
|
||||
}
|
||||
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
public partial class StockSelectDetail : PageBase
|
||||
{
|
||||
#region 定义变量
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 焊材ID
|
||||
/// </summary>
|
||||
|
|
@ -80,13 +80,18 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
strSql += " AND StockIn.WeldId=@WeldId";
|
||||
listStr.Add(new SqlParameter("@WeldId", this.WeldId));
|
||||
}
|
||||
|
||||
if (drpUnit.SelectedValue!=Const._Null && drpUnit.SelectedValue != null)
|
||||
string unitStoreId= Request.Params["UnitStoreId"];
|
||||
if (!string.IsNullOrEmpty(unitStoreId))
|
||||
{
|
||||
strSql += " AND StockIn.UnitStoreId=@UnitStoreId";
|
||||
listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId));
|
||||
}
|
||||
if (drpUnit.SelectedValue != Const._Null && drpUnit.SelectedValue != null)
|
||||
{
|
||||
strSql += " AND unit.UnitId = @UnitId";
|
||||
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
|
||||
}
|
||||
if (drpUnitStore.SelectedValue != Const._Null && drpUnitStore.SelectedValue!=null)
|
||||
if (drpUnitStore.SelectedValue != Const._Null && drpUnitStore.SelectedValue != null)
|
||||
{
|
||||
strSql += " AND StockIn.UnitStoreId = @UnitStoreId";
|
||||
listStr.Add(new SqlParameter("@UnitStoreId", drpUnitStore.SelectedValue));
|
||||
|
|
@ -96,7 +101,7 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
strSql += " AND WeldInfo.WeldName LIKE @WeldName";
|
||||
listStr.Add(new SqlParameter("@WeldName", "%" + this.txtWeldName.Text.Trim() + "%"));
|
||||
}
|
||||
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
|
|
@ -175,5 +180,62 @@ namespace FineUIPro.Web.WeldMat.Stock
|
|||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 弹出编辑窗口关闭事件
|
||||
/// <summary>
|
||||
/// 弹出编辑窗体关闭事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 编辑
|
||||
/// <summary>
|
||||
/// 双击Grid事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
|
||||
{
|
||||
this.EditData();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 编辑按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnMenuEdit_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.EditData();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 编辑数据方法
|
||||
/// </summary>
|
||||
private void EditData()
|
||||
{
|
||||
if (Grid1.SelectedRowIndexArray.Length == 0)
|
||||
{
|
||||
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
string id = Grid1.SelectedRowID;
|
||||
if (!string.IsNullOrEmpty(id))
|
||||
{
|
||||
var q = BLL.StockInService.GetStockInById(id);
|
||||
if (q.UnitStoreId != null)
|
||||
{
|
||||
var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId);
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInEdit.aspx?StockInId={0}&RemainingAmount=RemainingAmount", id, "编辑 - ")));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -146,5 +146,32 @@ namespace FineUIPro.Web.WeldMat.Stock {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,10 +129,13 @@
|
|||
<f:RenderField Width="90px" ColumnID="InPutMan" DataField="InPutMan"
|
||||
FieldType="String" HeaderText="录入人" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="InPutDate" DataField="InPutDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
|
||||
<f:RenderField Width="150px" ColumnID="InPutDate" DataField="InPutDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
|
||||
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="80px" ColumnID="CancelDate" DataField="CancelDate" FieldType="Date" RendererArgument="yyyy-MM-dd"
|
||||
<f:RenderField Width="170px" ColumnID="OrderTime" DataField="OrderTime"
|
||||
FieldType="String" HeaderText="预约时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="CancelDate" DataField="CancelDate" FieldType="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
|
||||
Renderer="Date" HeaderText="作废时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="90px" ColumnID="IsCancel" DataField="IsCancel" FieldType="String"
|
||||
|
|
|
|||
|
|
@ -29,19 +29,19 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
|||
this.drpProjectId.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProjectId);
|
||||
|
||||
string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p
|
||||
WHERE p.OrderDate<CONVERT(char(10),GetDate(),120)
|
||||
AND p.IsCancel=0
|
||||
AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(lastPlan, null);
|
||||
if (dt.Rows.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < dt.Rows.Count; i++)
|
||||
{
|
||||
string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString();
|
||||
BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用");
|
||||
}
|
||||
}
|
||||
//string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p
|
||||
// WHERE p.OrderDate<CONVERT(char(10),GetDate(),120)
|
||||
// AND p.IsCancel=0
|
||||
// AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
|
||||
//DataTable dt = SQLHelper.GetDataTableRunText(lastPlan, null);
|
||||
//if (dt.Rows.Count > 0)
|
||||
//{
|
||||
// for (int i = 0; i < dt.Rows.Count; i++)
|
||||
// {
|
||||
// string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString();
|
||||
// BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用");
|
||||
// }
|
||||
//}
|
||||
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
|
|
@ -56,7 +56,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
|||
string projectIds = BLL.Project_UserService.GetStrProjectIds(this.CurrUser.UserId);
|
||||
string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,
|
||||
unit.UnitName AS UsingUnit,UsingPlan.Amount, UsingPlan.UsingManOne, UsingPlan.InPutDate,
|
||||
UsingPlan.OrderDate,UsingPlan.OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm,
|
||||
CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm,
|
||||
(CASE UsingPlan.IsSteelStru WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSteelStru,
|
||||
(CASE UsingPlan.IsSubmit WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSubmit,
|
||||
(CASE UsingPlan.IsCancel WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsCancel,
|
||||
|
|
@ -335,6 +335,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
|||
var usedMat = BLL.UsingMatService.GetUsingMatByPlanId(id);
|
||||
if (usedMat == null)
|
||||
{
|
||||
Model.Weld_UsingPlan usingPlan = BLL.UsingPlanService.GetUsingPlanById(id);
|
||||
if (usingPlan != null && usingPlan.IsCancel == true)
|
||||
{
|
||||
Alert.ShowInTop("记录已作废，不能修改！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("UsingPlanEdit.aspx?UsingPlanId={0}", id, "编辑 - ")));
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -69,16 +69,25 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
|
|||
LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId
|
||||
LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId
|
||||
WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0
|
||||
AND StockIn.WeldId=@WeldId AND (StockIn.Amount-ISNULL(StockIn.UsingAmount,0))>=0 ";
|
||||
AND StockIn.WeldId=@WeldId AND (StockIn.Amount-ISNULL(StockIn.UsingAmount,0))>=0
|
||||
and StockIn.UnitStoreId=@UnitStoreId ";
|
||||
Model.Weld_Storeman storeMan = BLL.StoremanInfoService.GetStoremanByUserId(this.CurrUser.UserId);
|
||||
string unitStoreId = string.Empty;
|
||||
if (storeMan != null)
|
||||
{
|
||||
unitStoreId = storeMan.UnitStoreId;
|
||||
}
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (plan != null)
|
||||
{
|
||||
listStr.Add(new SqlParameter("@OneAmount", plan.Amount));
|
||||
listStr.Add(new SqlParameter("@WeldId", plan.WeldId));
|
||||
listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId));
|
||||
}
|
||||
else
|
||||
{
|
||||
listStr.Add(new SqlParameter("@WeldId", null));
|
||||
listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId));
|
||||
}
|
||||
//if (CurrUser.UnitId != null)
|
||||
//{
|
||||
|
|
|
|||
|
|
@ -61,6 +61,12 @@
|
|||
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="150px" ColumnID="InPutDate" DataField="InPutDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
|
||||
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="170px" ColumnID="OrderTime" DataField="OrderTime"
|
||||
FieldType="String" HeaderText="预约时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String"
|
||||
HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
|
|||
string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition,
|
||||
UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount,
|
||||
ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate,
|
||||
CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,
|
||||
(CASE WHEN stockIn.Warrantybook IS NOT NULL THEN stockIn.Warrantybook
|
||||
ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name,
|
||||
UsingMat.Number,Project.ProjectCode,Project.ProjectName,WeldInfo.WeldCode,
|
||||
|
|
@ -340,7 +341,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
|
|||
BindGrid();
|
||||
foreach (GridColumn column in grid.Columns)
|
||||
{
|
||||
if (column.ColumnIndex < 18)
|
||||
if (column.ColumnIndex < 20)
|
||||
{
|
||||
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
|
||||
}
|
||||
|
|
@ -352,7 +353,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
|
|||
sb.Append("<tr>");
|
||||
foreach (GridColumn column in grid.Columns)
|
||||
{
|
||||
if (column.ColumnIndex < 18)
|
||||
if (column.ColumnIndex < 20)
|
||||
{
|
||||
string html = row.Values[column.ColumnIndex].ToString();
|
||||
if (column.ColumnID == "tfNumber")
|
||||
|
|
|
|||
|
|
@ -35195,7 +35195,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TrustCode", DbType="VarChar(30)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TrustCode", DbType="NVarChar(100)")]
|
||||
public string CH_TrustCode
|
||||
{
|
||||
get
|
||||
|
|
@ -56497,7 +56497,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TRUSTCODE1", DbType="VarChar(30)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TRUSTCODE1", DbType="NVarChar(100)")]
|
||||
public string CH_TRUSTCODE1
|
||||
{
|
||||
get
|
||||
|
|
@ -63690,6 +63690,16 @@ namespace Model
|
|||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _PointType;
|
||||
|
||||
private string _RT1_RepairFilm;
|
||||
|
||||
private string _Dreportid;
|
||||
|
||||
private string _BSU_ID;
|
||||
|
||||
private string _STE_ID;
|
||||
|
||||
private string _JOT_JointNo;
|
||||
|
||||
private string _JOT_DailyReportNo;
|
||||
|
|
@ -63880,6 +63890,86 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PointType", DbType="NVarChar(10)")]
|
||||
public string PointType
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._PointType;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._PointType != value))
|
||||
{
|
||||
this._PointType = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RT1_RepairFilm", DbType="NVarChar(20)")]
|
||||
public string RT1_RepairFilm
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._RT1_RepairFilm;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._RT1_RepairFilm != value))
|
||||
{
|
||||
this._RT1_RepairFilm = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="dreportid", Storage="_Dreportid", DbType="VarChar(50)")]
|
||||
public string Dreportid
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Dreportid;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Dreportid != value))
|
||||
{
|
||||
this._Dreportid = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BSU_ID", DbType="NVarChar(50)")]
|
||||
public string BSU_ID
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._BSU_ID;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._BSU_ID != value))
|
||||
{
|
||||
this._BSU_ID = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="VarChar(50)")]
|
||||
public string STE_ID
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._STE_ID;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._STE_ID != value))
|
||||
{
|
||||
this._STE_ID = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNo", DbType="VarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string JOT_JointNo
|
||||
{
|
||||
|
|
@ -78734,7 +78824,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MIDWelder_QualifiedProjectCode", DbType="NVarChar(100)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MIDWelder_QualifiedProjectCode", DbType="VarChar(255)")]
|
||||
public string MIDWelder_QualifiedProjectCode
|
||||
{
|
||||
get
|
||||
|
|
@ -110622,6 +110712,8 @@ namespace Model
|
|||
|
||||
private System.Nullable<bool> _IsFaceTrain;
|
||||
|
||||
private string _UnitStoreId;
|
||||
|
||||
private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
|
||||
|
||||
private EntitySet<Weld_RecycleMatTop> _Weld_RecycleMatTop;
|
||||
|
|
@ -110648,6 +110740,8 @@ namespace Model
|
|||
partial void OnSignatureUrlChanged();
|
||||
partial void OnIsFaceTrainChanging(System.Nullable<bool> value);
|
||||
partial void OnIsFaceTrainChanged();
|
||||
partial void OnUnitStoreIdChanging(string value);
|
||||
partial void OnUnitStoreIdChanged();
|
||||
#endregion
|
||||
|
||||
public Weld_Storeman()
|
||||
|
|
@ -110818,6 +110912,26 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitStoreId", DbType="NVarChar(50)")]
|
||||
public string UnitStoreId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UnitStoreId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._UnitStoreId != value))
|
||||
{
|
||||
this.OnUnitStoreIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitStoreId = value;
|
||||
this.SendPropertyChanged("UnitStoreId");
|
||||
this.OnUnitStoreIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_Storeman", Storage="_Weld_RecycleMat", ThisKey="StoremanId", OtherKey="StockMan", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Weld_RecycleMat> Weld_RecycleMat
|
||||
{
|
||||
|
|
@ -113428,7 +113542,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TeamGroupName", DbType="NVarChar(20)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TeamGroupName", DbType="NVarChar(50)")]
|
||||
public string TeamGroupName
|
||||
{
|
||||
get
|
||||
|
|
|
|||
Loading…
Reference in New Issue