From 023e8364239f5e72cbcdeaca6aec87b7dd36fdf0 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 4 Nov 2022 09:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zhehekeji/web/service/PlcService.java   | 4 ----
 .../java/com/zhehekeji/web/service/client/Decoder.java    | 8 ++++----
 .../com/zhehekeji/web/service/client/ECTransmission.java  | 2 +-
 .../java/com/zhehekeji/web/service/sick/SickSocket.java   | 2 --
 4 files changed, 5 insertions(+), 11 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 33704e1..271c5f7 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -166,9 +166,7 @@ public class PlcService {
                 sep = plcCmdInfo.getSeparation2();
             }
             long delayTime = 0;
-
             if(code.startsWith("C1")){
-
                 delayTime = configProperties.getCameraConfig().getC1DelayCaptureTime();
             }else if(code.startsWith("C2")){
                 if(sep == 1){
@@ -176,7 +174,6 @@ public class PlcService {
                 }else {
                     delayTime = configProperties.getCameraConfig().getC2OutDelayCaptureTime();
                 }
-
             }else if(code.startsWith("C3")){
                 delayTime = configProperties.getCameraConfig().getC3DelayCaptureTime();
 
@@ -196,7 +193,6 @@ public class PlcService {
         }
         //转向原点位
         if(times == 2){
-
             if(street.getCamera2Id() != null){
                 gyrateCameraByCodeTimeLater(street.getCamera2Id(),"C5",configProperties.getCameraConfig().getC2OutDelayCaptureTime()+500);
             }
diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
index a61e845..e62e61c 100644
--- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
+++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
@@ -49,12 +49,13 @@ public class Decoder extends DelimiterBasedFrameDecoder {
             //盘点指令
             TMTransmission tmTransmission = new TMTransmission(body);
             if(tmTransmission.isCollectOver()){
-                //todo 给普天发送指令
-            }else {
+                //todo 给普天发送指令 把盘点结果告诉普天
                 //收到盘点结果
+                plcService.checkEnd(tmTransmission);
                 //添加到实时信息里
                 RealtimeCheckMap.put(tmTransmission.getSRMNumber(),tmTransmission.checkInfo());
-                //todo 保存到stock表
+            }else {
+                //开始盘点
                 plcService.checkStart(tmTransmission);
             }
             in.release();
@@ -64,7 +65,6 @@ public class Decoder extends DelimiterBasedFrameDecoder {
             //回复客户端，建立连接完成
             ctx.channel().writeAndFlush(ceTransmission.toString());
             ClientChanel.connect(ceTransmission.getSRMNumber(), ctx.channel());
-
             tcpLogger.info("client:{} connect", ceTransmission.getSRMNumber());
             in.release();
         }else if(body.startsWith(ECTransmission.getHEADER())){
diff --git a/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java
index f6a90c4..1ae6fca 100644
--- a/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java
+++ b/web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java
@@ -69,7 +69,7 @@ public class ECTransmission {
             side = Integer.valueOf(goodsLocation.substring(2,3));
             row = Integer.valueOf(goodsLocation.substring(3,6));
             column = Integer.valueOf(goodsLocation.substring(6,9));
-        }else if(strings != null && strings.length == 8 && HEADER.equals(strings[0])){
+        }else if(strings != null && strings.length == 9 && HEADER.equals(strings[0])){
             SRMNumber = strings[1];
             taskId = strings[2];
             startColumn = Integer.valueOf(strings[4]);
diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
index 93d5cdb..a3d15d8 100644
--- a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
+++ b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
@@ -40,8 +40,6 @@ public class SickSocket {
                 }
                 i++;
             }
-
-
         } catch (IOException e) {
             tcpLogger.error("sick time out,ip:{},info:{}",ip,e);
             log.error("sick time out,ip:{},info:{}",ip,e);