1

SmartScan/SetControl/UsrCamera.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+using BLL;
+using DocumentFormat.OpenXml.Spreadsheet;
 using Model;
 
 namespace SmartScan
@@ -14,7 +16,7 @@ namespace SmartScan
         {
             InitializeComponent();
             Asa.FaceControl.Language.SetLanguage(this);
-            BtnCameraImage.Enabled = Common.cameraVision==null?false:Common.cameraVision.Count > 0;
+            BtnCameraImage.Enabled = Common.cameraVision == null ? false : Common.cameraVision.Count > 0;
         }
 
         public Asa.FaceControl.FacePanel GetPanel()
@@ -65,13 +67,6 @@ namespace SmartScan
             List<CameraVisionLib.Model.BarcodeInfo> info = Common.cameraVision.GetBarCode(bmp);
             LstCode.Items.Clear();
             PicShow.CodeCenterClear();
-            if (info.Count == 0)
-            {
-                string text = Asa.FaceControl.Language.Dialog(Model.LanguageDialogKey.CODE_COUNT);
-                new Asa.FaceControl.FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
-                return;
-            }
-
             string[] arr = new string[info.Count];
             PointF[] lst = new PointF[info.Count];
             for (int i = 0; i < info.Count; i++)
@@ -79,8 +74,29 @@ namespace SmartScan
                 arr[i] = string.Format("({0}) ", i + 1) + info[i].Text.Replace("\r\n", "");
                 lst[i] = info[i].Center;
             }
-
+            List<string> ocrs = new List<string>();
+            int startidx = info.Count + 1;
+            if (Config.Func_EnabledOCR)
+            {
+                //保存需要识别ocr的区域
+                bmp?.Save(@"ocrt.jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
+                string[] regOcrCodes = PaddleOCRHelper.StartTest("..\\ocrt.jpg").Split(';');
+                foreach (var ocr in regOcrCodes)
+                {
+                    if (string.IsNullOrEmpty(ocr)) continue;
+                    ocrs.Add($"({startidx}) {ocr} <OCR>");
+                    startidx++;
+                }
+            }
+            if (info.Count == 0)
+            {
+                string text = Asa.FaceControl.Language.Dialog(Model.LanguageDialogKey.CODE_COUNT);
+                new Asa.FaceControl.FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
+                return;
+            }
             LstCode.Items.AddRange(arr);
+            if (ocrs.Count > 0)
+                LstCode.Items.AddRange(ocrs.ToArray());
             PicShow.AddCodeCenter(lst);
         }
 

SmartScan/SetControl/UsrMaterialTemplate.Designer.cs

@@ -89,7 +89,7 @@ namespace SmartScan
             this.BtnExtractCode.Padding = new System.Windows.Forms.Padding(4);
             this.BtnExtractCode.Size = new System.Drawing.Size(227, 56);
             this.BtnExtractCode.TabIndex = 17;
-            this.BtnExtractCode.Text = "条码提取";
+            this.BtnExtractCode.Text = "提取";
             this.BtnExtractCode.Click += new System.EventHandler(this.BtnExtractCode_Click);
             // 
             // BtnPrimaryCode
@@ -159,7 +159,7 @@ namespace SmartScan
             this.BtnScanCode.Padding = new System.Windows.Forms.Padding(4);
             this.BtnScanCode.Size = new System.Drawing.Size(461, 56);
             this.BtnScanCode.TabIndex = 12;
-            this.BtnScanCode.Text = "条码识别";
+            this.BtnScanCode.Text = "识别";
             this.BtnScanCode.Click += new System.EventHandler(this.BtnScanCode_Click);
             // 
             // BtnLocalImage