球机选择 左测camera2 右侧camera1

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -491,10 +491,10 @@ public class PlcService {
             //单伸
             if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) {
                 if (leftRight == 1) {
-                    return street.getCamera1Id();
+                    return street.getCamera2Id();
 
                 } else {
-                    return street.getCamera2Id();
+                    return street.getCamera1Id();
                 }
             } else {
                 Integer cameraId = street.getCamera1Id() != null && street.getCamera1Id() != 0 ? street.getCamera1Id() : street.getCamera2Id();
@@ -513,7 +513,7 @@ public class PlcService {
                             return street.getCamera2Id();
                         }else {
                             //左侧  外货架  camera1
-                            return street.getCamera1Id();
+                            return street.getCamera2Id();
                         }
                     }else {
                         if(plcCmdInfo.getSeparation1() == 1){
@@ -521,7 +521,7 @@ public class PlcService {
                             return street.getCamera1Id();
                         }else {
                             //右侧  外货架  camera2
-                            return street.getCamera2Id();
+                            return street.getCamera1Id();
                         }
                     }
                 }else {
@@ -533,7 +533,7 @@ public class PlcService {
                             return street.getCamera2Id();
                         }else {
                             //左侧  外货架  camera1
-                            return street.getCamera1Id();
+                            return street.getCamera2Id();
                         }
                     }else {
                         if(plcCmdInfo.getSeparation2() == 1){
@@ -541,7 +541,7 @@ public class PlcService {
                             return street.getCamera1Id();
                         }else {
                             //右侧  外货架  camera2
-                            return street.getCamera2Id();
+                            return street.getCamera1Id();
                         }
                     }
                 }
@@ -571,7 +571,9 @@ public class PlcService {
         String trayCode = null;
         Boolean trayCheck = Boolean.TRUE;
         //如果是用扫码枪 扫 托盘码,就直接扫
-        if(configProperties.getScanCodeMode().getTray() == 2){
+        //if(configProperties.getScanCodeMode().getTray() == 2){
+
+        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
             //托盘使用sick扫码枪
                 SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());
                 if(sensorGun == null){
@@ -607,7 +609,6 @@ public class PlcService {
         }else if(configProperties.getScanCodeMode().getTray() == 3){
             //RFID
             RFID rfid = rfidService.getRFIDByPlc(street.getId());
-
         }
         StockCheckRunnable stockCheckRunnable = new StockCheckRunnable(street,plcCmdInfo,cmdCode,stockMapper,path,checkLogMapper,configProperties.getScanCodeMode().getGoods(),wmsCode,wmsTrayCode,trayCode,trayCheck,configProperties);
         threadPoolExecutor.execute(stockCheckRunnable);

web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java

@@ -80,9 +80,8 @@ public class StockCheckRunnable implements Runnable {
                     codeCheck = wmsCode.equals(scanCode);
                 }
             }
-
         }
-        if(configProperties.getScanCodeMode().getTray() == 1){
+        if(configProperties.getScanCodeMode().getTray() == 2 && plcCmdInfo.getSeparation1() == 2){
             //托盘使用球机扫码
             if("".equals(wmsCode)){
                 //空货物的处理

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -118,6 +118,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     plcService.truncateStock();
                     lastLotnum = lotnum;
                 }
+                plcCmdInfo.setTimes(1);
                 Boolean ok = plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode());
                 if(ok){
                     ksecInfo.getData().setAckStatus(1);