移交优化

2024-12-05 18:48:45 +08:00
parent 3984e18e6c
commit 20363206d7
3 changed files with 39 additions and 31 deletions
@@ -86,7 +86,7 @@ else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end
 ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark

 from(
-SELECT SubCommissioningsystem as SubSysNo,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,Type,ProjectId
+SELECT SubCommissioningsystem as SubSysNo,SN,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,SN,Type,ProjectId
 ) f
 left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
 --piping
@@ -176,7 +176,7 @@ where f.ProjectId = @ProjectId ";

            //strSql += " order by f.Type ";
            //strSql += " order by f.SubSysNo ";
-            strSql += " order by f.Type,f.SubSysNo ";
+            strSql += " order by f.Type,f.SN ";
            SqlParameter[] parameter = listStr.ToArray();
            return SQLHelper.GetDataTableRunText(strSql, parameter);
        }