From 31850a4c5da6c86d5be354a9b6df735136cc5f37 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Sat, 25 May 2024 16:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A0=E6=8D=9F=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E5=8D=95=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CreateModel.bat                               |   4 +-
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1061888 -> 1068032 bytes
 HJGL/FineUIPro.Web/Web.config                 |   2 +-
 .../TestPackageManage/ImportError.aspx        |   5 +-
 .../TestPackageManage/ImportError.aspx.cs     |   2 +-
 .../TrustManage/TrustBatchIn.aspx             | 116 ++--
 .../TrustManage/TrustBatchIn.aspx.cs          |  96 ++-
 .../TrustManage/TrustBatchIn.aspx.designer.cs |  18 +
 .../TrustManage/TrustBatchManage.aspx         |   2 +-
 HJGL/Model/Model.cs                           | 565 +++++++++++++++---
 10 files changed, 658 insertions(+), 152 deletions(-)

diff --git a/CreateModel.bat b/CreateModel.bat
index 2f27853..27ceb4a 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS100COMNTOOLS%"vsvars32.bat
+@call "%VS150%"
 
-SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 1584f9e033191c6086cff6b91006c366d7f35ea8..d71bcc4645c1fc5362d50e5638b54fb521710d92 100644
GIT binary patch
delta 17929
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

delta 14257
zcmdUW4_sAMwm*BHbME<bFV`y~A`)J&M1+WlgyfiB5zPz<t;`4w|E7))Ny*F{y^@(@
zX2`L-9CHlOj*a6uC=JKgFb<kJ<~T-X<~R(IQO{}2A%}YQPu_R)r_8cHuQ&7i{H~ub
zYwvaT|F!m7>+F3DtREIQ>n};3$V1wHo{*3?k&Ff|wY0Pdt_0i*JOZ2m{tm1FB7paR
zrNA<PDIp;%LAL|H1bzi9Q$s>Zc0KV1b9i<P8-D&*<~&}^R#kq$os8v~Ozt`2M<~@5
z5WR(h-URdnIsq6=NM~S#91_w4^fQ#X6*Q$i{af%~N7`jhmwWaNBK13PGJpq>jsva(
zt_Kc*mjF5()Bv4o?vlGL6@Au%b0atzfDVAwG7K~a7z4<demdwwKr+%BKxYF^pd8o&
z>_Z#(fF1^ZgY*_4j<t>V&){taa)Hs{m4U_ss~8qeOlTf5<AFZ_cL5WCGk_S#?VuBZ
zk-%c03=IhWP^4!812CX8P{At&eF+^4(M<<_3@iYuz!T5IARa-*ZxHw`E#@IT%=-c!
zcWceIwA|TFMUmx5Pem2;A}ey|jLLxUPP1R4|BxS>i})h;%T^(lYTEUA;E9Rc0=feQ
z#Hv1kbcbX`YeKRuW`DU$uMSxX?v=8fgHkGF+57tMB1Z>GUtNwu7Q=um<tY07HaUti
z;uk=DAxDueKw8kRk)wID9=h~?JilCg(~$2F-$0~0#3xqjO7Vr^`8SCVA_@`Wn+qzm
zT!?QlFaqcf>=(){6tqK_i;xz=d>9bo=n&>8<UgzYOqb;3We`a*@CdLRcobLxJO-=;
zehP@HkAtoQ%;a$Igr|@Q0tBoFeg<p+o(47oKL<7e&j4k>W}qC{0&E4I1uS42@Eq_9
zU^`%XJ8fNC@%-+HXkHl|e~LK@z~qYgac+_spZc`<BJW?>oa$oNf7el8s=Pk@bry_c
zag}kAr`hg^cwQMFeadOxamvGHm}__RzCj2=pyMafiDG>~_kjxjLC~MIr+uKep=LMb
zS)t_SqftF$ZwBx3b}nyk7oG{>n1`bVU*m)H@{u_JJdWypKt%^ainVC8=UB)v<gIq@
zYoMYjp%?c7LjIz3FVMdL=YbrwG9K^(Ey%wLGy?AcZvzeH+8*7my&F|K1}Nx<c+w1r
z^aaom)ShPksYkb{kC7P$bMh(ZCE&k-HvoxMUh2zv={@n4@ri$C;V8lZ32*?fponI6
zt^Wt}o5~xHu?q8vH|Cco%fS*>#DerdI$O%t+8?AdC!;BcjC7h)YD8A%q*a8LzTo!?
z1rsn~O$B|bop$gm^Is@q<s-vN-RtG+gr014$9g&*3OYnEYu#D$Ev;JAC3<NN5@UgJ
z!0o^tz@5N&;4WYSa5s<(+ymqR6M;#<y+A%N8JGf01*QShff>Mkz)WBkFdMjhBqBXG
z6t1ig59R~&fYrc5fLYrqx%8fd%7omLPOK!wZ(?P#f#suDPO0(Kyouc=bX+Mx**e-+
zE)6x4xr+j%X=c`lR7x4E#FBT65^V-ta%JYs7DZ<_qx$HMCd{IO+jz(*dgX-F&ulJe
zYb_D2xy+Ap`<c(p?V+<<P<Tv71*IBG{j~YfXP>Zj<_DLuMfZ+Rpbarjb5YBR@)?|X
zwvkK6!kj+y{4X4p#YIaLYYO9~oulpO?W~cNFX2@(Yi7<m=ve8C9EuQ9*|LoB@(+3W
z3a#`~b8E|w@I$g_5gl{-q(JY};|L0lfDOwFxu@XXIn5J)JzZGxdxWE-SK`%y6j-hY
zf=hKj1(xcALp?(K@e?$ib`|M;oF|bT2?tmZGM!qM>fPy7E{~+zzRY9#-i)O{v>ILM
zFRhVEPpw}13CjKgRUKlV;8%(CHefq29)r4ofeZetpuYxh7qCv$0R;aD@;^a(GVq^B
zR|A6YM?MxH;1A&K1%40I0GZ(J2R$HTnxb$j7=j)K^N&Cw@_zz-1vm=)6*vaG3=F`t
z<Dm64Vm`YrK0?DjMD{L>_3xl>0UlTr(VX}-BHsj<>;9IkT|nZWB6IZ5spac=(8~gz
zzf3+d>%U5$Is5Jn2ge+Y%-Uz3Yg|C_!xb;ZOyp7I@5O4$HyWKe`Vs9(pfYf2?dF^H
zZb(D|S(R&d%w=mUlFOfy%b(|LmAP!}Sjum94ys(evq-U~LF!d<spO;BDi&=I(b#@g
zUM<fOi!V%#SbRZeATJhNq{V^@x(d9<0kPmBcoIB;r;zVRUv8Hdg8#L4IaAnWRBYLb
z63+q_a16a{1AQ4(JX?))N2?+)(jC9~cxE1m@?X_ji-JYMd5n1rMLVi>G$AZ?2T#ze
zS?aq{t`Yc>rH<>c)S{+nvBOe}e21l85@H_f5fOcLQ;m(dzlilWAK2gGSdR_<kzBdx
z#T9a^@t*fI6Pw(*$<-E~V+3}~Lkv6mRT!qDC)M)Py!<4m`_~yaRNm0=M;2Vn4#?M`
z75ngFmd?uScxm%Sxd@EPvgUN=dJw6Fz*2x3JFz_PDi|DL2fx{zpW&qw4w#uO$!7C}
z98K)Ot{6+JB{YlfUS0kU52mqEatkEZ%G_3z#uy`dU?6*(0+X1>_Do_;tZF-Zk?BmV
zkBI17i@JPBMFQeS{bN18O5gc<i2@U0AMz(EM!)gc$a7#irhyhAP8MclIylop=EEp0
z44K-R%WQo*IV7ImUnlj_??8463Qaectr;twg_i7E*28RC<D(OOSt2bSsrY_q!%sdr
zru1RRVbMuuPI`MqkAWcrL;8ozz-ZE85mN91HXZ*aW1Q2>mf!cU+}W7MzNOH^v}qFa
zeRcnLj)=9JCovZ*|CsMy%sDN0y9d*d0==4X8x~q&L4&W4xej|V0k|IM4)g)~0%E}j
z%2Z|WxWP9fe-rQ{U?wma5DG99^k!frFbwDoaa;@Z1*T({jt7q--(&vJ7s0s>oI-H^
ziLKR-);akct4Qair)rn}0K?ll&i|F&#YkQSPRJp2+kAG-|K0*y3v?dd36oQRe_*1;
zKxd@Q@RDRB42dp4I5V?L#<Otq*^;+druoyg4_XG})<T`H-JEWxH#3>>pN7zo57<2Z
zXbA28fMwJB4>||f0~YH~FbbQihqEKpzc24onxfg7j~!+Fu@E}hn<ZFFbY^Zo9ZR(d
zYBc$UOZ5#`;>?^wgJ@7+7DvWh-GfL&mf%s_by~Ci0X@LT7to`=Q13C{bKk%Piv2Y?
z<nyf);)U)OwZ4o$Mo-@4=}qhYsCvk~Ku<BVYdl@C5})r}Btx+Kg@G#88H0uRH-rv0
zi)Jm7-O>{#@teKjlday+_C&K}ZpASz7{;EDOoCbM2P6Yx3#7DD`)C+TWmYm1QS-lH
z8dfSS`o$vtAED-gi%a;NQ1io!OPFjv@X_ON<hi5o&A5Fe?fRP@W4?2L6gy_J<fUfG
zGQV}5hnY=_<!A+^#1`-PIgnQY4KTesqPu&L=nRAbT>vrJuAoo1#|VB?K0KIGMk<Sh
zjt%NPfj#qCpFXc;y<Ym;invwep1gQf_nteK4XyO;dPDu>k@wDiu6qB6=Ja1>r|HR|
z?A0FAp~`76&M7d?)8R6NaTX4x-8h>&8=t=-!lJ-4lF!`wX>{d~Pxmt`kufvx?Umos
z&_rt_b5;4+3C4a!uk~hqtUF*Bl3=A9x-prPe2&%1xx$p5GWg)N6|yj?McRGf2<g$f
z_t+e3+*PzWv?I3b4%uyPmtCTj3+<6&?bsAn%bY)kKZn+~?Zn5~107!23_Rquy)#%t
z7t6tTRRr_Owl}~U*cESmCD>4oi`WPkI?>0O>|@6Oqz9|^$B!|GTzbJPHzQvedtnFD
zK0xZf0rS*9<G&bycu{K~KxNBaBiL7?h2UKx9vCm;fehBnTYH=0Z0*g})?3^7uijgg
z#W=V5cy@_ZJ;$OQ6kX*sC_altntLZW?92*Qtpw}X9{y1Xy->%dcwU0366<@sol@do
zS)?L3jNaVBdeY3NSvZ~Bf<GmHWrfzF))321*vU>_8B+x_SS-b5v8cAL@>w+ty4htx
zR@~)5)*=L24+CPy{RDJLdph8xOVe4b?W<z-PHPEtq!>8F<f`Q?mXr0av%USJtlDYj
zpOS6)4Eq$}e7k#LJL#qm*nIX&d)Ei-Hco+hG!|RW>ZJdNfj}R56eQOg4OBHUSu^ER
zD}T_-oOrkBc$pJtr~hBQ%(ctpJgZZx;`mXP`oPwz4ZGF1Bhro!&se<dtt}CwOa5>Z
z($DNXxUYIdc%$IAYJQ+{;`-X*8Oz61KWxQwZe3(yRsw>)Kq!ZhUHoiU?OCjh2ump3
z$G<5qp(#t%&+N|<x#YCYNSc+-W#Z#`lAZLfbX>yQpY8MWdX-WJ^B6m30zV^JS=>P>
z$#~7IKPYQdm&+rl>{WLZWiuxNl4Pz?&8M<#FUsR9m~{t+l`>q3pu$zoM4B+r72Z}P
zFj4W@fo3V7T9dfTo?<GqnLYb6DJYkgq0d5I-??fX_i@{|oYyN<yqTwwXPoM>Ki#5g
z+|J&_ceBzm%ytd0lW3fYLDXC7yH!rvE7{&4Z&2vOR_O%gFUFrhwUR(h&+|RhWJzv&
zaG2`mwpGn@8S$63aBA>rIrg-2zEPnm<n)oJlQWD4|IHCYxd+u$%1OYSn%=>-J_ep$
zyPqdB3ak-py`9(TR;(;rd$??!!(1odrQKxTw3ojqS?3{{1KeRXfgVK*`^6wvn@XCU
z^&x+rv5myuVFM{EMUJquPx9Set&fEa6M49OI!QmqY4J2kv)?tO2xeX2a#fh*<>dW{
z%XaKVUdOB`iIe|?B%34OjJ4xG<);){7?i^7{Bi1ejPEri*0i39vWLjhek|a#>I^Eo
zq-Iq;re!nQoyjBZNSAb0u@WS1g-Z@A5j0vd=(tncZO@#fW-|N3J7q(z@=HPtNm9LH
zjYpTMc~ZC?o+q7SRywNXV*r7@5Lt#)--UP?52w5h>P#DhU(T!vlDw^KBNkv1T3;k-
z6nH}{+f1phvsEH#ti)ulp|-zRstL8WqKGhb7ATBet9!M5>!o_#S`PL`u)_WXP0I62
zh4zZ)q(#iy3QrZsYnVSC`$9yUBEr0UyIj7d#MTLn(*EA(>$j0%Rbe`Hk~=s<n93s<
z;ukxiyPf~I93i*rnB|lus;O3XP~cf9{#!N7*N2a?M{Sq(;IQ<&DwohWTZ@%1DirX^
z7>!%5ldJ^U5xmIZr6c7AMJS8qm1R1!RQ;;LkoT90Y-?jwhh!VK${#wc6q&b*I1S30
z3NenYRr{IVh%R=<V0o|88V|M~3qJ)hNSlP0%ja|}S9Z|2JJo<4SR@4`+P&I+hkeI1
zc}Gtw-^?RyPZxC%vvW+jVuBUvkgW@{(Jr=gay_HiTY0jb{Ha{q%gS~jtX5=eJW8b~
zG7HeK0_k>Yn5HG!#WBhfh354&q9`W|XIM3NL&t}tDf^+Es4`edw5lDPnz9`lEg7W5
zP{{&iFy-%+T~xDF8Dj5PpxmKbM^QvXWVUan0+)FV9j#HIaILI>g5k{DpkQzN)$NpX
z1J<k|sCaRVfPG@eu2AX}YlFh6aD*C01wR8Xtz0=GQJEo)rt`O|L+pxDjy)MTpzINb
zNTy3UDi&ai+T3Q1I34?ql0v0hm25kEhXm^+Lat2;tkb%Ud<Ct!M~$UTFDS7vQSWlv
z^PkEnRtoJOV`p2+Zi!N!=L@OKttHW<tx7aCIpsZ6_yQ)d<XI`9RmtptOARPi1%$WX
zk_HPicECxy8|5&H-6bVb&6|dc$`m<<lJg~pU9cPG+iaYJh~<4p1bIgDFne&b;{dY`
zDcq_?E9Gy5rjj?sNVM~hC}oU_Pw-gEIqS%woIP$gZRo2)Ak~mXnXKkBs{-oxQ?Xbl
zlseUlS2;}y!*;B#l2d5SA49{)|2x@dFW#tZWwy6LX@I`(kw=q1$t6?6+j11uydX!~
zfjx4uL`CD3a6951<=s%?dt{tGSIdoEgAOB>tos;jmf<)cQS+;q+L1rWF57!tZU}7`
zRkQ=5YLH#+3Kv5uk*;{tb1c)IljB&&ERUkKE`6?}4kC|K^6mUc%nn0`YD{uK55jsV
z<LJOe*-OiNDET4<r}R6lThpzIOtm^Dl^m_a)AsJrwP`(+jiQSvD!J30U}sKoR7+Gm
zTETQiV+WvMEwg4qGtpHdmBlJ)lza(8E{Ii1VK7_O-9dqX0}B@rL*fVJXbMb#D%PYc
zNwjy45pD<4l>oDrV~@;pbQE5V!j@m*Z38cH)Js+d6f{sOS_(SqoHS)N&!D}T@NLP(
zXelrorWM%?)!L4|P<kt7iH7~bIXEaQo8&TDZyW5|EG3y)J29|q#TER$BhHT7>o|?W
zffSq=Rpes-HDUZT>9>w#v-Yh>8>}3)t=wTz?m_`ip_+UpoNA^(Q3LlXqg%6fO_d{G
zg{T~meB%>J24P=%zh;}t!4*OjXM`yD6IidEtFag*e?g}UGsF&kLW#G*8z)i5Fk=d(
z?nmemNKmmtC0Ky4Y-2P9&hr@Z^i>y|IkVlZIUBhqnF4Q#<+*^hvoCzeHAdP1^&;&q
z<}hKUSY+B?Xuu|2bkt(ToB2u#q^R+B#X2Pi>iTnM6nS3O9JcpUM}zdW_QFb4`42P{
zwlEY%`#`*EtwJf!$XRxlN3H4<8~_bmc><IB+I<+O=1bNf)p6y*Q1KQByQEyHBG-E8
zL&`w)n7Qk8IC<7Py=K$Mh^sA_D>w`>6>MS?3kH>=t>(|J&s2R(==?bHyrVei=m;Kd
z7mZg}v#OCQ0vY}ioRBYHg_X@#wW^gGmxDH+L*BlK433VImoRIQijYWi1YhEi^l}x)
zwZ}WDizxrsYK*;puQoH(Du(@NDi)ouRGTEa@V*gm$8S^-#LRm__1pf{YE38|Ki>(q
zp+ap`DC}0jJ*U-lYislv8nx0@e)S2Y|1K1P$|?1nM5X<-AT8;uMbpR6@M!Wr3;Ugx
zq#bCrwZYAZd1v?2Mzf9PvL%Q{>eU)3$6mFFDv~wBUQ(kL!;++_L24L@0b3*0T*W$z
zCiZWW?jSE(v<vsEC5m-HMU?lRy3$^mr7mRFVF=2zPARj?>V*B2HEcO(Pm+$95Hw8V
z)~6^Eh|-|4QCgi&_tdIx%6bk#oR@12%!)%5L&J&>mNEGhtwynOP;(Gs*8QE-Rd((D
z>S0FH_NWDRO@!uW);Ls%)Hv-(7ONGj)v#^5Z-wViKwpzI_qN^FNj!Lq=&wK%=J7Xt
zh&?1x!|}yDlt|LJ8Hk6(7HHU;jcHN@ZA!+X?X6Zddr-1=h*8Z@shOIywMNFxUc3v{
zjMci*l!KuObZ=LFt(~)2tH2o14&DQ7ZM=3-vR3MxYJV=WtF?=;Jm_eR=Cz&&t<Yqe
z@{HR@J9}fH6X)nBn7#XYDH|>|SKX~xFK8|*cDsjs=_H#jq#5CqAFjvR=|{E05`{e{
z71>1#p`UG|KdvEEU4oUpOuxb^+}Kky6o(yqrgi2WO4i9buZ6R68uk<IeyWXfCsIxi
z!(ngL^t?`1wd!CiXxL-wtyJ(6X9S&3>J(?MjL{cLSI8bJ_J|v*8mBkHj~-OhskT@R
zr`iM1_t}TkAY&V7*tP0hyD&j7xl%JIkczp)rs^>G9m<ie8|~-1W|ZwO(rcJCTIb^Q
znaZCNQI$)pWkHt%!phO>RdKXTXI>Dx=GOArRSuK?FV2qR+SYiA4h=b8#9~^nVE)xd
z$zJ8(estV6&6#?=#NUCmm+3=nf1@7Y?vQ!-W+w^X1x?5OkxcI|)1xV&SdR!ksn^iF
zM|Hnd2tj$U33tDxuOUyV?xET>y3ejD)%{$~!#7maxm?epUzh7K<So^s`DsaTQrTj2
z-_1iQzgSNbH4NLo5pqYA*lLv)>HC=JbNQ(7U}&^Gv`k;d==2&K=!?cxaacJkq=<Sw
zr9VUYkLt_$-Vkz>>-Vty*525IwC@^s7wWb}zte$xv7(SdTDnEQi&Bd9gsP8qzf^TV
z_cQYU7PH9Tk2m?egZeZ(a7f%6bl92&EO;3A4K)W*reqsNKk2YuUYhK;A~arg1Y-@p
zgf`aGvNPH&dv=K)M0?=a{$oOaJqF%Nk);BBqt;fx>5oW_yy);yX=fuTcuXHGO%0i8
zE{(qyA&y?Ba2zu7lX~CI@3724$@us1@bvV|0sU`CLs;nv(EEd&0rL0r)R>!NuA%d3
zhJ$L7@di3@u;-TRil)ymDx5s^$CK}y{vVSI@Hg)(oaxhM6;avidiQNLgFV<aC-rXZ
zHF|T9b1dC^z0=?Isuhyi??tg?U8YVhESfrVa$Y-4nmm6dy&3OJ?7Z{J5!->AJvHcK
zkaHL<J*)S;YE@QAue`2%t*zM7>_^V2DN~ZB&MlZR>%PT{A09buz;MieMBf|J2WIq5
zO&u_-?~NJh{rmP$PwStYIwC!D*zo>8SzO*W1@zL(|Gg{YHJXW6Y4Mxoe@8U6mhSE6
z?EFou(Y9!2;7EWS!u7*45!*%vC%R?wpE5K$cBA4Ol)CDt>!WVT4-YL~Gc050j@MQe
zOn=IC*PYhv+i(BFxyd)~6dj5aSMhrp*S}+Mh5T3C7REA)`AGG(UU-@Q69L-%p5Cu@
zMCGrs-GKo6hJn$G4f>CEFNb1ZYS8a)6WWZ@HGUeF;OudA3GDoQ0k1BmuuhlBd|}em
z`Rr!e?DP0c|NHKt!@sH)qR6!)XBAAp^Ol@>bCd3xJ|*uer7mme#;X+h_J-&fH*Ss)
zU);9+JT<+Lz-fF)W~G?jBR@#3hJ0_eGBDwGJ!XSC7Rp2S_V#Ejl9<mE$*;mUH`VxP
zXsXj8C#NO%r%T-EM)|2ummxkS78A_;UP}6{JNp_MyIH@6v$-9kyhVZN62{Oz+^|v3
z0B2`&?)y;=!D9uVmywar`f?F^bdYo8kdN9gJ223;ul_)U7&_Q_cg-r8Huu5#dAC0_
zzerr9=Rrq`=FeM@Cw9H*xj(tn1hF0P%gD;gn_O6E_PW12_1LUOmhOwEe_ZQ{H2wPm
z?4LFZGg{y-g!!FL6|0OSdtJ3YN3y~VZtaIp`f^~1gFYjYVl>{z9v)%*4nA&{1M%`v
z9S3^|7lT3WCGTP8u;Xg=(~6bY5gVR@OGKn7e-R4OscW@(DlKs1Xe!ERP_1`ixl%?M
znY8z0XdDgcC5PKf#yN|nZx0Ng(`75skYiMQ4JE#qQ9xzD0rUmp0Zp-EWaEqzJ<6->
zRmsMJ&X&*M=H{7+)bx7jAhZ7GK5~fzhK(7<G#0#{$+Y5WBaU$N5Mle{3|QfmL>x7g
z_2-FpPNq?T2^)ADiRdKL_|47;J8G1%SFua8jRMI^adB(BAyY*cBg_uVbe&hKW*aZa
zxaGl%^GM?~V`pjd)6SbI=U&Z=(*mAu=gu|qb;_J1qrx}?XR(DRur#L^8V!n-3u~A%
zLL6UBR3dHnQe%e{%wpo^&1hgWuGzrh%Q&~sPJF~T5mvRq)u`JU&$>=}#H|v1qJf}2
zY=yhn-caRQ(v`LzH*m1MOde&=+i9$ki2cnOZKs|w5QGMvH!#5Gjng<cdEdyQ?5S?Q
zy|vLOQpopLOny^1UR(T!u^8JT--Uu4#T@zlEYB`FXRPi|WfNSn<UbOcOhZ;k@%CaP
zbYqV%0-;qRE~%#bySlg7)oYx2EVxFm`IgA&E&bRJ3x=9?oIw6NA|B|+mqVOwH81HL
zu}$FnL^2LUG9kFOMEugH3lFKhG9LImf|(!MVHjH-{MF)_YrmW4N9fR_Et*-I>P!=n
zMz8O0>A#Oby{$d4*_`O?|7~#s{XWU*Mtt*w{m=KGl0pw9JI(gK2YqS9zth5Yi0|JN
z<8*#q_qT^PH1>5p;fFfh$(@Zz5eJ!*_xZl7ztx1l75~Qp0h4*Grl*0sX?#xiFLSux
z=uCwV{toWed%3&SaS1AJoG*8`^fEVMB)C~>;>NXCE#BdBKMyu_I9qe_t-{yVP|e@;
z&LVV)qCP%+<^<Q9;cU5v=ADpZ?6eZ+k?vI)p^?#THha6Xt{2UCNQ$C{7z6J;H@L#=
z@rG-^+V=Q_v%WhG*dXC3Im~sISxrv9Ei&BY7EgZ@>w>-CzuuWdi4VY6&GWe|)>cgx
zPl^lm1Un(kIEf3rDXv7SXu!$E=!K!jdQ--OxJ@ZMAxGJ%>Bdnsa)*&&=T30#WmG;F
zZZKky@h<Lj7US^KpX)lMTSH*~ec{Fs%5QXgX-5RS$Hr-{#W<q<#5v<KmpaEeO<@mF
ze~EXqledSS?M=rgyV2fgW50A&muby562EX}S(Y5isrWHmh&*x5nPAV*oEy4+oyYkv
zs=3DPpyv#CHr38CG`r|n=vHQq+ZkaeT?jqi*-GzpwCcD!l2gXp#!Nd<8@m1)OYVf=
zL%8<_h8vIU^P#v{MLFxZJKXYmaKm#5Gi@4TxGBH8<Rw?B7G`HAdrm0ie+ozOi6`9W
zm>n7KDOITSI!^&L)ZlKrpj!9Z<4(GFcKW6^W;o5WTkz3(xs)va#BKBYJhEA{&)@n@
URzO6#Lpwgo5?@r=cwQs@52jTQ)&Kwi

diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index baa8804..9ecdad1 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
index 82ab602..74cea81 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
@@ -11,10 +11,11 @@
     <form id="form1" runat="server">
             <f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" />
   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璇曞帇鍖呭鍏ラ敊璇棩蹇�" runat="server" EnableCollapse="false"
-      DataKeyNames="ID" EnableCheckBoxSelect="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" >
+      DataKeyNames="ID"  PageSize="100" AllowPaging="true" >
       <Columns>
           <f:RowNumberField />
-           <f:RenderField  ColumnID="batchNo"  Width="160px"   DataField="BatchNo" HeaderText="鎵规鍙�" />
+            <f:RenderField  ColumnID="batchNo"  Width="160px"   DataField="BatchNo" HeaderText="鎵规鍙�" />
+            <f:RenderField  ColumnID="RowId"  Width="160px"   DataField="RowId" HeaderText="琛屽彿" />
             <f:RenderField  ColumnID="TestPackageNo"  MinWidth="80"   DataField="TestPackageNo" HeaderText="璇曞帇鍖呯紪鍙�" />
             <f:RenderField  ColumnID="UnitCode"  MinWidth="80"   DataField="UnitCode" HeaderText="鍗曚綅浠ｇ爜" />
             <f:RenderField  ColumnID="InstallCode" MinWidth="80"  DataField="InstallCode" HeaderText="瑁呯疆缂栧彿" />
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
index 7e4f63d..7e9d52a 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
         }
         void BindGrid()
         {
-            var list=Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t=>t.BatchNo == batchNo).OrderBy(t=>t.TestPackageNo).ToList();
+            var list=Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t=>t.BatchNo == batchNo).OrderBy(t=>t.RowId).ToList();
             this.Grid1.DataSource = list;
             this.Grid1.DataBind();
         }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
index daa41cd..8815dce 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx
@@ -8,8 +8,7 @@
     <title>濮旀墭鍗曞鍏�</title>
     <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
-        .f-grid-row .f-grid-cell-inner
-        {
+        .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
         }
@@ -17,50 +16,79 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <Toolbars>
-            <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:Button ID="btnAudit" Icon="ApplicationEdit" Text="瀹℃牳" runat="server" ToolTip="瀹℃牳" ValidateForms="SimpleForm1"
-                        OnClick="btnAudit_Click">
-                    </f:Button>
-                    <f:Button ID="btnImport" Icon="ApplicationGet" Text="瀵煎叆" runat="server" ToolTip="瀵煎叆" ValidateForms="SimpleForm1"
-                        OnClick="btnImport_Click">
-                    </f:Button>
-                    <f:Button ID="btnDownLoad" runat="server" Text="涓嬭浇妯℃澘" Icon="ApplicationGo"  ToolTip="涓嬭浇妯℃澘" OnClick="btnDownLoad_Click">
-                    </f:Button>
-                    <%--<f:Button ID="btnOut" Icon="Pencil" runat="server" Text="瀵煎嚭" ToolTip="瀵煎嚭閿欒鍒楄〃" ValidateForms="SimpleForm1"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" Text="瀹℃牳" runat="server" ToolTip="瀹℃牳" ValidateForms="SimpleForm1"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" Text="瀵煎叆" runat="server" ToolTip="瀵煎叆" ValidateForms="SimpleForm1"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Text="涓嬭浇妯℃澘" Icon="ApplicationGo" ToolTip="涓嬭浇妯℃澘" OnClick="btnDownLoad_Click">
+                        </f:Button>
+                        <%--<f:Button ID="btnOut" Icon="Pencil" runat="server" Text="瀵煎嚭" ToolTip="瀵煎嚭閿欒鍒楄〃" ValidateForms="SimpleForm1"
                         OnClick="btnOut_Click" Hidden="true"></f:Button>--%>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="閫夋嫨瑕佸鍏ョ殑鏂囦欢" Label="閫夋嫨瑕佸鍏ョ殑鏂囦欢"
-                        LabelWidth="150px">
-                    </f:FileUpload>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:HiddenField ID="hdFileName" runat="server">
-                    </f:HiddenField>
-                    <f:HiddenField ID="hdCheckResult" runat="server">
-                    </f:HiddenField>
-                    <f:Label ID="lbResult" runat="server" Label="瀹℃牳缁撴灉"></f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <%--<f:Label ID="lblBottom" runat="server" Text="璇存槑锛氳鍒欐槸">
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="閫夋嫨瑕佸鍏ョ殑鏂囦欢" Label="閫夋嫨瑕佸鍏ョ殑鏂囦欢"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                        <f:Label ID="lbResult" runat="server" Label="瀹℃牳缁撴灉"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <%--<f:Label ID="lblBottom" runat="server" Text="璇存槑锛氳鍒欐槸">
                     </f:Label>--%>
-                </Items>
-            </f:FormRow>
-        </Rows>
-    </f:Form>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" Hidden="true" ShowHeader="false" Title="濮旀墭鍗曞鍏ラ敊璇棩蹇�" runat="server" EnableCollapse="false"
+                            DataKeyNames="ID"  PageSize="100" AllowPaging="true">
+                            <Columns>
+                                <f:RowNumberField />
+                                <f:RenderField ColumnID="RowID" Width="80px" DataField="RowID" HeaderText="琛屽彿" />
+                                <f:RenderField ColumnID="TrustBatchCode" MinWidth="80" DataField="TrustBatchCode" HeaderText="濮旀墭鍗曠紪鍙�" />
+                                <f:RenderField ColumnID="InstallCode" MinWidth="80" DataField="InstallCode" HeaderText="瑁呯疆缂栧彿" />
+                                <f:RenderField ColumnID="AreaCode" MinWidth="80" DataField="AreaCode" HeaderText="鍖哄煙缂栧彿" />
+                                <f:RenderField ColumnID="PipelineCode" MinWidth="80" DataField="PipelineCode" HeaderText="绠＄嚎鍙�" />
+                                <f:RenderField ColumnID="WeldJointCode" MinWidth="80" DataField="WeldJointCode" HeaderText="鐒婂彛鍙�" />
+                                <f:RenderField ColumnID="DetectionType" MinWidth="80" DataField="DetectionType" HeaderText="鎺激绫诲瀷" />
+                                <f:RenderField ColumnID="TrustDate" MinWidth="80" DataField="TrustDate" HeaderText="濮旀墭鏃ユ湡" />
+                                <f:RenderField ColumnID="UnitCode" MinWidth="80" DataField="UnitCode" HeaderText="妫�娴嬪崟浣嶇紪鍙�" />
+                                <f:RenderField ColumnID="SurfaceState" MinWidth="80" DataField="SurfaceState" HeaderText="琛ㄩ潰鐘舵��" />
+                                <f:RenderField ColumnID="Opportunity" MinWidth="80" DataField="Opportunity" HeaderText="妫�娴嬫椂鏈�" />
+                                <f:TemplateField  HeaderText="閿欒鍘熷洜" MinWidth="500">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lablRemark" runat="server" Text='<%#Eval("Remark") %>'  ForeColor="Red"></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField ColumnID="CreatedTime" MinWidth="150" DataField="CreatedTime" HeaderText="瀵煎叆鏃堕棿" />
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
     </form>
 </body>
 </html>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
index f11f1dc..962745a 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.cs
@@ -4,10 +4,13 @@ using System.Data;
 using System.Data.OleDb;
 using System.IO;
 using System.Linq;
+using System.Web.Configuration;
 using System.Web.UI;
+using System.Web.UI.WebControls;
 using BLL;
 using FineUIPro.Web.common.ProjectSet;
 using FineUIPro.Web.Common.ProjectSet;
+using Model;
 
 namespace FineUIPro.Web.WeldingProcess.TrustManage
 {
@@ -88,15 +91,19 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
             if (ds.Tables.Count > 0)
             {
-                string result = string.Empty;
+                
                 List<Model.Batch_BatchTrust> trustList= new List<Model.Batch_BatchTrust>();
                 var units = from x in Funs.DB.Base_Unit select x;
                 var area = from x in Funs.DB.Project_WorkArea where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var installation = from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var trustIn = from x in Funs.DB.View_TrustBathcIn where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 var pipeList = from x in Funs.DB.Pipeline_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
+                List<Model.TrustBatchImportErrorLog> logListData = new List<Model.TrustBatchImportErrorLog>();
+                string BatchNo = DateTime.Now.ToString("yyyyMMddHHmmss");
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
+                    string result = string.Empty;
+                    var log=new Model.TrustBatchImportErrorLog();
                     string col0 = ds.Tables[0].Rows[i][0].ToString().Trim();
                     string col1 = ds.Tables[0].Rows[i][1].ToString().Trim();
                     string col2 = ds.Tables[0].Rows[i][2].ToString().Trim();
@@ -107,18 +114,33 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     string col7 = ds.Tables[0].Rows[i][7].ToString().Trim();
                     string col8 = ds.Tables[0].Rows[i][8].ToString().Trim();
                     string col9 = ds.Tables[0].Rows[i][9].ToString().Trim();
+                    log.Id = SQLHelper.GetNewID(typeof(TrustBatchImportErrorLog));
+                    log.RowID = (i + 2);
+                    log.BatchNo = BatchNo;
+                    log.TrustBatchCode = col0;
+                    log.InstallCode = col1;
+                    log.AreaCode = col2;
+                    log.PipelineCode= col3;
+                    log.WeldJointCode=col4;
+                    log.DetectionType=col5;
+                    log.TrustDate = col6;
+                    log.UnitCode= col7;
+                    log.SurfaceState= col8;
+                    log.Opportunity= col9;
+                    log.CreatedTime = DateTime.Now;
+
                     Model.Batch_BatchTrust t = new Model.Batch_BatchTrust();
 
                     if (string.IsNullOrEmpty(col0))
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鍗曞彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "濮旀墭鍗曞彿姝ら」涓哄繀濉」锛�" + "|";
                     }
                     else
                     {
                         var oldTrust = Funs.DB.Batch_BatchTrust.FirstOrDefault(x => x.TrustBatchCode == col0);
                         if (oldTrust != null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鍗曞彿" + "," + "[" + col0 + "]宸插瓨鍦紒" + "|";
+                            result += "濮旀墭鍗曞彿 [" + col0 + "]宸插瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -132,7 +154,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_Installation ins = installation.FirstOrDefault(x => x.InstallationCode == col1);
                         if (ins == null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "瑁呯疆缂栧彿" + "," + "[" + col1 + "]涓嶅瓨鍦紒" + "|";
+                            result += "瑁呯疆缂栧彿 [" + col1 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -142,7 +164,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "瑁呯疆缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "瑁呯疆缂栧彿姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string workAreaId = string.Empty;
@@ -151,7 +173,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Project_WorkArea workArea = area.FirstOrDefault(x => x.WorkAreaCode == col2 && x.InstallationId == installationId);
                         if (workArea == null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "鍖哄煙缂栧彿" + "," + "[" + col2 + "]涓嶅瓨鍦紒" + "|";
+                            result += "鍖哄煙缂栧彿 [" + col2 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -161,7 +183,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "鍖哄煙缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "鍖哄煙缂栧彿姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     string pipelineId = string.Empty;
@@ -170,7 +192,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var pipe = pipeList.FirstOrDefault(x => x.PipelineCode == col3 && x.WorkAreaId == workAreaId);
                         if (pipe == null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "璇ュ尯鍩熺绾垮彿" + "," + "[" + col3 + "]涓嶅瓨鍦紒" + "|";
+                            result += "璇ュ尯鍩熺绾垮彿 [" + col3 + "]涓嶅瓨鍦紒" + "|";
                         }
                         else
                         {
@@ -180,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "绠＄嚎鍙�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "绠＄嚎鍙锋椤逛负蹇呭～椤癸紒" + "|";
                     }
 
                     string weldJointId = string.Empty;
@@ -189,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var weldJoint = from x in Funs.DB.Pipeline_WeldJoint where x.PipelineId == pipelineId && x.WeldJointCode == col4 select x;
                         if (weldJoint.Count() == 0)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "[" + col4 + "]涓嶅瓨鍦紒" + "|";
+                            result += "鐒婂彛鍙� [" + col4 + "]涓嶅瓨鍦紒" + "|";
                         }
 
                         else if (weldJoint.Count() == 1)
@@ -200,12 +222,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         }
                         else
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "[" + col4 + "]閲嶅锛�" + "|";
+                            result += "鐒婂彛鍙� [" + col4 + "]閲嶅锛�" + "|";
                         }
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛鍙�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "鐒婂彛鍙锋椤逛负蹇呭～椤癸紒" + "|";
                     }
 
                     string ndeId = string.Empty;
@@ -214,7 +236,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         var nde = Funs.DB.Base_DetectionType.FirstOrDefault(x => x.DetectionTypeCode == col5);
                         if (nde == null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "鎺激绫诲瀷" + "," + "[" + col5 + "]閿欒锛�" + "|";
+                            result += "鎺激绫诲瀷[" + col5 + "]閿欒锛�" + "|";
                         }
 
                         else
@@ -225,19 +247,19 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "鎺激绫诲瀷" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "鎺激绫诲瀷姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     var pointBatchItem = trustIn.FirstOrDefault(x => x.InstallationId == installationId && x.WorkAreaId == workAreaId && x.PipelineId == pipelineId && x.WeldJointId == weldJointId && x.DetectionTypeId == ndeId);
                     if (pointBatchItem == null)
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "妫�楠屾壒涓笉瀛樺湪瀵瑰簲鐒婂彛淇℃伅"  + "|";
+                        result += "妫�楠屾壒涓笉瀛樺湪瀵瑰簲鐒婂彛淇℃伅"  + "|";
                     }
                     else
                     {
                         if (pointBatchItem.TrustBatchItemId != null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "鐒婂彛宸插鎵�" + "|";
+                            result += "鐒婂彛宸插鎵�" + "|";
                         }
                         else
                         {
@@ -254,12 +276,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         }
                         catch (Exception)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鏃ユ湡" + "," + "[" + col6 + "]閿欒锛�" + "|";
+                            result += "濮旀墭鏃ユ湡 [" + col6 + "]閿欒锛�" + "|";
                         }
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "濮旀墭鏃ユ湡" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "濮旀墭鏃ユ湡姝ら」涓哄繀濉」锛�" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col7))
@@ -267,7 +289,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                         Model.Base_Unit unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitCode == col7);
                         if (unit == null)
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬪崟浣嶇紪鍙�" + "," + "[" + col7 + "]閿欒锛�" + "|";
+                            result += "妫�娴嬪崟浣嶇紪鍙穂" + col7 + "]閿欒锛�" + "|";
                         }
                         else
                         {
@@ -276,31 +298,35 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     }
                     else
                     {
-                        result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬪崟浣�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                        result += "妫�娴嬪崟浣嶆椤逛负蹇呭～椤癸紒" + "|";
                     }
 
                     if (!string.IsNullOrEmpty(col8))
                     {
                         if (col8!= "鎵撶（" && col8 != "鏈哄姞宸�" && col8 != "鍠风爞" && col8 != "婕嗛潰")
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "琛ㄩ潰妫�娴嬮渶褰曞叆锛氭墦纾ㄣ�佹満鍔犲伐銆佸柗鐮傘�佹紗闈�" + "|";
+                            result += "琛ㄩ潰妫�娴嬮渶褰曞叆锛氭墦纾ㄣ�佹満鍔犲伐銆佸柗鐮傘�佹紗闈�" + "|";
                         }
                     }
                     if (!string.IsNullOrEmpty(col9))
                     {
                         if (col9 != "鐒婂悗" && col9 != "鎵撶（鍚�" && col9 != "鐑鐞嗗悗" && col9 != "鍧″彛鍑嗗" && col9 != "娓呮牴鍚�" && col9 != "鍘嬪姏璇曢獙鍚�" && col9 != "鍏朵粬")
                         {
-                            result += "绗�" + (i + 2).ToString() + "琛�," + "妫�娴嬫椂鏈洪渶褰曞叆锛氱剨鍚庛�佹墦纾ㄥ悗銆佺儹澶勭悊鍚庛�佸潯鍙ｅ噯澶囥�佹竻鏍瑰悗銆佸帇鍔涜瘯楠屽悗銆佸叾浠�" + "|";
+                            result += "妫�娴嬫椂鏈洪渶褰曞叆锛氱剨鍚庛�佹墦纾ㄥ悗銆佺儹澶勭悊鍚庛�佸潯鍙ｅ噯澶囥�佹竻鏍瑰悗銆佸帇鍔涜瘯楠屽悗銆佸叾浠�" + "|";
                         }
                     }
 
+                    log.Remark = result;
+                    logListData.Add(log);
                     trustList.Add(t);
                 }
 
                 var trustCodeList=trustList.Select(p=>p.TrustBatchCode).Distinct();
                 foreach (var trustCode in trustCodeList)
                 {
+                    string result = string.Empty;
                     var t = from x in trustList where x.TrustBatchCode == trustCode select x;
+                    var logInfo = logListData.FirstOrDefault(x => x.TrustBatchCode == trustCode);
                     if (t.Select(x => x.InstallationId).Distinct().Count() > 1)
                     {
                         result += "濮旀墭鍗�" + trustCode + "瑁呯疆涓嶄竴鑷�" + "|";
@@ -329,17 +355,18 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
                     {
                         result += "濮旀墭鍗�" + trustCode + "濮旀墭鏃ユ湡涓嶄竴鑷�" + "|";
                     }
-                }
-
-                if (!string.IsNullOrEmpty(result))
-                {
-                    if (result.Contains("|"))
+                    if (logInfo != null)
                     {
-                        result = result.Substring(0, result.LastIndexOf("|"));
+                        logInfo.Remark += result;
                     }
-                    errorInfos = result;
-
-                    lbResult.Text = result;
+                }
+                
+                if (logListData.Where(t=>t.Remark!="").Any())
+                {
+                    Funs.DB.TrustBatchImportErrorLog.InsertAllOnSubmit(logListData);
+                    Funs.DB.SubmitChanges();
+                    this.Grid1.Hidden = false;
+                    this.BindGrid1(BatchNo);
                 }
                 else
                 {
@@ -351,7 +378,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
 
 
         }
-
+        void BindGrid1(string batchNo)
+        {
+            var result = Funs.DB.TrustBatchImportErrorLog.Where(t=>t.BatchNo== batchNo).OrderBy(t=>t.RowID).ToList();
+            this.Grid1.DataSource = result;
+            this.Grid1.DataBind();
+        }
         #endregion
 
         #region 瀵煎叆
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
index e92d605..a33067c 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchIn.aspx.designer.cs
@@ -112,5 +112,23 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Label lbResult;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// lablRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lablRemark;
     }
 }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
index dd1c81a..4d07f97 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx
@@ -227,7 +227,7 @@
     </f:Window>
     <f:Window ID="Window4" Title="濮旀墭鍗曞鍏�" Hidden="true" EnableIFrame="true"
      EnableMaximize="true" Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window4_Close" 
-     CloseAction="HidePostBack" Width="1024px" Height="640px">
+     CloseAction="HidePostBack" Width="1200px" Height="640px">
      </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuCancel" OnClick="btnMenuCancel_Click" EnablePostBack="true"
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index bd40617..8f2cc39 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -263,6 +263,9 @@ namespace Model
     partial void InsertTemplate_Files(Template_Files instance);
     partial void UpdateTemplate_Files(Template_Files instance);
     partial void DeleteTemplate_Files(Template_Files instance);
+    partial void InsertTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
+    partial void UpdateTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
+    partial void DeleteTrustBatchImportErrorLog(TrustBatchImportErrorLog instance);
     partial void InsertWelder_ProjectWelder(Welder_ProjectWelder instance);
     partial void UpdateWelder_ProjectWelder(Welder_ProjectWelder instance);
     partial void DeleteWelder_ProjectWelder(Welder_ProjectWelder instance);
@@ -928,6 +931,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<TrustBatchImportErrorLog> TrustBatchImportErrorLog
+		{
+			get
+			{
+				return this.GetTable<TrustBatchImportErrorLog>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_Base_PipingClassDetail> View_Base_PipingClassDetail
 		{
 			get
@@ -22499,12 +22510,12 @@ namespace Model
 		
 		private string _DetectionStandard;
 		
-		private string _Tabler;
-		
 		private string _Remark;
 		
 		private System.Nullable<System.DateTime> _CreatedTime;
 		
+		private string _Tabler;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22523,12 +22534,12 @@ namespace Model
     partial void OnUnitIdChanged();
     partial void OnDetectionStandardChanging(string value);
     partial void OnDetectionStandardChanged();
-    partial void OnTablerChanging(string value);
-    partial void OnTablerChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
     partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCreatedTimeChanged();
+    partial void OnTablerChanging(string value);
+    partial void OnTablerChanged();
     #endregion
 		
 		public PMI_Delegation()
@@ -22596,7 +22607,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{
 			get
@@ -22676,26 +22687,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
-		public string Tabler
-		{
-			get
-			{
-				return this._Tabler;
-			}
-			set
-			{
-				if ((this._Tabler != value))
-				{
-					this.OnTablerChanging(value);
-					this.SendPropertyChanging();
-					this._Tabler = value;
-					this.SendPropertyChanged("Tabler");
-					this.OnTablerChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
 		public string Remark
 		{
@@ -22736,6 +22727,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
+		public string Tabler
+		{
+			get
+			{
+				return this._Tabler;
+			}
+			set
+			{
+				if ((this._Tabler != value))
+				{
+					this.OnTablerChanging(value);
+					this.SendPropertyChanging();
+					this._Tabler = value;
+					this.SendPropertyChanged("Tabler");
+					this.OnTablerChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -22775,10 +22786,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
 		private string _ReportNo;
 		
+		private System.Nullable<System.DateTime> _CheckTime;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -22797,10 +22808,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCheckTimeChanged();
     partial void OnReportNoChanging(string value);
     partial void OnReportNoChanged();
+    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCheckTimeChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     #endregion
@@ -22910,7 +22921,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22930,26 +22941,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
-		{
-			get
-			{
-				return this._CheckTime;
-			}
-			set
-			{
-				if ((this._CheckTime != value))
-				{
-					this.OnCheckTimeChanging(value);
-					this.SendPropertyChanging();
-					this._CheckTime = value;
-					this.SendPropertyChanged("CheckTime");
-					this.OnCheckTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
 		public string ReportNo
 		{
@@ -22970,6 +22961,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CheckTime
+		{
+			get
+			{
+				return this._CheckTime;
+			}
+			set
+			{
+				if ((this._CheckTime != value))
+				{
+					this.OnCheckTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CheckTime = value;
+					this.SendPropertyChanged("CheckTime");
+					this.OnCheckTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -32261,6 +32272,404 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TrustBatchImportErrorLog")]
+	public partial class TrustBatchImportErrorLog : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _BatchNo;
+		
+		private System.Nullable<int> _RowID;
+		
+		private string _TrustBatchCode;
+		
+		private string _InstallCode;
+		
+		private string _AreaCode;
+		
+		private string _PipelineCode;
+		
+		private string _WeldJointCode;
+		
+		private string _DetectionType;
+		
+		private string _TrustDate;
+		
+		private string _UnitCode;
+		
+		private string _SurfaceState;
+		
+		private string _Opportunity;
+		
+		private string _Remark;
+		
+		private System.Nullable<System.DateTime> _CreatedTime;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnBatchNoChanging(string value);
+    partial void OnBatchNoChanged();
+    partial void OnRowIDChanging(System.Nullable<int> value);
+    partial void OnRowIDChanged();
+    partial void OnTrustBatchCodeChanging(string value);
+    partial void OnTrustBatchCodeChanged();
+    partial void OnInstallCodeChanging(string value);
+    partial void OnInstallCodeChanged();
+    partial void OnAreaCodeChanging(string value);
+    partial void OnAreaCodeChanged();
+    partial void OnPipelineCodeChanging(string value);
+    partial void OnPipelineCodeChanged();
+    partial void OnWeldJointCodeChanging(string value);
+    partial void OnWeldJointCodeChanged();
+    partial void OnDetectionTypeChanging(string value);
+    partial void OnDetectionTypeChanged();
+    partial void OnTrustDateChanging(string value);
+    partial void OnTrustDateChanged();
+    partial void OnUnitCodeChanging(string value);
+    partial void OnUnitCodeChanged();
+    partial void OnSurfaceStateChanging(string value);
+    partial void OnSurfaceStateChanged();
+    partial void OnOpportunityChanging(string value);
+    partial void OnOpportunityChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreatedTimeChanged();
+    #endregion
+		
+		public TrustBatchImportErrorLog()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string BatchNo
+		{
+			get
+			{
+				return this._BatchNo;
+			}
+			set
+			{
+				if ((this._BatchNo != value))
+				{
+					this.OnBatchNoChanging(value);
+					this.SendPropertyChanging();
+					this._BatchNo = value;
+					this.SendPropertyChanged("BatchNo");
+					this.OnBatchNoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RowID", DbType="Int")]
+		public System.Nullable<int> RowID
+		{
+			get
+			{
+				return this._RowID;
+			}
+			set
+			{
+				if ((this._RowID != value))
+				{
+					this.OnRowIDChanging(value);
+					this.SendPropertyChanging();
+					this._RowID = value;
+					this.SendPropertyChanged("RowID");
+					this.OnRowIDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustBatchCode", DbType="NVarChar(50)")]
+		public string TrustBatchCode
+		{
+			get
+			{
+				return this._TrustBatchCode;
+			}
+			set
+			{
+				if ((this._TrustBatchCode != value))
+				{
+					this.OnTrustBatchCodeChanging(value);
+					this.SendPropertyChanging();
+					this._TrustBatchCode = value;
+					this.SendPropertyChanged("TrustBatchCode");
+					this.OnTrustBatchCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallCode", DbType="NVarChar(50)")]
+		public string InstallCode
+		{
+			get
+			{
+				return this._InstallCode;
+			}
+			set
+			{
+				if ((this._InstallCode != value))
+				{
+					this.OnInstallCodeChanging(value);
+					this.SendPropertyChanging();
+					this._InstallCode = value;
+					this.SendPropertyChanged("InstallCode");
+					this.OnInstallCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AreaCode", DbType="NVarChar(50)")]
+		public string AreaCode
+		{
+			get
+			{
+				return this._AreaCode;
+			}
+			set
+			{
+				if ((this._AreaCode != value))
+				{
+					this.OnAreaCodeChanging(value);
+					this.SendPropertyChanging();
+					this._AreaCode = value;
+					this.SendPropertyChanged("AreaCode");
+					this.OnAreaCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
+		public string PipelineCode
+		{
+			get
+			{
+				return this._PipelineCode;
+			}
+			set
+			{
+				if ((this._PipelineCode != value))
+				{
+					this.OnPipelineCodeChanging(value);
+					this.SendPropertyChanging();
+					this._PipelineCode = value;
+					this.SendPropertyChanged("PipelineCode");
+					this.OnPipelineCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")]
+		public string WeldJointCode
+		{
+			get
+			{
+				return this._WeldJointCode;
+			}
+			set
+			{
+				if ((this._WeldJointCode != value))
+				{
+					this.OnWeldJointCodeChanging(value);
+					this.SendPropertyChanging();
+					this._WeldJointCode = value;
+					this.SendPropertyChanged("WeldJointCode");
+					this.OnWeldJointCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionType", DbType="NVarChar(50)")]
+		public string DetectionType
+		{
+			get
+			{
+				return this._DetectionType;
+			}
+			set
+			{
+				if ((this._DetectionType != value))
+				{
+					this.OnDetectionTypeChanging(value);
+					this.SendPropertyChanging();
+					this._DetectionType = value;
+					this.SendPropertyChanged("DetectionType");
+					this.OnDetectionTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrustDate", DbType="NVarChar(50)")]
+		public string TrustDate
+		{
+			get
+			{
+				return this._TrustDate;
+			}
+			set
+			{
+				if ((this._TrustDate != value))
+				{
+					this.OnTrustDateChanging(value);
+					this.SendPropertyChanging();
+					this._TrustDate = value;
+					this.SendPropertyChanged("TrustDate");
+					this.OnTrustDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitCode", DbType="NVarChar(50)")]
+		public string UnitCode
+		{
+			get
+			{
+				return this._UnitCode;
+			}
+			set
+			{
+				if ((this._UnitCode != value))
+				{
+					this.OnUnitCodeChanging(value);
+					this.SendPropertyChanging();
+					this._UnitCode = value;
+					this.SendPropertyChanged("UnitCode");
+					this.OnUnitCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SurfaceState", DbType="NVarChar(50)")]
+		public string SurfaceState
+		{
+			get
+			{
+				return this._SurfaceState;
+			}
+			set
+			{
+				if ((this._SurfaceState != value))
+				{
+					this.OnSurfaceStateChanging(value);
+					this.SendPropertyChanging();
+					this._SurfaceState = value;
+					this.SendPropertyChanged("SurfaceState");
+					this.OnSurfaceStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Opportunity", DbType="NVarChar(50)")]
+		public string Opportunity
+		{
+			get
+			{
+				return this._Opportunity;
+			}
+			set
+			{
+				if ((this._Opportunity != value))
+				{
+					this.OnOpportunityChanging(value);
+					this.SendPropertyChanging();
+					this._Opportunity = value;
+					this.SendPropertyChanged("Opportunity");
+					this.OnOpportunityChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreatedTime
+		{
+			get
+			{
+				return this._CreatedTime;
+			}
+			set
+			{
+				if ((this._CreatedTime != value))
+				{
+					this.OnCreatedTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreatedTime = value;
+					this.SendPropertyChanged("CreatedTime");
+					this.OnCreatedTimeChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Base_PipingClassDetail")]
 	public partial class View_Base_PipingClassDetail
 	{
@@ -39146,6 +39555,8 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private System.Nullable<bool> _IsPMI;
+		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -39276,6 +39687,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
+		public System.Nullable<bool> IsPMI
+		{
+			get
+			{
+				return this._IsPMI;
+			}
+			set
+			{
+				if ((this._IsPMI != value))
+				{
+					this._IsPMI = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
 		public string PipelineCode
 		{
@@ -41284,8 +41711,6 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
-		private string _PIPClassCode;
-		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41300,6 +41725,8 @@ namespace Model
 		
 		private string _DetectionType;
 		
+		private string _PIPClassCode;
+		
 		private string _PageNum;
 		
 		public View_Pipeline_WeldJoint()
@@ -42394,22 +42821,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
-		public string PIPClassCode
-		{
-			get
-			{
-				return this._PIPClassCode;
-			}
-			set
-			{
-				if ((this._PIPClassCode != value))
-				{
-					this._PIPClassCode = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{
@@ -42522,6 +42933,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
+		public string PIPClassCode
+		{
+			get
+			{
+				return this._PIPClassCode;
+			}
+			set
+			{
+				if ((this._PIPClassCode != value))
+				{
+					this._PIPClassCode = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PageNum", DbType="NVarChar(10)")]
 		public string PageNum
 		{
@@ -47085,7 +47512,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
 		public string WelderIds
 		{
 			get