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-08-19 15:47:50 +08:00
parent 7b3f5eb504 820f285b2f
commit edfa232c45
5 changed files with 133 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
+20 -3
View File
@@ -72,9 +72,16 @@
<f:RenderField Width="70px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" HeaderText="类型" ColumnID="category" DataField="category"
<f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="300px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label8" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="70px" HeaderText="规格" ColumnID="spec" DataField="spec"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@@ -119,9 +126,14 @@
<f:RenderField Width="100px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="类型" ColumnID="category" DataField="category"
<f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="300px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" HeaderText="规格" ColumnID="spec" DataField="spec"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@@ -168,9 +180,14 @@
<f:RenderField Width="100px" HeaderText="管线号" ColumnID="pipe_no" DataField="pipe_no"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="类型" ColumnID="category" DataField="category"
<f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="300px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" HeaderText="规格" ColumnID="spec" DataField="spec"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
+43 -1
View File
@@ -1,10 +1,13 @@
using Aspose.Words.Rendering;
using BLL;
using BLL.Common;
using FastReport.DevComponents.DotNetBar;
using FineUIPro.Web.HJGL.Match;
using Microsoft.JScript;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using NPOI.XSSF.Streaming.Values;
using System;
using System.Collections.Generic;
using System.Data;
@@ -13,6 +16,7 @@ using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Web.Security;
using UglyToad.PdfPig;
using UglyToad.PdfPig.Content;
using UglyToad.PdfPig.Writer;
@@ -339,6 +343,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dt.Columns.Add("pipe_no");
dt.Columns.Add("drawing_number");
dt.Columns.Add("seq_no");
dt.Columns.Add("code");
dt.Columns.Add("category");
dt.Columns.Add("description");
dt.Columns.Add("spec");
@@ -389,7 +394,7 @@ namespace FineUIPro.Web.HJGL.DataIn
row["id"] = item.Value<string>("id");
row["pipe_no"] = item.Value<string>("pipe_no");
row["drawing_number"] = item.Value<string>("drawing_number");
row["code"] = item.Value<string>("code");
row["seq_no"] = item.Value<string>("seq_no");
row["category"] = item.Value<string>("category");
row["description"] = item.Value<string>("description");
@@ -451,11 +456,14 @@ namespace FineUIPro.Web.HJGL.DataIn
dtGroupByDrawing.Columns.Add("spec");
dtGroupByDrawing.Columns.Add("qty");
dtGroupByDrawing.Columns.Add("description");
dtGroupByDrawing.Columns.Add("code");
var groups2 = dt.AsEnumerable()
.GroupBy(r => new
{
drawing_number = r.Field<string>("drawing_number") ?? "",
category = r.Field<string>("category") ?? "",
code = r.Field<string>("code") ?? "",
spec = r.Field<string>("spec") ?? "",
description = r.Field<string>("description") ?? ""
})
@@ -463,6 +471,7 @@ namespace FineUIPro.Web.HJGL.DataIn
{
g.Key.drawing_number,
g.Key.category,
g.Key.code,
g.Key.spec,
g.Key.description,
qty = g.Sum(r => Funs.GetNewDecimalOrZero(r.Field<string>("qty"))),
@@ -474,6 +483,7 @@ namespace FineUIPro.Web.HJGL.DataIn
newRow["id"] = Guid.NewGuid().ToString();
newRow["drawing_number"] = g.drawing_number;
newRow["category"] = g.category;
newRow["code"] = g.code;
newRow["spec"] = g.spec;
newRow["qty"] = g.qty.ToString() + g.unit;
newRow["description"] = g.description;
@@ -494,6 +504,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dtGroupByPipe.Columns.Add("id");
dtGroupByPipe.Columns.Add("pipe_no");
dtGroupByPipe.Columns.Add("category");
dtGroupByPipe.Columns.Add("code");
dtGroupByPipe.Columns.Add("spec");
dtGroupByPipe.Columns.Add("qty");
dtGroupByPipe.Columns.Add("description");
@@ -502,6 +513,7 @@ namespace FineUIPro.Web.HJGL.DataIn
{
pipe_no = r.Field<string>("pipe_no") ?? "",
category = r.Field<string>("category") ?? "",
code = r.Field<string>("code") ?? "",
spec = r.Field<string>("spec") ?? "",
description = r.Field<string>("description") ?? ""
})
@@ -509,6 +521,7 @@ namespace FineUIPro.Web.HJGL.DataIn
{
g.Key.pipe_no,
g.Key.category,
g.Key.code,
g.Key.spec,
g.Key.description,
qty = g.Sum(r => Funs.GetNewDecimalOrZero(r.Field<string>("qty"))),
@@ -521,6 +534,7 @@ namespace FineUIPro.Web.HJGL.DataIn
newRow["pipe_no"] = g.pipe_no;
newRow["category"] = g.category;
newRow["spec"] = g.spec;
newRow["code"] = g.code;
newRow["qty"] = g.qty.ToString() + g.unit;
newRow["description"] = g.description;
dtGroupByPipe.Rows.Add(newRow);
@@ -740,6 +754,34 @@ namespace FineUIPro.Web.HJGL.DataIn
sb.Append("</table>");
return sb.ToString();
}
protected string ConvertCategory(object Category)
{
Dictionary<string, string> CategoryDic = new Dictionary<string, string>();
string res = string.Empty;
CategoryDic.Add("BOLTS", "螺栓");
CategoryDic.Add("FITTINGS", "管件");
CategoryDic.Add("FLANGES", "法兰");
CategoryDic.Add("GASKETS", "垫片");
CategoryDic.Add("INSTRUMENTS", "仪表元件");
CategoryDic.Add("PIPE", "无缝钢管");
CategoryDic.Add("SUPPORTS", "支吊架");
CategoryDic.Add(" VALVES/IN-LINEITEMS ", "阀门");
if (CategoryDic.ContainsKey(Category.ToString()))
{
res = CategoryDic[Category.ToString()];
}
else
{
res = Category.ToString();
}
return res;
}
#endregion
}
}
HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.designer.cs
Generated
+31 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.DataIn {
namespace FineUIPro.Web.HJGL.DataIn
{
public partial class DrawingRecognitionContent {
public partial class DrawingRecognitionContent
{
/// <summary>
/// form1 控件。
@@ -147,6 +149,15 @@ namespace FineUIPro.Web.HJGL.DataIn {
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label8;
/// <summary>
/// RegionPanel2 控件。
/// </summary>
@@ -192,6 +203,15 @@ namespace FineUIPro.Web.HJGL.DataIn {
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// RegionPanel3 控件。
/// </summary>
@@ -237,6 +257,15 @@ namespace FineUIPro.Web.HJGL.DataIn {
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// RegionPanel4 控件。
/// </summary>
HJGL_DS/FineUIPro.Web/Web.config
+2 -2
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1">
<compilation debug="true" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>