1.清空盘点

2。增加手动盘点类型
3。保证球机时间修改，减少报错

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

@@ -162,7 +162,15 @@ public class StockController {
         validatorUtil.validate(checkByMan);
         return Result.success(stockService.checkByMan(checkByMan));
     }
+    //
 
+    @ApiOperation(value = "清空盘点")
+    @RequestMapping(value = "/allStockClear", method = RequestMethod.POST)
+    public Result<Stock> allStockClear() {
+        //validatorUtil.validate(checkByMan);
+        stockService.allStockClear();
+        return Result.success();
+    }
     public static void main(String[] args) {
         Integer i = 0;
         String str=new String("");

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

@@ -96,10 +96,12 @@ public class CronTab {
         List<Camera> cameras = cameraMapper.selectList(new QueryWrapper<>());
         for (Camera camera : cameras){
             Boolean ok = false;
-            if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA){
+            if (CameraConnMap.getConnId(camera.getId() )!=null) {
-                ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
+                if (configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA) {
-            }else {
+                    ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
-                ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+                } else {
+                    ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+                }
             }
 
             if(ok){

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

@@ -725,11 +725,11 @@ public class PlcService {
         });
         thread.start();
         //核对异常
-        Integer status = 1;
+        Integer status = 4;
         //托盘和货物都正确
-        if (algorithmPojo != null && algorithmPojo.getResult() != null  && algorithmPojo.getResult() == 1) {
+//        if (algorithmPojo != null && algorithmPojo.getResult() != null  && algorithmPojo.getResult() == 1) {
-            status = 2;
+//            status = 2;
-        }
+//        }
         if (stock == null) {
             stock = Stock.builder()
                     .checkNum(plcCmdInfo.getOrderNum())

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

@@ -511,4 +511,7 @@ public class StockService {
     }
 
 
+    public void allStockClear() {
+        stockMapper.truncate();
+    }
 }

web/src/main/resources/application-prod.yml

@@ -113,7 +113,7 @@ orderTest: 1
 productDoc: "C:/Users/昊天/Desktop/新建文本文档 (3).txt"
 
 smokeBoxType:
-  - type: 1
+  - type: 125425
     name: 古20
     code: "125425"
     #用于视觉的一层个数