lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
潘鸿锋 2024-12-11 09:43:27 +08:00
parent d8e79a9fd8 851f6790ed
commit 8a443d509a
18 changed files with 249 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DataBase/版本日志/SUBQHSE_V2024-12-10-xiaj.sql Normal file
View File

@ -0,0 +1,18 @@
--SUBQHSE_V2024-12-10-xiaj
--1、给管道表添加SN序列号
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Transfer_Piping' AND COLUMN_NAME = 'SN')
BEGIN
ALTER TABLE Transfer_Piping ADD SN INT NOT NULL DEFAULT 1000;
END
GO
--2、给仪表表添加SN序列号
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Transfer_Instrumentation' AND COLUMN_NAME = 'SN')
BEGIN
ALTER TABLE Transfer_Instrumentation ADD SN INT NOT NULL DEFAULT 1000;
END
GO

81
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
View File

@ -12,19 +12,24 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="移交统计表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="SubSysNo" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="SubSysNo" AllowSorting="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="true" AllowColumnLocking="true">
<toolbars>
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<items>
<Items>
<f:DropDownList ID="ddlSubSysNo" runat="server" Label="Turnover System Code" AutoPostBack="true" EnableEdit="true"
OnSelectedIndexChanged="ddlSubSysNo_SelectedIndexChanged" Width="400px" LabelWidth="200px">
</f:DropDownList>
<f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right"
LabelWidth="80px">
<f:ListItem Value="" Text="ALL" />
<f:ListItem Value="0" Text="工艺系统清单" />
<f:ListItem Value="1" Text="非工艺系统清单" />
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@ -32,24 +37,28 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</items>
</Items>
</f:Toolbar>
</toolbars>
<columns>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<itemtemplate>
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</itemtemplate>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="50px">
</f:RenderField>--%>
<f:RenderField ColumnID="SubSysNo" DataField="SubSysNo"
FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true">
</f:RenderField>
<f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
FieldType="String" HeaderText="Commissioning Code<br/>Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="300px" EnableLock="true" Locked="true">
</f:RenderField>
<f:RenderField MinWidth="100px" ColumnID="PlanPWD" DataField="PlanPWD"
HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"
@ -64,7 +73,7 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
<f:GroupField HeaderText="Welding<br/>管道焊接信息" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrTotalFactor" DataField="StrTotalFactor"
HeaderText="总达因数" TextAlign="Center" />
@ -73,11 +82,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrCompleteProportion" DataField="StrCompleteProportion"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Piping<br/>管道试压包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrPipingCount" DataField="StrPipingCount"
HeaderText="总数" TextAlign="Center" />
@ -86,11 +95,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrPipingPercent" DataField="StrPipingPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Reinstate<br/>管道冲洗吹扫&复位信息" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrReinstateCount" DataField="StrReinstateCount"
HeaderText="总数" TextAlign="Center" />
@ -99,11 +108,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrReinstatePercent" DataField="StrReinstatePercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Equipment<br/>设备测试包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrEqCount" DataField="StrEqCount"
HeaderText="总数" TextAlign="Center" />
@ -112,11 +121,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrEqPercent" DataField="StrEqPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Electric<br/>电气测试包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrTeCount" DataField="StrTeCount"
HeaderText="总数" TextAlign="Center" />
@ -125,11 +134,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrTePercent" DataField="StrTePercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="instrument<br/>仪表测试包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrTiCount" DataField="StrTiCount"
HeaderText="总数" TextAlign="Center" />
@ -138,11 +147,11 @@
<f:RenderField MinWidth="30px" ColumnID="StrTiPercent" DataField="StrTiPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrTcsCount" DataField="StrTcsCount"
HeaderText="总数" TextAlign="Center" />
@ -151,7 +160,7 @@
<f:RenderField MinWidth="30px" ColumnID="StrTcsPercent" DataField="StrTcsPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<%-- <f:GroupField HeaderText="Firefighting<br/>消防测试包" TextAlign="Center">
@ -168,7 +177,7 @@
</f:GroupField>--%>
<f:GroupField HeaderText="Telecom<br/>电信测试包" TextAlign="Center">
<columns>
<Columns>
<f:RenderField MinWidth="30px" ColumnID="StrTtCount" DataField="StrTtCount"
HeaderText="总数" TextAlign="Center" />
@ -177,7 +186,7 @@
<f:RenderField MinWidth="30px" ColumnID="StrTtPercent" DataField="StrTtPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</columns>
</Columns>
</f:GroupField>
<%--<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" >
@ -194,9 +203,9 @@
</f:GroupField>--%>
<f:TemplateField ColumnID="Count4" MinWidth="120px" HeaderText="Total<br/>completion<br/>总完成率（%）" HeaderTextAlign="Center" TextAlign="Right">
<itemtemplate>
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SubSysNo")) %>'></asp:Label>
</itemtemplate>
</ItemTemplate>
</f:TemplateField>
<f:RenderField MinWidth="120px" ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing"
@ -277,11 +286,11 @@
HeaderText="Remark<br/>备注" TextAlign="Center"
FieldType="String" />
</columns>
<listeners>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</listeners>
<pageitems>
</Listeners>
<PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@ -291,19 +300,19 @@
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</pageitems>
</PageItems>
</f:Grid>
</items>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<items>
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
</items>
</Items>
</f:Menu>
</form>
<script type="text/javascript">

17
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
View File

@ -45,7 +45,7 @@ namespace FineUIPro.Web.Transfer.Chart
public DataTable DataSql()
{
string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
string strSql = @"select f.SubSysNo,lhcs.CommissioningCodeDescription,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
case ISNULL(tpi3.TotalFactor,0) when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion,
@ -86,8 +86,9 @@ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end
ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
from(
SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId
SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,ProjectId
) f
left join Transfer_LHCSystemList lhcs on f.ProjectId=lhcs.ProjectId and f.SubSysNo=lhcs.SubCommissioningsystem
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
--piping
@ -95,7 +96,7 @@ left join (select count(*)as PipingCount,ProjectId,TestPackage from Transfer_Pip
group by ProjectId,TestPackage)
tpi on f.ProjectId=tpi.ProjectId and f.SubSysNo=tpi.TestPackage
left join (select count(*)as PipingScount,ProjectId,TestPackage from Transfer_Piping where FINALStatus='Completed'
left join (select count(*)as PipingScount,ProjectId,TestPackage from Transfer_Piping where PressureTestCompleted='Completed'
group by ProjectId,TestPackage)
tpi1 on f.ProjectId=tpi1.ProjectId and f.SubSysNo=tpi1.TestPackage
@ -160,7 +161,7 @@ left join (select count(*)as TtScount,ProjectId,Test_Package from Transfer_Telec
group by ProjectId,Test_Package)
Tt1 on f.ProjectId=Tt1.ProjectId and f.SubSysNo=Tt1.Test_Package
where f.ProjectId = @ProjectId";
where f.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@ -169,8 +170,14 @@ where f.ProjectId = @ProjectId";
{
strSql += " AND f.SubSysNo='" + ddlSubSysNo.SelectedValue + "' ";
}
if (!string.IsNullOrEmpty(drpType.SelectedValue))
{
strSql += " AND lhcs.Type='" + drpType.SelectedValue + "' ";
}
strSql += " order by f.SubSysNo ";
//strSql += " order by f.Type ";
//strSql += " order by f.SubSysNo ";
strSql += " order by lhcs.Type,lhcs.SN ";
SqlParameter[] parameter = listStr.ToArray();
return SQLHelper.GetDataTableRunText(strSql, parameter);
}

9
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs generated
View File

@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer.Chart
/// </remarks>
protected global::FineUIPro.DropDownList ddlSubSysNo;
/// <summary>
/// drpType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpType;
/// <summary>
/// btnSearch 控件。
/// </summary>

3
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
View File

@ -15,7 +15,8 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SN"
SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<Toolbars>

2
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
View File

@ -81,7 +81,7 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Test_Package like @SysSubNo";
listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
}
strSql += " order by INSTRUMENTATION ";
//strSql += " order by SN ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

14
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
View File

@ -306,9 +306,19 @@ namespace FineUIPro.Web.Transfer
}
string result = string.Empty;
ir = pds.Rows.Count;
int Sn = 0;
if (pds != null && ir > 0)
{
List<Model.Transfer_Instrumentation> list = new List<Model.Transfer_Instrumentation>();
//根据项目id查询sn
var snModel = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == CurrUser.LoginProjectId).OrderByDescending(x => x.SN).FirstOrDefault();
if (snModel == null && Sn == 0)
{
Sn = 1000;
}
else {
Sn = snModel.SN;
}
for (int i = 1; i < ir; i++)
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
@ -322,6 +332,10 @@ namespace FineUIPro.Web.Transfer
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
Sn += 1;
model.SN = Sn;
model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();

2
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
View File

@ -19,6 +19,8 @@
<f:TextBox ID="txtINSTRUMENTATION" runat="server" Label="Tag No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:NumberBox ID="txtSN" NoDecimal="true" ShowTrigger="false" runat="server" Label="SN" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
</f:NumberBox>
</Items>
</f:FormRow>

11
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
View File

@ -51,6 +51,7 @@ namespace FineUIPro.Web.Transfer
var model = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.Id == Id);
if (model != null)
{
txtSN.Text = model.SN.ToString();
txtINSTRUMENTATION.Text = model.INSTRUMENTATION;
txtSystemName.Text = model.SystemName;
txtSubsystem.Text = model.Subsystem;
@ -64,6 +65,14 @@ namespace FineUIPro.Web.Transfer
txtDescriptions.Text = model.Descriptions;
}
}
else
{
var model = Funs.DB.Transfer_Instrumentation.OrderByDescending(x => x.SN).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
if (model == null)
txtSN.Text = "1001";
else
txtSN.Text = (model.SN + 1).ToString();
}
}
}
@ -71,6 +80,7 @@ namespace FineUIPro.Web.Transfer
{
var model = new Model.Transfer_Instrumentation
{
SN = Convert.ToInt32(txtSN.Text),
ProjectId = ProjectId,
INSTRUMENTATION = txtINSTRUMENTATION.Text,
SystemName = txtSystemName.Text,
@ -118,6 +128,7 @@ namespace FineUIPro.Web.Transfer
var newModel = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.Id == Id);
if (newModel != null)
{
newModel.SN = model.SN;
newModel.INSTRUMENTATION = txtINSTRUMENTATION.Text;
newModel.SystemName = txtSystemName.Text;
newModel.Subsystem = txtSubsystem.Text;

9
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs generated
View File

@ -50,6 +50,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtINSTRUMENTATION;
/// <summary>
/// txtSN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSN;
/// <summary>
/// txtSystemName 控件。
/// </summary>

23
SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
View File

@ -226,7 +226,8 @@ namespace FineUIPro.Web.Transfer
}
}
}
else {
else
{
string row4 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row4))
{
@ -472,9 +473,9 @@ namespace FineUIPro.Web.Transfer
//根据项目id查询sn
var snModel = Funs.DB.Transfer_LHCSystemList.Where(x => x.ProjectId == CurrUser.LoginProjectId
&& x.Type == Type).OrderByDescending(x => x.SN).FirstOrDefault();
if (snModel == null && Sn==0)
if (snModel == null && Sn == 0)
{
Sn = 1001;
Sn = Type == "0" ? 1001 : 2001;
model.SN = Sn;
}
else
@ -484,32 +485,34 @@ namespace FineUIPro.Web.Transfer
Sn = Convert.ToInt32(snModel.SN + 1);
model.SN = Sn;
}
else {
else
{
Sn += 1;
model.SN = Sn;
}
}
model.SystemNo = pds.Rows[i][0].ToString().Trim();
model.Commissioningsystemcode= pds.Rows[i][1].ToString().Trim();
model.Commissioningsystemcode = pds.Rows[i][1].ToString().Trim();
model.CommissioningCodeDescription = pds.Rows[i][2].ToString().Trim();
if (Type == "0")
{
model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim();
//model.Turnover_Code= pds.Rows[i][4].ToString().Trim();
DateTime t1, t2,t3;
DateTime t1, t2, t3;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.PlanStartofTestingDate = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.PlanFinishofTestingDate = t2;
model.Status= pds.Rows[i][6].ToString().Trim();
model.Status = pds.Rows[i][6].ToString().Trim();
if (DateTime.TryParse(pds.Rows[i][7].ToString(), out t3) && !string.IsNullOrEmpty(pds.Rows[i][7].ToString()))
model.ActualFinishedDate = t3;
}
else {
else
{
model.Describe = pds.Rows[i][3].ToString().Trim();
model.SubCommissioningsystem = pds.Rows[i][4].ToString().Trim();
//model.Turnover_Code = pds.Rows[i][5].ToString().Trim();

43
SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.cs
View File

@ -54,10 +54,11 @@ namespace FineUIPro.Web.Transfer
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack) {
if (!IsPostBack)
{
Id = Request.Params["Id"];
ProjectId = this.CurrUser.LoginProjectId;
Type= Request.Params["Type"];
Type = Request.Params["Type"];
if (Type == "1")
Type1.Hidden = false;
else
@ -91,38 +92,41 @@ namespace FineUIPro.Web.Transfer
ddlSStatus.SelectedValue = model.Status;
}
}
else {
else
{
var model = Funs.DB.Transfer_LHCSystemList.OrderByDescending(x => x.SN).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId
&& x.Type==Type);
&& x.Type == Type);
if (model == null)
txtSN.Text = "1001";
txtSN.Text = Type == "0" ? "1001" : "2001";
else
txtSN.Text = (Convert.ToInt32(model.SN) + 1).ToString();
}
}
}
protected void btnSave_Click(object sender, EventArgs e) {
var model = new Model.Transfer_LHCSystemList() {
ProjectId=ProjectId,
Type=Type,
SN=Convert.ToInt32(txtSN.Text),
SystemNo= txtSystem_No.Text,
Commissioningsystemcode= txtCommissioningsystemcode.Text,
CommissioningCodeDescription= txtCommissioningCodeDescription.Text,
SubCommissioningsystem= txtSubCommissioningsystem.Text,
protected void btnSave_Click(object sender, EventArgs e)
{
var model = new Model.Transfer_LHCSystemList()
{
ProjectId = ProjectId,
Type = Type,
SN = Convert.ToInt32(txtSN.Text),
SystemNo = txtSystem_No.Text,
Commissioningsystemcode = txtCommissioningsystemcode.Text,
CommissioningCodeDescription = txtCommissioningCodeDescription.Text,
SubCommissioningsystem = txtSubCommissioningsystem.Text,
PlanStartofTestingDate = Funs.GetNewDateTime(this.txtPlanStartofTestingDate.Text),
Describe=txtDescribe.Text,
Describe = txtDescribe.Text,
PlanFinishofTestingDate = Funs.GetNewDateTime(this.txtPlanFinishofTestingDate.Text),
ActualFinishedDate = Funs.GetNewDateTime(this.txtActualFinishedDate.Text),
Status=ddlSStatus.SelectedValue
Status = ddlSStatus.SelectedValue
};
if (!string.IsNullOrEmpty(Id))
{
var newModel = Funs.DB.Transfer_LHCSystemList.FirstOrDefault(x => x.Id == Id);
if (newModel!=null)
if (newModel != null)
{
newModel.SN = model.SN;
newModel.SystemNo = model.SystemNo;
@ -137,7 +141,8 @@ namespace FineUIPro.Web.Transfer
newModel.UpdateTime = DateTime.Now;
}
}
else {
else
{
model.Id = Guid.NewGuid().ToString();
Funs.DB.Transfer_LHCSystemList.InsertOnSubmit(model);
}

5
SGGL/FineUIPro.Web/Transfer/Piping.aspx
View File

@ -15,7 +15,7 @@
<items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PIPINGLINENUMBER"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SN"
SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="true">
@ -50,6 +50,9 @@
</f:Toolbar>
</toolbars>
<columns>
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="70px">
</f:RenderField>--%>
<f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
<columns>
<f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"

15
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
View File

@ -302,6 +302,17 @@ namespace FineUIPro.Web.Transfer
}
string result = string.Empty;
ir = pds.Rows.Count;
int Sn = 0;
//根据项目id查询sn
var snModel = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == CurrUser.LoginProjectId).OrderByDescending(x => x.SN).FirstOrDefault();
if (snModel == null && Sn == 0)
{
Sn = 1000;
}
else
{
Sn = snModel.SN;
}
if (pds != null && ir > 0)
{
List<Model.Transfer_Piping> list = new List<Model.Transfer_Piping>();
@ -315,6 +326,10 @@ namespace FineUIPro.Web.Transfer
Model.Transfer_Piping model = new Model.Transfer_Piping();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
Sn += 1;
model.SN = Sn;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.SYSTEM = pds.Rows[i][1 + 1].ToString().Trim();

2
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
View File

@ -19,6 +19,8 @@
<f:TextBox ID="txtPIPINGLINENUMBER" runat="server" Label="Test Package No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:NumberBox ID="txtSN" NoDecimal="true" ShowTrigger="false" runat="server" Label="SN" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>

11
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
View File

@ -50,6 +50,7 @@ namespace FineUIPro.Web.Transfer
var model = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.Id == Id);
if (model != null)
{
txtSN.Text = model.SN.ToString();
txtPIPINGLINENUMBER.Text = model.PIPINGLINENUMBER;
txtSYSTEM.Text = model.SYSTEM;
txtSubsystem.Text = model.Subsystem;
@ -76,6 +77,14 @@ namespace FineUIPro.Web.Transfer
ddlInsulation.SelectedValue = model.Insulation;
}
}
else
{
var model = Funs.DB.Transfer_Piping.OrderByDescending(x => x.SN).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
if (model == null)
txtSN.Text = "1001";
else
txtSN.Text = (model.SN + 1).ToString();
}
}
}
@ -83,6 +92,7 @@ namespace FineUIPro.Web.Transfer
{
var model = new Model.Transfer_Piping()
{
SN = Convert.ToInt32(txtSN.Text),
ProjectId = ProjectId,
PIPINGLINENUMBER = txtPIPINGLINENUMBER.Text,
SYSTEM = txtSYSTEM.Text,
@ -154,6 +164,7 @@ namespace FineUIPro.Web.Transfer
if (!string.IsNullOrEmpty(Id))
{
var newModel = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.Id == Id);
newModel.SN = model.SN;
newModel.PIPINGLINENUMBER = model.PIPINGLINENUMBER;
newModel.SYSTEM = model.SYSTEM;
newModel.Subsystem = newModel.Subsystem;

9
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs generated
View File

@ -50,6 +50,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtPIPINGLINENUMBER;
/// <summary>
/// txtSN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSN;
/// <summary>
/// txtSYSTEM 控件。
/// </summary>

48
SGGL/Model/Model.cs
View File

@ -396054,6 +396054,8 @@ namespace Model
private string _Calibration;
private int _SN;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -396092,6 +396094,8 @@ namespace Model
partial void OnDescriptionsChanged();
partial void OnCalibrationChanging(string value);
partial void OnCalibrationChanged();
partial void OnSNChanging(int value);
partial void OnSNChanged();
#endregion
public Transfer_Instrumentation()
@ -396439,6 +396443,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SN", DbType="Int NOT NULL")]
public int SN
{
get
{
return this._SN;
}
set
{
if ((this._SN != value))
{
this.OnSNChanging(value);
this.SendPropertyChanging();
this._SN = value;
this.SendPropertyChanged("SN");
this.OnSNChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -396926,6 +396950,8 @@ namespace Model
private string _Insulation;
private int _SN;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -396992,6 +397018,8 @@ namespace Model
partial void OnElectricHeatTracingChanged();
partial void OnInsulationChanging(string value);
partial void OnInsulationChanged();
partial void OnSNChanging(int value);
partial void OnSNChanged();
#endregion
public Transfer_Piping()
@ -397619,6 +397647,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SN", DbType="Int NOT NULL")]
public int SN
{
get
{
return this._SN;
}
set
{
if ((this._SN != value))
{
this.OnSNChanging(value);
this.SendPropertyChanging();
this._SN = value;
this.SendPropertyChanged("SN");
this.OnSNChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;