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

Compare commits

base: shecs:9db2db1ad1cc812103291ce680c337d7f1b17826
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:b22eb421ec79e7d3f547e6228d9697cd5edc7036
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "9db2db1ad1cc812103291ce680c337d7f1b17826" and "b22eb421ec79e7d3f547e6228d9697cd5edc7036" have entirely different histories.
9db2db1ad1 ... b22eb421ec

3 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@ -250,7 +250,7 @@
</site>
<site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" />

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

7
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportItemEdit.aspx.cs
View File

@ -128,10 +128,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
rootNode.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode);
var iso = (from x in Funs.DB.Pipeline_Pipeline
join y in Funs.DB.Project_WorkArea on x.WorkAreaId equals y.WorkAreaId
where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode
select new {x.PipelineId,x.PipelineCode,y.WorkAreaCode }).ToList();
var iso = (from x in Funs.DB.Pipeline_Pipeline where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode select x).ToList();
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
{
iso = (from x in iso where x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList();
@ -140,7 +137,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
foreach (var item in iso)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.PipelineCode + "(" + item.WorkAreaCode + ")";
newNode.Text = item.PipelineCode;
newNode.NodeID = item.PipelineId;
newNode.ToolTip = item.PipelineCode;
newNode.EnableClickEvent = true;