20260602 首页焊口返修超期未处理预警
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
.f-grid-row .f-grid-cell-inner {
|
.f-grid-row .f-grid-cell-inner {
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -30,6 +30,9 @@
|
|||||||
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询"
|
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询"
|
||||||
Width="250px" LabelWidth="70px">
|
Width="250px" LabelWidth="70px">
|
||||||
</f:TextBox>
|
</f:TextBox>
|
||||||
|
<f:TextBox ID="txtProjectName" runat="server" Label="项目名称" EmptyText="输入项目名称查询"
|
||||||
|
Width="250px" LabelWidth="70px">
|
||||||
|
</f:TextBox>
|
||||||
<f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
|
<f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
|
||||||
</f:Button>
|
</f:Button>
|
||||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||||
@@ -41,7 +44,7 @@
|
|||||||
<f:Grid ID="GridProject" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
|
<f:Grid ID="GridProject" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
|
||||||
ShowGridHeader="false" runat="server" BoxFlex="0" DataKeyNames="ProjectId"
|
ShowGridHeader="false" runat="server" BoxFlex="0" DataKeyNames="ProjectId"
|
||||||
AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
|
AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
|
||||||
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GridProject_PageIndexChange"
|
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="GridProject_PageIndexChange"
|
||||||
EnableColumnLines="false" EnableRowLines="false" DataIDField="ProjectId" OnRowCommand="GridProject_RowCommand">
|
EnableColumnLines="false" EnableRowLines="false" DataIDField="ProjectId" OnRowCommand="GridProject_RowCommand">
|
||||||
<Columns>
|
<Columns>
|
||||||
<f:LinkButtonField EnableAjax="false" Width="90px" CommandName="project" DataTextField="ProjectCode"
|
<f:LinkButtonField EnableAjax="false" Width="90px" CommandName="project" DataTextField="ProjectCode"
|
||||||
@@ -51,18 +54,18 @@
|
|||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
</Columns>
|
</Columns>
|
||||||
<PageItems>
|
<PageItems>
|
||||||
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||||
</f:ToolbarSeparator>
|
</f:ToolbarSeparator>
|
||||||
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页:">
|
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页:">
|
||||||
</f:ToolbarText>
|
</f:ToolbarText>
|
||||||
<f:DropDownList runat="server" ID="ddlPageSize" Width="60px" AutoPostBack="true"
|
<f:DropDownList runat="server" ID="ddlPageSize" Width="60px" AutoPostBack="true"
|
||||||
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
||||||
<f:ListItem Text="10" Value="10" />
|
<f:ListItem Text="10" Value="10" />
|
||||||
<f:ListItem Text="50" Value="50" />
|
<f:ListItem Text="50" Value="50" />
|
||||||
<f:ListItem Text="100" Value="100" />
|
<f:ListItem Text="100" Value="100" />
|
||||||
<f:ListItem Text="500" Value="500" />
|
<f:ListItem Text="500" Value="500" />
|
||||||
</f:DropDownList>
|
</f:DropDownList>
|
||||||
</PageItems>
|
</PageItems>
|
||||||
</f:Grid>
|
</f:Grid>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
@@ -70,7 +73,6 @@
|
|||||||
<Items>
|
<Items>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
|
|
||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
<f:Panel ID="Panel5" BoxFlex="1" runat="server" ShowBorder="false" ShowHeader="false"
|
<f:Panel ID="Panel5" BoxFlex="1" runat="server" ShowBorder="false" ShowHeader="false"
|
||||||
@@ -94,19 +96,19 @@
|
|||||||
<f:Button runat="server" ID="btnSelect2" Icon="Find" OnClick="btnSelect2_Click" ToolTip="根据所选条件查询">
|
<f:Button runat="server" ID="btnSelect2" Icon="Find" OnClick="btnSelect2_Click" ToolTip="根据所选条件查询">
|
||||||
</f:Button>
|
</f:Button>
|
||||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
|
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
|
||||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||||
</f:Button>
|
</f:Button>
|
||||||
<f:ToolbarFill ID="ToolbarFill2" runat="server">
|
<f:ToolbarFill ID="ToolbarFill2" runat="server">
|
||||||
</f:ToolbarFill>
|
</f:ToolbarFill>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Toolbar>
|
</f:Toolbar>
|
||||||
</Toolbars>
|
</Toolbars>
|
||||||
<Columns>
|
<Columns>
|
||||||
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
|
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
|
||||||
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="200px">
|
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="120px">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField ColumnID="BatchCode" DataField="BatchCode" FieldType="String"
|
<f:RenderField ColumnID="BatchCode" DataField="BatchCode" FieldType="String"
|
||||||
HeaderText="批编号" HeaderTextAlign="Center" TextAlign="left" Width="160px">
|
HeaderText="批编号" HeaderTextAlign="Center" TextAlign="left" Width="90px">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField HeaderText="焊缝类型" ColumnID="JOTY_Name" DataField="JOTY_Name" SortField="JOTY_Name"
|
<f:RenderField HeaderText="焊缝类型" ColumnID="JOTY_Name" DataField="JOTY_Name" SortField="JOTY_Name"
|
||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="105px">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="105px">
|
||||||
@@ -115,24 +117,55 @@
|
|||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="75px">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="75px">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField ColumnID="AskCompleteDate" DataField="AskCompleteDate" FieldType="Date"
|
<f:RenderField ColumnID="AskCompleteDate" DataField="AskCompleteDate" FieldType="Date"
|
||||||
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" Width="160px" RendererArgument="yyyy-MM-dd">
|
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" Width="120px" RendererArgument="yyyy-MM-dd">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField HeaderText="完成报告反馈" ColumnID="ReportFeedback" DataField="ReportFeedback"
|
<f:RenderField HeaderText="完成报告反馈" ColumnID="ReportFeedback" DataField="ReportFeedback"
|
||||||
SortField="ReportFeedback" HeaderTextAlign="Center" TextAlign="Left" Width="105px"
|
SortField="ReportFeedback" HeaderTextAlign="Center" TextAlign="Left" Width="105px"
|
||||||
RendererArgument="yyyy-MM-dd" FieldType="Date" Renderer="Date">
|
RendererArgument="yyyy-MM-dd" FieldType="Date" Renderer="Date">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:WindowField ColumnID="myWindowFieldSelected" Width="50px" WindowID="Window1" HeaderText="编辑"
|
<f:WindowField ColumnID="myWindowFieldSelected" Width="50px" WindowID="Window1" HeaderText="编辑"
|
||||||
Icon="Pencil" ToolTipType="Title" ToolTip="编辑完成报告反馈时间" DataTextFormatString="{0}" DataIFrameUrlFields="BatchId"
|
Icon="Pencil" ToolTipType="Title" ToolTip="编辑完成报告反馈时间" DataTextFormatString="{0}" DataIFrameUrlFields="BatchId"
|
||||||
DataIFrameUrlFormatString="../HJGL/WeldingManage/CompleteReportDateEdit.aspx?batchId={0}" DataWindowTitleFormatString="编辑 - {1}"
|
DataIFrameUrlFormatString="../HJGL/WeldingManage/CompleteReportDateEdit.aspx?batchId={0}" DataWindowTitleFormatString="编辑 - {1}"
|
||||||
HeaderTextAlign="Center" TextAlign="Center" />
|
HeaderTextAlign="Center" TextAlign="Center" />
|
||||||
</Columns>
|
</Columns>
|
||||||
</f:Grid>
|
</f:Grid>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
<f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true">
|
<f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true" Title="焊口返修超期未处理预警" AutoScroll="true">
|
||||||
<Items>
|
<Items>
|
||||||
<f:Label ID="Label5" runat="server" Text="">
|
<f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
|
||||||
</f:Label>
|
ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
|
||||||
|
AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
|
||||||
|
EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
|
||||||
|
<Toolbars>
|
||||||
|
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
|
||||||
|
<Items>
|
||||||
|
<f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
|
||||||
|
Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
|
||||||
|
</f:DropDownList>
|
||||||
|
<f:ToolbarFill ID="ToolbarFill3" runat="server">
|
||||||
|
</f:ToolbarFill>
|
||||||
|
</Items>
|
||||||
|
</f:Toolbar>
|
||||||
|
</Toolbars>
|
||||||
|
<Columns>
|
||||||
|
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
|
||||||
|
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
|
||||||
|
HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
|
||||||
|
HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
|
||||||
|
HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
|
||||||
|
HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
|
||||||
|
</f:RenderField>
|
||||||
|
</Columns>
|
||||||
|
</f:Grid>
|
||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
</Items>
|
</Items>
|
||||||
@@ -140,9 +173,9 @@
|
|||||||
</Items>
|
</Items>
|
||||||
</f:Panel>
|
</f:Panel>
|
||||||
<f:Window ID="Window1" Title="编辑完成报告反馈时间" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
<f:Window ID="Window1" Title="编辑完成报告反馈时间" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||||
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
|
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||||
Width="420px" Height="280px">
|
Width="420px" Height="280px">
|
||||||
</f:Window>
|
</f:Window>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -25,6 +25,15 @@ namespace FineUIPro.Web.common
|
|||||||
this.drpProject.DataBind();
|
this.drpProject.DataBind();
|
||||||
Funs.FineUIPleaseSelect(this.drpProject);
|
Funs.FineUIPleaseSelect(this.drpProject);
|
||||||
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
|
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
|
||||||
|
|
||||||
|
|
||||||
|
this.drpPro.DataTextField = "ProjectCode";
|
||||||
|
this.drpPro.DataValueField = "ProjectId";
|
||||||
|
this.drpPro.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
|
||||||
|
this.drpPro.DataBind();
|
||||||
|
Funs.FineUIPleaseSelect(this.drpPro);
|
||||||
|
this.drpPro.SelectedValue = this.CurrUser.LoginProjectId;
|
||||||
|
|
||||||
//委托单不为null且 对应批明细的委托单明细状态为2
|
//委托单不为null且 对应批明细的委托单明细状态为2
|
||||||
List<Model.HJGL_BO_Batch> Allbatch = (from x in Funs.DB.HJGL_BO_Batch
|
List<Model.HJGL_BO_Batch> Allbatch = (from x in Funs.DB.HJGL_BO_Batch
|
||||||
where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
|
where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
|
||||||
@@ -35,18 +44,18 @@ namespace FineUIPro.Web.common
|
|||||||
select x; //获取所以批明细
|
select x; //获取所以批明细
|
||||||
var trustdetails = from x in Funs.DB.HJGL_CH_TrustItem
|
var trustdetails = from x in Funs.DB.HJGL_CH_TrustItem
|
||||||
join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchDetailId equals y.BatchDetailId
|
join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchDetailId equals y.BatchDetailId
|
||||||
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
|
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
|
||||||
where z.ProjectId == this.drpProject.SelectedValue && !z.AskCompleteDate.HasValue
|
where z.ProjectId == this.drpProject.SelectedValue && !z.AskCompleteDate.HasValue
|
||||||
select x; //获取所有批明细对应委托明细
|
select x; //获取所有批明细对应委托明细
|
||||||
List<Model.HJGL_BO_Batch> batchLists2 = (from x in Allbatch
|
List<Model.HJGL_BO_Batch> batchLists2 = (from x in Allbatch
|
||||||
join m in Funs.DB.HJGL_BS_NDTRate on x.NDTR_ID equals m.NDTR_ID
|
join m in Funs.DB.HJGL_BS_NDTRate on x.NDTR_ID equals m.NDTR_ID
|
||||||
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
|
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
|
||||||
from t in g.DefaultIfEmpty()
|
from t in g.DefaultIfEmpty()
|
||||||
where m.NDTR_Rate.Value==0 && t==null
|
where m.NDTR_Rate.Value == 0 && t == null
|
||||||
select x).Distinct().ToList(); //获取委托单为null且检测比例是0的
|
select x).Distinct().ToList(); //获取委托单为null且检测比例是0的
|
||||||
var batchLists = (from x in Allbatch
|
var batchLists = (from x in Allbatch
|
||||||
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
|
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
|
||||||
select x).Distinct().ToList();
|
select x).Distinct().ToList();
|
||||||
var batchdetailsList = batchdetails.ToList();
|
var batchdetailsList = batchdetails.ToList();
|
||||||
var trustdetailsList = trustdetails.ToList();
|
var trustdetailsList = trustdetails.ToList();
|
||||||
var batchLists4 = (
|
var batchLists4 = (
|
||||||
@@ -58,14 +67,14 @@ namespace FineUIPro.Web.common
|
|||||||
select g.First().x
|
select g.First().x
|
||||||
).Distinct().ToList();
|
).Distinct().ToList();
|
||||||
batchLists2.AddRange(batchLists4);
|
batchLists2.AddRange(batchLists4);
|
||||||
batchLists2= batchLists2.Distinct().ToList();
|
batchLists2 = batchLists2.Distinct().ToList();
|
||||||
foreach (var item in batchLists2)
|
foreach (var item in batchLists2)
|
||||||
{
|
{
|
||||||
var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId; //获取批次详情ID
|
var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId; //获取批次详情ID
|
||||||
var trustdetail = from x in trustdetails where batchdetail.Contains(x.BatchDetailId) orderby x.FeedbackDate descending select x;
|
var trustdetail = from x in trustdetails where batchdetail.Contains(x.BatchDetailId) orderby x.FeedbackDate descending select x;
|
||||||
|
|
||||||
//检测合格,更新要求完成日期
|
//检测合格,更新要求完成日期
|
||||||
if ( item.BatchIsClosed == true)
|
if (item.BatchIsClosed == true)
|
||||||
{
|
{
|
||||||
|
|
||||||
DateTime date = DateTime.Now;
|
DateTime date = DateTime.Now;
|
||||||
@@ -141,6 +150,7 @@ namespace FineUIPro.Web.common
|
|||||||
|
|
||||||
BindProject();
|
BindProject();
|
||||||
BindBatch();
|
BindBatch();
|
||||||
|
BindRepair();
|
||||||
//BindGetWelder();
|
//BindGetWelder();
|
||||||
//BindGetWelderLimitDate();
|
//BindGetWelderLimitDate();
|
||||||
//BindPointNoTrust();
|
//BindPointNoTrust();
|
||||||
@@ -149,17 +159,21 @@ namespace FineUIPro.Web.common
|
|||||||
//BindCheckNoAudit();
|
//BindCheckNoAudit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#region 绑定数据
|
#region 绑定数据
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 绑定项目数据
|
/// 绑定项目数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void BindProject()
|
private void BindProject()
|
||||||
{
|
{
|
||||||
var project = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1");
|
var project = BLL.Base_ProjectService.GetOnProjectListByUser(this.CurrUser.UserId, "1");
|
||||||
if (!string.IsNullOrEmpty(txtProjectCode.Text))
|
if (!string.IsNullOrEmpty(txtProjectCode.Text.Trim()))
|
||||||
{
|
{
|
||||||
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList();
|
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList();
|
||||||
}
|
}
|
||||||
|
if (!string.IsNullOrEmpty(txtProjectName.Text.Trim()))
|
||||||
|
{
|
||||||
|
project = project.Where(e => e.ProjectName.Contains(txtProjectName.Text.Trim())).ToList();
|
||||||
|
}
|
||||||
GridProject.RecordCount = project.Count;
|
GridProject.RecordCount = project.Count;
|
||||||
var table = GetPagedDataTable(GridProject, project);
|
var table = GetPagedDataTable(GridProject, project);
|
||||||
this.GridProject.DataSource = table;
|
this.GridProject.DataSource = table;
|
||||||
@@ -212,13 +226,13 @@ namespace FineUIPro.Web.common
|
|||||||
// left join dbo.Base_Project p on p.ProjectId=b.ProjectId";
|
// left join dbo.Base_Project p on p.ProjectId=b.ProjectId";
|
||||||
//DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
//DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
|
||||||
// 这个字段不要了
|
// 这个字段不要了
|
||||||
//(case when(select Count(*) from dbo.HJGL_CH_TrustItem item
|
//(case when(select Count(*) from dbo.HJGL_CH_TrustItem item
|
||||||
|
|
||||||
// --left
|
// --left
|
||||||
// join dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId = item.BatchDetailId
|
// join dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId = item.BatchDetailId
|
||||||
// -- where item.States != '2' and batchDetail.BatchId = v.BatchId) > 0 OR
|
// -- where item.States != '2' and batchDetail.BatchId = v.BatchId) > 0 OR
|
||||||
// --(SELECT COUNT(*) FROM dbo.HJGL_BO_Batch b WHERE b.BatchId = v.BatchId AND b.BatchIsClosed = 1) = 0
|
// --(SELECT COUNT(*) FROM dbo.HJGL_BO_Batch b WHERE b.BatchId = v.BatchId AND b.BatchIsClosed = 1) = 0
|
||||||
// -- THEN '否' else '是' end) as IsPass,
|
// -- THEN '否' else '是' end) as IsPass,
|
||||||
string strSql = @"select project.ProjectCode, v.BatchId,batch.BatchCode,ty.JOTY_Name,rate.NDTR_Name,
|
string strSql = @"select project.ProjectCode, v.BatchId,batch.BatchCode,ty.JOTY_Name,rate.NDTR_Name,
|
||||||
batch.SubmitAskDate, batch.AskCompleteDate,
|
batch.SubmitAskDate, batch.AskCompleteDate,
|
||||||
|
|
||||||
@@ -394,5 +408,39 @@ namespace FineUIPro.Web.common
|
|||||||
{
|
{
|
||||||
BindBatch();
|
BindBatch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void BindRepair()
|
||||||
|
{
|
||||||
|
string strSql = @"select repairItemRecord.RepairItemRecordId,repairItemRecord.ProjectId,repairItemRecord.ISO_ID,repairItemRecord.JOT_ID,repairItemRecord.FilmNum,repairItemRecord.FeedbackDate,
|
||||||
|
jointInfo.JOT_JointNo,isoInfo.ISO_IsoNo,project.ProjectCode from HJGL_CH_RepairItemRecord repairItemRecord
|
||||||
|
left join HJGL_PW_JointInfo jointInfo on jointInfo.JOT_ID = repairItemRecord.JOT_ID
|
||||||
|
left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID = jointInfo.ISO_ID
|
||||||
|
left join Base_Project project on project.ProjectId = repairItemRecord.ProjectId
|
||||||
|
where repairItemRecord.ProjectId = @projectId
|
||||||
|
order by repairItemRecord.FeedbackDate asc";
|
||||||
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
|
if (!string.IsNullOrEmpty(this.drpPro.SelectedValue) && this.drpPro.SelectedValue != BLL.Const._Null)
|
||||||
|
{
|
||||||
|
listStr.Add(new SqlParameter("@projectId", this.drpPro.SelectedValue));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
|
||||||
|
}
|
||||||
|
SqlParameter[] parameter = listStr.ToArray();
|
||||||
|
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||||
|
this.GridRepair.DataSource = tb;
|
||||||
|
this.GridRepair.DataBind();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void GridRepair_Sort(object sender, GridSortEventArgs e)
|
||||||
|
{
|
||||||
|
BindRepair();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drpPro_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
BindRepair();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+71
-33
@@ -7,11 +7,13 @@
|
|||||||
// </自动生成>
|
// </自动生成>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace FineUIPro.Web.common {
|
namespace FineUIPro.Web.common
|
||||||
|
{
|
||||||
|
|
||||||
public partial class mainGdaz {
|
|
||||||
|
public partial class mainGdaz
|
||||||
|
{
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Head1 控件。
|
/// Head1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
|
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// form1 控件。
|
/// form1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// PageManager1 控件。
|
/// PageManager1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.PageManager PageManager1;
|
protected global::FineUIPro.PageManager PageManager1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel2 控件。
|
/// Panel2 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel2;
|
protected global::FineUIPro.Panel Panel2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel1 控件。
|
/// Panel1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel1;
|
protected global::FineUIPro.Panel Panel1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel3 控件。
|
/// Panel3 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel3;
|
protected global::FineUIPro.Panel Panel3;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Toolbar2 控件。
|
/// Toolbar2 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Toolbar Toolbar2;
|
protected global::FineUIPro.Toolbar Toolbar2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// txtProjectCode 控件。
|
/// txtProjectCode 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.TextBox txtProjectCode;
|
protected global::FineUIPro.TextBox txtProjectCode;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// txtProjectName 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.TextBox txtProjectName;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// btnSelect 控件。
|
/// btnSelect 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Button btnSelect;
|
protected global::FineUIPro.Button btnSelect;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ToolbarFill1 控件。
|
/// ToolbarFill1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GridProject 控件。
|
/// GridProject 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Grid GridProject;
|
protected global::FineUIPro.Grid GridProject;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ToolbarSeparator1 控件。
|
/// ToolbarSeparator1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ToolbarText1 控件。
|
/// ToolbarText1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ddlPageSize 控件。
|
/// ddlPageSize 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel4 控件。
|
/// Panel4 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel4;
|
protected global::FineUIPro.Panel Panel4;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel5 控件。
|
/// Panel5 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel5;
|
protected global::FineUIPro.Panel Panel5;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel7 控件。
|
/// Panel7 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel7;
|
protected global::FineUIPro.Panel Panel7;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GridBatch 控件。
|
/// GridBatch 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Grid GridBatch;
|
protected global::FineUIPro.Grid GridBatch;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Toolbar1 控件。
|
/// Toolbar1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Toolbar Toolbar1;
|
protected global::FineUIPro.Toolbar Toolbar1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// drpProject 控件。
|
/// drpProject 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.DropDownList drpProject;
|
protected global::FineUIPro.DropDownList drpProject;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// cbIsReportFeedback 控件。
|
/// cbIsReportFeedback 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.CheckBox cbIsReportFeedback;
|
protected global::FineUIPro.CheckBox cbIsReportFeedback;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// btnSelect2 控件。
|
/// btnSelect2 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Button btnSelect2;
|
protected global::FineUIPro.Button btnSelect2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// btnOut 控件。
|
/// btnOut 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Button btnOut;
|
protected global::FineUIPro.Button btnOut;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ToolbarFill2 控件。
|
/// ToolbarFill2 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.ToolbarFill ToolbarFill2;
|
protected global::FineUIPro.ToolbarFill ToolbarFill2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Panel8 控件。
|
/// Panel8 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -236,16 +247,43 @@ namespace FineUIPro.Web.common {
|
|||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Panel Panel8;
|
protected global::FineUIPro.Panel Panel8;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Label5 控件。
|
/// GridRepair 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// 自动生成的字段。
|
/// 自动生成的字段。
|
||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.Label Label5;
|
protected global::FineUIPro.Grid GridRepair;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Toolbar3 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Toolbar Toolbar3;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpPro 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpPro;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarFill3 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarFill ToolbarFill3;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Window1 控件。
|
/// Window1 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user