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

1

This commit is contained in:
高飞 2025-09-02 14:30:55 +08:00
parent e2da671c2f
commit a289a05ac5
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
View File

@ -490,10 +490,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
Model.HJGL_BO_Batch batch = BLL.HJGL_BO_BatchService.GetBatchById(this.BatchId);
this.btnDelete.Hidden = true;
Model.SGGLDB db = Funs.DB;
if (batch != null)
{
var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_PW_IsoInfo on x.ISO_ID equals y.ISO_ID
var isoList = (from x in db.HJGL_BO_BatchDetail
join y in db.HJGL_PW_IsoInfo on x.ISO_ID equals y.ISO_ID
where x.BatchId == this.BatchId
select new { x.ISO_ID, y.ISO_IsoNo }).Distinct();
this.drpIsoNo.Items.Clear();
@ -509,10 +510,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
else
{
drpWelder.Items.Clear();
var welderList = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID
join z in Funs.DB.HJGL_BS_Welder on y.JOT_CellWelder equals z.WED_ID
join a in Funs.DB.HJGL_BS_Welder on y.JOT_FloorWelder equals a.WED_ID
var welderList = (from x in db.HJGL_BO_BatchDetail
join y in db.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID
join z in db.HJGL_BS_Welder on y.JOT_CellWelder equals z.WED_ID
join a in db.HJGL_BS_Welder on y.JOT_FloorWelder equals a.WED_ID
where x.BatchId == this.BatchId
select new { WedId = y.JOT_CellWelder + "," + y.JOT_FloorWelder, WedCode = z.WED_Code != a.WED_Code ? (z.WED_Code + "/" + a.WED_Code) : z.WED_Code }).Distinct().ToList();
welderList = welderList.Distinct().ToList();
@ -1250,6 +1251,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value);
if (batchDetail != null)
{
Model.SGGLDB db = Funs.DB;
var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
if (!string.IsNullOrEmpty(batchDetail.NDT))
{
@ -1282,7 +1284,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
//热处理合格
var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
var hotPass = db.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
if (hotPass != null)
{
if (hotPass.IsOK == true)
@ -1291,7 +1293,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
//硬度合格
var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
var hardPass = db.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
if (hardPass != null)
{
if (hardPass.IsOK == true)
@ -1300,14 +1302,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
//是否热处理
var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null);
if (hotProessTrustItem != null)
var hasHotProessTrustItem = db.HJGL_View_CH_HotProessTrustItem.Any(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null);
if (hasHotProessTrustItem ==true)
{
cbHotTrust.Checked = true;
}
//硬度委托
var hotHard = Funs.DB.HJGL_CH_HardTestReportItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
if (hotHard != null)
var hasHotHard = db.HJGL_CH_HardTestReportItem.Any(x => x.JOT_ID == batchDetail.JOT_ID);
if (hasHotHard == true)
{
cbHotHard.Checked = true;
}

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;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=.\MSSQLSERVER01;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/;"/>

21
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>07/25/2025 18:18:16</publishTime>
<publishTime>09/01/2025 17:47:50</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>07/03/2024 11:01:05</publishTime>
<publishTime>07/28/2025 20:15:00</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>07/25/2025 18:18:16</publishTime>
<publishTime>09/01/2025 17:47:50</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime>
@ -115,13 +115,16 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>07/25/2025 18:18:15</publishTime>
<publishTime>09/01/2025 17:47:50</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>07/25/2025 18:18:15</publishTime>
<publishTime>09/01/2025 17:47:50</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>02/18/2018 09:44:54</publishTime>
<publishTime>03/17/2021 20:03:36</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.pdb">
<publishTime>11/27/2018 17:59:08</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 01:07:54</publishTime>
@ -316,10 +319,10 @@
<publishTime>02/01/2018 12:20:56</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>07/25/2025 18:18:17</publishTime>
<publishTime>09/01/2025 17:47:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>07/25/2025 18:18:17</publishTime>
<publishTime>09/01/2025 17:47:51</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
@ -445,7 +448,7 @@
<publishTime>07/03/2024 11:01:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>07/25/2025 18:19:02</publishTime>
<publishTime>09/01/2025 17:48:01</publishTime>
</File>
</ItemGroup>
</Project>

5
HJGL_DS/WebAPI/WebAPI.csproj
View File

@ -46,8 +46,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=13.0.1.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\bin\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />