From f64e936da81777d473a7f94f9eae7f6f1330f307 Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Fri, 27 Jun 2025 13:57:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=93=8D=E5=BA=94=E6=97=B6=E9=97=B4=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/controller/XSHTController.java | 7 +-- .../java/com/management/task/CrmTask.java | 50 +++++++++---------- .../java/com/management/task/CrmTaskTZ.java | 24 ++++----- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/management/controller/XSHTController.java b/src/main/java/com/management/controller/XSHTController.java index df69a86..570910a 100644 --- a/src/main/java/com/management/controller/XSHTController.java +++ b/src/main/java/com/management/controller/XSHTController.java @@ -21,6 +21,7 @@ import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; /** @@ -800,7 +801,7 @@ public class XSHTController { contractBGDetailList.add(contractBGDetailMap); } - if (contractBGDetailList.isEmpty()){ + if (contractBGDetailList.isEmpty()) { log.info("没用符合条件的变更明细数据，将不再继续向下执行"); try { System.out.println("暂停3秒"); @@ -868,7 +869,7 @@ public class XSHTController { logMap.put("res_body", "同步成功"); //backReqMap.put("sales_contract_ERPID__c", contractRes.getJSONObject("data").getString("pkId")); backReqMap.put("sync_status__c", "option_sync_success__c"); - backReqMap.put("response_info__c", "变更同步成功"); + backReqMap.put("response_info__c", "变更同步成功，同步时间：" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); //开始审核 // KingDeeUtils kingDeeUtils = new KingDeeUtils(); @@ -878,7 +879,7 @@ public class XSHTController { logMap.put("log_status", "1"); logMap.put("res_body", "同步失败：" + contractRes.getString("message")); backReqMap.put("sync_status__c", "option_sync_failure__c"); - backReqMap.put("response_info__c", "变更失败：" + contractRes.getString("message")); + backReqMap.put("response_info__c", "变更失败：" + contractRes.getString("message") + "，同步时间：" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); } //开始回写 diff --git a/src/main/java/com/management/task/CrmTask.java b/src/main/java/com/management/task/CrmTask.java index 9988068..0b4afb8 100644 --- a/src/main/java/com/management/task/CrmTask.java +++ b/src/main/java/com/management/task/CrmTask.java @@ -56,30 +56,30 @@ public class CrmTask { * @return void * @Author weiloong_zhang */ -// @Scheduled(cron = "0 0/1 * * * ?") -// private void configureTasks() throws Exception { -// System.out.println("开始同步ERP数据"); -// crmTokenController.tokenReSync(); -// preContractController.syncContract(); -// preContractController.bgPreContract(); -// frameContractController.syncFrameContract(); -// frameContractController.syncFrameContractBG(); -// xshtController.syncXSHT(); -// xshtController.XSHTBGSync(); -// xshtController.isComplete(); -// designController.syncDesign(); -// designController.upDesignDoc(); -// goodsPlanController.syncGoodsPlan(); -// invoiceController.syncInvoice(); -// invoiceController.syncRedInvoice(); -// invoiceController.deleteInvoice(); -// qualityBackController.qualityFeedBack(); -// tenderingController.syncTendering(); -// bankInfoController.syncBankInfo(); -// reimbursementController.syncReimbursement(); -// reimbursementController.syncPublicExpenses(); -// reimbursementController.syncTravelExpenses(); -// System.out.println("ERP数据执行完毕"); -// } + @Scheduled(cron = "0 0/1 * * * ?") + private void configureTasks() throws Exception { + System.out.println("开始同步ERP数据"); + crmTokenController.tokenReSync(); + preContractController.syncContract(); + preContractController.bgPreContract(); + frameContractController.syncFrameContract(); + frameContractController.syncFrameContractBG(); + xshtController.syncXSHT(); + xshtController.XSHTBGSync(); + xshtController.isComplete(); + designController.syncDesign(); + designController.upDesignDoc(); + goodsPlanController.syncGoodsPlan(); + invoiceController.syncInvoice(); + invoiceController.syncRedInvoice(); + invoiceController.deleteInvoice(); + qualityBackController.qualityFeedBack(); + tenderingController.syncTendering(); + bankInfoController.syncBankInfo(); + reimbursementController.syncReimbursement(); + reimbursementController.syncPublicExpenses(); + reimbursementController.syncTravelExpenses(); + System.out.println("ERP数据执行完毕"); + } } diff --git a/src/main/java/com/management/task/CrmTaskTZ.java b/src/main/java/com/management/task/CrmTaskTZ.java index ef1330f..2ba30d9 100644 --- a/src/main/java/com/management/task/CrmTaskTZ.java +++ b/src/main/java/com/management/task/CrmTaskTZ.java @@ -35,16 +35,16 @@ public class CrmTaskTZ { * @return void * @Author weiloong_zhang */ -// @Scheduled(cron = "0 0/2 * * * ?") -// private void configureTasks() throws Exception { -// System.out.println("开始同步台账数据"); -// projectInitiateController.syncProjectInitiate(); -// deliveryReqController.syncDeliveryReq(); -// deliveryReqController.syncRefund(); -// deviceInstallController.syncDeviceInstall(); -// deviceInstallController.upDeviceInstall(); -// xshtController.syncSaleOrder(); -// yqhtController.syncYQHT(); -// System.out.println("台账执行完毕"); -// } + @Scheduled(cron = "0 0/2 * * * ?") + private void configureTasks() throws Exception { + System.out.println("开始同步台账数据"); + projectInitiateController.syncProjectInitiate(); + deliveryReqController.syncDeliveryReq(); + deliveryReqController.syncRefund(); + deviceInstallController.syncDeviceInstall(); + deviceInstallController.upDeviceInstall(); + xshtController.syncSaleOrder(); + yqhtController.syncYQHT(); + System.out.println("台账执行完毕"); + } }