gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2026-08-11 14:41:19 +08:00
parent d59a5b7166
commit 65bc4f64e3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/Global.asax.cs
+2 -2
View File
@@ -538,8 +538,8 @@
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+2 -2
View File
@@ -109,8 +109,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (b) if (b)
{ {
string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p
WHERE p.OrderDate<CONVERT(char(10),GetDate(),120) WHERE ((p.OrderDate<CONVERT(char(10),GetDate(),120) AND OrderTime=@OrderTime) or p.OrderDate<CONVERT(char(10),DATEADD(day, -1, GETDATE()),120))
AND p.IsCancel=0 AND OrderTime=@OrderTime AND p.IsCancel=0
AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0"; AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@OrderTime", orderTime)); listStr.Add(new SqlParameter("@OrderTime", orderTime));
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+4 -4
View File
@@ -436,8 +436,8 @@ namespace FineUIPro.Web.Welder
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {
@@ -789,8 +789,8 @@ namespace FineUIPro.Web.Welder
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {