1

BLL/MaterialEdit.cs

@@ -420,15 +420,15 @@ namespace BLL
                // OCR oCR = new();
                // OCR oCR = new();
                 for (int i = 0; i < ocrlist.Count; i++)
                 for (int i = 0; i < ocrlist.Count; i++)
                 {
                 {
-                    //List<MaterialCodeMatch> codeMatch = mateTemp[index].Match.FindAll(match => match.CodeID == mateTemp[index].Ocr[i].ID && match.Keyword != "");
                     List<MaterialCodeMatch> codeMatch = mateTemp[index].Match.FindAll(match => match.CodeID == ocrlist[i].ID);
                     List<MaterialCodeMatch> codeMatch = mateTemp[index].Match.FindAll(match => match.CodeID == ocrlist[i].ID);
-                    //if (codeMatch.Count == 0) continue;
                     matchCount += codeMatch.Count;
                     matchCount += codeMatch.Count;
-                    //MaterialCode codeTemp = mateTemp[index].Code.Find(match => match.ID == mateTemp[index].Ocr[i].CodeID);
-                    //if (codeTemp == null) continue;
                     
                     
+
                     Bitmap bmp = CodeOcr(ocrcode[i], ocrlist[i], CurrntBitmap);
                     Bitmap bmp = CodeOcr(ocrcode[i], ocrlist[i], CurrntBitmap);
+                    #region ocrr文字提取开始
+                    //ocr匹配调用
                     var resp = namedPipeClient.Request("..\\ocr.jpg");
                     var resp = namedPipeClient.Request("..\\ocr.jpg");
+                    //ocr结果
                     var lp = JsonConvert.DeserializeObject<List<TextBlock>>(resp);
                     var lp = JsonConvert.DeserializeObject<List<TextBlock>>(resp);
                     string codeOcr = "";
                     string codeOcr = "";
                     double maxbox = 0;
                     double maxbox = 0;
@@ -439,6 +439,7 @@ namespace BLL
                             codeOcr = l.Text;
                             codeOcr = l.Text;
                         }
                         }
                     }
                     }
+                    #endregion ocr文字提取结束
                     var x = new BarcodeInfo() {Text=codeOcr,CodeType="OCR"};
                     var x = new BarcodeInfo() {Text=codeOcr,CodeType="OCR"};
                     Dictionary<string, string> matchKey = CodeMatch(x, codeMatch);
                     Dictionary<string, string> matchKey = CodeMatch(x, codeMatch);
                     if (matchKey != null)
                     if (matchKey != null)