盘点信息返回增加viewStatus

-1:没有盘点 0:盘点未核对  1：盘点异常  2：核对正确

web/src/main/java/com/zhehekeji/web/entity/Stock.java

@@ -70,6 +70,15 @@ public class Stock {
     @ApiModelProperty("0:未盘点  1：盘点异常  2：核对正确")
     private Integer status;
 
+    public void setStatus(Integer status){
+            this.status = status;
+            this.viewStatus = status;
+    }
+
+    @ApiModelProperty("-1:没有盘点 0:盘点未核对  1：盘点异常  2：核对正确")
+    @TableField(exist = false)
+    private Integer viewStatus;
+
     @ApiModelProperty("操作前的图片")
     private String preoperationPic;
 

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

@@ -590,7 +590,7 @@ public class PlcService {
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn());
         //核对异常
         if(stock == null){
-            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,null,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,null,null,path, LocalDateTime.now());
+            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,null,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,0,null,null,path, LocalDateTime.now());
             stockMapper.insert(stock);
         }else {
             //stock.setStatus(status);

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

@@ -97,7 +97,7 @@ public class StockCheckRunnable implements Runnable {
             status = 2;
         }
         if(stock == null){
-            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),scanCode, null,null,wmsCode,null,null,wmsTrayCode,trayCode,orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),status,null,null,path, LocalDateTime.now());
+            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),scanCode, null,null,wmsCode,null,null,wmsTrayCode,trayCode,orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),status,status,null,null,path, LocalDateTime.now());
             stockMapper.insert(stock);
         }else {
             stock.setStatus(status);

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

@@ -91,7 +91,7 @@ public class StockService {
         //checkStatus.setShelveId(rowColumnStatus.getShelveId());
 
 
-        List<Stock>stockList = new ArrayList<>();
+        List<Stock> stockList = new ArrayList<>();
         //默认全部盘点正确
         Map<String,Integer> rowTabStatus = new LinkedHashMap<>();
         int columns = 0;
@@ -204,7 +204,7 @@ public class StockService {
                     Stock stock = new Stock();
                     stock.setColumn(j);
                     stock.setRow(i);
-                    stock.setStatus(0);
+                    stock.setStatus(-1);
                     //stock.setShelveId(shelveId);
                     readyList.add(stock);
                 }
@@ -325,7 +325,7 @@ public class StockService {
             stock.setColumn(stockCheck.getColumn());
             stock.setRow(stockCheck.getRow());
             //stock.setShelveId(stockCheck.getShelveId());
-            stock.setStatus(0);
+            stock.setViewStatus(-1);
         }
         List<StockLog> stockLogs = stockLogMapper.selectList(new QueryWrapper<StockLog>().eq("`row`",stockCheck.getRow()).eq("`column`",stockCheck.getColumn()).eq("street_id",stockCheck.getStreetId()).eq("direction",stockCheck.getDirection()).eq("side",stockCheck.getSide()).orderByDesc("create_time").last(" limit 2"));
         if(stockLogs.size() == 1){

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

@@ -47,6 +47,7 @@ public class KsecNettyClient {
         client.handler(new KescFilter(heart, plcService,this));
         // 连接服务端
         channel = client.connect(ksec.getIp(), ksec.getPort()).sync().channel();
+
     }
 
     /**