From 1a1ddc8a3b2c544b834ba7721a983ca0d3620a27 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Fri, 24 May 2024 22:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=95=E5=8E=8B=E5=8C=85?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1359872 -> 1359872 bytes
 .../TestPackageManageEdit.aspx.cs             |  13 +++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 0593f468668faf600902ba117baf2d4d3082f1eb..042dba6a9d3cfbf228a8e5cf9e6dcace519748d4 100644
GIT binary patch
delta 906
zcma))ZAep57{{M;cdu^i+T7GOahjQgOp%Q+s~OD-3Dio(GU!bt$PblfS^1JT1`0yU
z?L<Ze<)kpPmAjE&f)tV>3M9y26-D_nLI@)KV5t3XFHqk)@Z*2ZbIv`_bD#fFlnO<u
z=yEc_?@Ez$L}VN+OA#c+(>XDv)(f|pY(a1l!wuzGVh)?<m7-T%K#0E;3zB0I&-{I6
z6(j0L;04xeRF~vt(ud1mW~O+(;1#~h>a1X70e$?6Z0rx<?B925Ip#qe_DZ-*znsau
zOy7~EB}za{(;d)KFa|_$7+eL|S`0|G<QUAgS`L7JYT+))npcVFF|ZTtG6HB7_z1Mj
z70|t)0JMPXsBkN9l~T;*SlPirP!Hz$ErZ*CPgJ7@n`raNM1t_ELJ=x~S;SOZQ<MdL
zLOA}RC~GDD8T{$82|kdtmKCX!*3E*Nr95Yn4qu(&r|mA)VIMbz6YY!{cxuuUR>UW*
z`Kmp4Vk1|sI8;Z@I1APp!{4IJqV+^WK+_hGaZy(1nqw@%BSNrC;5{vw-Dz_sJNHD^
zr`PY!>{;G>_vO(&z0(=B@15@bt@0~hYJ1<H>Gg)}Xfi+RPvoJ9g^lsT5m&c!F2Tp9
zICHiIFIXO=F@<@KQ!Z6g1J%(f%xW;x1#b=(H?A&zbm^pJrtoVZaDP+2yRuzrUT4j#
zl5UKnQ$MZI{=1)b4_7l!uutT}3!XNjF#h)tOgx9WnVBdFCTGCBi|Is<w-C8tCMzaN
zlZdR)PPlQWgy;k`cN@_=Xf_^1>Pn)04Md-C-}XklJ0$f(y|_EQnW!D-!m#r^R4YUq
zHD-EK{j7F6a4q^dZ?tsORx&a)=3q`14mIWcSF60CNJl8bfB<wr1QLh=u|N+DzzCKA
U8N`95zy#uf8CZrwk%aQeAKvspEC2ui

delta 698
zcmYk&Ur19?90%~7vvb{_Hn%oy<<?rm?2@ZCjG|`rAc-X9a#;})J{q!-<shSn)do=y
zF?XVYhQuXAO~%@ld`JlD!5%agq{S$ETJ#5c3L|l|?*Sh?@ZopP@BV)0&yB~!@pw4p
zCz_#vQz9CT#_;^ClS-cOmEMxtPoEJ}5Xp6nGH{vsNQHN?1Zzc_e`d`)Y?#z<)HGm+
zNu5TsfOV}Jkb*=?O(b6o@P3-0O=fk48cAAj-7WT;LT%$l-{v#S$hGl+eisih#?R@K
zdqlMz*$QF^@iY`boE(A2VB%%wJT5B5T}0*PyNLWH<WJ$udx$dJ$Give8k~nR?~?X1
zQOV<yOxF2?A;_xmLH%yn&eFztQc)L-O(budWqj7xLv(znW3KM7XhqW+Vg>%fSI`o*
z(&#4K<w&t+ta;AiqJ35TonssMrIs8mRF#K4gufl}@qv*J{)Pr58{V$xgRX$O&$VPp
z_sXgq{X`zM>AkA=!14*@0adOV$EFEYZrKzoRZ<i+T#h;^31{Aa&>l3E@u;UDhUg!U
zUL?vx8~1*x&$w4D?o3UdoyipH>{frw|NCgNJ9Q+oxH4J2);i|Ao{cQKbMvc*`r1#H
zU;YzYh`%952ewoTML$u-S$=7XuugpBxsRcI_NLDhxI9Y!IF7v<-v9I4Tubc2jVHBt
z8e(kl$EdS?@%2nMzdclw$QJKriv%cWfq?{7paVS^zzAEw1ZJoP3s_+**k-atduQoC
D2;&I{

diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
index 2e5c037..9111d9c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
@@ -988,6 +988,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
 
                         var ptpDetailList = Funs.DB.PTP_PipelineList
                             .Where(t => t.PipelineId == newPipelineInfo.PipelineId);
+
+                        var isExcelPipline = listData.Where(t => t.PipelineId == newPipelineInfo.PipelineId).Any();
+                        if (isExcelPipline)
+                        {
+                            errorMsg += "该管线已被使用 | ";
+                        }
                         //查询当前的管线是否被使用了
                         if (isALL == "是")
                         {
@@ -996,13 +1002,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
                             {
                                 errorMsg += "该管线已被使用 | ";
                             }
-                            var isExcelPipline= listData.Where(t=>t.PipelineId== newPipelineInfo.PipelineId).Any();
-                            if (isExcelPipline)
-                            {
-                                errorMsg += "该管线已被使用 | ";
-                            }
                         }
-
+                      
                         //查询当前的焊口是否被使用了
                         if (isALL == "否")
                         {