From 5a7cd27890f823a50e372afc5b1c0d26a6380d45 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 27 Jul 2022 14:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/thread/DlBasicService.java | 9 +++++-- .../glxp/api/admin/thread/HeartService.java | 24 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 91229dff..e562ea87 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -308,7 +308,7 @@ public class DlBasicService { authAdmin.setLastModifyTime(null); authAdminService.replaceAuthAdmin(authAdmin); } - remark.append("用户：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); + remark.append("用户信息：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); } spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); @@ -390,14 +390,17 @@ public class DlBasicService { bussinessChangeTypeService.deleteByLocaAction(spsBusLoclTypeResponse.getAction()); mapper.insertBussinessType(bussinessTypeEntity); } + remark.append("业务单据类型：").append(syncDataResponse.getBussinessLocalTypeEntities().size()).append("条\n"); batchSession.commit(); List bussinessChangeTypeEntities = syncDataResponse.getBussinessChangeTypeEntities(); if (CollUtil.isNotEmpty(bussinessChangeTypeEntities)) { for (BussinessChangeTypeEntity bussinessChangeTypeEntity : bussinessChangeTypeEntities) { bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity); } + remark.append("缺量补单单据类型：").append(bussinessChangeTypeEntities.size()).append("条\n"); } - remark.append("业务单据类型：").append(syncDataResponse.getBussinessLocalTypeEntities().size()).append("条\n"); + + } catch (Exception e) { logger.error(e.getMessage()); } @@ -425,6 +428,8 @@ public class DlBasicService { entrustReceEntity.setUpdateTime(null); entrustReceService.replaceEntrustRec(entrustReceEntity); } + + remark.append("委托验收单据类型：").append(syncDataResponse.getBussinessOriginTypeEntities().size()).append("条\n"); } batchSession.close(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 4c79f80b..8086060c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -214,26 +214,38 @@ public class HeartService { basicExportStatusEntity3.setEndTime(new Date()); basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); String logs = ""; + + if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) + logs = logs + "仓库字典：" + syncDataResponse.getInvWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getInvSubWarehouseEntities())) + logs = logs + "分库信息：" + syncDataResponse.getInvSubWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { + logs = logs + "仓库用户信息：" + syncDataResponse.getWarehouseUserEntities().size() + "条\n"; + } + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { + logs = logs + "仓库单据类型：" + syncDataResponse.getWarehouseBussinessTypeEntities().size() + "条\n"; + } + if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) logs = logs + "耗材字典：" + syncDataResponse.getUdiRelevanceEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { + logs = logs + "产品信息：" + syncDataResponse.getUdiInfoEntities().size() + "条\n"; + } if (CollUtil.isNotEmpty(syncDataResponse.getBasicUnitMaintainEntities())) logs = logs + "往来单位：" + syncDataResponse.getBasicUnitMaintainEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getCompanyProductRelevanceEntities())) logs = logs + "供应商关联产品信息：" + syncDataResponse.getCompanyProductRelevanceEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) - logs = logs + "仓库字典：" + syncDataResponse.getInvWarehouseEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getInvSubWarehouseEntities())) - logs = logs + "分库信息：" + syncDataResponse.getInvSubWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getThrInvWarehouseEntities())) logs = logs + "第三方仓库字典：" + syncDataResponse.getThrInvWarehouseEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getThrSubInvWarehouseEntities())) logs = logs + "第三方仓库分库字典：" + syncDataResponse.getThrSubInvWarehouseEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities())) - logs = logs + "第三方业务单据：" + syncDataResponse.getThrOrderEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) logs = logs + "第三方产品信息：" + syncDataResponse.getThrProductsEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getThrCorpEntities())) logs = logs + "第三方往来单位：" + syncDataResponse.getThrCorpEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities())) + logs = logs + "第三方业务单据：" + syncDataResponse.getThrOrderEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) logs = logs + "系统用户信息：" + syncDataResponse.getAuthAdminList().size() + "条\n"; basicExportStatusEntity3.setRemark(logs);