diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 6ea53edc..47f3936e 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ 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 @@ @@ -84,7 +84,7 @@ 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 @@ + EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false"> 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 @@ + EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">