shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-10-10 10:35:01 +08:00
parent 94fc0c6aa5
commit 022aebc00d
45 changed files with 1525 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
+1
View File
@@ -39,6 +39,7 @@
<f:ListItem Value="FeⅡ" Text="FeⅡ"/>
<f:ListItem Value="FeⅢ" Text="FeⅢ"/>
<f:ListItem Value="FeⅣ" Text="FeⅣ"/>
<f:ListItem Value="NiⅢ" Text="NiⅢ"/>
<f:ListItem Value="其它" Text="其它"/>
</f:DropDownList>
</Items>
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
+2 -2
View File
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.WelderManage
}
if (!string.IsNullOrEmpty(numSizesMin.Text))
{
updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text);
updateQue.SizesMin = Convert.ToDecimal(numSizesMin.Text);
}
else
{
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.WelderManage
}
if (!string.IsNullOrEmpty(numThicknessMax.Text))
{
updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text);
updateQue.ThicknessMax = Convert.ToDecimal(numThicknessMax.Text);
}
else
{
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
+1 -1
View File
@@ -474,7 +474,7 @@ namespace FineUIPro.Web.WelderManage
}
else
{
if (queProject[2] == ("6G"))
if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs
+2 -2
View File
@@ -627,7 +627,7 @@ namespace FineUIPro.Web.WelderManage
listData.Add(model);
}
string type = "FeⅠ,FeⅡ,FeⅢ,FeⅣ,其他";
string type = "FeⅠ,FeⅡ,FeⅢ,FeⅣ,NiⅢ,其它";
var isAnyMeaterail = weldMeatrail.Split(',');
foreach (var item in isAnyMeaterail)
{
@@ -637,7 +637,7 @@ namespace FineUIPro.Web.WelderManage
model.rowId = i;
model.createdTime = DateTime.Now;
model.columnName = "焊接材质";
model.errMsg = "材质应为FeⅠ,FeⅡ,FeⅢ,FeⅣ,其他,多个用','隔开";
model.errMsg = "材质应为FeⅠ,FeⅡ,FeⅢ,FeⅣ,NiⅢ,其它,多个用','隔开";
model.isSuccess = false;
listData.Add(model);