shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-05-26 09:08:19 +08:00
parent 9661524631
commit a5b12ff9a6
11 changed files with 619 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs
+1
View File
@@ -21,6 +21,7 @@ namespace FineUIPro.Web.PublicInfo.WPQ
ckbWelders.DataTextField = "WelderCode";
ckbWelders.DataSource = from x in Funs.DB.Welder_Welder
join y in Funs.DB.Welder_ProjectWelder on x.WelderId equals y.WelderId
orderby x.WelderCode
where y.ProjectId == CurrUser.LoginProjectId
select x;
ckbWelders.DataBind();
HJGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -51,7 +51,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="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<compilation debug="false" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
+3 -1
View File
@@ -95,10 +95,12 @@ namespace FineUIPro.Web.WelderManage
{
welders = welders.Where(e => e.WelderName.Contains(this.txtWelderNameS.Text.Trim())).ToList();
}
welders= welders.OrderBy(x=>x.WelderCode).ToList();
foreach (var item in welders)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.WelderName;
newNode.Text = item.WelderName + "(" + item.WelderCode + ")";
newNode.NodeID = item.WelderId;
newNode.ToolTip = item.WelderCode;
newNode.EnableClickEvent = true;
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs
+1 -1
View File
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.WeldingManage
FROM View_Pipeline_Pipeline WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql += " AND WorkAreaId =@WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))