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

提交代码

This commit is contained in:
高飞 2025-03-13 10:02:23 +08:00
parent 3c56280173
commit 95c7eaedd4
7 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL_DS/.vs/SGGL/v15/.suo
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

19
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
View File

@ -29,6 +29,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
/// <summary>
/// 返修焊缝记录主键
/// </summary>
public string RepairItemRecordId
@ -116,6 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_CH_RepairItemRecord record = BLL.HJGL_CH_RepairItemRecordService.GetRepairItemRecordById(RepairItemRecordId);
Model.HJGL_PW_JointInfo joint = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(record.JOT_ID);
BatchId = record.BatchId;
ProjectId = record.ProjectId;
WelderId = joint.JOT_CellWelder;
WelderId2= joint.JOT_FloorWelder;
NDT_ID = record.NDT_ID;
@ -158,9 +173,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
+ @" LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder"
+ @" LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder"
+ @" LEFT JOIN HJGL_BO_WeldReportMain AS WeldReportMain on WeldReportMain.DReportID=JointInfo.DReportID"
+ @" WHERE JointInfo.JOT_CellWelder=@WelderId and JointInfo.JOT_FloorWelder=@WelderId2 and BatchDetail.JOT_ID<>@JOT_ID and (BatchDetail.PointType is null or BatchDetail.PointType= '2')";
+ @" WHERE JointInfo.ProjectId=@ProjectId and JointInfo.JOT_CellWelder=@WelderId and JointInfo.JOT_FloorWelder=@WelderId2 and BatchDetail.JOT_ID<>@JOT_ID and (BatchDetail.PointType is null or BatchDetail.PointType= '2')";
List<SqlParameter> listStr = new List<SqlParameter>();
//listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
//listStr.Add(new SqlParameter("@BatchId", this.BatchId));
listStr.Add(new SqlParameter("@WelderId", this.WelderId ?? ""));
listStr.Add(new SqlParameter("@WelderId2", this.WelderId2 ?? ""));

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

@ -50,7 +50,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="true" targetFramework="4.6.1">
<compilation debug="false" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />