From bf29d89dc68c2ab3a58adae203c3fbf1dba9bdb9 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: Fri, 21 Jun 2024 16:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=84=A6=E4=BD=9C=E8=9C=9C=E9=9B=AA=E7=90=83?=
 =?UTF-8?q?=E6=9C=BA=E7=9A=84=E8=B0=83=E7=94=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/java/com/zhehekeji/web/service/PlcService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 0cbf9b7..2cdba51 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -608,6 +608,7 @@ public class PlcService {
         if (type == 0) {
             //单伸
             if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) {
+                //使用对侧
                 if (leftRight == 1) {
                     return street.getCamera2Id();
                 } else {
@@ -650,8 +651,8 @@ public class PlcService {
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo, plcCmdInfo.getLeftRight1());
 
         //蜜雪冰城拍摄货物顶部时用同侧相机
-        Integer leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1;
-        Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, leftRightTop);
+        //Integer leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1;
+        Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, plcCmdInfo.getLeftRight1());
         if (plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2) {
             //内测
             String c = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1);