reelID+2问题修改。

BLL/Extension/Item_General.cs

@@ -213,27 +213,6 @@ namespace BLL
             }
             }
             LogNet.log.Info($"OnKeySet1");
             LogNet.log.Info($"OnKeySet1");
             OnKeySet(templateName, originalCode, key, hasMatch);
             OnKeySet(templateName, originalCode, key, hasMatch);
-            // 添加或替换自增ID
-            string reelIdKeyWord = config.ReelIDKeyWord;
-            if (!string.IsNullOrEmpty(config.ReelIDKeyWord) && isdisplay)
-            {
-                var Reelidstr = GetReelid();
-                if (key.ContainsKey(config.ReelIDKeyWord))
-                {
-                    key[config.ReelIDKeyWord] = Reelidstr;
-                }
-                else
-                {
-                    key.Add(config.ReelIDKeyWord, Reelidstr);
-                }
-                LogNet.log.Info($"重设{config.ReelIDKeyWord}={Reelidstr}");
-            }
-
-
-
-            // 如果有字段更新，则再次调用OnKeySet更新WPF界面
-            LogNet.log.Info($"OnKeySet2");
-            OnKeySet(templateName, originalCode, key, hasMatch);
             if (lastKeys == null && !islast && BLLCommon.config.CheckFunction)
             if (lastKeys == null && !islast && BLLCommon.config.CheckFunction)
             {
             {
 
 
@@ -251,16 +230,12 @@ namespace BLL
                 (Config.DataSource_DataKey_Others.Val != null && Config.DataSource_DataKey_Others.Val.Length > 0);
                 (Config.DataSource_DataKey_Others.Val != null && Config.DataSource_DataKey_Others.Val.Length > 0);
             if (findOk)
             if (findOk)
             {
             {
-                // 添加或替换自增ID
-
+                LogNet.log.Info($"OnKeySet  匹配到外部数据源 findOK ，key=" + JsonConvert.SerializeObject(key));
+            }
+            LogNet.log.Info($"OnKeySet2");
+            OnKeySet(templateName, originalCode, key, hasMatch); 
             if (!string.IsNullOrEmpty(config.ReelIDKeyWord) && isdisplay)
             if (!string.IsNullOrEmpty(config.ReelIDKeyWord) && isdisplay)
             {
             {
-
-                    LogNet.log.Info($"OnKeySet  匹配到外部数据源 findOK ，key="+JsonConvert.SerializeObject(key));
-                    OnKeySet(templateName, originalCode, key, hasMatch);
-                    extensionsUpdate(key);
-                   
-
                 var Reelidstr = GetReelid();
                 var Reelidstr = GetReelid();
                 if (key.ContainsKey(config.ReelIDKeyWord))
                 if (key.ContainsKey(config.ReelIDKeyWord))
                 {
                 {
@@ -270,10 +245,11 @@ namespace BLL
                 {
                 {
                     key.Add(config.ReelIDKeyWord, Reelidstr);
                     key.Add(config.ReelIDKeyWord, Reelidstr);
                 }
                 }
-
-                    LogNet.log.Info($"匹配到外部数据源，重设{config.ReelIDKeyWord}={Reelidstr}");
-                }
+                LogNet.log.Info($"{(findOk ? "匹配到外部数据源，" : "")}重设{config.ReelIDKeyWord}={Reelidstr}");
+                LogNet.log.Info($"OnKeySet2 update reelId");
+                OnKeySet(templateName, originalCode, key, hasMatch);
             }
             }
+            extensionsUpdate(key);
             if (hasDataSource && ExtraFileData.hasFileData() && (!findOk) && Config.DataSource_CanReMatch)
             if (hasDataSource && ExtraFileData.hasFileData() && (!findOk) && Config.DataSource_CanReMatch)
             {
             {
                 CheckText("ReMatch_Show");
                 CheckText("ReMatch_Show");

paddleOCR/Form1.cs

@@ -112,9 +112,14 @@ namespace paddleOCR
         }
         }
         private void ItemShow_Click(object sender, EventArgs e)
         private void ItemShow_Click(object sender, EventArgs e)
         {
         {
-            Show();
             if (WindowState == FormWindowState.Minimized)
             if (WindowState == FormWindowState.Minimized)
                 WindowState = FormWindowState.Normal;
                 WindowState = FormWindowState.Normal;
+            ShowInTaskbar = true;
+            Show();
+            Activate();
+            BringToFront();
+            TopMost = true;
+            TopMost = false;
         }
         }
 
 
         private void ItemExit_Click(object sender, EventArgs e)
         private void ItemExit_Click(object sender, EventArgs e)