From 535ac337bf6873c4abc48f8c3d6a062e8eaa374d Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Thu, 9 Jun 2022 10:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=A0=86=E5=9E=9B=E6=9C=BA=E8=B7=91=E4=BD=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=8F=91B1=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhehekeji/web/service/StockCheckRunnable.java   |  9 +++++----
 .../com/zhehekeji/web/service/ksec/KsecDecoder.java | 13 ++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java b/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java
index e224548..31f551a 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java
+++ b/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());
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
index b025fe3..8fd8c98 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
+++ b/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);