From 97896322f603a8c60f812ed5e32bca7c8e072ff5 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Wed, 7 Dec 2022 17:16:29 +0800
Subject: [PATCH] =?UTF-8?q?2022-12-07=20=E7=84=8A=E6=8E=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 24064 -> 22528 bytes
 DataBase/版本日志/SGGLDB_V2022-11-28.sql      |   1 +
 .../WeldingManage/PipelineListPDMSIn.aspx.cs  |   8 ++++----
 .../BiddingManagement/SetSubReviewDetail.aspx |   4 ++--
 .../BiddingManagement/SetSubReviewEdit.aspx   |   2 +-
 .../BiddingManagement/SetSubReviewEdit2.aspx  |   2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-11-28.sql

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 6ea53edcfc31c3a2be37b29a2da423c472f31277..47f3936e8e51794939eb8941103316149e94163b 100644
GIT binary patch
delta 1658
zcmcgs-%DF}6wir?#(0xnUHs8vqjlG4G;z7+HchRrw>B}#7^n$W=u;OXEw~j*BDK=y
zzKlIM#&$n_=}RBlx0XU@piiZwbiPhs$6ovc29;tMbFl1uuLkT!nH_B3a5(3DzUO?;
z=bZ2N#&}M~Q+m2&_vp#ZXp{RVI%eaA75gf=QL$GkjY?gg(!^kumzQ+|%W;+-mOmKt
zus+Fxokrh$BO4;Hwp#z<cOCfBA^bzO1Bd+n13SoifW^o1{Y-{T`;tfA`te;f8wQKb
z94RQ)stbLXqOe<d{{t4$g4jPQ<8F=@EsLCYF!oeylw}UID7(8MyIl@3RfOF0vS3h?
zUItBfM`wt&z=jUAuvNB)t$m*(&Kle9t4=HNyP1+HO}gqC<hUxD8x%T?f>fjdRHU@4
zHc4wEjDqL!f5AY`BR|-QZ{-CFlqzzX-h<GZITS#kW0oAHm5#5-^yMjrg0Dz}sI(PH
zL!q@;e}?;8cVh4O9tBZ3QFST|WU$hig5If@%HsyD`x7LI8Hg*b&EjFci>R?w=w2h-
zOnTu}p1~I!eb7tL1MB`9%h$5GPp>cJmWIxp&Ar~Z(Y$m2<6k#!E7yMUoLVkz1tM?r
zVODSRIdyBl@gA%3o+dK2-F=3V#gM6pb);hbik+gU3>2vkg~4LIcwP=0_S)}=(S&}t
z8W~z6GnS{1P>2;Nf=aCF6wl9v-_%us4qNDORkBb~o0sXo=pg}!H&z=B^8RW3V2@ze
zKmE74A>Z{i<WIaMukwZ{2^u*s4bP>gi4RC#Oi!aZsG)pLe^?$Nb5#F_i1kr};2qUr
zjOiv{m(Cf7e0;-O``7q0;c}wa!BuQf$69eO(MN=riSy8t8I};X?LOR1hU&;hc$FN3
zp1Ay;DK6`HQQ_rO9L7W(Hzy=0b{TgkLT2g<jHg;)q~=gg`S2*!W==-1lal{sTKEZ9
z68~As;$kcsiK|*T9*r)9wMaA<jxT<ug=6X!b>T`*jcV#yd_HNk#j{!M_INm*8Hw<3
zRn2OPJa@dB9COWYy7?$}wl6UCseW9Y>TrrnvEj?9bLOo6KbJew!{)CD`fM3<m)h}S
WHuxY-B|T%*A)7e?&!qsrCH+r|rBBWP

delta 1719
zcmd5+U1(cn7(Q>>^d~(@+cnv;HY?qlrFG4jNqUy1Rd<eSvZj#0x}<SpktI!|7ef#d
z*c^DGH(pF+%_E4+-OL}9;h4#VC@OL6ehMP&V&H{dilPfr2aE4_*37nc7b=1;ynNsL
zJn#2?&-0z1@>ME-MpsW+>_1;AcYGk-q<%?~beyrArCu~FO-iHDHfG3-HrJz*=e?Y6
z&b^#>8F%m~XwUj6u%7j~z(qK>)O)zLZ^8C)J<2(;8DCxMm;DSWoCBO6EySr}Ib}b8
z-FT4b&IzNNJNr1r;X<$&MYII(W=secwTSHm3zPTQW>W|r*-#7f4-hPtte&*r7rld9
zP0_XyS;!JciiF>GqF?OM0>tRUs%>bu@G7c@H?Sd|Pcpj;-`Sq+PPG^;^!(Q4<BHpx
zSRL_F7$w=D2{hzXmjFeW#6gtom;VC^wT0eMqK8oGGia>V=u6Sx5Ol7xvq)1Y?KH@b
zhS#7&DD5&jBJ8MY#qX{c{v^3&Gdb`gC2D7!uTaH(n+~AiZd&*Ax->q~=AaMil|db^
z9ex>>p)abQD9Ig6il@=Kk++L`h-|ge@HwjZio$`<bl~eDL}HGbBk~KO{Dh8QGcLIH
zUBtM>acT4~P<7%qk&1@jK(Wt*^Ge<--s5(x4H!b;!8_(D0Y1eam0e5?ZxDf^zr6kG
z$+HwdNi`^lhT61xc~KYE#_nvgx)wCMLS|Q})fJ4nO!agGG^5GHOGU<#N7MLvN|i&I
z)G-s7O&zPfI-|0u86AT|@4-Dd&UaQtS<|6w`oG=)j>Ejs{by0L%sxrD5ZzA_zKm)_
zczkXadd#^gUyu2**W$!CF@G1C$|VV&#fY_?O-P8vHALfT_tFm^zx(~?Z!HlwyKyr<
zhI;(D9nNcauMH>OxtPE5#_&(m3F)g(q0eXV?fe1M=L3)NO_20v+v%5{@}AZu$?_rZ
zD1J}gmBOKwe7;an)O>hZQNy8-5(#F5N>~kNLxtSbbar_KN}`M(69cU3Uf`rQ!WP|~
zCvMmTg1O{0^yE0+PrBKhXHi3a_QL<uuo{>w1eSBcVJ@$z*~pZV%d+d0>0BVMh9i+&
zF!xUkZ}Y|Iv36WfK3X|mzmy`>kL%TRxefgb{Az4vD(PFevG@p{UVI+mjK=e4a4UVZ
LR?6^K$t(T<%AJ86

diff --git a/DataBase/版本日志/SGGLDB_V2022-11-28.sql b/DataBase/版本日志/SGGLDB_V2022-11-28.sql
new file mode 100644
index 00000000..cb77f8f1
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-11-28.sql
@@ -0,0 +1 @@
+alter table [dbo].[HJGL_Pipeline_Component] alter column [QRCode] nvarchar(max)
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
index 5db62e06..bc5b38d7 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
@@ -1086,8 +1086,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     }
 
 
-                    string col23 = pds[i].X;
-                    if (!string.IsNullOrEmpty(col23))
+                    var col23 = pds[i].X;
+                    if (col23!=null)
                     {
                         try
                         {
@@ -1104,8 +1104,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         result += "第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|";
                     }
 
-                    string col24 = pds[i].Y;
-                    if (!string.IsNullOrEmpty(col24))
+                    var col24 = pds[i].Y;
+                    if (col24!=null)
                     {
                         try
                         {
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
index 8ae557d4..a759843e 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
@@ -62,7 +62,7 @@
                         <f:FormRow>
                             <Items>
                                 <f:Grid ID="Grid_MinPrice" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
-                                    runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex"
+                                    runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex" AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false"
                                     EnableColumnLines="true" DataIDField="ID">
 
                                     <Columns>
@@ -84,7 +84,7 @@
                         <f:FormRow>
                             <Items>
                                 <f:Grid ID="Grid_ConEvaluation" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
-                                    runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex"
+                                    runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex" AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false"
                                     EnableColumnLines="true" DataIDField="ID">
 
                                     <Columns>
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
index 9a7f660a..0bd7c766 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
@@ -67,7 +67,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                                                     runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
-                                                    EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex">
+                                                    EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex"  AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false">
                                                     <Toolbars>
                                                         <f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
                                                             <Items>
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
index 1974e834..486ff66d 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
@@ -74,7 +74,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                                                     runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
-                                                    EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex">
+                                                    EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex"  AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false">
                                                     <Toolbars>
                                                         <f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
                                                             <Items>