上限合同补充

黄千龙

2023-03-28 17ef9dd2ae1d3de83cfa769d02ebe066ffb238dd

上限合同补充

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

@@ -247,11 +247,12 @@
            // NFM103Controller.callout(iflog.Id, rprIds);
            String uid = UserInfo.getUserId();
            String BUid = System.Label.Batch_User_Id;
            String OLYid = System.Label.OlympusSystem_ID;
            System.debug('zheli');
            if (uid.substring(0,15) == BUid.substring(0,15)) {
                NFM103Controller.calloutNotfuture(iflog.Id, rprIds, null);
            if (uid.substring(0,15) == BUid.substring(0,15) || uid.substring(0,15) == OLYid.substring(0,15)) {
                NFM103Controller.calloutNotfuture(iflog.Id, rprIds);
            }else{
                NFM103Controller.callout(iflog.Id, rprIds, null);
                NFM103Controller.callout(iflog.Id, rprIds);
            }
            // 20220902 ljh XLIU-CHSD8G update end
        }
@@ -265,11 +266,11 @@
     * @param repairIds          送信対象修理
     */
    @future (callout = true)
    public static void callout(String iflog_Id, List<Id> repairIds, String flag) {
       calloutNotfuture(iflog_Id, repairIds, flag);
    public static void callout(String iflog_Id, List<Id> repairIds) {
       calloutNotfuture(iflog_Id, repairIds);
    }
    //20220902 ljh 新增（复制）方法  XLIU-CHSD8G 
    public static void calloutNotfuture(String iflog_Id, List<Id> repairIds,String flag) {
    public static void calloutNotfuture(String iflog_Id, List<Id> repairIds) {

        if (repairIds == null || repairIds.size() == 0) {
            return;
@@ -623,11 +624,7 @@
                 rprId = rpr.Id;   //2022-07-14  zyh  add

                 //再注册分析 需求 新增字段 20220811 sx start
                 element.Reanalysis                = flag;

                 if(flag != null){
                    element.UpdateStatus = 'X';
                 }
                 element.Reanalysis                = null;
                 //再注册分析 需求 新增字段 20220811 sx end
            }

@@ -848,11 +845,18 @@
            // エラーが発生した場合
            System.debug(Logginglevel.ERROR, 'NFM103_' + iflog.Name + ':' + ex.getMessage());
            System.debug(Logginglevel.ERROR, 'NFM103_' + iflog.Name + ':' + ex.getStackTraceString());
            //NFM105触发103接口 20230303 LY start
            // Callout from triggers are currently not supported.
            System.debug('NFM201jiekou'+ex.getMessage());
            if (!String.valueOf(ex.getMessage()).contains('Callout from triggers')) {

            logstr += ex.getMessage();
            iflog.ErrorLog__c += ex.getMessage() + '\n';
            iflog.ErrorLog__c += ex.getStackTraceString() + '\n';

            }
                System.debug('标记0--------------------1:' + rowData.retry_cnt__c);

            //NFM105触发103接口 20230303 LY end
            //---Gaozw---add
            if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
            if (rowData.retry_cnt__c < batch_retry_max_cnt) {

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

@@ -313,6 +313,10 @@
                            else if (di.DiscountType == '运输索赔') {
                                rq.Delivery_compensation__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
                            }
                            //DB202303075842 LY 2023/3/6 add
                            else if (di.DiscountType == '上限合同'){
                                rq.LimitPrice_contract_discount_amount__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
                            }
                            //
                            else if (di.DiscountType == '其他') {
                                rq.Other_discount__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);

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

@@ -62,7 +62,10 @@

        BatchIF_Log__c rowData = NFMUtil.saveRowData(Monitoring, 'NFM105', ges.RepairStatusUpdate.GeneralData);
        if (String.isBlank(rowData.Log__c) == false) {
            executefuture(rowData.Id);
            //上限合同 LY 20230209 start
            //executefuture(rowData.Id);
            main(rowData.Id);
            //上限合同 LY 20230209 end
        }

        // JSONを戻す
@@ -599,7 +602,8 @@
                for (Repair__c rc : rprList) {
                    if (rc.Limit_Price__c) {
                        //B95-报价同意确认、B99-报价同意确认取消、A95-取消修理受理、A96-取消修理、A99-修理单关闭 更新合同期间修理金额
                        if (rc.RepairOrderStatusCode__c =='B95' || rc.RepairOrderStatusCode__c =='B99' || rc.RepairOrderStatusCode__c =='A99' || rc.RepairOrderStatusCode__c =='A95' || rc.RepairOrderStatusCode__c =='A96'){
                        //if (rc.RepairOrderStatusCode__c =='B95' || rc.RepairOrderStatusCode__c =='B99' || rc.RepairOrderStatusCode__c =='A99' || rc.RepairOrderStatusCode__c =='A95' || rc.RepairOrderStatusCode__c =='A96'){
                        if (rc.Agreed_Date__c != null){
                            Maintenance_Contract__c mc = new Maintenance_Contract__c();
                            if (!updateMC.contains(rc.Maintenance_Contract__c)) {
                                mc.Id = rc.Maintenance_Contract__c;

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

 force-app/main/default/triggers/Repair.trigger

@@ -421,10 +421,8 @@
        if (Trigger.isBefore && Trigger.isUpdate) {
            for (Repair__c repair: Trigger.new) {
                if (repair.Limit_Price__c ==true ){
                    if (repair.Agreed_Date__c!=null &&(repair.Remaining_Amount__c-repair.Usage_Ratio_Price__c)<=0){
                    if (repair.Agreed_Date__c!=null && repair.Remaining_Amount__c >=0 &&(repair.Remaining_Amount__c-repair.Usage_Ratio_Price__c)<=0){
                        repair.ZFLAG_SX__c = true;
                    }else{
                        repair.ZFLAG_SX__c = false;
                    }
                }
            }