协议调试 修改

web/src/main/java/com/zhehekeji/web/service/client/Decoder.java

@@ -23,9 +23,10 @@ public class Decoder extends DelimiterBasedFrameDecoder {
     private EmptyCheckService emptyCheckService;
 
     private PlcService plcService;
-    public Decoder(PlcService plcService) {
+    public Decoder(PlcService plcService,EmptyCheckService emptyCheckService) {
         super(200,true,false, Unpooled.copiedBuffer(";".getBytes()));
         this.plcService = plcService;
+        this.emptyCheckService = emptyCheckService;
     }
 
     @Override

web/src/main/java/com/zhehekeji/web/service/client/ECTransmission.java

@@ -41,6 +41,15 @@ public class ECTransmission {
 
     private Integer column;
 
+    private Integer startColumn;
+
+    private Integer endColumn;
+
+    /**
+     * 货位条码
+     */
+    private String originCode;
+
     public String toString(){
         return HEADER + "," + SRMNumber;
     }
@@ -60,6 +69,18 @@ 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])){
+            SRMNumber = strings[1];
+            taskId = strings[2];
+            startColumn = Integer.valueOf(strings[4]);
+            endColumn = Integer.valueOf(strings[5]);
+            goodsLocation = strings[6];
+            direction = goodsLocation.substring(0).equals("L") ? 1:2;
+            side = Integer.valueOf(goodsLocation.substring(2,3));
+            row = Integer.valueOf(goodsLocation.substring(3,6));
+            column = Integer.valueOf(goodsLocation.substring(6,9));
+            originCode = strings[7];
+            isEmpty = strings[8];
         }
     }
 
@@ -69,7 +90,7 @@ public class ECTransmission {
      */
     public static String toEmptyCheckStartString(String SRMNumber,String taskId,Integer row,Integer startColumn,Integer endColumn){
         StringBuffer sb = new StringBuffer(HEADER);
-        sb.append(Split).append(SRMNumber).append(Split).append(taskId).append(Split).append(row).append(Split).append(startColumn).append(Split).append(endColumn).append("START");
+        sb.append(Split).append(SRMNumber).append(Split).append(taskId).append(Split).append(row).append(Split).append(startColumn).append(Split).append(endColumn).append(Split).append("START");
         return sb.toString();
     }
 
@@ -79,7 +100,7 @@ public class ECTransmission {
      */
     public static String toEmptyCheckEndString(String SRMNumber,String taskId,Integer row,Integer startColumn,Integer endColumn){
         StringBuffer sb = new StringBuffer(HEADER);
-        sb.append(Split).append(SRMNumber).append(Split).append(taskId).append(Split).append(row).append(Split).append(startColumn).append(Split).append(endColumn).append("END");
+        sb.append(Split).append(SRMNumber).append(Split).append(taskId).append(Split).append(row).append(Split).append(startColumn).append(Split).append(endColumn).append(Split).append("END");
         return sb.toString();
     }
 }

web/src/main/java/com/zhehekeji/web/service/client/NettyServer.java

@@ -1,5 +1,6 @@
 package com.zhehekeji.web.service.client;
 
+import com.zhehekeji.web.service.EmptyCheckService;
 import com.zhehekeji.web.service.PlcService;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
@@ -18,6 +19,8 @@ public class NettyServer {
 
     @Resource
     private PlcService plcService;
+    @Resource
+    private EmptyCheckService emptyCheckService;
 
     public void CreateNettyServer(int port) throws InterruptedException {
         Thread thread = new Thread(new Runnable() {
@@ -37,7 +40,7 @@ public class NettyServer {
                             .childHandler(new ChannelInitializer<SocketChannel>() {
                                 @Override
                                 public void initChannel(SocketChannel ch) {
-                                    ch.pipeline().addLast(new Decoder(plcService));
+                                    ch.pipeline().addLast(new Decoder(plcService,emptyCheckService));
                                     ch.pipeline().addLast(new Encoder());
                                 }}); // 子处理器，用于处理workerGroup
 

web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java

@@ -72,7 +72,7 @@ public class TMTransmission {
 
     public TMTransmission(String body){
         String [] strings = body.split(Split);
-        if(strings != null && strings.length > 9 && strings[0].equals(header)){
+        if(strings != null && strings.length >= 9 && strings[0].equals(header)){
             if(strings.length == 9){
                 SRMNumber = strings[1];
                 taskNo = strings[2];