lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改预制组件二维码导入

Browse Source
This commit is contained in:
李鹏飞
2024-11-26 11:20:39 +08:00
parent cc22d0e0ae
commit 73a869c851
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin_New/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+3 -2
View File
@@ -237,11 +237,12 @@ namespace BLL
/// <summary> /// <summary>
/// 根据管线code获取管线信息 /// 根据管线code获取管线信息
/// </summary> /// </summary>
/// <param name="projectId"></param>
/// <param name="pipelineCode"></param> /// <param name="pipelineCode"></param>
/// <returns></returns> /// <returns></returns>
public static Model.HJGL_Pipeline GetPipelineByPipelineCode(string pipelineCode) public static Model.HJGL_Pipeline GetPipelineByPipelineCode(string projectId, string pipelineCode)
{ {
return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode); return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode&&e.ProjectId==projectId );
} }
/// <summary> /// <summary>
/// 根据管线信息筛选管线 /// 根据管线信息筛选管线
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+1 -1
View File
@@ -249,7 +249,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
}); });
foreach (var item in dt) foreach (var item in dt)
{ {
var pipeline = PipelineService.GetPipelineByPipelineCode(item.pipelinecode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "")); var pipeline = PipelineService.GetPipelineByPipelineCode(this.CurrUser.LoginProjectId,item.pipelinecode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""));
var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId); var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId);
if (hJGL_Pipeline_Component!=null) if (hJGL_Pipeline_Component!=null)
{ {