no message

张宇恒

2022-11-30 c2d9ad60164e91dde9b6bbb0cb377a89cb86a235

 force-app/main/default/classes/NFM611Rest.cls

@@ -157,8 +157,10 @@
                        repair.ReturnOrderLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus;
                    }
                    if (String.isNotBlank(logisticsType)) {
                        LogisticsInformation__c logisticsInformation = DataAssembly(ged,logisticsType,logisticsInformationMap,repairMap);
                        upsertLogisticsInformationList.add(logisticsInformation);
                        if (String.isNotBlank(ged.LogisticsInfo.logisticsNo)) { // 2022-11-08 zyh insert
                            LogisticsInformation__c logisticsInformation = DataAssembly(ged,logisticsType,logisticsInformationMap,repairMap);
                            upsertLogisticsInformationList.add(logisticsInformation);
                        } // 2022-11-08 zyh insert
                    }
                    updateList.add(repair);
                }
@@ -215,11 +217,11 @@
            if (ged.repairOrderInfo.api_type == null) {
                result += 'DataError: [ ' + repairNo + ' ] api_type is null!\n';
            }
            if ((ged.repairOrderInfo.api_type == 3 || ged.repairOrderInfo.api_type == 4 || ged.repairOrderInfo.api_type == 5) &&
            /*if ((ged.repairOrderInfo.api_type == 3 || ged.repairOrderInfo.api_type == 4 || ged.repairOrderInfo.api_type == 5) &&
                String.isBlank(ged.LogisticsInfo.logisticsNo)) {
                result += 'DataError: [ ' + repairNo + ' ] logisticsNo is null!\n';

            }
            }*/  // 2022-11-08 zyh 注释
            
        }

@@ -233,19 +235,22 @@
    private static Map < String, Map < String, Id >> getLogisticsInformationMap(Map < String, GeData > geDataMap) {
        List < LogisticsInformation__c > logisticsInformationList = [Select Id, LogisticsNo__c, LogisticsRepair__r.Name FROM LogisticsInformation__c WHERE LogisticsRepair__r.Name IN: geDataMap.keySet()];
        Map < String, Map < String, Id >> result = new Map < String, Map < String, Id >> ();
        for (LogisticsInformation__c logistics: logisticsInformationList) {
        if (logisticsInformationList.size() > 0) { //2022-11-08 zyh insert
            
            for (LogisticsInformation__c logistics: logisticsInformationList) {

            String repairName = logistics.LogisticsRepair__r.Name;
            String logisticsNo = logistics.LogisticsNo__c;
            Map < String, Id > logisticsMap = new Map < String, Id > ();
                String repairName = logistics.LogisticsRepair__r.Name;
                String logisticsNo = logistics.LogisticsNo__c;
                Map < String, Id > logisticsMap = new Map < String, Id > ();

            if (result.containsKey(repairName)) {
                logisticsMap = result.get(repairName);
                if (result.containsKey(repairName)) {
                    logisticsMap = result.get(repairName);
                }
                logisticsMap.put(logistics.LogisticsNo__c, logistics.Id);
                result.put(repairName, logisticsMap);

            }
            logisticsMap.put(logistics.LogisticsNo__c, logistics.Id);
            result.put(repairName, logisticsMap);

        }
        } //2022-11-08 zyh insert
        return result;
    }
    /**