diff --git a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java b/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java index 3e0fc3a..d82887a 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java +++ b/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java @@ -12,9 +12,6 @@ import java.time.LocalDateTime; @Data public class CheckLog { - @TableId(type = IdType.AUTO) - private Long id; - private Integer streetId; private Integer direction; 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 d3226e3..a1e65b4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java @@ -28,16 +28,16 @@ public class CheckLogService { if(search.getStartTimestamp() != null && search.getEndTimestamp() != null){ wrapper.ge("create_time",search.getStartTimestamp()).le("create_time",search.getEndTimestamp()); } - if(search.getLeftRight() != null && search.getLeftRight() != 0){ + if(search.getLeftRight() != null && search.getLeftRight() > 0){ wrapper.eq("`direction`",search.getLeftRight()); } - if(search.getSide() != null && search.getSide() != 0){ + if(search.getSide() != null && search.getSide() > 0){ wrapper.eq("`side`",search.getSide()); } - if(search.getRow() != null && search.getRow() != 0){ + if(search.getRow() != null && search.getRow() > 0){ wrapper.eq("`row`",search.getRow()); } - if(search.getColumn() != null && search.getColumn() != 0){ + if(search.getColumn() != null && search.getColumn() > 0){ wrapper.eq("`column`",search.getColumn()); } ListstockChecks = checkLogMapper.selectList(wrapper); 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 78f40c2..ae9baf3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -510,6 +510,7 @@ public class PlcService { stock.setCode(tmTransmission.getCode()); stock.setStatus(1); } + checkLog(stock); return stock; } diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTDecoder.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTDecoder.java index 4267a68..3985019 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTDecoder.java @@ -80,6 +80,7 @@ public class PTDecoder extends LineBasedFrameDecoder { if(ptData.getType().equals(PTData.HEART_TYPE)){ //心跳 什么都不处理,因为netty长链接,断开会感知 }else if(ptData.getType().equals(PTData.EMPTY_CHECK_01)){ + log.info("空货位检测开始"); PTEmptyCheckContent checkContent = PTEmptyCheckContent.EmptyCheck(ptData.getContent()); emptyCheckService.emptyCheckStart(checkContent.getSRMNUmber(), checkContent.getTaskNo(), checkContent.getRow(),checkContent.getStartColumn(),checkContent.getEndColumn());