From 73a869c851199122b54acb9d1a5df9d1fbc0fd51 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Tue, 26 Nov 2024 11:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E5=88=B6=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 66048 -> 64512 bytes
 .../BLL/HJGL/WeldingManage/PipelineService.cs |   5 +++--
 .../PreDesign/PrePipelineQRCodeIn.aspx.cs     |   2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index 2874464fa5ff0a1b4a3ae08944c9750828fb03a1..51d45a06837fd1ee6b2a50390053588c6da1f246 100644
GIT binary patch
delta 1494
zcmdUu%TE(g6vjKl6ib<wQp!szEv11HskXIPOsv$DC`uz}5v%y9rPQ|~wuwX|HM(TO
zod19rRz8Rm6PH9bE=*jwbmzv6Q5RsusP#L*Xmx`oY`n>@cg}aunK}LLz4^OR{&UG}
zOcYwFNpzS-$A&zQx?T%SI-M?0<KhirA1#Wn3~s~)44SHNo3<h-J%Aq!0|}BNXu}gP
zH()jaGpGbc;052YR)e`5aGs2rERt<1Dbc88pdP&??1I(|_){LhdD>`0T=9pt1+fMA
zz(LxrzcX<NPjN5+4ue5(1SG&wa10EA<KP512~L3|I1N%@7^J}n$bd88EI0?wgA3py
zxCAbPD_|5{)#<FdF+5xYS&#!a(N=>ZOH?PxiWpn<IN7_l$Khg+H5Uwc<u?TECJ%PI
z46ys`_KI34)X{CJs*U~L0N8)_o2#_SQp8%e6;0Nz>3&sF1y{2B)!=_|Uw&%Q4B$C{
z*6F!1q8M#tFPC|Prjjp|zsj06ONuLM($(S}e9+krz8AtC%DMVvaaH;$chjOPZYU|r
zq-^t~V(pgo(D=w}sg$+8Gzomrd8=1d4_&W{$r6OkzeG1>&34sN^RYy+MQPsd*Yh?H
z(ztCuMcrYgdRe4wb)QM#%e1MeRL{4`NK2Ky%MCb-mj0mub)g|9dOzUb^6_)0Q@)PS
za5~@(c5KUdgPpz+Zz>b&^!i8q=}<b53hW5^=s{zg;t3bMaWpE9Ir1m!sXo!FI3tvI
zTGW2$tf2TLlH6SsHHX!_J1Ww==vNn7V#4}-sU6$Kw({N3Oc$b*YcB|X%6TVbzIJ@1
zdHmj2kD&#cR-|Tqlfq-)ytL9_uuoWNdHbAWT{>lN)cVBRGMZiLSNreH3e)KbxgL6G
mXU0nQcN^7#nfrT{Cq~uy<&!|-ObbPB)v3GQKP#X9D*gay_QxFn

delta 1580
zcmchWO-NKx6vyX2-{^emYi6_=wS3ysK6G+M$B!Y(S7TN-HcAi?QjTOFL=iHUQ{YFr
ziZ;E|BHC2aqGj+lQJYaW?FwoU)WR0gBCCx;23h};4NMRiQ62cbchCJe_n!Z~XY5nn
z*o1sPE(w_`r3&}#J$bOC?WI_2u~;&cmM)4;T9BUEB=}!pbgf8phvDS!!w062kSi$U
zl*4X#<-i420SBlBOITKn|7zd_9EQzKJ@Ptx1$tCaO;fTrP=nTbPzaW1Er09ij_jqU
zvg~ibNF#`VCeRF80KIbfySAax26V6;>;N&)4t9bLunX)4dq5}H3*w*)a83!(4bI^}
zm#_8ts?Wn225E2sTm&N^d%jV$m*|T~{E#qnXk`h*xe{grDG2lh4hzP{V%h+U>Bnix
zw5*H;=*dcJN1JE!s(iGmPxk$+s`b07bjRkk)?tE=mHz)aYQLkS;m}BN$fP;0EA==l
zCzXXBJ9L?ElU&Yn(wr|0*MpTOO%}?AubtXULX`47p&2PmAxWm;;<$?+8LP<Z@w>M2
zP8M1Wbn-N75JQ(JUD`>p!Y)$E8ow`2l_lJk4H#OJyK*BOhq+i>z?-=^pqewh;?Cy$
z8dTsan(C?FYOx4`wJ>#9M<skj>G|Mk;b^iynT$3CTN;zC!AMi`XfWCmX%05D9*af?
zTEqPVO%Xb+?l&qklu>n~N~f_S8_W|`H-zDdxdqoB*A}0S(-nJY$dhp8aqQgg4qEW+
zw^?(#DCNCsXfc{8-D-|$G081B2EVFoEOWjlF8*Z#n~*>eHY~~6RJ7C3rmv!bhH6Kx
zTu>oe4DNMpMvKcPdp1gKes1H-%yyWm`h@jYIYbg-ImhNq#otOsVIkQLyq(?h`qrU1
zq_3y8%5lCUdZGr*z`?in+{>Cgs?*?`Ug|#WG0*fHf({=aq=_p!Wlq}6hj%-6k#x6)
z^bx<g?ZdQla!#83EYab2Dou~-boOS1X5XtKpQav-8>ej4`(B|)TBp9bb9B9^j&2vJ
Je?&-9z5zX7+w%Yb

diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
index 9b1f88ec..8c509ae5 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
@@ -237,11 +237,12 @@ namespace BLL
         /// <summary>
         /// 根据管线code获取管线信息
         /// </summary>
+        /// <param name="projectId"></param>
         /// <param name="pipelineCode"></param>
         /// <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>
         /// 根据管线信息筛选管线
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
index 5d6167cc..c68e3134 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
@@ -249,7 +249,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                     });
                     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);
                         if (hJGL_Pipeline_Component!=null)
                         {