This commit is contained in:
parent
3bc378cd12
commit
5e5d4ba5fe
|
|
@ -27,7 +27,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
public void BindGrid()
|
public void BindGrid()
|
||||||
{
|
{
|
||||||
string strSql = @"select Id, Sortid, StartDate, EndDate, ProjectId,ReportType
|
string strSql = @"select Id, Sortid, StartDate, EndDate, ProjectId,ReportType
|
||||||
from Report_WeekAndMonthReport_New C
|
from Report_WeekAndMonthReport_New C with(nolock)
|
||||||
where C.ReportType='1' AND C.ProjectId = @ProjectId";
|
where C.ReportType='1' AND C.ProjectId = @ProjectId";
|
||||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||||
|
|
|
||||||
|
|
@ -2860,7 +2860,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
{
|
{
|
||||||
if (objType == "1")
|
if (objType == "1")
|
||||||
{
|
{
|
||||||
string strSql = @"select UnitOrMajor,ReType, Remarks from Report_Construction_Plan
|
string strSql = @"select UnitOrMajor,ReType, Remarks from Report_Construction_Plan with(nolock)
|
||||||
where ReportId='" + ReportId + "' ";
|
where ReportId='" + ReportId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -2955,7 +2955,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select ApprovalDate,
|
string strSql = @"select ApprovalDate,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
UnitId,
|
UnitId,
|
||||||
CompileDate from Comprehensive_GeneralPlanApproval
|
CompileDate from Comprehensive_GeneralPlanApproval with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3054,7 +3054,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select ApprovalDate,
|
string strSql = @"select ApprovalDate,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
UnitId,IsReview,
|
UnitId,IsReview,
|
||||||
CompileDate from Comprehensive_MajorPlanApproval
|
CompileDate from Comprehensive_MajorPlanApproval with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3148,7 +3148,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select ApprovalDate,
|
string strSql = @"select ApprovalDate,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
CNProfessionalId,
|
CNProfessionalId,
|
||||||
CreateDate from Inspection_Test_Plan
|
CreateDate from Inspection_Test_Plan with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3244,7 +3244,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select Status,
|
string strSql = @"select Status,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
CNProfessionalId,
|
CNProfessionalId,
|
||||||
CompileDate from Comprehensive_DesignDetails
|
CompileDate from Comprehensive_DesignDetails with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3338,7 +3338,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select Status,
|
string strSql = @"select Status,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
CNProfessionalId,
|
CNProfessionalId,
|
||||||
ReviewDate from Comprehensive_ReviewDrawings
|
ReviewDate from Comprehensive_ReviewDrawings with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3419,7 +3419,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
string strSql = @"select ImplementationFrontState,
|
string strSql = @"select ImplementationFrontState,
|
||||||
ProjectId,
|
ProjectId,
|
||||||
CNProfessionalId,
|
CNProfessionalId,
|
||||||
IssuedDate,ApprovalDate from Comprehensive_DesignChangeOrder
|
IssuedDate,ApprovalDate from Comprehensive_DesignChangeOrder with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3528,8 +3528,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
string strSql = @"select InspectionPersonId,UnitId,ApprovalTime,ProfessionalName,PostName
|
string strSql = @"select InspectionPersonId,UnitId,ApprovalTime,ProfessionalName,PostName
|
||||||
from Comprehensive_InspectionPerson a left join Base_CNProfessional b on a.CNProfessionalId=b.CNProfessionalId
|
from Comprehensive_InspectionPerson a with(nolock)
|
||||||
left join Base_Post c on a.PostId=c.PostId
|
left join Base_CNProfessional b with(nolock) on a.CNProfessionalId=b.CNProfessionalId
|
||||||
|
left join Base_Post c with(nolock) on a.PostId=c.PostId
|
||||||
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3872,7 +3873,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
||||||
|
|
||||||
string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate
|
string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate
|
||||||
from ProcessControl_NondestructiveTest_New
|
from ProcessControl_NondestructiveTest_New with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='" + startDate + "' and CreateDate <='" + endDate + "'";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='" + startDate + "' and CreateDate <='" + endDate + "'";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -3987,7 +3988,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
||||||
|
|
||||||
string strSql = @"select UnitId,InspectionDate,SamplingResult
|
string strSql = @"select UnitId,InspectionDate,SamplingResult
|
||||||
from Comprehensive_InspectionEquipment
|
from Comprehensive_InspectionEquipment with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4081,7 +4082,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
{
|
{
|
||||||
if (objType == "1")
|
if (objType == "1")
|
||||||
{
|
{
|
||||||
string strSql = @"select ContentName,ReType, Remarks from Report_CQMS_MonthReportItem
|
string strSql = @"select ContentName,ReType, Remarks from Report_CQMS_MonthReportItem with(nolock)
|
||||||
where ReportId='" + ReportId + "' ";
|
where ReportId='" + ReportId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4101,7 +4102,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
|
||||||
|
|
||||||
string strSql = @"select UnitId,InspectionDate
|
string strSql = @"select UnitId,InspectionDate
|
||||||
from Comprehensive_InspectionMachine
|
from Comprehensive_InspectionMachine with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' and InspectionType='计量'";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' and InspectionType='计量'";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4512,10 +4513,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
{
|
{
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate
|
||||||
string strSql = @"select a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate from View_MonthReport_InspectionManagement a
|
from View_MonthReport_InspectionManagement a with(nolock)
|
||||||
left join WBS_UnitWork b on a.UnitWorkId =b.UnitWorkId
|
left join WBS_UnitWork b with(nolock) on a.UnitWorkId =b.UnitWorkId
|
||||||
left join Base_CNProfessional c on a.CNProfessionalId= c.CNProfessionalId
|
left join Base_CNProfessional c with(nolock) on a.CNProfessionalId= c.CNProfessionalId
|
||||||
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' order by cNProfessionalCode,UnitWorkName";
|
where a.ProjectId='" + this.CurrUser.LoginProjectId + "' order by cNProfessionalCode,UnitWorkName";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4603,7 +4604,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select UnitId, PressurePipeNumber,ActualNumber, ReportTime from Comprehensive_PressurePipe
|
string strSql = @"select UnitId, PressurePipeNumber,ActualNumber, ReportTime from Comprehensive_PressurePipe with(nolock)
|
||||||
where Projctid='" + this.CurrUser.LoginProjectId + "' ";
|
where Projctid='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4692,7 +4693,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
{
|
{
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
string strSql = @"select UnitId, PackageNumber,IssuedReportNumber, ReportTime from Comprehensive_PressurePipe
|
string strSql = @"select UnitId, PackageNumber,IssuedReportNumber, ReportTime from Comprehensive_PressurePipe with(nolock)
|
||||||
where Projctid='" + this.CurrUser.LoginProjectId + "' ";
|
where Projctid='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4779,7 +4780,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select UnitId, SunNumber,MonitoringReportNumber, ReportTime from Comprehensive_SpecialEquipment
|
string strSql = @"select UnitId, SunNumber,MonitoringReportNumber, ReportTime from Comprehensive_SpecialEquipment with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4891,7 +4892,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select ReceiveUnit,ImplementationFrontState, IssuedDate from Comprehensive_NCRManagement
|
string strSql = @"select ReceiveUnit,ImplementationFrontState, IssuedDate from Comprehensive_NCRManagement with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -4995,7 +4996,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select UnitId,State, CheckDate from Check_CheckControl
|
string strSql = @"select UnitId,State, CheckDate from Check_CheckControl with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -5072,7 +5073,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select CheckType, CheckDate from Check_JointCheck
|
string strSql = @"select CheckType, CheckDate from Check_JointCheck with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
@ -5167,7 +5168,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
return await Task.Run(() =>
|
return await Task.Run(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
string strSql = @"select SendUnit, ReceiveDate ,IsReply,RetrunWuhuangCopies from Comprehensive_DataReceivingDoc
|
string strSql = @"select SendUnit, ReceiveDate ,IsReply,RetrunWuhuangCopies from Comprehensive_DataReceivingDoc with(nolock)
|
||||||
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
where ProjectId='" + this.CurrUser.LoginProjectId + "' ";
|
||||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
return dt;
|
return dt;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue