盘点的时候，堆垛机跑位会发B1的处理

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

@@ -58,7 +58,7 @@ public class StockCheckRunnable implements Runnable {
         Boolean codeCheck = Boolean.TRUE;
         Boolean trayCodeCheck = Boolean.TRUE;
         //货物使用球机扫码
-        if(configProperties.getScanCodeMode().getGoods() == 1){
+        /*if(configProperties.getScanCodeMode().getGoods() == 1){
             if("".equals(wmsCode)){
                 //空货物的处理
                 //如果系统货物为空，则只要扫码识别未出结果，就认为无货物
@@ -80,18 +80,19 @@ public class StockCheckRunnable implements Runnable {
                     codeCheck = wmsCode.equals(scanCode);
                 }
             }
-        }
+        }*/
         if(configProperties.getScanCodeMode().getTray() == 2 && plcCmdInfo.getSeparation1() == 2){
             //托盘使用球机扫码
-            if("".equals(wmsCode)){
+            if("".equals(wmsTrayCode)){
                 //空货物的处理
                 //如果系统货物为空，则只要扫码识别未出结果，就认为无货物
                 trayCode = BarcodeDetector.detectBestCodeUntilOK(configProperties.getSavePath().getMediaPath()+path,configProperties.getScanCodeMode().getTrayCodeTypes());
+                log.info("tray code:{},sys trayCode:{}",trayCode,wmsTrayCode);
                 if(StringUtils.isEmpty(trayCode)|| trayCode.equals("Unrecognized")){
                     trayCheck = Boolean.TRUE;
                     trayCode = "";
                 }else {
-                    trayCheck = wmsCode.equals(trayCode);
+                    trayCheck = wmsTrayCode.equals(trayCode);
                 }
             }else {
                 trayCode = BarcodeDetector.detectBestCodeUntilOK(configProperties.getSavePath().getMediaPath()+path,configProperties.getScanCodeMode().getTrayCodeTypes());

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

@@ -66,9 +66,16 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                 tcpLogger.info("info:{}",body);
                 //任务
                 if (Cmd.B1.name().equals(cmdName)) {
-                    //任务开始 旋转到原点位
-                    plcService.gyrateCamera(plcCmdInfo,Cmd.C5.name());
-                    plcService.orderStart(plcCmdInfo);
+                    //昆船盘点模式下也会发B1 ,但是不会发送B2
+                    //这里判断下，是否存在盘点批次号  若存在，既是盘点的B1,无需处理；若不存在lotnum，则是随行的B1
+                    if(StringUtils.isEmpty(dataInfo.getLotnum())){
+                        //任务开始 旋转到原点位
+                        plcService.gyrateCamera(plcCmdInfo,Cmd.C5.name());
+                        plcService.orderStart(plcCmdInfo);
+                    }else {
+                        log.info("check move");
+                    }
+
                 } else if (Cmd.B2.name().equals(cmdName)) {
                     plcService.gyrateCamera(plcCmdInfo,Cmd.C5.name());
                     plcService.orderStop(plcCmdInfo);