新ui

BLL/Config.cs

@@ -325,9 +325,9 @@ namespace BLL
         [MyConfigComment("遍历数据源目录")]
         public static MyConfig<bool> DataSource_Recursive;
         [MyConfigComment("是否启用OCR")]
-        public static MyConfig<bool> Func_EnabledOCR=true;
-        //[MyConfigComment("是否启用飞浆OCR识别")]
-        //public static MyConfig<bool> UsePaddleOCR = true;
+        public static MyConfig<bool> Func_EnabledOCR;
+        [MyConfigComment("允许修改打内容")]
+        public static MyConfig<bool> AllowModifyPrintInfo;
 
         public void Save()
         {

BLL/Extension.cs

@@ -137,7 +137,8 @@ namespace BLL
                                 { "Height",40},
                                 { "ShowDel","False"},
                                 { "ShowQuery","False"},
-                                { "Text",""}
+                                { "Text",""},
+                                {"Enabled",Config.AllowModifyPrintInfo }
                             }
                         }
                     };

Model/LanguageDialogKey.cs

@@ -18,5 +18,9 @@ namespace Model
         public const string SAVE_SUCCEED = "SaveSucceed";
         public const string REMIND_CLEARTEMPLATE = "RemindClearTemplate";
         public const string REMIND_SELECTCODE = "RemindSelectCode";
+        public const string TEMPLATE_MATCHING_CONFLICT = "TemplateMatchingConflict";
+        public const string TEMPLATE_UN_SET_MATCHING = "TemplateUnSetMatching";
+        public const string TEMPLATE_KEY_UN_MATCHING = "TemplateKeyUnMatching";
+        public const string TEMPLATE_KEY_MATCHING_DUL = "TemplateKeyMatchingDul";
     }
 }

SmartScan/Form/FrmCodeExtract.cs

@@ -187,15 +187,15 @@ namespace SmartScan
                 else
                     keyTemp.Add(key, 1);
             }
-            if (matchButton.Keys.Count == 0) {
-                var mateCopy = BLLCommon.mateEdit.ToCopy();
-                var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null);
-                if (findocrm != null) {
-                    string text = Language.Dialog("ThisMatchHasOcrCantdelete");
-                    new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
-                    return;
-                }
-            }
+            //if (matchButton.Keys.Count == 0) {
+            //    var mateCopy = BLLCommon.mateEdit.ToCopy();
+            //    var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null);
+            //    if (findocrm != null) {
+            //        string text = Language.Dialog("ThisMatchHasOcrCantdelete");
+            //        new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
+            //        return;
+            //    }
+            //}
 
             foreach (string key in keyTemp.Keys)
             {

SmartScan/SetControl/UsrMaterialTemplate.Designer.cs

@@ -143,7 +143,6 @@ namespace SmartScan
             this.BtnTemplateValite.Size = new System.Drawing.Size(227, 56);
             this.BtnTemplateValite.TabIndex = 15;
             this.BtnTemplateValite.Text = "模板验证";
-            this.BtnTemplateValite.Visible = false;
             this.BtnTemplateValite.Click += new System.EventHandler(this.BtnTemplateValite_Click);
             // 
             // ImgShow

SmartScan/SetControl/UsrWorkMode.cs

@@ -33,7 +33,7 @@ namespace SmartScan
             ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight;
             ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting;
             ChkAutoPrint.Checked = BLLCommon.config.AutoPrint;
-
+            ChkAllowModifyPrint.Checked = Config.AllowModifyPrintInfo;
             //默认标签
             LstLabel.Items.AddRange(BLLCommon.labelEdit.Name);
             LstLabel.Text = BLLCommon.config.DefaultPrintLabel;