diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 5943670d9..65f6d93d4 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -149,6 +149,18 @@ public class RelCodeBatchService extends ServiceImpl list = this.list(new LambdaQueryWrapper() + .eq(RelCodeBatch::getProductCode, productCode) + .eq(RelCodeBatch::getSubTypeNo, subTypeNo) + .eq(RelCodeBatch::getBatchNo, batchNo)) + ; + if (CollUtil.isNotEmpty(list)){ + throw new JsonException( "层级编码:【"+productCode + "】;类型编码:【" + subTypeNo + "】;批次号:【"+batchNo + "】已存在!"); + } List detailList = relCodeBatchRequest.getDetailList(); if(CollUtil.isEmpty(detailList)){ throw new JsonException("关联明细不能为空!"); diff --git a/src/main/java/com/glxp/api/task/SyncHeartService.java b/src/main/java/com/glxp/api/task/SyncHeartService.java index 1bb046e69..515076ade 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartService.java +++ b/src/main/java/com/glxp/api/task/SyncHeartService.java @@ -47,7 +47,13 @@ public class SyncHeartService { try { if (curTime1 - lastTime1 > timeInterval1) { Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> { + try { heartService.pushData(syncDataSetEntity, null, i); + } catch (Exception e) { + log.error(ExceptionUtils.getStackTrace(e)); + e.printStackTrace(); + + } }); redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); }