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

11

This commit is contained in:
佘春生 2024-05-26 09:09:09 +08:00
parent a5b12ff9a6 eedac73a48
commit 090bd573de
11 changed files with 580 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CreateModel.bat
View File

@ -25,9 +25,9 @@ REM --------------
@echo 设置.net控制台环境
@echo.
@call "%VS100COMNTOOLS%"vsvars32.bat
@call "%VS150%"
SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

4
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@ -250,7 +250,7 @@
</site>
<site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" />

8
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1235,6 +1235,7 @@
<Content Include="WeldingProcess\DataIn\DataInEdit.aspx" />
<Content Include="WeldingProcess\PMI\PMIDelegation.aspx" />
<Content Include="WeldingProcess\PMI\PMIDelegationEdit.aspx" />
<Content Include="WeldingProcess\PMI\PMIDelegationReport.aspx" />
<Content Include="WeldingProcess\PMI\PMIDetectionEntry.aspx" />
<Content Include="WeldingProcess\PMI\PMISelectList.aspx" />
<Content Include="WeldingProcess\TestPackageManage\AItemEndCheck.aspx" />
@ -5422,6 +5423,13 @@
<Compile Include="WeldingProcess\PMI\PMIDelegationEdit.aspx.designer.cs">
<DependentUpon>PMIDelegationEdit.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDelegationReport.aspx.cs">
<DependentUpon>PMIDelegationReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDelegationReport.aspx.designer.cs">
<DependentUpon>PMIDelegationReport.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.cs">
<DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

2
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
View File

@ -133,7 +133,9 @@
<f:RenderField HeaderText="WeldJointId" ColumnID="WeldJointId" DataField="WeldJointId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="WorkAreaId" ColumnID="WorkAreaId" DataField="WorkAreaId"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="Id" ColumnID="Id"
DataField="Id" FieldType="String" Hidden="true">
</f:RenderField>

35
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -139,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
}
//url查询
string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}", "编辑 - ");
string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}&installId={drpInstallationId.SelectedValue}", "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
}
else
@ -285,19 +285,24 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{
string[] arr = weldJointIds.Split('|');
JArray mergedData = Grid1.GetMergedData();
var result = Funs.DB.View_Pipeline_WeldJoint.Select(t => new View_PMI_DelegationDetails {
WeldJointId= t.WeldJointId,
PipelineCode= t.PipelineCode,
ProjectId= t.ProjectId,
Acceptance="",
QualityNo="",
WeldJointCode=t.WeldJointCode,
Specification=t.Specification,
MaterialCode=t.MaterialCode,
WorkAreaId=t.WorkAreaId,
Status=0,
PMIId=this.PMIDelegationId
}).Where(t => arr.Contains(t.WeldJointId)).ToList();
var result = Funs.DB.View_Pipeline_WeldJoint.Where(t =>t.UnitId==this.drpUnitId.SelectedValue
&& t.InstallationId==this.drpInstallationId.SelectedValue
&&arr.Contains(t.WeldJointId))
.Select(t => new View_PMI_DelegationDetails
{
WeldJointId = t.WeldJointId,
PipelineCode = t.PipelineCode,
ProjectId = t.ProjectId,
Acceptance = "",
QualityNo = "",
WeldJointCode = t.WeldJointCode,
Specification = t.Specification,
MaterialCode = t.MaterialCode,
WorkAreaId = t.WorkAreaId,
Status = 0,
PMIId = this.PMIDelegationId
})
.ToList();
result.ForEach(item =>
{
item.Id = SQLHelper.GetNewID(typeof(PMI_DelegationDetails));
@ -317,6 +322,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.WeldJointId = values.Value<string>("WeldJointId").ToString();
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
newTrustItem.WeldJointCode = values.Value<string>("WeldJointCode").ToString();
newTrustItem.Specification =HttpUtility.HtmlDecode(values.Value<string>("Specification").ToString());
newTrustItem.MaterialCode = values.Value<string>("MaterialCode").ToString();
@ -349,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.JointId = values.Value<string>("WeldJointId").ToString();
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
newTrustItem.Status = 0;
newTrustItem.CheckTime = DateTime.Now;
newTrustItem.ReportTime = DateTime.Now;

98
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx Normal file
View File

@ -0,0 +1,98 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegationReport.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegationReport" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>PMI检测报告</title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="PMI检测报告"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PipelineCode"
AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true"
PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
OnRowDataBound="Grid1_RowDataBound"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="<%$ Resources:Lan,UnitName %>"
LabelAlign="Right" Width="280px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>"
LabelAlign="Right" Width="280px">
</f:DropDownList>
<f:DropDownList ID="drpIsALl" OnSelectedIndexChanged="drpIsALl_SelectedIndexChanged" runat="server" Label="筛选报警" LabelAlign="Right" Width="200px">
<f:ListItem Text="全部" Value="全部" />
<f:ListItem Text="报警" Value="报警" />
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="<%$ Resources:Lan,Statistics %>" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineCode" runat="server" Label="<%$ Resources:Lan,PipelineCode %>"
LabelAlign="Right" Width="280px">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" HeaderText="<%$ Resources:Lan,SerialNumber %>"
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="InstallationCode" DataField="InstallationCode" Width="120"></f:RenderField>
<f:RenderField HeaderText="区域" ColumnID="WorkAreaCode" DataField="WorkAreaCode" Width="120"></f:RenderField>
<f:RenderField HeaderText="管线" ColumnID="PipelineCode" DataField="PipelineCode" Width="160"></f:RenderField>
<f:RenderField HeaderText="需要PMI焊口数量" ColumnID="PMINum" DataField="PMINum" Width="160"></f:RenderField>
<f:RenderField HeaderText="预制检测数量" ColumnID="PMIBySNum" DataField="PMIBySNum" Width="160"></f:RenderField>
<f:TemplateField HeaderText="预制检测比例" ColumnID="RateBys" Width="160">
<ItemTemplate>
<asp:Label ID="labRateBys" runat="server" Text='<%#Eval("RateBys") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="安装检测数量" ColumnID="PMIByFNum" DataField="PMIByFNum" Width="160"></f:RenderField>
<f:TemplateField HeaderText="安装检测比例" ColumnID="RateByf" Width="160">
<ItemTemplate>
<asp:Label ID="labRateByf" runat="server" Text='<%#Eval("RateByf") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</form>
</body>
</html>

210
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs Normal file
View File

@ -0,0 +1,210 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
using System.Drawing;
namespace FineUIPro.Web.WeldingProcess.PMI
{
public partial class PMIDelegationReport : 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();
BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnitId, true, this.CurrUser.LoginProjectId, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//单位
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, this.drpUnitId.SelectedValue, string.Empty, Resources.Lan.PleaseSelect);//区域
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string sql = @"select *from (
select
projectId,
InstallationId,
WorkAreaId,
UnitId,
PipelineId,
InstallationCode,
WorkAreaCode,
PipelineCode,
PMINum,
(convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100) as RateBys,
PMIBySNum,
(convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100) as RateByf,
PMIByFNum
from (
select
a.projectId,
a.InstallationId,
a.WorkAreaId,
a.UnitId,
a.PipelineId,
b.InstallationCode,
c.WorkAreaCode,
a.PipelineCode,
(select count(1) from Pipeline_WeldJoint as d where isPMI=1 and d.PipelineId=a.PipelineId) as PMINum,
(
select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='活动S' and pwj.isPMI=1
) as PMIBySNum,
(
select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='固定F' and pwj.isPMI=1
) as PMIByFNum
from Pipeline_Pipeline as a
left join Project_Installation as b on a.InstallationId=b.InstallationId
left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId
) as t
) as H where projectId=@projectId and RateBys>0 ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
sql += " and UnitId=@unitId";
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null)
{
sql += " and WorkAreaId=@workAreaId";
listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue));
}
if (this.drpIsALl.SelectedValue!="全部")
{
sql += " and RateBys<=2";
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
{
sql += " and PipelineCode like '%'+@PipelineCode+'%'";
listStr.Add(new SqlParameter("@PipelineCode", this.txtPipelineCode.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
this.Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
decimal rates =Math.Round(Convert.ToDecimal(row["RateBys"]),2);
decimal ratef = Math.Round(Convert.ToDecimal(row["RateByf"]), 2);
AspNet.Label itemLable = e.Row.FindControl("labRateBys") as AspNet.Label;
if (itemLable !=null && !string.IsNullOrEmpty(itemLable.Text))
{
itemLable.Text = rates.ToString() + "%";
if (rates <= 2)
{
itemLable.ForeColor = Color.Red;
}
}
AspNet.Label labRateByf = e.Row.FindControl("labRateByf") as AspNet.Label;
if(labRateByf!=null && !string.IsNullOrEmpty(labRateByf.Text))
{
labRateByf.Text= ratef.ToString() + "%";
if (ratef <= 2)
{
labRateByf.ForeColor = Color.Red;
}
}
}
/// <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)
{
BindGrid();
}
#endregion
#region 下拉选择事件
/// <summary>
/// 单位下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpWorkAreaId.Items.Clear();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, this.drpUnitId.SelectedValue, string.Empty, Resources.Lan.PleaseSelect);
}
else
{
Funs.FineUIPleaseSelect(this.drpWorkAreaId, Resources.Lan.PleaseSelect);
}
this.drpWorkAreaId.SelectedValue = BLL.Const._Null;
}
protected void drpIsALl_SelectedIndexChanged(object obj, EventArgs e)
{
this.BindGrid();
}
#endregion
}
}

188
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,188 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.PMI
{
public partial class PMIDelegationReport
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// drpIsALl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsALl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// labNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// labRateBys 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labRateBys;
/// <summary>
/// labRateByf 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labRateByf;
/// <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;
}
}

35
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs
View File

@ -1,4 +1,6 @@
using BLL;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
@ -15,6 +17,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
string ProjectId = string.Empty;
string PMIId = string.Empty;
string weldJointIds=string.Empty;
string installId=string.Empty;
#region 加载页面
/// <summary>
/// 加载页面
@ -27,6 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
this.ProjectId = this.CurrUser.LoginProjectId;
this.PMIId = Request.Params["PMIId"] ?? "";
this.weldJointIds = Request.Params["weldJointIds"] ?? "";
this.installId = Request.Params["installId"];
if (!IsPostBack)
{
this.InitTreeMenu();//加载树
@ -54,13 +58,23 @@ namespace FineUIPro.Web.WeldingProcess.PMI
b in Funs.DB.PMI_DelegationDetails.AsQueryable() on
a.Id equals b.PMIId
select b.JointId
).Distinct().ToList();
).Distinct().ToList();
//查询带有PMI处理的管线数据
var iso = from x in Funs.DB.View_Pipeline_WeldJoint
where x.ProjectId == this.ProjectId && x.IsPMI == true && x.UnitId == this.UnitId
select new { x.PipelineCode, x.PipelineId,x.WeldJointId }; //from x in Funs.DB.Pipeline_Pipeline where x.ProjectId == this.ProjectId && x.UnitId == this.UnitId select x;
var iso = (from a in Funs.DB.Pipeline_Pipeline join b
in Funs.DB.Project_WorkArea on a.WorkAreaId equals b.WorkAreaId
join c in Funs.DB.Pipeline_WeldJoint on a.PipelineId equals c.PipelineId
where a.ProjectId==this.ProjectId && a.UnitId==this.UnitId &&
a.InstallationId==this.installId && c.IsPMI==true
select new {
a.PipelineCode,
a.PipelineId,
b.WorkAreaId,
b.WorkAreaCode,
c.WeldJointId,
c.WeldJointCode
});
if (listData.Count > 0)
{
iso = iso.Where(e => !listData.Contains(e.WeldJointId));
@ -69,14 +83,14 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{
iso = iso.Where(e => e.PipelineCode.Contains(this.txtIsono.Text.Trim()));
}
var isoList = iso.Select(x => new {x.PipelineId,x.PipelineCode }).OrderBy(x => x.PipelineCode).Distinct().ToList();
var isoList = iso.Select(x => new { x.PipelineId,x.PipelineCode,x.WorkAreaCode}).OrderBy(x => x.PipelineCode).Distinct().ToList();
if (isoList.Count > 0)
{
foreach (var q in isoList)
{
TreeNode newNode = new TreeNode();
newNode.NodeID = q.PipelineId;
newNode.Text = q.PipelineCode;
newNode.Text = q.PipelineCode + "(" + q.WorkAreaCode + ")";
newNode.EnableClickEvent = true;
rootNode.Nodes.Add(newNode);
}
@ -128,7 +142,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
).Distinct().ToList();
string[] arr = this.weldJointIds.Split('|');
var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true);
var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true && t.PipelineId == this.tvControlItem.SelectedNodeID);
if (arr.Length > 0)
{
listData.Add(arr[0]);
@ -141,10 +155,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{
query = query.Where(t => t.WeldJointCode == this.txtJointNo.Text);
}
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID);
}
var data= query.ToList() ;
if (!string.IsNullOrEmpty(weldJointIds))
{

24
HJGL/Model/Model.cs
View File

@ -22792,6 +22792,8 @@ namespace Model
private System.Nullable<System.DateTime> _ReportTime;
private string _WorkAreaId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -22814,6 +22816,8 @@ namespace Model
partial void OnReportNoChanged();
partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
partial void OnReportTimeChanged();
partial void OnWorkAreaIdChanging(string value);
partial void OnWorkAreaIdChanged();
#endregion
public PMI_DelegationDetails()
@ -23001,6 +23005,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")]
public string WorkAreaId
{
get
{
return this._WorkAreaId;
}
set
{
if ((this._WorkAreaId != value))
{
this.OnWorkAreaIdChanging(value);
this.SendPropertyChanging();
this._WorkAreaId = value;
this.SendPropertyChanged("WorkAreaId");
this.OnWorkAreaIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;