From 314fe5e8c7ed4fadb802ced1640f1ce63b8b726f Mon Sep 17 00:00:00 2001
From: QuShuailong <qu.shuailong@hzleaper.com>
Date: Wed, 12 Apr 2023 15:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E7=BB=99=E4=B8=8A=E4=BD=8D=E6=9C=BA=E5=8F=91=E9=80=81=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E6=8C=87=E4=BB=A4?=
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 | 4 +---
 .../java/com/zhehekeji/web/service/ksec/KsecDecoder.java    | 6 ++++--
 2 files changed, 5 insertions(+), 5 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 9f1dd12..14b3396 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -580,7 +580,6 @@ public class PlcService {
             }
         }
 
-
         String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
         cameraCapture(cameraId,false,null,path);
         //托盘码
@@ -588,10 +587,9 @@ public class PlcService {
         Boolean trayCheck = Boolean.TRUE;
         //如果是用扫码枪 扫 托盘码,就直接扫
         //if(configProperties.getScanCodeMode().getTray() == 2){
-        SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());
         if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
             //托盘使用sick扫码枪
-
+            SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());
                 if(sensorGun == null){
                     trayCode = "识别异常";
                     trayCheck = Boolean.FALSE;
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 5794ac0..7e7f299 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
@@ -201,7 +201,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
 //                    ctx.channel().writeAndFlush(ksecInfo);
                     //rfid的逻辑
                     String code = dataInfo.getCmdName();
-
+                    log.info("盘点指令：{}", ksecInfo);
                     plcService.check(plcCmdInfo,ksecInfo.getType(),dataInfo.getCode(),dataInfo.getTrayCode());
                 /*
                     if("E1".equals(code)){
@@ -209,7 +209,8 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     }else {
                         plcService.RFIDStop(plcCmdInfo);
                     }*/
-
+                    ctx.channel().writeAndFlush(ksecInfo);
+                    log.info("盘点完成");
                 }
                 //找到该货位的最后一张照片与现在的照片比照
                 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0);
@@ -218,3 +219,4 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
         }
     }
 }
+