lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2024-03-31 12:05:56 +08:00
parent 066ce71002 3ea9f6278c
commit cb86e6e805
17 changed files with 781 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+3 -3
View File
@@ -130,9 +130,9 @@
HeaderText="总焊口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Left">
<f:RenderField Width="200px" ColumnID="PipeAreaStr" DataField="PipeAreaStr" SortField="PipeAreaStr"
FieldType="String" HeaderText="管线划分" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="DetectionType">
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+1 -1
View File
@@ -317,7 +317,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
完成焊口=x.FinishJointCount,
总达因数 =x.TotalDin,
总焊口量=x.JointCount,
单位名称=x.UnitName,
管线划分 = x.PipeAreaStr,
无损检测类型=x.DetectionTypeCode,
探伤比例 =x.DetectionRateCode,
介质名称=x.MediumName,
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
+10 -9
View File
@@ -66,8 +66,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
//var table = this.GetPagedDataTable(Grid1, tb);
//Grid1.DataSource = table;
//Grid1.DataBind();
var list= BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim());
Grid1.RecordCount = list.Count;
var list2 = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), 0, 10000);
var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
Grid1.RecordCount = list2.Count;
Grid1.DataSource = list;
Grid1.DataBind();
}
@@ -145,13 +146,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
#endregion
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "cmd_detail" )
if (e.CommandName == "cmd_detail")
{
string id = Grid1.SelectedRowID;
string url = "PackagingManageView.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
}
else if (e.CommandName== "cmd_print")
else if (e.CommandName == "cmd_print")
{
string Id = this.Grid1.SelectedRowID;
Pring(Id);
@@ -219,9 +220,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
string url = string.Empty;
var wpq = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(id);
if (wpq != null)
{
url = "PackagingManageEdit.aspx?PackagingManageId={0}";
{
url = "PackagingManageEdit.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, id, "操作 - ")));
}
}
@@ -429,9 +430,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
if (state != null)
{
string txt= HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
string txt = HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
return txt;
return txt;
}
return "";
}