From 94070179f1f5186ae99e86bb9e8481e54f1f4a7b Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Mon, 16 Jun 2025 09:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=81=9A=E4=BA=86=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DesignController.java | 15 +++++++++++++- .../controller/GoodsPlanController.java | 20 +++++++++++++++++++ .../controller/InvoiceController.java | 6 +++--- .../java/com/management/task/CrmTask.java | 2 ++ 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/management/controller/DesignController.java b/src/main/java/com/management/controller/DesignController.java index cd8d84a..eb5fc02 100644 --- a/src/main/java/com/management/controller/DesignController.java +++ b/src/main/java/com/management/controller/DesignController.java @@ -187,7 +187,20 @@ public class DesignController { erpDesignMap.put("bizuser_number", ownerCode);//人员编码 erpDesignMap.put("bizorg_number", orgCode);//采购组织 erpDesignMap.put("project_number", designDocData.getString("project_id__c") != null ? designDocData.getString("project_id__c") : "");//项目号（商机） - erpDesignMap.put("contractno", designDocData.getString("sales_contract_number__c__r"));//合同号 + + //合同 + String contractNo = ""; + + if (designDocData.getString("sales_contract_number__c__r") != null) { + contractNo = designDocData.getString("sales_contract_number__c__r"); + } else if (designDocData.getString("pre_signed_contract_id__c__r") != null) { + contractNo = designDocData.getString("pre_signed_contract_id__c__r"); + } else { + log.info("当前单据没有合同号，将不再向下执行"); + continue; + } + + erpDesignMap.put("contractno", contractNo);//合同号 erpDesignMap.put("crmid", designDocId);//crm唯一id erpDesignMap.put("comment", designDocData.getString("remark__c") != null ? designDocData.getString("remark__c") : "");//备注 diff --git a/src/main/java/com/management/controller/GoodsPlanController.java b/src/main/java/com/management/controller/GoodsPlanController.java index a437a81..09d0e17 100644 --- a/src/main/java/com/management/controller/GoodsPlanController.java +++ b/src/main/java/com/management/controller/GoodsPlanController.java @@ -272,6 +272,26 @@ public class GoodsPlanController { erpGoodsPlanDetailReq.put("f9w5_contractno", goodsPlanDetailData.getString("sales_contract_number__c__r") != null ? goodsPlanDetailData.getString("sales_contract_number__c__r") : "");//销售合同编号 erpGoodsPlanDetailReq.put("f9w5_tracknumber_number", trackingNum);//跟踪号 + //预计发货时间 + long deliveryDate = goodsPlanDetailData.getLong("expected_ship_date__c") != null ? goodsPlanDetailData.getLong("expected_ship_date__c") : 0; + + Date deliveryDateDate = new Date(deliveryDate); + erpGoodsPlanDetailReq.put("f9w5_delivarydate", deliveryDateDate); + + //是否最新程序 + String isLatestProgram = goodsPlanDetailData.getString("is_latest__c") != null ? goodsPlanDetailData.getString("is_latest__c") : ""; + switch (isLatestProgram) { + case "yes": + erpGoodsPlanDetailReq.put("f9w5_latest", true); + break; + case "no": + erpGoodsPlanDetailReq.put("f9w5_latest", false); + break; + default: + erpGoodsPlanDetailReq.put("f9w5_latest", null); + break; + } + //程序版本 String programVersion = goodsPlanDetailData.getString("program_version_number__c") != null ? goodsPlanDetailData.getString("program_version_number__c") : ""; diff --git a/src/main/java/com/management/controller/InvoiceController.java b/src/main/java/com/management/controller/InvoiceController.java index 206eaa1..25458d4 100644 --- a/src/main/java/com/management/controller/InvoiceController.java +++ b/src/main/java/com/management/controller/InvoiceController.java @@ -27,8 +27,8 @@ public class InvoiceController { private RestTemplate restTemplate = new RestTemplate(); public static void main(String[] args) { - new InvoiceController().syncInvoice(); - //new InvoiceController().syncRedInvoice(); + //new InvoiceController().syncInvoice(); + new InvoiceController().syncRedInvoice(); } /** @@ -493,7 +493,7 @@ public class InvoiceController { invoiceMap.put("showbuyerbank", redInvoiceData.getBooleanValue("show_bank_account__c"));//是否展示开户行 invoiceMap.put("showdetails", redInvoiceData.getBooleanValue("is_display_invoice_details__c"));//是否展示发票明细（名称、数量、单价、单位、规格） - String isSoftWorks = redInvoiceData.getString("is_contain_soft__c"); + String isSoftWorks = redInvoiceData.getString("is_contain_soft__c") != null ? redInvoiceData.getString("is_contain_soft__c") : ""; Boolean isSoftWorksFlag = false; switch (isSoftWorks) { case "v2j71Ak5p": diff --git a/src/main/java/com/management/task/CrmTask.java b/src/main/java/com/management/task/CrmTask.java index 78110d5..d0b2832 100644 --- a/src/main/java/com/management/task/CrmTask.java +++ b/src/main/java/com/management/task/CrmTask.java @@ -36,6 +36,8 @@ public class CrmTask { TenderingController tenderingController; @Autowired BankInfoController bankInfoController; + @Autowired + ReimbursementController reimbursementController; /** * 定时任务获取纷享销客token