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"); ListstockChecks = 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(); }