新增期初合同定时任务，优化了销售合同和预签合同变更

src/main/java/com/management/controller/PastContractController.java

@@ -42,8 +42,15 @@ public class PastContractController {
     public void syncPastContract() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        String[] syncStatus = {"option_pending_sync__c", "option_resync__c"};
+
         JSONObject getPastContract = crmRequestUtil.getCRMList(Arrays.asList(
-                new Filter("EQ", "name", Arrays.asList("0024"))
+                //new Filter("IS", "erp_id__c", Arrays.asList("")),
+                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
+                new Filter("GT", "create_time", Arrays.asList("1748923200000")),
+                //new Filter("EQ", "name", Arrays.asList("ZHY2505280021")),
+                new Filter("EQ", "is_initial__c", Arrays.asList("true")),
+                new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "SaleContractObj");
 
         JSONObject pastContractRes = new JSONObject();
@@ -141,9 +148,9 @@ public class PastContractController {
             erpContractReq.put("billno", contractData.getString("name"));//合同编号
             erpContractReq.put("crmid", contractData.getString("_id"));//CRM唯一性编码
             erpContractReq.put("suitscope", "A");//todo 适用组织范围
-            //erpContractReq.put("project_number", projectCode);//项目号
+            erpContractReq.put("project_number", projectCode);//项目号
             erpContractReq.put("zhybilltype", contractData.getString("contract_type__c"));//合同类型
-            erpContractReq.put("project_number", "SJ20250424-0033");//项目号
+            //erpContractReq.put("project_number", "SJ20250424-0033");//项目号
             erpContractReq.put("billtype_number", "conm_salcontract_BT_QD");//单据类型
             erpContractReq.put("billname", contractData.getString("project_name__c") != null ? contractData.getString("project_name__c") : "销售合同");//合同名称
             erpContractReq.put("type_number", contractMainType);//合同类型

src/main/java/com/management/controller/PreContractController.java

@@ -442,8 +442,8 @@ public class PreContractController {
             }
 
             String deptERPCode = deptRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0).getString("field_Vj6sf__c");
-            //YQBGMap.put("dept", deptERPCode);//部门编码
-            YQBGMap.put("dept", "ZHY");//部门编码
+            YQBGMap.put("dept", deptERPCode);//部门编码
+            //YQBGMap.put("dept", "ZHY");//部门编码
 
             List ownerId = preContractBGData.getJSONArray("change_owner") != null ? preContractBGData.getJSONArray("change_owner") : new ArrayList<>();
 
@@ -467,8 +467,8 @@ public class PreContractController {
             System.out.println("负责人数据为：" + ownerRes);
 
             String ownerUserId = ownerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0).getString("field_T1xid__c");
-            //YQBGMap.put("operator", ownerUserId);//负责人
-            YQBGMap.put("operator", "ID-000016");//负责人
+            YQBGMap.put("operator", ownerUserId);//负责人
+            //YQBGMap.put("operator", "ID-000016");//负责人
 
             //质保期
             YQBGMap.put("warranty", preContractBGData.getBigDecimal("change_warranty_period_months__c") != null ? preContractBGData.getBigDecimal("warranty_period") : BigDecimal.ZERO);

src/main/java/com/management/controller/XSHTController.java

@@ -60,6 +60,7 @@ public class XSHTController {
                 new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 //new Filter("EQ", "name", Arrays.asList("ZHY2505280021")),
+                new Filter("N", "is_initial__c", Arrays.asList("true")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "SaleContractObj");
 
@@ -829,7 +830,7 @@ public class XSHTController {
                 //规格型号
                 contractBGDetailMap.put("specification", contractBGDetailData.getString("change_specification__c") != null ? contractBGDetailData.getString("change_specification__c") : "");
                 //todo 计量单位
-                contractBGDetailMap.put("unit", "pcs");
+                contractBGDetailMap.put("unit", contractBGDetailData.getString("change_unit__c") != null ? contractBGDetailData.getString("change_unit__c") : "");
                 //数量
                 contractBGDetailMap.put("qty", contractBGDetailData.getBigDecimal("change_quantity") != null ? contractBGDetailData.getBigDecimal("change_quantity") : BigDecimal.ZERO);
                 //含税单价

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

@@ -40,6 +40,8 @@ public class CrmTask {
     ReimbursementController reimbursementController;
     @Autowired
     VendorController vendorController;
+    @Autowired
+    PastContractController pastContractController;
 
     /**
      * 定时任务获取纷享销客token
@@ -69,6 +71,7 @@ public class CrmTask {
 //        xshtController.syncXSHT();
 //        xshtController.XSHTBGSync();
 //        xshtController.isComplete();
+//        pastContractController.syncPastContract();
 //        designController.syncDesign();
 //        designController.upDesignDoc();
 //        goodsPlanController.syncGoodsPlan();