yhluo 4 hónapja
szülő
commit
643af68891

+ 1 - 1
UAS_MES_HGS/FunctionCode/Make/Make_ImeiCheck.cs

@@ -71,7 +71,7 @@ namespace UAS_MES_NEW.Make
                     sql.Clear();
                     sql.Append("select ms_sncode from makeserial where ms_sncode ='" + sncode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count == 0 || dt.Rows[0]["mal_id"].ToString() == "")
+                    if (dt.Rows.Count == 0 || dt.Rows[0]["ms_sncode"].ToString() == "")
                     {
                         OperateResult.AppendText("<<SN错误,序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);

+ 8 - 3
UAS_MES_HGS/FunctionCode/Make/Make_ParseLog.cs

@@ -68,8 +68,8 @@ namespace UAS_MES_NEW.Make
             watcher = new FileSystemWatcher();
             watcher.NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite;
             watcher.Created += OnFileCreated;
-            /*watcher.Changed += OnFileChanged;
-            watcher.Deleted += OnFileChanged;
+            watcher.Changed += OnFileChanged;
+            /*watcher.Deleted += OnFileChanged;
             watcher.Renamed += OnFileChanged;*/
 
             //设置锁定工单
@@ -280,6 +280,11 @@ namespace UAS_MES_NEW.Make
                             continue;
                         }
 
+                        if(File.ReadAllText(file).Length == 0)
+                        {
+                            continue;
+                        }
+
                         if (Device.SelectedIndex == 0)
                         {
                             ParseLogInsert(file);
@@ -336,7 +341,7 @@ namespace UAS_MES_NEW.Make
                     if (ConsoleLog(restOfStream, PathName))
                     {
                         File.WriteAllText(PathName, string.Empty);
-                        File.Delete(PathName);
+                        /*File.Delete(PathName);*/
                     }
                 }
             }