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

1

Browse Source
This commit is contained in:
高飞
2026-09-10 10:07:51 +08:00
parent a92d966365
commit d26e5ae8b9
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File 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();
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -67,7 +67,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/> <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"> <compilation debug="false" targetFramework="4.6.1">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies> </assemblies>