From 7608cc675f5d82f5c563f36bc6487751f67d6d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Tue, 13 May 2025 14:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=9B=B8=E6=9C=BA=E5=8F=96?=
 =?UTF-8?q?=E5=9B=BE=E5=90=8E=E9=83=BD=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E5=88=B0=E5=88=A4=E6=96=AD=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E4=B8=BA=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/IndustrialCameraController.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/IndustrialCameraController.java b/web/src/main/java/com/zhehekeji/web/controller/IndustrialCameraController.java
index ae50cc1..8e598af 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/IndustrialCameraController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/IndustrialCameraController.java
@@ -148,11 +148,16 @@ public class IndustrialCameraController {
         boolean re = false;
         //sick识别
         String code = SickSocket.readOCR(configProperties.getCameraConfig().getSickIp(), configProperties.getCameraConfig().getSickPort());
+        String pa = "";
         //2d识别
-        if (listResult.getData().size()!=0){
+        for(String path:listResult.getData()){
             re = FeatureMatchingExample.matchTemplate(
                     InventoryService.readImagesInFolder(configProperties.getSavePath().getMediaPath() + "template/" + industrialCameraVo.getTypeMacth()),
-                    configProperties.getSavePath().getMediaPath() +listResult.getData().get(0));
+                    configProperties.getSavePath().getMediaPath() +path);
+            if (re){
+                pa = path;
+                break;
+            }
         }
         //3d pcd保存
         LocalDate currentDate = LocalDate.now();
@@ -176,7 +181,7 @@ public class IndustrialCameraController {
         kuKou.setCode(code);
         kuKou.setWmsCount(industrialCameraVo.getCount());
         kuKou.setWmsCode(industrialCameraVo.getCode());
-        kuKou.setPath(configProperties.getSavePath().getNetPicPath()+listResult.getData().get(0)+".jpg");
+        kuKou.setPath(configProperties.getSavePath().getNetPicPath()+pa+".jpg");
         kuKouService.save(kuKou);
         serialPortExample.openLight(0);
         return new Result<>(kuKou);