对部分内容做了新增和优化，修复了一些问题

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") : "");//备注
 

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") : "";
 

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().syncInvoice();
-        //new InvoiceController().syncRedInvoice();
+        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":

src/main/java/com/management/task/CrmTask.java

@@ -36,6 +36,8 @@ public class CrmTask {
     TenderingController tenderingController;
     @Autowired
     BankInfoController bankInfoController;
+    @Autowired
+    ReimbursementController reimbursementController;
 
     /**
      * 定时任务获取纷享销客token