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

2022-12-09 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-12-09 14:46:31 +08:00
parent ce763f6a52
commit b80cb47621
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+1 -1
View File
@@ -34,7 +34,7 @@
<Items> <Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程" <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true" OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" AutoLeafIdentification="true"
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded"> EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
</f:Tree> </f:Tree>
</Items> </Items>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+1 -1
View File
@@ -33,7 +33,7 @@
<Items> <Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程" <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true" OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" AutoLeafIdentification="true"
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded"> EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
</f:Tree> </f:Tree>
</Items> </Items>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+2 -1
View File
@@ -768,7 +768,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
NewItem.WeldingWireCode = values.Value<string>("WeldingWireCode").ToString(); NewItem.WeldingWireCode = values.Value<string>("WeldingWireCode").ToString();
} }
if (!string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
if (!string.IsNullOrEmpty(values.Value<string>("Size"))&&!string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
{ {
NewItem.Size = values.Value<int>("Size"); NewItem.Size = values.Value<int>("Size");
} }