diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java index b028c42..64e92e5 100644 --- a/src/main/java/com/management/controller/PastContractController.java +++ b/src/main/java/com/management/controller/PastContractController.java @@ -345,7 +345,7 @@ public class PastContractController { contractDetailMap.put("linetype_number", contractTypeStr);//行类型 contractDetailMap.put("goodsname", contractDetailData.getString("product_name__c"));//产品名称 //contractDetailMap.put("material_number", contractDetailData.getString("product_id__r"));//物料编号 - contractDetailMap.put("material_number", "TEST0001");//todo 物料编号 + contractDetailMap.put("material_number", "80800001");//todo 物料编号 contractDetailMap.put("specification", contractDetailData.getString("specification__c") != null ? contractDetailData.getString("specification__c") : "");//规格 contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位 //contractDetailMap.put("baseunit", "TEST0001");//todo 单位 diff --git a/src/main/java/com/management/tzcontroller/DeliveryReqController.java b/src/main/java/com/management/tzcontroller/DeliveryReqController.java index 51533dc..97bd762 100644 --- a/src/main/java/com/management/tzcontroller/DeliveryReqController.java +++ b/src/main/java/com/management/tzcontroller/DeliveryReqController.java @@ -53,6 +53,7 @@ public class DeliveryReqController { JSONObject getDelivery = crmRequestUtil.getCRMList(Arrays.asList( new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), new Filter("EQ", "life_status", Arrays.asList("normal")), + new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")), //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")), new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus)) ), "shipping_application__c"); @@ -262,6 +263,7 @@ public class DeliveryReqController { JSONObject getRefund = crmRequestUtil.getCRMList(Arrays.asList( new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")), new Filter("EQ", "life_status", Arrays.asList("normal")), + new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")), //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")), new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus)) ), "return_application__c");