From c669e476932d84718f04df838b1c443a38cc9e15 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, 14 Sep 2023 08:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8B=8D=E7=85=A7=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=B0=83=E7=94=A8=E5=AF=B9=E9=9D=A2=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E9=87=87=E7=94=A8=E5=A4=8D=E6=9D=82?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/CheckLogService.java     |  2 +-
 .../java/com/zhehekeji/web/service/PlcService.java     |  2 ++
 .../com/zhehekeji/web/service/sick/SickSocket.java     | 10 +++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
index 66a5a01..536b96e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
@@ -50,7 +50,7 @@ public class CheckLogService {
         if(search.getColumn() != null && search.getColumn() != 0){
             wrapper.eq("`column`",search.getColumn());
         }
-        wrapper.orderByDesc("shelve_id","`row`","`column`","id");
+        wrapper.orderByDesc("id");
         List<CheckLog>stockChecks = checkLogMapper.selectList(wrapper);
 
         return new PageInfo<>(stockChecks);
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 2193f05..eb23c7d 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -621,6 +621,8 @@ public class PlcService {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+
+        gyrateCameraByCode(cameraId, cameraCmdCode2);
         cameraCapture(cameraId,false,null,path+".jpg");
 
         //托盘码
diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
index 5688618..2a9fe93 100644
--- a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
+++ b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
@@ -105,15 +105,19 @@ public class SickSocket {
         try {
             new Thread(future).start();
             future.get(1000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-
+        } catch (InterruptedException | ExecutionException e ) {
+            log.info("sick 读取的数据为："+stringBuilder);
             if("".equals(stringBuilder.toString())){
                 tcpLogger.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e);
                 log.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e);
-                throw new RuntimeException(e);
             }else {
                 return stringBuilder.toString();
             }
+        }catch (TimeoutException e){
+
+            log.info("sick 读取的数据为："+stringBuilder);
+            tcpLogger.error("sick 扫码超时,ip:{},info:{}", ip, e);
+            log.error("sick 扫码超时,ip:{},info:{}", ip, e);
         }
         return stringBuilder.toString();
     }