From 2fe06c242ff2c3354d2d42b6839003233327ce62 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Fri, 4 Jul 2025 13:50:37 +0800
Subject: [PATCH] =?UTF-8?q?20250704=20=E8=AF=95=E5=8E=8B=E5=8C=85=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_V2025-07-02-001-bwj.sql   |  33 ++
 .../TestPackage/TestPackageEditService.cs     |   9 +
 .../File/Excel/DataIn/试压包导入模版.xlsx     | Bin 0 -> 8504 bytes
 .../HJGL/TestPackage/TestPackageEdit.aspx     |   2 +-
 .../HJGL/TestPackage/TestPackageImport.aspx   |  21 +-
 .../TestPackage/TestPackageImport.aspx.cs     | 289 ++++++--------
 SGGL/Model/Model.cs                           | 360 ++++++++++--------
 7 files changed, 367 insertions(+), 347 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2025-07-02-001-bwj.sql
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx

diff --git a/DataBase/版本日志/SGGLDB_V2025-07-02-001-bwj.sql b/DataBase/版本日志/SGGLDB_V2025-07-02-001-bwj.sql
new file mode 100644
index 00000000..d9bfa7b2
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-07-02-001-bwj.sql
@@ -0,0 +1,33 @@
+
+alter table PTP_PipelineList add TestPackageNo varchar(50)
+go
+
+ALTER VIEW [dbo].[View_TestPackage_PipelineList]
+as
+/*********��ѹ����ϸ**********/
+select l.PT_PipeId,
+l.PTP_ID,
+l.PipelineId,
+l.TestPressure,
+t.ProjectId,
+t.TestPackageNo,
+t.TestPackageName,
+t.Remark,
+t.UnitWorkId,
+t.Tabler,
+t.TableDate,
+p.PipelineCode,
+uw.UnitWorkCode,
+uw.UnitWorkName,
+uw.UnitId,
+u.UnitCode,
+u.UnitName,
+t.adjustTestPressure
+from PTP_PipelineList l
+left join PTP_TestPackage as t on t.PTP_ID=l.PTP_ID
+left join HJGL_Pipeline p on p.PipelineId = l.PipelineId
+left join WBS_UnitWork uw on uw.UnitWorkId = t.UnitWorkId
+left join Base_Unit u on u.UnitId =uw.UnitId
+GO
+
+
diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
index a3314e5e..c1ddf1ef 100644
--- a/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
+++ b/SGGL/BLL/HJGL/TestPackage/TestPackageEditService.cs
@@ -455,5 +455,14 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
+
+        public static void AddPipelineLists(List<Model.PTP_PipelineList> pipelineList)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                db.PTP_PipelineList.InsertAllOnSubmit(pipelineList);
+                db.SubmitChanges();
+            }
+        }
     }
 }
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/试压包导入模版.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8eee13d894cae67d09bd9bee814ba382f2a59157
GIT binary patch
literal 8504
zcmeHMg<n)#*B-jNVUQN2W`>gP7(zNE1nC}NXz3IX1d&h>BqXGyLAtv`8kAH(N$L2;
z>-)ami}(BffcLv+esj)m|IS&@*=Ox%@3r=`)Rj?CNdf2pOaK7D0O-jc<nurR08r5Y
z0206glA(+f%*_(!W}@xwZ0Y)d+sn~`K5GVvEdzjzc>bT`zs&<h+P$zgFkz$Kri5&h
zZpVm>jt(mRgQr}?hbStd4CGH8z0t7)mJ~JB-`X&faz~aA%&oJmd?_jKC1<4G;ejYU
zW<*N%ahzu-dHtlOH5(e2Fy8kF<K;9;)R)yGtA=Teme4#}t1M=0HBB>P=^XHPB%s6{
z-y+gIOQYV5{VIc?20DB?i*K|+*+`R=W<35u(vF-g??jpw*!8Jd<2Q~PQ`kw^QSIS!
zoZ7IoD;b_$IaBzE_>wkmnps2!UlKrjhEKLV+67<M0XOVbw8XR<A9ei8sKXL=t2hyk
zNLooBV9s`Cas>KziTvqnLR%*!AFZ@AM=62<>*bh-dp!0MI4a)dGe}9dA7aROdMv#3
zJ*_o<)ZFC3?oKnNMCCc+SAuGkseg#XLQzr!$fqfmB0!drW=82A7;<q%vfsJqs3DMd
z#U)zYMbylJ@*yZEDr2L=WN35q`$fz`&Pwf*d4*bEs>eeg#;pbDQv;?~X#jxhYZQR`
zU*=$y4w&gXf><huDTV_WLNb9{I=F(kf1K&F`u>@F|21<iI(}HS9gN$x18tC5J>P^u
zF*9@ORiO0@+P7MmztL62WHU=1ABCa>E1A!Y9&HRu7%qNWx7DTtnt@c?>)52qc+GsK
z?7WI!>k?#`F<RS_c2hqEn(8eqI+%F9Nk}!DI?peE@`SoB;eyGGk5-KoXKx#x^9-!f
zXKFM0oGRaPK4DEPy!n<om*`}x9VUhkMuGU5=xKQk-#sTU(7K;lvTC$sI*CZX$C`{4
z&fDR+{1oYa#SpTCSK~yz=Zxkk>9=Q%)DEw!1zi}GBS)Yg4@8%uTqU=*g1BGXygg|g
z5?#&<{dCXb#I&`OK-&Z{Y`=3oNIW6=5OJpt!F6f?CX$x}=qKGho#6InPEPheBF?|4
zkNSi9h}iW1`zVSZR_Xu~cI^c35U#_<OBfkbzsZF*+W7^>sic-W67#IQZfeZTnhUdR
zJS0A`>N&pTdHMC5J+K4g_GXBlIvES*;qB=~Pwd5%jZ_T6j#)!7)L87>%+r%odUF&&
zz76HoGbm%dm*&S8E7=Jaz^5rugrgg(G-LTf{S&?UgHoPscP+g^<6|hBBx+?f*kg-}
z!8W-so?jp1JI>MgVz2wj4qG!a@A0i-M9Ami>$k>o^Dy-s?4|Or2*skseyK<}(0^c-
z|H0w}_lqR{vshpNOT6m_<G?}+c-2k%yzkDtxqZW=wWZ#k=P`xNh|&I?Gm9&;O6rI^
zEC|jJAjp8=%%9m3{j49>PEROzoOnhM;b)GqHY!`jq~kd0PyoG`${*$u9o&ixWDQsf
z>hasIGh0V~{62Z|Y~BWryphO{MjH!PYQf}46e2zJJNETdizJwbmJ|mC8@G(Rd;3&u
z7K`{B_%LIFn=;%nzw-1q<Y#{Jw=e|PYUxky1{RB0G`Y9ryhD=C=1tnDDEibl!eRR5
zs=ZVv2UXNyl>cEH*|Ow8;L5o{ReDmPlI=;YFk^$GiFb(WYkroL^Ic{gfc^+pb@gM3
z;H}xms$XhF1~>RPn(x7ArR)GT?wcK*XwS1`r8`AvJ#4(Z2;2os9msdOoW)5GuP{gq
z;fowhjwb5SXFL-)4rgz65^?$A<dh>Bje)`wNS!W2`#nScty&o;P=iQC*pgX~pxKy!
z4W@mK_WjxzAZwfRJ!h^FW1}%CfwT%+VaSE^DIx{@-TCh!<F6PH&VPyclm2wRtBon#
z(n8A(ZVR(^{V`t?)a#W{q)5M_U7OZ6zSL2dwPKZ%EUg$Jp!8s!30n}^8Y+5W5d7}M
zMpGXusZPpAC<PAk9keh{G;v<e22bB#^cfO6e$`%pVJm%PSz;b0&Z#F#PmDs=HN9)<
zY3*uD8zF!!^NcM)oG&Mw-Nfjj0nIW@<D8J{xubeP2sBq(Py6;LgL`6LTP?&%J#9@h
zR5*U@4c3Fb2L6;N${^GN$(45YIOLT^=@0%^Lv8~vKRw@g+9+7@HL1}z4L|m4zGZ#v
z_$RFFa9-gR-@U%84B-59;lX~%-PoDAY?o_)e?xKi{+dyfa{bk;6v62s#Rr))*bg9*
zD!i_z8k3~{$7qMiVTwD>^WHAuOLVim!+BG$LD$9d52`Lu{?4T$jy%e(2v<rYT*~x|
z&#pF>mTs>9S`PncK>o8BhQ_u=wSh_Hj!~{;ynLR22*Z`py31Irvw>oEHj6%&9Cu85
z=~Dr;Y*|}#9$phjJr{jTV}<{WbD|D8Y}K5?rgYb5maAE+OmK6a6pKqV&UBo+DFsDU
zRVlJN?mih#S(pa%C1tyR$4uE%thaIE>obax-r(NTCp05P1$K`6CK#0<)v6uNRX@ED
zVKGhptL>+LbfU2A<{{|*aHyhC+(Yp!s8EmG*Zn{<sV&c=bbCL1)Lh4b{(~c|zw<x@
z>lq{h9RScq<U=GsJ>X_z>1YZ1<NU{GZ|mQ4qLHI)V%npV_i=J$^`KU8FPJW)u^E>y
zGn`oQ5?f4r<YCRvtGY>J7Yl_(1V56JHWH-I(Bue`J>|b6mjk`TY2dA>UyPh$zC(nW
zPY~&O<lQW>p0>Bfam*Nw9}$<(&GpWsY?Fcb+*fubV{L)@kh{nS$_|VLuRv_Qc^Mly
zQg@nMshslTWKog)IPW_5<0L8xu#<gh=SiaQmNxUcyUy5#eM?TA3d<MMmq}Out?m>%
zQEu5|Ga%Aj>I&pL)}yNxHBj@TRY$A&dR*BKrA@TgkxlFOfW#rR_w1+{tjpU`g<Fc&
zf-;CCfN?&3GPufUAOqt`--f>RHS9%b<O>67!;Gz$YD&q((YHC|b1}o;j~KjLY^Y2-
zxC_W7cUgedj2Ew6-~!IY@7uZG*)KZ&VE;AR8p)!Wd;gm@&1BsZ(5}gYk@qvO8k#|E
zivEef?Wr?l|HeAqB?FgTbc?+hG~dR?$uC7hUMS@!RcO9Dny$s)mhspu_|iEu+$DV)
z6MXQgT&uOPO)yR#@rMm-#Nl~+*b<rFDzto0{;A&R5Regs%R$Y=uiQg<9@j++#6#;e
z04&ni?sjpX!c7(XrN=1vG`MyyQDqbdP8<D?zHV8ojci%R#(t9!tGjL=4Z%=2Zmwwn
zw$TDH<l6L10`|`-=(3j5eNQ((S+9BNcU<o;C=3T&RRS@|_@+L0Zo~%oot<=M$C~&b
zl%h7V?3QBEjYL4*LV#I*w}KqIASLS-Y(w%8Oo%(1GiHPGeNUaw0H*;kM|)M|R>K@}
ziUQT{=3z;;y#%S2oHDZs4iiRgzmUDF#%7?sfo^Mih%GPyhhm%&Mz<2eGeZj$$^5EH
z@;OCcQ@Cj-v_r!+_S5}OfgQ38mrvC&@05MR&v|O%`4&{WY997YeWI&!f(1p`jo4PT
zQids_zi7Y;vuY)EVJ?4A|K;S|YKxq-)I;5@i$HL9jNYF1r~K$OfI`vd-L3m!mP$v~
zZJ^~kO{q61ZGxLmBN8n6?xIZ_VxIBiUKa3e*E^8Ehh~0$6TRU+;7#;?kTs1^L6NFj
zZKX8APfe9x4l=t^fZNo+fIT`)hyeuQ9Xl$$a(+FJ2^($EuuZ2w8`S=MUpm|4%t>}d
z!oDk7`fjz*ZZ%a+1J`s)pOV?eeH`QPa|(e)N70yL%+<5yu7m2Grmyvj0ZlvHg=^y;
zbKW6gi-nIdL?}}42pI@7$KEmb<2PTe<8v(!9W<K=k-KND8o?~V$HL%yFSR}d2UUO%
z>iiu^$5f&NYhapRjTg(JPdJY46Y-FT)%%2+uJ%_Y+r6ck!?@LS&?1l19`1LWYuh$)
z6%a$!heNMlX6OultZdT-<*2l7-zCx=S4uN57|gdaNMqu<OJ!DTL(RFq7<vb_bsO2(
zIE1&39M76$pa*)s0Bg~|uR=P+E6dZt6yF7%YoyFh!O~3PSmy!2^O)t&UU>#jVUMMx
zd^L&lNTDa|oJ@}B&pOu2O0e7&RjPx<CNe#F(%Ea~Hocz`lNkQk_f=&B1Ze-sK0$IK
z=hg)n=OesFuPyg7veTi!_tv15)eA#Z{@S;t{wCn*FDQ|5b~ODXx#8Z4xqv5C%!SuV
zDD#hu(Wg}cP`Grb7^towTrIIMn_e#!UmaWzQ@QgY@!aABH8P@0XSaxO2lgXKs7W6C
zG;bC$j8#Qpgupp5x6#q~{h$z6-7;EI>x}zAJYn8f-DDfxUUJx`;8d$9*#yd*lKb7R
zv;|VF{S6BxNX)f$?&nL?5*%FxVPtWmHSB1&#%fV+?Vd~=7KZOW$mkg3BJ_qIg~^R&
zG+V>UPeDCFS5Edr`(R7FJn<?u6lS(<1$NTVZ7D;Z8BgR2gE~+BBu+~Uo`Q@Lm7-Z0
zxa73taSMNAjSpL>_T2?$M-+5V(d+q*%HZ&zTkxpw>xXf^J5~I<o@(ONFIw4Z2vUP?
z9|V+`^_JLu!Sk*@CdV5Et()tL6=D<WPGhIo&NOFYThH4$b{mv><vhECp<z@>Nq!K-
z7Nkt~=DOudA#6B8(Y!Ge|3v&y7qyw+#wt!AZjxgAV~|@&<r5joSKC?lZV&d=3DBlh
zPL&Uyy<%N3`UbJKA5<mT;T0C48!~cH<x0=1&>|3Ns<u~tfcH$yIIEOz2%qORc-^{q
znLy3givqb3Pwzr2_l@H16Me;plw#+(_!%d~vNCn27>Ka+dp0B`ajN(bk%r<Uf*0P;
zz~$=Z?O^#w8dRx07&ReD*o4z0^SM5?HyXc$S^p4B&xR=yJeB_DIp3k$=WkT;Vm=3-
zWxNg==$HGqgJVr~JmVw5<rNs9FPlo2zTb6p^7PV3M}w&PtNNhuGI}DdFz)vSy!$To
z-beAWA2f6{Gs*g)!<_H?UW+RhZ=u!0C|!v{)diShT)!3yR?D?BS5eeiVqa;`LN`C!
zZBAE*kB((MC*6aW-S3Wv%k5W=_08mu_^k1iQ<HkzIc1@c1#&RBq>~%ikO*NCNH)l8
z^agic9)mn3nzMA|SSb8PxEl>+V$fbNjBN^SiuSbXz;p1}&1H#7fm$ZZudiQNKeid-
zKKRxR$|q$Q>^I8H64Y2%e<s0s;>>V6DY=J-ZND;S2$C(}9Et8dSJP4!oMir4a9Zr)
z1DaXZehOZU9Sm>J*#xkec>u&!eeLbT#1P!@DZF&mn%xE4jY`za)yfZ1*n}&i=Axq{
z@+7%nrjk7^QuNTmc=w`#p4l2<`F4hO{i9n?9>bG_BySPDwxo*^c`&EWtgZ`YC@HH|
zo9r+|ZgAIma|CBvFk~Z4B2(}n%?t>k6vR#z%?X}T;z8qRiC#g2X(Q>8=Qb4vE_gS^
z`6W@(9G!G%=!qe>HZOxRyR^bsETZT}tI00WU$j^=%rBli6InEg1!mZ(DrVy~BTZ4=
zAs9jJ7&tr7^Sn*Y<O|_}2l$+y&uvhREu`ag>wHAZd$b?;!qRj5JMvV|C~ZTTAet7r
zjdw459R*C}a-c`Ue^{w0Ir;e{hX2UW;~qr&@m5mNWx*NQK7scYf{VXXafR4$T^K>d
zP*ebb^0zGVSN<4{Q26E$3LnL13Bm@w!Wzn?kO|lb5S#Q~GA~yQCnIrhytzp4lr^+B
zd?Di=h*8MbNuX(T`K-)-=2p>j12WMV;vvbzx_CRoUAiSFi2*@ZHf<Jz;*5`KA5XsT
zU)Fa@&0$Od=$Q!m$Qq>h4g@_cQPP~B31ocE{ZLH;Rj7|iE2A%v+?*9uj#r$=dh4}g
z3cK!pTw<@^W{_NuPkN-vS&4inU<$f&0@qNiJ3xcrxVJiuo#rKU_sd0GXtlMbeWi*T
z6suHc)Sdtg`I^!c(~0grRl)LhL;5HdMZ9)PccdE4gk<&-A7Z17w5%0+a0!`pwCU9A
zXV32}>2x~VrCP0)!WP*-)T{~30d2hrz#S6ao8DmNaKKJy9c3Q2vK3e_nirZ_cz4Ap
zD?wBd1l`JP9^Pk5Grngv9zb${XiKVCkMgBPvpUHF@nj8RJ2c!98|1Pbq{AxlD@9}F
zS1v$kU49|b&!><(;ilh%o;h5IP=1noG1Pr%lyi5{%f2=n-A8{rxtDQqygvbDdBtA#
zQRMwb`PJlzjG%tDY-Lp2ong^(62@HYrv_h?dGH3Q`r_R*?Zb?NRspYZ@m`N{6o;FB
z4~CfGn1n7Ut=-4rpL{8+HRJ#)C{=I_PBds3g+>XbQ&Y=j2(S<}dKB~DA_!UXX-PAc
zrz}0*e;I7zl3V;H6Q@GgIh)IX;aNra_HaU>&6GU(EA-TJ6KpaUSedJ0)pUIUUE=t)
z`6+@`zw-^PKUzrv!7~TMu7&j{-<%OUKsQUcmZh89kF6l+MjOIyW(zaRAOx3#OXp2r
zw6qirx3u)MU<q)c^_W=*BC%3Y`ci6ADFuQPGb5zWp`*s>FXK4?6D<*MzR(e0qs9x0
zy+FL^Z~8KFy%s5n=!XWPr$h)9$->E89q#1p3Nm+sTmGzB{39OyaGh_whH^WYG;9g&
zTBg@0HP>85W-h2N9f+w*x+D#sLQCai9)(>mRxa3Kw0HXq_j(RDGMmt8lUxS6mrtTG
zDn>DmG>~adp*<=T*rSblWo=NJJE@+*Bv{Gq<OGMYIdL^ie+c|eY(xs3)qr7F9xtj#
z(=LUWabw}rc08~rJIJi$7l;lhqjpZp<tS?5Z53@70}GH4rNsrSK@S{Lk>~}((MfG~
zz>1hx2aiho9{7RTc=O_~Y}!=wYF(>8W(&S2P*v?J*@}ljIxtVMuBOGC@e8{&k873#
z`;46XxWG%ZJlzM3z!K9Tr}h|6;*NI6XT3+k1TG4g5p1X#=JOT%O<ukQ0{PoclzGPx
zeeKYZ=n<CFZ3W|o9h4Y6cj^le#IOrVX)MZu?}0}AV1#wci}QVwgyz4coiC?H=MNo(
z5V5T%{4?!Lot^(--4DL~JYL1O+R;D=!*{|O+OvF$s<3h>i=|zN;n2ud)o)QAA2_lS
zL;3W#MU_Efq-W@2-yIEl%q=`9y0<FxHu-q3celo)J5H<1^l>0mJJ<qgtDGo#ezx<u
z4?VXE$JIEM^NrpXd8(JvGJ9~ViAPu-A~8}!sq|~LOQ|6PLTYv4@;O+&PZRpO<r#8Z
z+WmB>@F<KW_&>%C?_V%I<_hM>6vcB2cW{1HbJCofGev7sXR?Egq`W7DYF{b+DCfe=
z?XXwx#RC}s{nqX*`Z}`Dc{a|huC3i~@7r3MN_CZM3Iu(899)Y&iRbuMMMbkx&`Byg
zR-b2>ubQg=mUb|H-oxT3c_HSa5=ZFSba<%7)#>Tw@w<1RC4WrSGxe=@mn}g7YxwM4
zb?5nMDqJ8lkfa3909rGtDR+Uf>xMhei(88_RDj;{X$WF+ZC3Xs?YQl()O%Vir_mUf
z*e~2gmtoS=Y6rD!x>Zr?W5`Emne-*Laibo$pBTKyOE^z&4uc&Zw__xa&oJkWzw<RA
zx!6ry<3Nnd&lMdBnF}G~{eAWK-^2Is>)+IZ)s_DW@YmASzYTv}LlJZ2Plc?ThJURC
z{MpbMky`)nRe_s0H?`qkNN*4Y?i)(+P2-!|<}YIg>_3cuQ#x-V+?4WuA-LiE=k@=W
zuy+&irZV;m&;$1mz?(YRO@Ny_lwSZKgwlp^$glm%P1Bnh<uB7ZvYQ|CE5E#nax+i(
zg~E<VQxP4wktN)0|B*G^1pRBk{{;yER3kut3;#FG|GIGh*_;cZK>o-4U(2|<G8%$|
R001uHcN;<D3)&y8{{brTXqx~4

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
index 7438d6ff..e0b7b91f 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx
@@ -111,7 +111,7 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-                <f:MenuButton ID="btnMenuImport" EnablePostBack="true" runat="server" Text="导入" Icon="PageExcel" OnClick="btnMenuImport_Click" Hidden="true">
+                <f:MenuButton ID="btnMenuImport" EnablePostBack="true" runat="server" Text="导入" Icon="PageExcel" OnClick="btnMenuImport_Click" >
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuNew" EnablePostBack="true" runat="server" Text="新增" Icon="Add" OnClick="btnMenuNew_Click">
                 </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx
index 4f1ec36d..bbb06e76 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx
@@ -48,40 +48,35 @@
                 </f:Toolbar>
             </Toolbars>
             <Rows>
-                <f:FormRow>
-                    <Items>
-                       
-                    </Items>
-                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="试压包信息" Height="350px"
                             EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
-                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" EnableBigData="true"
+                            EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" 
                             AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
-                            AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false"
+                            AllowPaging="true" IsDatabasePaging="false" PageSize="300"
                             EnableTextSelection="True" >
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
                                     Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                                <f:RenderField Width="100px" ColumnID="" DataField="" SortField=""
+                                <f:RenderField Width="300px" ColumnID="TestPackageNo" DataField="TestPackageNo" SortField="TestPackageNo"
                                     FieldType="String" HeaderText="试压包号" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="" DataField="" SortField=""
+                                <f:RenderField Width="200px" ColumnID="TestPackageName" DataField="TestPackageName" SortField="TestPackageName"
                                     FieldType="String" HeaderText="系统名称" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="130px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
+                                <f:RenderField Width="330px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
                                     FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="100px" ColumnID="" DataField="" SortField=""
+                                <f:RenderField Width="100px" ColumnID="TestPressure" DataField="TestPressure" SortField="TestPressure"
                                     FieldType="String" HeaderText="调整试验压力" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="备注" ColumnID=""
-                                    DataField="" SortField="" FieldType="String" HeaderTextAlign="Center"
+                                <f:RenderField HeaderText="备注" ColumnID="Remark"
+                                    DataField="Remark" SortField="Remark" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="100px">
                                 </f:RenderField>
                             </Columns>
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
index 99040cf3..1b86ff42 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
@@ -63,6 +63,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
             }
         }
         #endregion
+
         //void BindGrid2()
         //{
         //    string strSql = @" select  Import.DesignBasisDataImportId
@@ -154,6 +155,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 alert.Show();
             }
         }
+
         #region 读Excel提取数据
         /// <summary>
         /// 从Excel提取数据--》Dataset
@@ -192,8 +194,6 @@ namespace FineUIPro.Web.HJGL.TestPackage
         }
         #endregion
 
-
-
         #region 将Dataset的数据导入数据库
         /// <summary>
         /// 将Dataset的数据导入数据库
@@ -216,8 +216,11 @@ namespace FineUIPro.Web.HJGL.TestPackage
             if (pds.Count > 0 && pds != null)
             {
                 Model.SGGLDB db = Funs.DB;
-                var getPipeline = from x in db.View_HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x;
-                
+                //var getPipeline = from x in db.View_HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x;
+                var getPipeline = from x in db.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId
+                                  && x.UnitWorkId==Request.Params["UnitWorkId"]
+                                  select x;
+
                 Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(Request.Params["UnitWorkId"]);
                 for (int i = 1; i < pds.Count; i++)
                 {
@@ -229,46 +232,67 @@ namespace FineUIPro.Web.HJGL.TestPackage
                         pipeline.UnitId = unitWork.UnitId;                        
                     }
 
-                    string col0 = pds[i].A;
-                    if (string.IsNullOrEmpty(col0))
+                    if (pds[i].A != null)
+                    {
+                        string col0 = pds[i].A.ToString();
+                        if (string.IsNullOrEmpty(col0))
+                        {
+                            result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项！" + "|");
+                        }
+                        else
+                        {
+                            pipeline.TestPackageNo = col0;
+                        }
+                    }
+                    else
                     {
                         result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项！" + "|");
                     }
-                    else
+                    if (pds[i].B != null)
                     {
-                        pipeline.TestPackageNo = col0;
+                        pipeline.TestPackageName = pds[i].B.ToString();//系统名称
                     }
-
-                    pipeline.TestPackageName = pds[i].B;//系统名称
-                    
-                    string col2 = pds[i].C;
-                    if (string.IsNullOrEmpty(col2))
+                    if (pds[i].C != null)
+                    {
+                        string col2 = pds[i].C.ToString();
+                        if (string.IsNullOrEmpty(col2))
+                        {
+                            result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
+                        }
+                        else
+                        {
+                            var line = getPipeline.FirstOrDefault(u => u.PipelineCode == col2);
+                            if (line != null)
+                            {
+                                var ptpLineList = from x in db.PTP_PipelineList where x.PipelineId == line.PipelineId select x;
+                                if (ptpLineList != null && DrpType.SelectedValue == "0")
+                                {
+                                    result.Add("第" + (i + 1).ToString() + "行," + "管线号[" + col2 + "]已试压！" + "|");
+                                }
+                                else
+                                {
+                                    pipeline.PipelineId = line.PipelineId;
+                                    pipeline.PipelineCode = col2;
+                                }
+                            }
+                            else
+                            {
+                                result.Add("第" + (i + 1).ToString() + "行," + "管线号[" + col2 + "]不存在！" + "|");
+                            }
+                        }
+                    }
+                    else
                     {
                         result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|");
                     }
-                    else
+                    if (pds[i].D != null)
                     {
-                        var line = getPipeline.FirstOrDefault(u => u.PipelineCode == col2);
-                        if (line!=null)
-                        {
-                            pipeline.PipelineId = line.PipelineId;
-                            pipeline.PipelineCode = col2;
-                        }
+                        pipeline.AdjustTestPressure = pds[i].D.ToString();
                     }
-                    string col3 = pds[i].D;
-                    if (!string.IsNullOrEmpty(col3))
+                    if (pds[i].E != null)
                     {
-                        try
-                        {
-                            decimal testPressure = Convert.ToDecimal(col3);
-                            pipeline.TestPressure = testPressure;
-                        }
-                        catch (Exception)
-                        {
-                            result.Add("第" + (i + 1).ToString() + "行," + "调整试验压力格式输入有误" + "|");
-                        }                        
-                    }
-                    pipeline.Remark = pds[i].E;
+                        pipeline.Remark = pds[i].E.ToString();
+                    }                    
                     pipeline.Tabler = this.CurrUser.PersonId;
                     pipeline.TableDate = DateTime.Now;
 
@@ -289,7 +313,6 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 {
                     errorInfos = string.Empty;
                 }
-
             }
             else
             {
@@ -339,6 +362,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
         }
 
         #endregion
+
         #region 提交
         /// <summary>
         /// 提交
@@ -371,9 +395,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 if (DrpType.SelectedValue == "1")//更新导入
                 {
                     //BLL.PipelineMatService.DeletePipeLineMatByUnitWorkId(unitworkId);//删除原有管线对应材料
-                    BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
-                    BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
-                    AddView_HJGL_WeldJoint(PipelineList);//导入数据
+                    //BLL.WeldJointService.DeleteWeldJointByUnitWorkId(unitworkId);////删除原有管线对应焊口
+                    //BLL.PipelineService.DeletePipelineByUnitworkId(unitworkId);//删除原有管线
+                    AddView_TestPackage_PipelineList(PipelineList);//导入数据
 
                     //Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
                     //hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
@@ -396,7 +420,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 }
                 else   //补充导入
                 {
-                    AddView_HJGL_WeldJoint(PipelineList);
+                    AddView_TestPackage_PipelineList(PipelineList);
 
                     //Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
                     //hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
@@ -427,12 +451,12 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
             }
         }
-        public void AddView_HJGL_WeldJoint(List<Model.View_TestPackage_PipelineList> PipelineList)
+        public void AddView_TestPackage_PipelineList(List<Model.View_TestPackage_PipelineList> PipelineList)
         {
             string unitworkId = Request.Params["UnitWorkId"];
 
             addTestPackage(PipelineList, unitworkId);
-            addHJGL_WeldJoints(PipelineList, unitworkId);
+            addPTP_PipelineList(PipelineList, unitworkId);
 
         }
         void addTestPackage(List<Model.View_TestPackage_PipelineList> PipelineList, string UnitWorkId)
@@ -448,7 +472,8 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                  TestPackageName=x.TestPackageName,
                                  Tabler =x.Tabler,
                                  TableDate=x.TableDate,
-                                 Remark = x.Remark
+                                 Remark = x.Remark,
+                                 AdjustTestPressure=x.AdjustTestPressure
                              }).DistinctBy(temp => new
                              {
                                  temp.PTP_ID,
@@ -457,7 +482,8 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                  temp.UnitWorkId,
                                  temp.TestPackageNo,
                                  temp.TestPackageName,
-                                 temp.Remark
+                                 temp.Remark,
+                                 temp.AdjustTestPressure
                              }).ToList();
             for (int i = 0; i < pipelines.Count(); i++)
             {
@@ -471,6 +497,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 pipeline.Tabler = pipelines[i].Tabler;
                 pipeline.TableDate = pipelines[i].TableDate;
                 pipeline.Remark = pipelines[i].Remark;
+                pipeline.AdjustTestPressure = pipelines[i].AdjustTestPressure;
 
                 var isExistTestPackageNo = TestPackageEditService.GetTestPackageByNo(pipeline.TestPackageNo, pipeline.UnitWorkId);
                 if (isExistTestPackageNo != null) // 更新试压包
@@ -485,40 +512,41 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 }
             }
         }
-        void addHJGL_WeldJoints(List<Model.View_TestPackage_PipelineList> PipelineList, string UnitWorkId)
+        void addPTP_PipelineList(List<Model.View_TestPackage_PipelineList> PipelineList, string UnitWorkId)
         {
             Model.SGGLDB db = Funs.DB;
-            var getpipelines = from y in db.PTP_TestPackage where y.UnitWorkId == UnitWorkId select y;
-            var allWeldJoints = from x in db.PTP_PipelineList
+            var getTestPackage = from y in db.PTP_TestPackage where y.UnitWorkId == UnitWorkId select y;
+            var allPipelineLists = from x in db.PTP_PipelineList
                                 join y in db.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
                                 where y.UnitWorkId == UnitWorkId
                                 select x;
-            List<Model.PTP_PipelineList> weldJoints_add = new List<Model.PTP_PipelineList>();
+            List<Model.PTP_PipelineList> pipelineList_add = new List<Model.PTP_PipelineList>();
 
             var weldJoints = (from x in PipelineList
                               select new Model.PTP_PipelineList
-                              {
+                              {                                  
                                   PTP_ID = x.PTP_ID,
+                                  TestPackageNo=x.TestPackageNo,
                                   PipelineId = x.PipelineId,
-                                  TestPressure = x.TestPressure,
+                                  //TestPressure = x.TestPressure,
                               }).DistinctBy(temp => new
                               {
                                   temp.PTP_ID,
+                                  temp.TestPackageNo,
                                   temp.PipelineId,
-                                  temp.TestPressure
+                                  //temp.TestPressure
                               }).ToList();
 
             var pipelineCodes = weldJoints.Select(x => x.PTP_ID).Distinct().ToList();
             for (int i = 0; i < weldJoints.Count(); i++)
             {
                 Model.PTP_PipelineList weldJoint = new Model.PTP_PipelineList();
-                //weldJoint.PipelineId = getpipelines.Where(x => x.TestPackageNo == weldJoints[i].PipelineCode).FirstOrDefault().PipelineId;
-                //weldJoint.WeldJointCode = weldJoints[i].WeldJointCode;
-                //weldJoint.PipelineCode = weldJoints[i].PipelineCode;
-                
+                weldJoint.PTP_ID = getTestPackage.Where(x => x.TestPackageNo == weldJoints[i].TestPackageNo).FirstOrDefault().PTP_ID;
+                weldJoint.PipelineId = weldJoints[i].PipelineId;
+                //weldJoint.TestPressure = weldJoints[i].TestPressure;
 
-                var isExistJot = allWeldJoints.FirstOrDefault(x => x.PTP_ID == weldJoint.PTP_ID && x.PipelineId == weldJoint.PipelineId);
-                if (isExistJot != null) // 更新焊口
+                var isExistJot = allPipelineLists.FirstOrDefault(x => x.PTP_ID == weldJoint.PTP_ID && x.PipelineId == weldJoint.PipelineId);
+                if (isExistJot != null) // 更新试压管线
                 {
                     weldJoint.PT_PipeId = isExistJot.PT_PipeId;
                     BLL.TestPackageEditService.UpdatePipelineList(weldJoint);
@@ -526,130 +554,43 @@ namespace FineUIPro.Web.HJGL.TestPackage
                 else // 增加试压管线
                 {
                     weldJoint.PT_PipeId = SQLHelper.GetNewID();
-                    weldJoints_add.Add(weldJoint);
+                    pipelineList_add.Add(weldJoint);
                 }
             }
-            if (weldJoints_add.Count > 0)
+            if (pipelineList_add.Count > 0)
             {
-                //BLL.TestPackageEditService.AddPipelineList(weldJoints_add);
-            }
-            Model.SGGLDB db2 = Funs.DB;
-            List<Model.PTP_PipelineList> delJoints = new List<Model.PTP_PipelineList>();
-            var allWeldJoints2 = from x in db2.PTP_PipelineList
-                                 join y in db2.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
-                                 where y.UnitWorkId == Request.Params["UnitWorkId"]
-                                 select x;
-            foreach (var pipelineCode in pipelineCodes)
-            {
-                var pipelineWeldJointCodes = weldJoints.Where(x => x.PTP_ID == pipelineCode).Select(x => x.PipelineId).ToList();
-                var q = allWeldJoints2.Where(x => x.PTP_ID == pipelineCode && !pipelineWeldJointCodes.Contains(x.PipelineId)).ToList();
-                delJoints.AddRange(q);
-            }
-            if (delJoints.Count() > 0)
-            {
-                try
-                {
-                    db2.PTP_PipelineList.DeleteAllOnSubmit(delJoints);
-                    db2.SubmitChanges();
-                }
-                catch (Exception)
-                {
-                    string weldJointCodes = string.Empty;
-                    foreach (var item in delJoints)
-                    {
-                        weldJointCodes += item.PipelineId + ",";
-                    }
-                    Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning);
-                }
+                BLL.TestPackageEditService.AddPipelineLists(pipelineList_add);
             }
+            //Model.SGGLDB db2 = Funs.DB;
+            //List<Model.PTP_PipelineList> delJoints = new List<Model.PTP_PipelineList>();
+            //var allWeldJoints2 = from x in db2.PTP_PipelineList
+            //                     join y in db2.PTP_TestPackage on x.PTP_ID equals y.PTP_ID
+            //                     where y.UnitWorkId == Request.Params["UnitWorkId"]
+            //                     select x;
+            //foreach (var pipelineCode in pipelineCodes)
+            //{
+            //    var pipelineWeldJointCodes = weldJoints.Where(x => x.PTP_ID == pipelineCode).Select(x => x.PipelineId).ToList();
+            //    var q = allWeldJoints2.Where(x => x.PTP_ID == pipelineCode && !pipelineWeldJointCodes.Contains(x.PipelineId)).ToList();
+            //    delJoints.AddRange(q);
+            //}
+            //if (delJoints.Count() > 0)
+            //{
+            //    try
+            //    {
+            //        db2.PTP_PipelineList.DeleteAllOnSubmit(delJoints);
+            //        db2.SubmitChanges();
+            //    }
+            //    catch (Exception)
+            //    {
+            //        string weldJointCodes = string.Empty;
+            //        foreach (var item in delJoints)
+            //        {
+            //            weldJointCodes += item.PipelineId + ",";
+            //        }
+            //        Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning);
+            //    }
+            //}
         }
-
-        //public void AddView_HJGL_WeldJoint(List<Model.View_HJGL_WeldJoint> PipelineList)
-        //{
-        //    string unitworkId = Request.Params["UnitWorkId"];
-
-        //    var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId== unitworkId select x;
-        //    List<Model.HJGL_WeldJoint> weldJoints_add = new List<Model.HJGL_WeldJoint>(); 
-
-        //    for (int i = 0; i < PipelineList.Count(); i++)
-        //    {
-        //        var pipeLineId = string.Empty;
-        //        var WeldJointId = string.Empty;
-
-        //        Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline();
-        //        pipeline.PipelineId = PipelineList[i].PipelineId;
-        //        pipeline.ProjectId = this.CurrUser.LoginProjectId;
-        //        pipeline.UnitId = PipelineList[i].UnitId;
-        //        pipeline.UnitWorkId = PipelineList[i].UnitWorkId;
-        //        pipeline.PipelineCode = PipelineList[i].PipelineCode;
-        //        pipeline.SingleName = PipelineList[i].SingleName;
-        //        pipeline.SingleNumber = PipelineList[i].SingleNumber;
-        //        pipeline.MediumId = PipelineList[i].MediumId;
-        //        pipeline.PipingClassId = PipelineList[i].PipingClassId;
-        //        pipeline.DetectionRateId = PipelineList[i].DetectionRateId;
-        //        pipeline.DetectionType = PipelineList[i].DetectionType;
-        //        pipeline.DesignPress = PipelineList[i].DesignPress;
-        //        pipeline.DesignTemperature = PipelineList[i].DesignTemperature;
-        //        pipeline.TestMedium = PipelineList[i].TestMedium;
-        //        pipeline.TestPressure = PipelineList[i].TestPressure;
-        //        pipeline.PressurePipingClassId = PipelineList[i].PressurePipingClassId;
-        //        pipeline.PipeLenth = PipelineList[i].PipeLenth;
-        //        pipeline.LeakMedium = PipelineList[i].LeakMedium;
-        //        pipeline.LeakPressure = PipelineList[i].LeakPressure;
-        //        pipeline.VacuumPressure = PipelineList[i].VacuumPressure;
-        //        pipeline.PCMedium = PipelineList[i].PCMedium;
-        //        pipeline.MaterialId = PipelineList[i].MaterialId;
-        //        pipeline.Remark = PipelineList[i].Remark;
-
-        //        var isExistPipelineCode = getPipeline.FirstOrDefault(x => x.PipelineCode == pipeline.PipelineCode && x.UnitWorkId == Request.Params["UnitWorkId"]);
-        //        if (isExistPipelineCode != null) // 更新管线
-        //        {
-        //            pipeLineId = isExistPipelineCode.PipelineId;
-        //            pipeline.PipelineId = isExistPipelineCode.PipelineId;
-        //            BLL.PipelineService.UpdatePipeline(pipeline);
-        //        }
-        //        else // 增加管线
-        //        {
-        //            pipeLineId = SQLHelper.GetNewID();
-        //            pipeline.PipelineId = pipeLineId;
-        //            BLL.PipelineService.AddPipeline(pipeline);
-
-        //        }
-
-        //        Model.HJGL_WeldJoint weldJoint = new Model.HJGL_WeldJoint();
-        //        weldJoint.PipelineId = pipeLineId;
-        //        weldJoint.WeldJointCode = PipelineList[i].WeldJointCode;
-        //        weldJoint.PipelineCode = PipelineList[i].PipelineCode;
-        //        weldJoint.Material1Id = PipelineList[i].Material1Id;
-        //        weldJoint.Material2Id = PipelineList[i].Material2Id;
-        //        weldJoint.Dia = PipelineList[i].Dia;
-        //        weldJoint.Size = PipelineList[i].Size;
-        //        weldJoint.Thickness = PipelineList[i].Thickness;
-        //        weldJoint.Specification = PipelineList[i].Specification;
-        //        weldJoint.WeldTypeId = PipelineList[i].WeldTypeId;
-        //        weldJoint.DetectionTypeId = PipelineList[i].DetectionTypeId;
-        //        weldJoint.JointAttribute = PipelineList[i].JointAttribute;
-        //        weldJoint.ProjectId= PipelineList[i].ProjectId;
-        //        var isExistJot = getPipeline.FirstOrDefault(x => x.PipelineId == pipeLineId && x.WeldJointCode == PipelineList[i].WeldJointCode);
-        //        if (isExistJot != null) // 更新焊口
-        //        {
-        //            weldJoint.WeldJointId = isExistJot.WeldJointId;
-        //            BLL.WeldJointService.UpdateWeldJoint(weldJoint);
-        //        }
-        //        else // 增加焊口
-        //        {
-        //            weldJoint.WeldJointId=SQLHelper.GetNewID();
-        //            weldJoints_add.Add(weldJoint); 
-        //            //BLL.WeldJointService.AddWeldJoint(weldJoint);
-        //        }
-        //    }
-        //    if (weldJoints_add.Count>0)
-        //    {
-        //        BLL.WeldJointService.AddBulkWeldJoint(weldJoints_add);
-
-        //    }
-
-        //}
         #endregion
 
         /// <summary>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 68ebc382..dab0ae56 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -12229,7 +12229,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
 		public string ApproveIdea
 		{
 			get
@@ -97580,10 +97580,10 @@ namespace Model
 		
 		private string _TrainNumber;
 		
-		private System.Nullable<int> _TypeInt;
-		
 		private string _TrainNumberId;
 		
+		private System.Nullable<int> _TypeInt;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -97612,10 +97612,10 @@ namespace Model
     partial void OnReceiveDateChanged();
     partial void OnTrainNumberChanging(string value);
     partial void OnTrainNumberChanged();
-    partial void OnTypeIntChanging(System.Nullable<int> value);
-    partial void OnTypeIntChanged();
     partial void OnTrainNumberIdChanging(string value);
     partial void OnTrainNumberIdChanged();
+    partial void OnTypeIntChanging(System.Nullable<int> value);
+    partial void OnTypeIntChanged();
     #endregion
 		
 		public HJGL_PackagingManage()
@@ -97863,26 +97863,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
-		public System.Nullable<int> TypeInt
-		{
-			get
-			{
-				return this._TypeInt;
-			}
-			set
-			{
-				if ((this._TypeInt != value))
-				{
-					this.OnTypeIntChanging(value);
-					this.SendPropertyChanging();
-					this._TypeInt = value;
-					this.SendPropertyChanged("TypeInt");
-					this.OnTypeIntChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
 		public string TrainNumberId
 		{
@@ -97903,6 +97883,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
+		public System.Nullable<int> TypeInt
+		{
+			get
+			{
+				return this._TypeInt;
+			}
+			set
+			{
+				if ((this._TypeInt != value))
+				{
+					this.OnTypeIntChanging(value);
+					this.SendPropertyChanging();
+					this._TypeInt = value;
+					this.SendPropertyChanged("TypeInt");
+					this.OnTypeIntChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -108994,7 +108994,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
 		public string Rectification
 		{
 			get
@@ -109120,7 +109120,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")]
 		public string Measures
 		{
 			get
@@ -161691,7 +161691,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
 		public string AttentPerson
 		{
 			get
@@ -192674,7 +192674,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
 		public string ProjectDescription
 		{
 			get
@@ -192794,7 +192794,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
 		public string CalculationRule
 		{
 			get
@@ -192854,7 +192854,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
 		public string ConstructionSubcontractor
 		{
 			get
@@ -193238,7 +193238,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
 		public System.Nullable<decimal> WorkPackageEstimate
 		{
 			get
@@ -193543,16 +193543,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private string _ContractId;
-		
-		private string _OrderCode;
-		
-		private System.Nullable<System.DateTime> _OrderInDate;
-		
-		private System.Nullable<System.DateTime> _OrderOutDate;
-		
-		private string _MaterialRequisitionUnit;
-		
 		private System.Nullable<int> _State;
 		
 		private string _InvoiceCode;
@@ -193581,6 +193571,16 @@ namespace Model
 		
 		private string _CreateUser;
 		
+		private string _ContractId;
+		
+		private System.Nullable<System.DateTime> _OrderInDate;
+		
+		private string _OrderCode;
+		
+		private System.Nullable<System.DateTime> _OrderOutDate;
+		
+		private string _MaterialRequisitionUnit;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -193589,16 +193589,6 @@ namespace Model
     partial void OnInvoiceIdChanged();
     partial void OnProjectIdChanging(string value);
     partial void OnProjectIdChanged();
-    partial void OnContractIdChanging(string value);
-    partial void OnContractIdChanged();
-    partial void OnOrderCodeChanging(string value);
-    partial void OnOrderCodeChanged();
-    partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnOrderInDateChanged();
-    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnOrderOutDateChanged();
-    partial void OnMaterialRequisitionUnitChanging(string value);
-    partial void OnMaterialRequisitionUnitChanged();
     partial void OnStateChanging(System.Nullable<int> value);
     partial void OnStateChanged();
     partial void OnInvoiceCodeChanging(string value);
@@ -193627,6 +193617,16 @@ namespace Model
     partial void OnCreateDateChanged();
     partial void OnCreateUserChanging(string value);
     partial void OnCreateUserChanged();
+    partial void OnContractIdChanging(string value);
+    partial void OnContractIdChanged();
+    partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnOrderInDateChanged();
+    partial void OnOrderCodeChanging(string value);
+    partial void OnOrderCodeChanged();
+    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnOrderOutDateChanged();
+    partial void OnMaterialRequisitionUnitChanging(string value);
+    partial void OnMaterialRequisitionUnitChanged();
     #endregion
 		
 		public PHTGL_Invoice()
@@ -193674,106 +193674,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
-		public string ContractId
-		{
-			get
-			{
-				return this._ContractId;
-			}
-			set
-			{
-				if ((this._ContractId != value))
-				{
-					this.OnContractIdChanging(value);
-					this.SendPropertyChanging();
-					this._ContractId = value;
-					this.SendPropertyChanged("ContractId");
-					this.OnContractIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
-		public string OrderCode
-		{
-			get
-			{
-				return this._OrderCode;
-			}
-			set
-			{
-				if ((this._OrderCode != value))
-				{
-					this.OnOrderCodeChanging(value);
-					this.SendPropertyChanging();
-					this._OrderCode = value;
-					this.SendPropertyChanged("OrderCode");
-					this.OnOrderCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
-		public System.Nullable<System.DateTime> OrderInDate
-		{
-			get
-			{
-				return this._OrderInDate;
-			}
-			set
-			{
-				if ((this._OrderInDate != value))
-				{
-					this.OnOrderInDateChanging(value);
-					this.SendPropertyChanging();
-					this._OrderInDate = value;
-					this.SendPropertyChanged("OrderInDate");
-					this.OnOrderInDateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
-		public System.Nullable<System.DateTime> OrderOutDate
-		{
-			get
-			{
-				return this._OrderOutDate;
-			}
-			set
-			{
-				if ((this._OrderOutDate != value))
-				{
-					this.OnOrderOutDateChanging(value);
-					this.SendPropertyChanging();
-					this._OrderOutDate = value;
-					this.SendPropertyChanged("OrderOutDate");
-					this.OnOrderOutDateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
-		public string MaterialRequisitionUnit
-		{
-			get
-			{
-				return this._MaterialRequisitionUnit;
-			}
-			set
-			{
-				if ((this._MaterialRequisitionUnit != value))
-				{
-					this.OnMaterialRequisitionUnitChanging(value);
-					this.SendPropertyChanging();
-					this._MaterialRequisitionUnit = value;
-					this.SendPropertyChanged("MaterialRequisitionUnit");
-					this.OnMaterialRequisitionUnitChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
 		public System.Nullable<int> State
 		{
@@ -194054,6 +193954,106 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
+		public string ContractId
+		{
+			get
+			{
+				return this._ContractId;
+			}
+			set
+			{
+				if ((this._ContractId != value))
+				{
+					this.OnContractIdChanging(value);
+					this.SendPropertyChanging();
+					this._ContractId = value;
+					this.SendPropertyChanged("ContractId");
+					this.OnContractIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
+		public System.Nullable<System.DateTime> OrderInDate
+		{
+			get
+			{
+				return this._OrderInDate;
+			}
+			set
+			{
+				if ((this._OrderInDate != value))
+				{
+					this.OnOrderInDateChanging(value);
+					this.SendPropertyChanging();
+					this._OrderInDate = value;
+					this.SendPropertyChanged("OrderInDate");
+					this.OnOrderInDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
+		public string OrderCode
+		{
+			get
+			{
+				return this._OrderCode;
+			}
+			set
+			{
+				if ((this._OrderCode != value))
+				{
+					this.OnOrderCodeChanging(value);
+					this.SendPropertyChanging();
+					this._OrderCode = value;
+					this.SendPropertyChanged("OrderCode");
+					this.OnOrderCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
+		public System.Nullable<System.DateTime> OrderOutDate
+		{
+			get
+			{
+				return this._OrderOutDate;
+			}
+			set
+			{
+				if ((this._OrderOutDate != value))
+				{
+					this.OnOrderOutDateChanging(value);
+					this.SendPropertyChanging();
+					this._OrderOutDate = value;
+					this.SendPropertyChanged("OrderOutDate");
+					this.OnOrderOutDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
+		public string MaterialRequisitionUnit
+		{
+			get
+			{
+				return this._MaterialRequisitionUnit;
+			}
+			set
+			{
+				if ((this._MaterialRequisitionUnit != value))
+				{
+					this.OnMaterialRequisitionUnitChanging(value);
+					this.SendPropertyChanging();
+					this._MaterialRequisitionUnit = value;
+					this.SendPropertyChanged("MaterialRequisitionUnit");
+					this.OnMaterialRequisitionUnitChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -217713,6 +217713,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _HoldingTime;
 		
+		private string _TestPackageNo;
+		
 		private EntityRef<HJGL_Pipeline> _HJGL_Pipeline;
 		
 		private EntityRef<PTP_TestPackage> _PTP_TestPackage;
@@ -217743,6 +217745,8 @@ namespace Model
     partial void OnTestPressureChanged();
     partial void OnHoldingTimeChanging(System.Nullable<decimal> value);
     partial void OnHoldingTimeChanged();
+    partial void OnTestPackageNoChanging(string value);
+    partial void OnTestPackageNoChanged();
     #endregion
 		
 		public PTP_PipelineList()
@@ -217980,6 +217984,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageNo", DbType="VarChar(50)")]
+		public string TestPackageNo
+		{
+			get
+			{
+				return this._TestPackageNo;
+			}
+			set
+			{
+				if ((this._TestPackageNo != value))
+				{
+					this.OnTestPackageNoChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackageNo = value;
+					this.SendPropertyChanged("TestPackageNo");
+					this.OnTestPackageNoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PTP_PipelineList_HJGL_Pipeline", Storage="_HJGL_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)]
 		public HJGL_Pipeline HJGL_Pipeline
 		{
@@ -311860,6 +311884,8 @@ namespace Model
 		
 		private string _UnitName;
 		
+		private string _AdjustTestPressure;
+		
 		public View_TestPackage_PipelineList()
 		{
 		}
@@ -312135,6 +312161,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="adjustTestPressure", Storage="_AdjustTestPressure", DbType="NVarChar(100)")]
+		public string AdjustTestPressure
+		{
+			get
+			{
+				return this._AdjustTestPressure;
+			}
+			set
+			{
+				if ((this._AdjustTestPressure != value))
+				{
+					this._AdjustTestPressure = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Training_TestTrainingItem")]
@@ -312935,7 +312977,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
 		public string Name
 		{
 			get
@@ -313512,7 +313554,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
 		public string PackageContent
 		{
 			get
@@ -313703,7 +313745,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
 		public string PackageContent
 		{
 			get
@@ -319042,7 +319084,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
 		public string PackageContent
 		{
 			get
@@ -320514,7 +320556,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
 		public string PackageContent
 		{
 			get
@@ -330065,7 +330107,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
 		public string ContractNo
 		{
 			get
@@ -330085,7 +330127,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
 		public string UnitWorks
 		{
 			get