Merge branch 'WLIG-CC78MX'

涂煌豪

2022-04-14 bb40778647eee144863ee08cb20506838847d884

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

@@ -26,7 +26,7 @@
        public String ReturnType;
        public String InspectType;
        //WLIG-CC78MX 【委托】NFM105接口增加OTS运单号字段 thh 20220307 start
        // public String OTSRepairOrder;
        public String OTSRepairOrder;
        //WLIG-CC78MX 【委托】NFM105接口增加OTS运单号字段 thh 20220307 end
        public InspectionResultInformation[] InspectionResultInformation;
        public FailureInformation[] FailureInformation;
@@ -475,9 +475,9 @@
                    // L65-OGZ修理品出库
                    // L80-RC修理品出库
                    //WLIG-CC78MX 【委托】NFM105接口增加OTS运单号字段 thh 20220307 start
                    // if(String.isNotBlank(quoteInfo.OTSRepairOrder)){
                    //     rpr.OTSRepairOrder__c = quoteInfo.OTSRepairOrder;
                    // }
                    if(String.isNotBlank(quoteInfo.OTSRepairOrder)){
                        rpr.OTSRepairOrder__c = quoteInfo.OTSRepairOrder;
                    }
                    //WLIG-CC78MX 【委托】NFM105接口增加OTS运单号字段 thh 20220307 end
                    Asset ast = getAstUpdate(astUpdateMap, rpr);
                    if (rpr.Return_Without_Repair_IF__c == true) {
@@ -554,6 +554,7 @@
            for (Repair_Quotation__c rqfalse : rqList) {
                rqfalse.Quotation_agreement__c = false;
            }
            System.debug('rqUpdateMap1:' + rqUpdateMap);
            rqList.addAll(rqUpdateMap.values());
            if (rqList.size() > 0) {
                // TODO update false;