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

试压管理修改

This commit is contained in:
李鹏飞 2025-08-18 10:15:28 +08:00
parent b81501713e
commit edebefa3c9
26 changed files with 1351 additions and 1315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

2
.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json
View File

@ -8,7 +8,7 @@
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"DockedWidth": 217,
"SelectedChildIndex": -1,
"Children": [
{

2
.vs/SGGL_SeDin_New/v17/DocumentLayout.json
View File

@ -8,7 +8,7 @@
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"DockedWidth": 217,
"SelectedChildIndex": -1,
"Children": [
{

11
SGGL/BLL/BLL.csproj
View File

@ -57,7 +57,16 @@
<HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
</Reference>
<Reference Include="FastReport">
<HintPath>E:\工作\天辰施工平台\SGGL_TCC\SGGL\BLL\bin\Debug\FastReport.dll</HintPath>
<HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
</Reference>
<Reference Include="FastReport.Bars">
<HintPath>..\FineUIPro\Reference BLL\FastReport.Bars.dll</HintPath>
</Reference>
<Reference Include="FastReport.Compat">
<HintPath>..\FineUIPro\Reference BLL\FastReport.Compat.dll</HintPath>
</Reference>
<Reference Include="FastReport.Editor">
<HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -16804,7 +16804,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

23
SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheckEdit2.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.DataShow;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@ -210,7 +211,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
private void SaveData(string saveType)
{
bool flag = true;
bool flag_A = true;
bool flag_B = true;
Model.Project_Sys_Set PressMustCheckBItem = BLL.Project_SysSetService.GetSysSetBySetId("10", this.CurrUser.LoginProjectId);
bool isMustCheckBItem = false;
isMustCheckBItem= (bool)PressMustCheckBItem?.IsAuto;//是否必须检查B项
///保存明细
if (saveType == Const.BtnSubmit)
{
@ -223,7 +228,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
if (item.ItemType == "A" && item.Result != "合格")
{
flag = false;
flag_A = false;
}
if (isMustCheckBItem && item.ItemType == "B" && item.Result != "合格")
{
flag_B = false;
}
}
if (saveType != Const.BtnSave)
@ -238,11 +248,16 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
if (State == Const.TestPackage_Complete || State == Const.TestPackage_Audit3)
{
if (!flag)
if (!flag_A)
{
Alert.ShowInTop("A项尾项尚未全部合格，请打回施工单位重新整改！", MessageBoxIcon.Warning);
return;
}
if (!flag_B)
{
Alert.ShowInTop("B项尾项尚未全部合格，请打回施工单位重新整改！", MessageBoxIcon.Warning);
return;
}
}
Model.PTP_TestPackageApprove approve1 = BLL.TestPackageApproveService.GetTestPackageApproveById(this.ItemEndCheckListId);
if (approve1 != null && saveType == Const.BtnSubmit)
@ -265,7 +280,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var ItemEndCheckList = ItemEndCheckListService.GetItemEndCheckListByID(this.ItemEndCheckListId);
if (ItemEndCheckList != null)
{
if (flag)
if (flag_A)
{
ItemEndCheckList.AOKState = true;
}

239
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
View File

@ -1,5 +1,16 @@
using BLL; using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Linq; using System.Web;
namespace FineUIPro.Web.HJGL.TestPackage { public partial class TestPackageComplete : PageBase { #region 定义项
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageComplete : PageBase
{
#region 定义项
/// <summary>
/// 试压包主键
/// </summary>
@ -99,15 +110,31 @@
#endregion
#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(); this.PTP_ID = string.Empty;
#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();
this.PTP_ID = string.Empty;
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId);
if (pressUnit != null && pressUnit.SetValue == "2")
{
this.Grid1.Columns[1].HeaderText = "设计压力kpa(g)";
this.Grid1.Columns[4].HeaderText = "压力试验压力kpa(g)";
} this.InitTreeMenu();//加载树
} } #endregion #region 加载树装置-单位-工作区
}
this.InitTreeMenu();//加载树
}
}
#endregion
#region 加载树装置-单位-工作区
/// <summary>
/// 加载树
/// </summary>
@ -202,7 +229,9 @@
}
}
}
#endregion #region 绑定树节点
#endregion
#region 绑定树节点
/// <summary>
/// 绑定树节点
/// </summary>
@ -263,6 +292,7 @@
}
#endregion
#region 数据绑定
/// <summary>
/// 数据绑定
@ -423,8 +453,19 @@
#endregion
#endregion
#region 分页排序
#region 页索引改变事件 /// <summary> /// 页索引改变事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { BindGrid(); }
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
@ -510,7 +551,17 @@
#endregion
#region 排序 /// <summary> /// 排序 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_Sort(object sender, GridSortEventArgs e) { BindGrid(); }
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
@ -596,7 +647,18 @@
#endregion
#region 分页选择下拉改变事件 /// <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(); }
#region 分页选择下拉改变事件
/// <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();
}
@ -693,74 +755,98 @@
#endregion
#endregion
#region 关闭弹出窗口及刷新页面 /// <summary> /// 关闭弹出窗口 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Window1_Close(object sender, WindowCloseEventArgs e) { this.PTP_ID = this.hdPTP_ID.Text; this.BindGrid(); this.InitTreeMenu(); this.hdPTP_ID.Text = string.Empty; }
/// <summary> /// 查询 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Tree_TextChanged(object sender, EventArgs e) { this.InitTreeMenu(); this.BindGrid(); }
#endregion
#region 关闭弹出窗口及刷新页面
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
this.PTP_ID = this.hdPTP_ID.Text;
this.BindGrid();
this.InitTreeMenu();
this.hdPTP_ID.Text = string.Empty;
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Tree_TextChanged(object sender, EventArgs e)
{
this.InitTreeMenu();
this.BindGrid();
}
#endregion
protected void btnMenuModify_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID) + Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - ")));
@ -819,4 +905,5 @@
InitTreeMenu();
}
#endregion
} }
}
}

8
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx
View File

@ -30,7 +30,7 @@
runat="server" BoxFlex="1" DataKeyNames="PTP_ID" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PTP_ID" AllowSorting="true"
SortField="TestPackageNo" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true">
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -52,13 +52,13 @@
<f:RenderField HeaderText="试压名称" ColumnID="TestPackageName" DataField="TestPackageName" SortField="TestPackageName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="试压状态" ColumnID="" DataField="" SortField=""
<%--<f:RenderField HeaderText="试压状态" ColumnID="" DataField="" SortField=""
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="试压时间" ColumnID="TableDate" DataField="TableDate" SortField="TableDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="试压结论" ColumnID="" DataField="" SortField=""
<f:RenderField HeaderText="试压结论" ColumnID="FinishDef" DataField="FinishDef" SortField="FinishDef"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="打印状态" ColumnID="PrintState" DataField="PrintState" SortField="PrintState"

53
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageData.aspx.cs
View File

@ -171,6 +171,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
t.UnitWorkId,
t.TestPackageNo,
t.TestPackageName,
t.FinishDef,
(case when t.PrintState>0 then '第'+convert(varchar(10),t.PrintState)+'次打印' else '未打印' end) as PrintState,
t.TableDate
from PTP_TestPackage t where t.ProjectId=@projectId";
@ -245,24 +246,29 @@ namespace FineUIPro.Web.HJGL.TestPackage
/// <param name="e"></param>
protected void btnPrint_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
{
this.PTP_ID = this.Grid1.SelectedRowID;
exportWord("1");
}
else
var selectedRows = this.Grid1.SelectedRowIDArray;
if (selectedRows.Length==0)
{
Alert.ShowInTop("请选择一条试压包", MessageBoxIcon.Warning);
return;
}
foreach (var ptp_id in selectedRows)
{
exportWord(ptp_id);
}
}
protected void exportWord(string type)
protected void exportWord(string ptp_id)
{
if (!string.IsNullOrEmpty(this.PTP_ID))
if (string.IsNullOrEmpty(ptp_id))
{
Alert.ShowInTop("请选择要打印的单据!", MessageBoxIcon.Warning);
return;
}
//修改试压包打印状态
var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == this.PTP_ID);
var updateTestPackage = Funs.DB.PTP_TestPackage.FirstOrDefault(x => x.PTP_ID == ptp_id);
string exportName = updateTestPackage?.TestPackageNo; //导出文件名称
if (updateTestPackage != null)
{
if (updateTestPackage.PrintState.HasValue && updateTestPackage.PrintState > 0)
@ -298,7 +304,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var Path = Funs.RootPath + "FileUpload/" + this.PTP_ID + ".pdf";
var Path = Funs.RootPath + "FileUpload/" + ptp_id + ".pdf";
BLL.FastReportService.ExportMergeReport(FastReportItemList, Path, this.drpPrintType.SelectedValue);
FileInfo info = new FileInfo(Path);
@ -306,7 +312,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("试压包资料.pdf", System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(exportName + ".pdf", System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
@ -325,7 +331,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var PathA = Funs.RootPath + "FileUpload/" + this.PTP_ID + ".docx";
var PathA = Funs.RootPath + "FileUpload/" + ptp_id + ".docx";
BLL.FastReportService.ExportMergeReport(FastReportItemList, PathA, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc1 = new Aspose.Words.Document(PathA);
@ -336,7 +342,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
FastReportItemList2.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var PathB = Funs.RootPath + "FileUpload/" + this.PTP_ID + "2.docx";
var PathB = Funs.RootPath + "FileUpload/" + ptp_id + "2.docx";
BLL.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB);
@ -351,7 +357,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
FastReportItemList3.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var PathC = Funs.RootPath + "FileUpload/" + this.PTP_ID + "3.docx";
var PathC = Funs.RootPath + "FileUpload/" + ptp_id + "3.docx";
BLL.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC);
// 合并 Word DOcx 文档
@ -365,7 +371,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
FastReportItemList4.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var PathD = Funs.RootPath + "FileUpload/" + this.PTP_ID + "4.docx";
var PathD = Funs.RootPath + "FileUpload/" + ptp_id + "4.docx";
BLL.FastReportService.ExportMergeReport(FastReportItemList4, PathD, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc4 = new Aspose.Words.Document(PathD);
// 合并 Word DOcx 文档
@ -380,7 +386,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
FastReportItemList5.Add(GetFastReportItem(updateTestPackage, item.Text));
}
var PathE = Funs.RootPath + "FileUpload/" + this.PTP_ID + "5.docx";
var PathE = Funs.RootPath + "FileUpload/" + ptp_id + "5.docx";
BLL.FastReportService.ExportMergeReport(FastReportItemList5, PathE, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc5 = new Aspose.Words.Document(PathE);
// 合并 Word DOcx 文档
@ -395,7 +401,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("交工资料.docx", System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(exportName + ".docx", System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
@ -408,12 +414,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
File.Delete(PathE);
}
}
}
else
{
Alert.ShowInTop("请选择要打印的单据!", MessageBoxIcon.Warning);
return;
}
}
@ -524,9 +525,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
string sql = @"SELECT ptpPipe.PT_PipeId,
ptpPipe.PTP_ID,
ptpPipe.PipelineId,
ptpPipe.DesignPress, --设计压力
ptpPipe.DesignTemperature, --设计温度
ptpPipe.TestPressure, --试验压力
IsoInfo.DesignPress, --设计压力
IsoInfo.DesignTemperature, --设计温度
IsoInfo.TestPressure, --试验压力
IsoInfo.PipelineCode,--管道编号/单线号
testMedium.MediumName,--试验介质
testPackage.AmbientTemperature,--试验环境温度

8
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
View File

@ -72,9 +72,13 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField HeaderText="管线编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
<f:WindowField ColumnID="myWindowField1" Width="160px" WindowID="Window1" HeaderText="管线编号"
Text="编辑" ToolTip="编辑" DataTextFormatString="{0}" DataIFrameUrlFields="PipelineId" DataTextField="PipelineCode"
DataIFrameUrlFormatString="../WeldingManage/PipelineEdit.aspx?PipelineId={0}" DataWindowTitleField="PipelineCode"
DataWindowTitleFormatString="编辑 - {0}" />
<%--<f:RenderField HeaderText="管线编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="160px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="设计压力Mpa(g)" ColumnID="DesignPress" DataField="DesignPress" SortField="DesignPress"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>

2
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
View File

@ -279,7 +279,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
this.PageInfoLoad(); ///页面输入保存信息
string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, IsoInfo.DesignPress,
IsoInfo.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium,
ptpPipe.TestMediumTemperature, ptpPipe.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
ptpPipe.TestMediumTemperature, IsoInfo.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
FROM dbo.PTP_PipelineList AS ptpPipe
LEFT JOIN dbo.HJGL_Pipeline AS IsoInfo ON ptpPipe.PipelineId = IsoInfo.PipelineId
LEFT JOIN dbo.Base_TestMedium AS testMedium ON testMedium.TestMediumId = IsoInfo.TestMedium

49
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx
View File

@ -25,6 +25,8 @@
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:HiddenField ID="hdFileName" runat="server">
</f:HiddenField>
<f:Button ID="btnDownLoadLine" runat="server" Icon="ApplicationGo" ToolTip="下载模板(附加未试压管线信息)" Text="下载模板(附加管线信息)" OnClick="btnDownLoadLine_Click">
</f:Button>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click">
</f:Button>
<%--<f:Label ID="lbVersion" runat="server" Label="当前版本："></f:Label>--%>
@ -71,7 +73,7 @@
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
<f:RenderField Width="100px" ColumnID="AdjustTestPressure" DataField="AdjustTestPressure" SortField="AdjustTestPressure"
FieldType="String" HeaderText="调整试验压力" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@ -97,51 +99,6 @@
</f:Grid>
</Items>
</f:FormRow>
<%--<f:FormRow>
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" IsFluid="true"
EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="DesignBasisDataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DesignBasisDataImportId"
AllowSorting="true" SortField="CreateDate" SortDirection="ASC" EnableMultiSelect="false"
IsDatabasePaging="false" PageSize="15" >
<Toolbars>
<f:Toolbar runat="server">
<Items>
<f:DropDownList runat="server" ID="drpVersion" Label="恢复版本至" ></f:DropDownList>
<f:Button runat="server" ID="btnRestore" Text="确定" OnClick="btnRestore_Click"> </f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="编号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="名称" ColumnID="FileName"
DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="版本" ColumnID="Version"
DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="导入类型" ColumnID="ImportType"
DataField="ImportType" SortField="ImportType" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="更新人" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField HeaderText="更新日期" ColumnID="CreateDate"
DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>--%>
</Rows>
</f:Form>
</form>

254
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
View File

@ -1,9 +1,11 @@
using BLL;
using FineUIPro.Web.ProjectData;
using MiniExcelLibs;
using NPOI.POIFS.Crypt.Dsig;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
@ -58,52 +60,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
PipelineList.Clear();
}
errorInfos = string.Empty;
//lbVersion.Text = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(Request.Params["UnitWorkId"], DataClassification).ToString();
//BindGrid2();
}
}
#endregion
//void BindGrid2()
//{
// string strSql = @" select Import.DesignBasisDataImportId
// ,Import.ProjectId
// ,Import.UnitWorkId
// ,(Case Import.ImportType when '0' then '补充导入'
// when '1' then '更新导入' end) as ImportType
// ,Import.FileName
// ,Import.FilePath
// ,Import.DataClassification
// ,Import.FileType
// ,Import.FileSize
// ,Import.FileId
// ,Import.Version
// ,Import.Remark
// ,Import.CreateMan
// ,Import.CreateDate
// , Users.PersonName
// from HJGL_DesignBasisDataImport as Import
// left join Person_Persons as Users on Users.PersonId=Import.CreateMan
// where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.DataClassification=@DataClassification
// order by Import.CreateDate";
// List<SqlParameter> listStr = new List<SqlParameter>();
// listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
// listStr.Add(new SqlParameter("@UnitWorkId", Request.Params["UnitWorkId"]));
// //listStr.Add(new SqlParameter("@DataClassification", DataClassification));
// SqlParameter[] parameter = listStr.ToArray();
// DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// // 2.获取当前分页数据
// //var table = this.GetPagedDataTable(Grid1, tb1);
// Grid2.RecordCount = tb.Rows.Count;
// tb = GetFilteredTable(Grid2.FilteredData, tb);
// var table = this.GetPagedDataTable(Grid2, tb);
// Grid2.DataSource = table;
// Grid2.DataBind();
// drpVersion.DataSource = BLL.HJGL_DesignBasisDataImportService.GetListVersionByUnitWorkId(Request.Params["UnitWorkId"], DataClassification);
// drpVersion.DataBind();
//}
#region 审核
/// <summary>
/// 审核
@ -207,7 +168,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
// string result = string.Empty;
List<string> result = new List<string>();
//pds = BLL.Funs.FilterBlankLines(pds);
if (count < 5)
if (count < 11)
{
responeData.code = 0;
responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列";
@ -255,7 +216,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
}
if (pds[i].C != null)
{
string col2 = pds[i].C.ToString();
pipeline.AdjustTestPressure = pds[i].C.ToString();//调整试验压力
}
if (pds[i].D != null)
{
pipeline.Remark = pds[i].D.ToString(); //备注
}
if (pds[i].E != null) //管线号
{
string col2 = pds[i].E.ToString();
if (string.IsNullOrEmpty(col2))
{
result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
@ -286,14 +255,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
}
if (pds[i].D != null)
{
pipeline.AdjustTestPressure = pds[i].D.ToString();
}
if (pds[i].E != null)
{
pipeline.Remark = pds[i].E.ToString();
}
pipeline.Tabler = this.CurrUser.PersonId;
pipeline.TableDate = DateTime.Now;
@ -395,51 +357,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (DrpType.SelectedValue == "1")//更新导入
{
//BLL.PipelineMatService.DeletePipeLineMatByUnitWorkId(unitworkId);//删除原有管线对应材料
//BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
//BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
AddView_TestPackage_PipelineList(PipelineList);//导入数据
//Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
//hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
//hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
//hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
//hJGL_DesignBasisDataImport.ImportType = "1";
//hJGL_DesignBasisDataImport.DataClassification = DataClassification;
//hJGL_DesignBasisDataImport.FileName = FileName;
//hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, "");
//hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
//hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNewVersionByUnitWorkId(unitworkId, DataClassification);
//hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
//hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
//hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
//BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
//BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
}
else //补充导入
{
AddView_TestPackage_PipelineList(PipelineList);
//Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
//hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
//hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
//hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
//hJGL_DesignBasisDataImport.ImportType = "0";
//hJGL_DesignBasisDataImport.DataClassification = DataClassification;
//hJGL_DesignBasisDataImport.FileName = FileName;
//hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, ""); ;
//hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
//hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(unitworkId, DataClassification);
//hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
//hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
//hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
//BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
//BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
}
ShowNotify("导入成功！", MessageBoxIcon.Success);
@ -562,85 +485,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
BLL.TestPackageEditService.AddPipelineLists(pipelineList_add);
}
//Model.SGGLDB db2 = Funs.DB;
//List<Model.PTP_PipelineList> delJoints = new List<Model.PTP_PipelineList>();
//var allWeldJoints2 = from x in db2.PTP_PipelineList
// join y in db2.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
// where y.UnitWorkId == Request.Params["UnitWorkId"]
// select x;
//foreach (var pipelineCode in pipelineCodes)
//{
// var pipelineWeldJointCodes = weldJoints.Where(x => x.PTP_ID == pipelineCode).Select(x => x.PipelineId).ToList();
// var q = allWeldJoints2.Where(x => x.PTP_ID == pipelineCode && !pipelineWeldJointCodes.Contains(x.PipelineId)).ToList();
// delJoints.AddRange(q);
//}
//if (delJoints.Count() > 0)
//{
// try
// {
// db2.PTP_PipelineList.DeleteAllOnSubmit(delJoints);
// db2.SubmitChanges();
// }
// catch (Exception)
// {
// string weldJointCodes = string.Empty;
// foreach (var item in delJoints)
// {
// weldJointCodes += item.PipelineId + ",";
// }
// Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning);
// }
//}
}
#endregion
/// <summary>
/// 恢复版本
/// </summary>
/// <param name="unitworkId"></param>
/// <param name="version"></param>
private void RestoreVersion(string unitworkId, decimal version)
{
//var model = BLL.HJGL_DesignBasisDataImportService.GetDataByUnitWorkIdAndVersion(unitworkId, version, DataClassification);
//if (model != null && model.Count > 0)
//{
// foreach (var item in model)
// {
// string rootPath = Server.MapPath("~/");
// // initFullPath = rootPath + initPath;
// string filePath = rootPath + item.FilePath;
// ImportXlsToData(filePath);
// BLL.PipelineMatService.DeletePipeLineMatByUnitWorkId(unitworkId);//删除原有管线对应材料
// BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
// BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
// AddView_HJGL_WeldJoint(PipelineList);//导入数据
// PipelineList.Clear();
// }
// BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, version, DataClassification);
// PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
// ShowNotify("恢复成功！");
//}
}
protected void btnRestore_Click(object sender, EventArgs e)
{
//if (string.IsNullOrEmpty(drpVersion.SelectedValue))
//{
// ShowNotify("请选择版本");
//}
//else
//{
// PageContext.RegisterStartupScript(Confirm.GetShowReference("确定恢复至该版本吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_Restore"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
//}
}
#region 下载模板
/// <summary>
/// 下载模板按钮
@ -651,36 +498,67 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
}
protected void btnDownLoadLine_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "DownLine_Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
}
/// <summary>
/// 下载导入模板
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
{
if (e.EventArgument == "Confirm_OK")
{
string rootPath = Server.MapPath("~/");
string uploadfilepath = rootPath + Const.TestPackageTemplateUrl;
string filePath = Const.TestPackageTemplateUrl;
string fileName = Path.GetFileName(filePath);
FileInfo info = new FileInfo(uploadfilepath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(uploadfilepath, 0, fileSize);
Response.End();
string path = uploadfilepath.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
string fileName = Path.GetFileName(uploadfilepath);
if (e.EventArgument == "DownLine_Confirm_OK")
{
string UnitWorkId = Request.Params["UnitWorkId"];
var queryList = from x in Funs.DB.View_HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId into yGroup
from y in yGroup.DefaultIfEmpty()
where x.UnitWorkId == UnitWorkId && y==null
select new
{
x.PipelineId,
x.PipelineCode,
x.PipingClassCode,
x.MediumName,
x.DesignPress,
x.DesignTemperature,
x.TestMediumCode,
x.TestPressure
};
var value = new
{
model = queryList.ToList()
};
MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
}
//else if (e.EventArgument == "Confirm_Restore")
//{
// var unitworkid = Request.Params["UnitWorkId"];
// decimal version = decimal.Parse(drpVersion.SelectedValue);
// RestoreVersion(unitworkid, version);
//}
else if (e.EventArgument == "Confirm_OK")
{
var value = new
{
model = ""
};
MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
}
FileInfo info = new FileInfo(path);
long fileSize = info.Length;
System.Web.HttpContext.Current.Response.ClearContent();
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.ContentType = "excel/plain";
System.Web.HttpContext.Current.Response.ContentEncoding = System.Text.Encoding.UTF8;
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString().Trim());
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
File.Delete(path);
System.Web.HttpContext.Current.Response.End();
}
#endregion

9
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.designer.cs generated
View File

@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.TestPackage
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// btnDownLoadLine 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoadLine;
/// <summary>
/// btnDownLoad 控件。
/// </summary>

6
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx
View File

@ -45,7 +45,7 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:HiddenField ID="hdPipelinesId" runat="server"></f:HiddenField>
<f:TextBox ID="hdPipelinesId" runat="server" Hidden="true"></f:TextBox>
<f:Button ID="btnFind" Text="查询" ToolTip="查找符合条件的管线" ValidateForms="SimpleForm1" Icon="Find" runat="server" OnClick="btnFind_Click">
</f:Button>
<f:Button ID="btnSave" Text="保存" ToolTip="保存试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
@ -77,10 +77,10 @@
</f:RenderField>
<f:RenderField HeaderText="压力试验压力Mpa(g)" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
<%-- <Editor>
<f:NumberBox ID="NumberBox1" Required="true" runat="server">
</f:NumberBox>
</Editor>
</Editor>--%>
</f:RenderField>
</Columns>
<Listeners>

17
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.TestPackage {
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageItemEdit {
public partial class TestPackageItemEdit
{
/// <summary>
/// Head1 控件。
@ -154,7 +156,7 @@ namespace FineUIPro.Web.HJGL.TestPackage {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdPipelinesId;
protected global::FineUIPro.TextBox hdPipelinesId;
/// <summary>
/// btnFind 控件。
@ -192,15 +194,6 @@ namespace FineUIPro.Web.HJGL.TestPackage {
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// NumberBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
View File

@ -173,6 +173,10 @@
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationCode"
DataField="WeldingLocationCode" SortField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
View File

@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName
WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName,WeldingLocationCode
FROM dbo.View_HJGL_WeldJoint
WHERE WeldingDailyId=@WeldingDailyId";

16
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldReportEdit.aspx.cs"
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingLocationId.aspx.cs"
Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit" %>
<!DOCTYPE html>
@ -142,6 +142,15 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationId"
DataField="WeldingLocationId" FieldType="String" RendererFunction="render_user"
HeaderTextAlign="Center" TextAlign="Center" Width="150px">
<Editor>
<f:DropDownList ID="drpWeldingLocationId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<%-- <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
@ -238,8 +247,11 @@
var gridClientID = '<%= Grid1.ClientID %>';
var drpCoverWelderIdClientID = '<%= drpCoverWelderId.ClientID %>';
var drpBackingWelderIdClientID = '<%= drpBackingWelderId.ClientID %>';
var drpWeldingLocationClientID = '<%= drpWeldingLocationId.ClientID %>';
function render_user(value) {
return F(drpWeldingLocationClientID).getTextByValue(value);
}
function onGridBeforeEdit(event, value, params) {
var grid = F(gridClientID);
var canWelder = grid.getCellValue(params.rowId, 'CanWelderCode');

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -140,6 +140,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
Base_WeldingLocationServie.InitWeldingLocationDropDownList(this.drpWeldingLocationId,true);
var report = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(this.WeldingDailyId);
if (report != null)
@ -519,6 +520,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (newWeldJoint != null)
{
newWeldJoint.JointAttribute = values.Value<string>("JointAttribute");
newWeldJoint.WeldingLocationId = values.Value<string>("WeldingLocationId");
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId &&
x.WelderCode == values.Value<string>("CoverWelderCode")

15
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage {
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class WeldReportEdit {
public partial class WeldReportEdit
{
/// <summary>
/// form1 控件。
@ -264,6 +266,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// </remarks>
protected global::FineUIPro.DropDownList drpBackingWelderId;
/// <summary>
/// drpWeldingLocationId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingLocationId;
/// <summary>
/// drpJointAttribute2 控件。
/// </summary>

6
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -45,6 +45,12 @@
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="ckPressMustCheckBItem" runat="server" Label="压力试验尾项条件" Text="必须B项整改完成" LabelWidth="200">
</f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="ckbDayReport" runat="server" Label="焊接日报编号" Text="是否自动生成" LabelWidth="200">

39
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
View File

@ -59,6 +59,34 @@ namespace FineUIPro.Web.common.ProjectSet
Model.Project_Sys_Set thickness = BLL.Project_SysSetService.GetSysSetBySetId("7", projectId);
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", projectId);
Model.Project_Sys_Set AvevaNetUrl = BLL.Project_SysSetService.GetSysSetBySetId("9", projectId);
Model.Project_Sys_Set PressMustCheckBItem = BLL.Project_SysSetService.GetSysSetBySetId("10", projectId);
if (PressMustCheckBItem != null)
{
if (this.ckPressMustCheckBItem.Checked)
{
PressMustCheckBItem.IsAuto = true;
}
else
{
PressMustCheckBItem.IsAuto = false;
}
BLL.Project_SysSetService.UpdateSet(PressMustCheckBItem);
}
else
{
Model.Project_Sys_Set newPressMustCheckBItem = new Model.Project_Sys_Set();
newPressMustCheckBItem.SetId = "10";
newPressMustCheckBItem.ProjectId = projectId;
if (this.ckPressMustCheckBItem.Checked)
{
newPressMustCheckBItem.IsAuto = true;
}
else
{
newPressMustCheckBItem.IsAuto = false;
}
BLL.Project_SysSetService.AddSet(newPressMustCheckBItem);
}
if (jointB != null)
{
if (this.ckbJointB.Checked)
@ -550,6 +578,17 @@ namespace FineUIPro.Web.common.ProjectSet
this.AvevaNetUrl.Text = s.SetValue;
}
else if (s.SetId == "10")
{
if (s.IsAuto == true)
{
this.ckPressMustCheckBItem.Checked = true;
}
else
{
this.ckPressMustCheckBItem.Checked = false;
}
}
}
}
//颜色模型设置

9
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs generated
View File

@ -104,6 +104,15 @@ namespace FineUIPro.Web.common.ProjectSet
/// </remarks>
protected global::FineUIPro.RadioButtonList rblPressUnit;
/// <summary>
/// ckPressMustCheckBItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckPressMustCheckBItem;
/// <summary>
/// ckbDayReport 控件。
/// </summary>