SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy

Thhto

2022-11-17 ea6a4eec81a6a74e214aefc5971d701242c3e7d3

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

@@ -367,8 +367,8 @@
            }
        } else {
            //添加行
            List<Quote> quoList =
                [ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,
            List<Quote> quoList =//SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy start QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
                [ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
                        Dealer_Final_Price__c,TotalPrice__c,Estimation_List_Price__c,QuoteNumber,
                        CreatedByid,Queto_Confirm_Date__c,
                        QuoteToName,Quote_Expiration_Date__c,Quote_Comment__c,Stocking_Price__c,Unit_Price__c,
@@ -433,6 +433,7 @@
            if (copyQuoId == null) {
                    quo = quoList[0];
                    quoteOwner = quo.CreatedByid;
                   
                    //SWAG-C5DBAL  【委托】 [紧急]SI询价肖寒无法修改报价单  精琢技术  2021/07/30 start
                    //注释原逻辑
                    if(quo.Queto_Confirm_Date__c != null ||
@@ -717,6 +718,11 @@
        }
        // vivek end
        system.debug('初始化时的集合：'+activities);
         //SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy start
         quo.Offer_Amount__c = true;
         quo.TOTAL__c = true;
         quo.Preferential_Gurantee_Period__c = true;
         //SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy end
        return null;
     }

@@ -2017,7 +2023,13 @@
        Boolean error = false;
        errorflg = false;
        errormessage = null;

        //obsap 最终用户合同金额验证 fy start
        if (quo.Dealer_Final_Price_Page__c == null) {
            quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
            error = true;
            errormessage = System.Label.Error_Message3;
        }
        //obsap 最终用户合同金额验证 fy end
        if (checkAgentsDeleteFlag() == false) {
            return false;
        }
@@ -2289,11 +2301,11 @@
            error = true;
            errormessage = System.Label.Error_Message3;
        }
        if (quo.Dealer_Final_Price_Page__c == null) {
            quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
            error = true;
            errormessage = System.Label.Error_Message3;
        }
        // if (quo.Dealer_Final_Price_Page__c == null) {
        //     quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
        //     error = true;
        //     errormessage = System.Label.Error_Message3;
        // }
        if (qb.Quote_Adjust_Calculate == null) {
            quo.Quote_Adjust_Calculate__c.addError(System.Label.Error_Message3);
            error = true;
@@ -2470,8 +2482,8 @@
            }

        } else {
            List<Quote> qs = New List<Quote>();
            qs = [select Id,OpportunityId,Pricebook2Id,Name,Estimation_List_Price__c,Dealer_Final_Price__c,
            List<Quote> qs = New List<Quote>();//SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy start QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
            qs = [select Id,OpportunityId,Pricebook2Id,Name,Estimation_List_Price__c,Dealer_Final_Price__c,QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
                Stocking_Price__c,Discount_Amount__c,Discount_Amount_Calculate__c,Quote_Adjust_Amount__c,Quote_Adjust_Calculate__c,
                Agency1__c,OCM_Agent1_Price__c,Agency1_Profit__c,Agency1_Profit_Rate__c,Quote_No__c,
                Agency2__c,Agent1_Agent2_Price__c,Agency2_Profit__c,Agency2_Profit_Rate__c,
@@ -2558,6 +2570,12 @@
        q.Quote_Comment__c = quo.Quote_Comment__c;

        q.Installation_location__c = quo.Installation_location__c;

        //SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy start
        q.QuotationChange__c = quo.QuotationChange__c;
        q.MainEngineWithoutMonitor__c = quo.MainEngineWithoutMonitor__c;
        q.Interdepartmental__c = quo.Interdepartmental__c;
        //SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy end
        /*
        if (hasType3Machine) {
            q.Installation_location__c = '';