shecs/Basf_TCC11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+7 -8
View File
@@ -581,13 +581,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
{
this.PageInfoLoad();
string strSql = @" SELECT PointBatchItemId,PointBatchId,WeldJointId,PointState,PointDate,RepairDate,CutDate,WorkAreaCode,
(CASE WHEN JointAttribute='固定F' THEN 'F'+WeldJointCode ELSE 'S'+WeldJointCode END) AS WeldJointCode,
JointArea,Size,WelderCode,WeldingDate,PipelineCode,PipingClassName,
CONVERT(INT,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJoint,
(CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst,
(CASE WHEN IsCompletedPoint=1 THEN '已处理' ELSE '待处理' END) CompletedState,
JLAudit,GLGSAudit,QTAudit,IsPointAudit,
(CASE WHEN PointDate IS NOT NULL AND IsBuildTrust=1 THEN '已委托'
WeldJointCode, JointArea,Size,WelderCode,WeldingDate,PipelineCode,PipingClassName,
CONVERT(INT,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJoint,
(CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst,
(CASE WHEN IsCompletedPoint=1 THEN '已处理' ELSE '待处理' END) CompletedState,
JLAudit,GLGSAudit,QTAudit,IsPointAudit,
(CASE WHEN PointDate IS NOT NULL AND IsBuildTrust=1 THEN '已委托'
ELSE (CASE WHEN PointDate IS NOT NULL THEN '未委托' ELSE '' END) END) AS IsTrust
FROM dbo.View_Batch_PointBatchItem
WHERE PointBatchId=@PointBatchId";
@@ -627,7 +626,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
// tb = GetFilteredTable(Grid1.FilteredData, tb);
// tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();