lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-12-07 焊接导入修改

This commit is contained in:
李鹏飞 2022-12-07 17:16:29 +08:00
parent a2d3fd4cb2
commit 97896322f6
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin/v17/.wsuo
View File

Binary file not shown.

1
DataBase/版本日志/SGGLDB_V2022-11-28.sql Normal file
View File

@ -0,0 +1 @@
alter table [dbo].[HJGL_Pipeline_Component] alter column [QRCode] nvarchar(max)

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
View File

@ -1086,8 +1086,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
string col23 = pds[i].X; var col23 = pds[i].X;
if (!string.IsNullOrEmpty(col23)) if (col23!=null)
{ {
try try
{ {
@ -1104,8 +1104,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
result += "第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|"; result += "第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|";
} }
string col24 = pds[i].Y; var col24 = pds[i].Y;
if (!string.IsNullOrEmpty(col24)) if (col24!=null)
{ {
try try
{ {

4
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
View File

@ -62,7 +62,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Grid ID="Grid_MinPrice" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <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"> EnableColumnLines="true" DataIDField="ID">
<Columns> <Columns>
@ -84,7 +84,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Grid ID="Grid_ConEvaluation" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <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"> EnableColumnLines="true" DataIDField="ID">
<Columns> <Columns>

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
View File

@ -67,7 +67,7 @@
<Items> <Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true" 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> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items> <Items>

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
View File

@ -74,7 +74,7 @@
<Items> <Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true" 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> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items> <Items>