From 417ab581d24bad8d84e88d78914b61f0abed7842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Thu, 6 Jun 2024 15:36:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B8=85=E7=A9=BA=E7=9B=98=E7=82=B9=202?=
 =?UTF-8?q?=E3=80=82=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=A8=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=203=E3=80=82=E4=BF=9D=E8=AF=81=E7=90=83?=
 =?UTF-8?q?=E6=9C=BA=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/controller/StockController.java  |  8 ++++++++
 .../main/java/com/zhehekeji/web/service/CronTab.java   | 10 ++++++----
 .../java/com/zhehekeji/web/service/PlcService.java     |  8 ++++----
 .../java/com/zhehekeji/web/service/StockService.java   |  3 +++
 web/src/main/resources/application-prod.yml            |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java
index 7e45534..d8f608b 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java
+++ b/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("");
diff --git a/web/src/main/java/com/zhehekeji/web/service/CronTab.java b/web/src/main/java/com/zhehekeji/web/service/CronTab.java
index 6a0614f..1b15b14 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CronTab.java
+++ b/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){
-                ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
-            }else {
-                ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+            if (CameraConnMap.getConnId(camera.getId() )!=null) {
+                if (configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA) {
+                    ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
+                } else {
+                    ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+                }
             }
 
             if(ok){
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 c7c6e08..806a5e6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/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) {
-            status = 2;
-        }
+//        if (algorithmPojo != null && algorithmPojo.getResult() != null  && algorithmPojo.getResult() == 1) {
+//            status = 2;
+//        }
         if (stock == null) {
             stock = Stock.builder()
                     .checkNum(plcCmdInfo.getOrderNum())
diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java
index 52809b6..d7619a9 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java
@@ -511,4 +511,7 @@ public class StockService {
     }
 
 
+    public void allStockClear() {
+        stockMapper.truncate();
+    }
 }
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index c1fa4d4..832545f 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/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"
     #用于视觉的一层个数