diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 82dc829..303919c 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -538,8 +538,8 @@
                                 }
                                 else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
                                 {
-                                    materialType = "FeⅢ";
-                                    materialTypeName = "合金钢";
+                                    materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                    materialTypeName = "合金钢,不锈钢,碳钢";
                                 }
                                 else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
                                 {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index b418b68..6e3daaf 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
@@ -109,8 +109,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 if (b)
                 {
                     string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p 
-                                    WHERE p.OrderDate<CONVERT(char(10),GetDate(),120) 
-                                          AND p.IsCancel=0 AND OrderTime=@OrderTime
+                                    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 (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
                     List<SqlParameter> listStr = new List<SqlParameter>();
                     listStr.Add(new SqlParameter("@OrderTime", orderTime));
diff --git a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
index cf949bf..2875e1a 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
@@ -436,8 +436,8 @@ namespace FineUIPro.Web.Welder
                                     }
                                     else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
                                     {
-                                        materialType = "FeⅢ";
-                                        materialTypeName = "合金钢";
+                                        materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                        materialTypeName = "合金钢,不锈钢,碳钢";
                                     }
                                     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Ⅲ"))
                                     {
-                                        materialType = "FeⅢ";
-                                        materialTypeName = "合金钢";
+                                        materialType = "FeⅢ,FeⅡ,FeⅠ";
+                                        materialTypeName = "合金钢,不锈钢,碳钢";
                                     }
                                     else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
                                     {