盘点暂时采用数量有啥反啥

web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java

@@ -5,6 +5,7 @@ import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
 import com.zhehekeji.web.config.ConfigProperties;
 import com.zhehekeji.web.entity.Camera;
+import com.zhehekeji.web.entity.CameraDownload;
 import com.zhehekeji.web.lib.*;
 import com.zhehekeji.web.lib.hik.HCNetSDK;
 import com.zhehekeji.web.lib.joyware.NetSDKLib;
@@ -319,6 +320,15 @@ public class CameraControlController {
         return Result.success();
     }
 
+
+    @PostMapping("/mp4/delay")
+    @ApiOperation(value = "录像")
+    public Result MP4delay( CameraDownload cameraDownload) {
+        //checkLogin(id);
+        String path = plcService.cameraVideo(cameraDownload.getId(),cameraDownload.getStartTime(),cameraDownload.getEndTime());
+        return Result.success(path);
+    }
+
     @PostMapping("/mp4/{id}")
     @ApiOperation(value = "录像")
     public Result MP4(@PathVariable Integer id) {

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

@@ -0,0 +1,13 @@
+package com.zhehekeji.web.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class CameraDownload {
+    private Integer id;
+    LocalDateTime startTime;
+    LocalDateTime endTime;
+
+}

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

@@ -543,13 +543,18 @@ public class PlcService {
         Integer inout = Integer.valueOf(scTransmission.getGoodsLocation().substring(11,12));
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(),leftRight,inout,row,column);
         if(stock != null){
-            stock.setCount(scTransmission.getRstCount());
+
+            //暂时不盘点数量
+            //stock.setCount(scTransmission.getRstCount());
+            stock.setCount(scTransmission.getRstCategory().equals(stock.getWmsCategory())?scTransmission.getCount():0);
             stock.setCategory(scTransmission.getRstCategory());
             stock.setCode(scTransmission.getGoodsLocation());
             stock.setWmsCategory(scTransmission.getCategory());
             //盘点正确  ：2
             //盘点异常  ：1
-            Integer status = scTransmission.getRstCount().equals(stock.getWmsCount()) && scTransmission.getRstCategory().equals(stock.getWmsCategory()) ? 2: 1;
+            //暂时不盘点数量
+            Integer status =  scTransmission.getRstCategory().equals(stock.getWmsCategory()) ? 2: 1;
+            //Integer status = ;
             stock.setStatus(status);
             stock.setTrayCode(scTransmission.getTrayNo());
             stockMapper.updateById(stock);
@@ -658,8 +663,6 @@ public class PlcService {
         orderMapper.insert(order);
         return "";
     }
-
-
     /**
      * 相机转动，拍照，并返回两张照片地址
      * 顶部拍照 C1

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

@@ -277,11 +277,6 @@ public class Decoder extends DelimiterBasedFrameDecoder {
                     in.release();
                 }
 
-//                else if (body.contains("EMPTY_CLIENT")){
-//                    ClientChanel.connect(EMPTY_CLIENT_NAME, ctx.channel());
-//                    tcpLogger.info("client:{} connect", EMPTY_CLIENT_NAME);
-//                    in.release();
-//                }
             }
         }
     }

web/src/main/java/com/zhehekeji/web/service/putian/PTData.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Objects;
+
 @Slf4j
 @Data
 @NoArgsConstructor
@@ -150,9 +152,15 @@ public class PTData {
         String smokeCategory = scTransmission.getCategory();
         String smokeCount = scTransmission.getCount().toString();
         String smokeRstCategory = scTransmission.getRstCategory();
-        Integer rstCount = scTransmission.getRstCount();
+        Integer rstCount = 0;
+        String checkRst = "0";
+        if(Objects.equals(scTransmission.getRstCategory(), scTransmission.getCategory())){
+
+             rstCount = scTransmission.getCount();
+             checkRst = "1";
+        }
+
         String smokeRstCount = rstCount.toString();
-        String checkRst = scTransmission.getCheckRst();
         String ip ="http://"+ClientChanel.getIpFromId(scTransmission.getSRMNumber())+":9009/pic/"+scTransmission.getGoodsLocation()+"/"
                 +scTransmission.getTaskNo()+"/";
         String pic1 = ip + 1 + ".png";
@@ -161,8 +169,10 @@ public class PTData {
         String pic4 = ip + 4 + ".png";
         String pic5 = ip + 5 + ".png";
         String pic6 = ip + 6 + ".png";
-        contentSB.append(SRMNumber).append(",").append(goodsLocation).append(",").append(taskId).append(",").append(smokeCategory).append(",").append(smokeCount)
-                .append(",").append(smokeRstCategory).append(",").append(smokeRstCount).append(",").append(checkRst).append(",").append(pic1)
+        contentSB.append(SRMNumber).append(",").append(goodsLocation).append(",")
+                .append(taskId).append(",").append(smokeCategory).append(",").append(smokeCount)
+                .append(",").append(smokeRstCategory).append(",").append(smokeRstCount)
+                .append(",").append(checkRst).append(",").append(pic1)
                 .append("*").append(pic2).append("*").append(pic3).append("*").append(pic4).append("*").append(pic5).append("*").append(pic6);
         log.info("stock check message:{}", contentSB.toString());
         PTData ptData = new PTData(contentSB.toString(),FLOW_R,STOCK_CHECK_04);