Merge branch 'master' of https://git.steerinfo.com/caol/jisco_winform_wzjl.git

CarMeterSystem/frmMain.cs

@@ -511,9 +511,9 @@ namespace CarMeterSystem
                 {
                     if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
                     {
-                        codeFlag = false;
-                        if (!string.IsNullOrEmpty(PbCache.strCode))
+                        if (string.IsNullOrEmpty(PbCache.strCode))
                         {
+                            codeFlag = false;
                             firstCode = "";
                             PbCache.strCode = "";
                             l.WriteLog(12, "主线程扫码值为空时清空；sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ；PbCache.strCode值为：" + PbCache.strCode);