焦作蜜雪球机的调用修改

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 leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1;
-        Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, leftRightTop);
+        Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, plcCmdInfo.getLeftRight1());
         if (plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2) {
             //内测
             String c = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1);