From eaec15dc8808c080d7064c75751c59401ba78eb8 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 27 Jul 2022 14:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=8F=98=E6=88=90=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/EntrustReceController.java | 1 + .../basic/SpsSyncDownloadController.java | 27 ++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java index 0364b4e..c71142b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java @@ -88,6 +88,7 @@ public class EntrustReceController { @PostMapping("/spms/entrust/rece/update") public BaseResponse updateEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) { + entrustReceEntity.setUpdateTime(new Date()); boolean b = entrustReceService.updateEntrustRec(entrustReceEntity); if (b) { return ResultVOUtils.success("添加成功！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index d32ea4e..f6122c2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -31,22 +31,36 @@ public class SpsSyncDownloadController { BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_BASIC_DATA, 0); String logs = ""; if (basicExportStatusEntity != null) { + + if (CollUtil.isNotEmpty(baseResponse.getData().getInvWarehouseEntities())) + logs = logs + "仓库字典：" + baseResponse.getData().getInvWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getInvSubWarehouseEntities())) + logs = logs + "分库信息：" + baseResponse.getData().getInvSubWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getWarehouseUserEntities())) { + logs = logs + "仓库用户信息：" + baseResponse.getData().getWarehouseUserEntities().size() + "条\n"; + } + + if (CollUtil.isNotEmpty(baseResponse.getData().getUdiRelevanceEntities())) logs = logs + "耗材字典：" + baseResponse.getData().getUdiRelevanceEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getUdiInfoEntities())) { + logs = logs + "产品信息：" + baseResponse.getData().getUdiInfoEntities().size() + "条\n"; + } if (CollUtil.isNotEmpty(baseResponse.getData().getBasicUnitMaintainEntities())) logs = logs + "往来单位：" + baseResponse.getData().getBasicUnitMaintainEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getCompanyProductRelevanceEntities())) logs = logs + "供应商关联产品信息：" + baseResponse.getData().getCompanyProductRelevanceEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(baseResponse.getData().getInvWarehouseEntities())) - logs = logs + "仓库字典：" + baseResponse.getData().getInvWarehouseEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getThrInvWarehouseEntities())) logs = logs + "第三方仓库字典：" + baseResponse.getData().getThrInvWarehouseEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(baseResponse.getData().getThrOrderEntities())) - logs = logs + "第三方业务单据：" + baseResponse.getData().getThrOrderEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getThrSubInvWarehouseEntities())) + logs = logs + "第三方仓库分库字典：" + baseResponse.getData().getThrSubInvWarehouseEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getThrProductsEntities())) logs = logs + "第三方产品信息：" + baseResponse.getData().getThrProductsEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getThrCorpEntities())) logs = logs + "第三方往来单位：" + baseResponse.getData().getThrCorpEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getThrOrderEntities())) + logs = logs + "第三方业务单据：" + baseResponse.getData().getThrOrderEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getAuthAdminList())) logs = logs + "系统用户信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n"; basicExportStatusEntity.setRemark(logs); @@ -91,6 +105,11 @@ public class SpsSyncDownloadController { String logs = ""; if (basicExportStatusEntity != null) { logs = logs + "单据：" + baseResponse.getData().getOrderEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getOrderDetailEntityList())) + logs = logs + "单据详情：" + baseResponse.getData().getOrderDetailEntityList().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getWarehouseEntityList())) + logs = logs + "单据条码信息：" + baseResponse.getData().getWarehouseEntityList().size() + "条\n"; + basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity);