Merge repos.ubtob.net:usoft/mes-client

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -17,6 +17,7 @@ using System.Security;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web.Services.Description;
 using System.Web.UI.WebControls;
@@ -453,7 +454,13 @@ namespace UAS_MES_NEW.Make
                                 LogMessage($"文件: {file},无SN信息");
                                 continue;
                             }
-                            
+
+                            if (!Regex.IsMatch(SN, @"^[a-zA-Z]"))
+                            {
+                                LogMessage($"序列号: {SN}异常序列号");
+                                continue;
+                            }
+
                             if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                             {
                                 if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "日志解析", "OK", User.UserCode, out oErrorMessage))
@@ -954,6 +961,14 @@ namespace UAS_MES_NEW.Make
                                 continue;
                             }
                         }
+                        else if(equiType == "SPI")
+                        {
+                            if(!Regex.IsMatch(item.SN, @"^[a-zA-Z]"))
+                            {
+                                LogMessage($"序列号: {item.SN}异常序列号");
+                                continue;
+                            }
+                        }
 
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, item.SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                         {