gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei/HJGL_DS:298496d47b62574d64ae7e4a29ca5605d6fc383e
Branches Tags
gaofei/HJGL_DS:master
...
compare: gaofei/HJGL_DS:48b9117756988b6bebad4fa2492f5c7a0e417367
Branches Tags
gaofei/HJGL_DS:master

2 Commits
298496d47b ... 48b9117756

Author SHA1 Message Date
gaofei 48b9117756 1 2026-09-10 10:08:36 +08:00
gaofei d26e5ae8b9 1 2026-09-10 10:07:51 +08:00
2 changed files with 17 additions and 2 deletions
Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx
+2 -2
View File
@@ -79,9 +79,9 @@
<f:RenderField HeaderText="单线图号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo" <f:RenderField HeaderText="单线图号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="管道等级" ColumnID="IDName" DataField="IDName" SortField="IDName" <%--<f:RenderField HeaderText="管道等级" ColumnID="IDName" DataField="IDName" SortField="IDName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true">
</f:RenderField> </f:RenderField>--%>
<f:TemplateField Width="90px" HeaderText="管道等级" HeaderTextAlign="Center" TextAlign="Center"> <f:TemplateField Width="90px" HeaderText="管道等级" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertIsoClass(Eval("ISC_ID")) %>'></asp:Label> <asp:Label ID="Label1" runat="server" Text='<%# ConvertIsoClass(Eval("ISC_ID")) %>'></asp:Label>
HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+15
View File
@@ -153,6 +153,7 @@ namespace FineUIPro.Web.HJGL.DataIn
where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == this.IsPDMS where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == this.IsPDMS
select x; select x;
var users = from x in Funs.DB.Sys_User select x; var users = from x in Funs.DB.Sys_User select x;
string serviceNames = string.Empty;
for (; i < pdf.Pages.Count; i++) for (; i < pdf.Pages.Count; i++)
{ {
PdfPageBase page = pdf.Pages[i]; PdfPageBase page = pdf.Pages[i];
@@ -351,6 +352,20 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
isoInfo.SER_ID = SER_ID; isoInfo.SER_ID = SER_ID;
} }
else
{
if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()) && !serviceNames.Contains(row[dataColumn.ColumnName].ToString()))
{
Model.HJGL_BS_Service newBSService = new HJGL_BS_Service();
newBSService.SER_ID = SQLHelper.GetNewID();
newBSService.SER_Code = row[dataColumn.ColumnName].ToString();
newBSService.SER_Name = row[dataColumn.ColumnName].ToString();
Funs.DB.HJGL_BS_Service.InsertOnSubmit(newBSService);
Funs.DB.SubmitChanges();
serviceNames += row[dataColumn.ColumnName].ToString();
isoInfo.SER_ID = newBSService.SER_ID;
}
}
break; break;
case "管道类别": case "管道类别":
isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString(); isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();