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

Compare commits

base: gaofei:64f32709e2e8caf8b4a102636da2bffbb23907ef
Branches Tags
gaofei:master
..
compare: gaofei:88ec31b36f05788b21552d2beb11ee97dfe92f22
Branches Tags
gaofei:master

No commits in common. "64f32709e2e8caf8b4a102636da2bffbb23907ef" and "88ec31b36f05788b21552d2beb11ee97dfe92f22" have entirely different histories.
64f32709e2 ... 88ec31b36f

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

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<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 />

8
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs
View File

@ -178,12 +178,8 @@
rootNode.NodeID = "0";
rootNode.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode);
Model.SGGLDB db = Funs.DB;
var iso = (from x in db.HJGL_PW_IsoInfo
where x.ProjectId == this.ProjectId && x.BSU_ID == this.UnitId
&& (from y in db.HJGL_PW_JointInfo where y.ISO_ID == x.ISO_ID && y.DReportID == null select y).Count() > 0
orderby x.ISO_IsoNo
select x).ToList();
var iso = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId && x.BSU_ID == this.UnitId orderby x.ISO_IsoNo select x).ToList();
if (!string.IsNullOrEmpty(this.txtIsono.Text))
{
iso = (from x in iso where x.ISO_IsoNo.Contains(this.txtIsono.Text.Trim()) orderby x.ISO_IsoNo select x).ToList();

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />