From e42a9df5ac26b05cc8d35728bfd9f9d323bff73a Mon Sep 17 00:00:00 2001
From: 一生一代一双人 <754543560@qq.com>
Date: 星期二, 01 三月 2022 10:52:17 +0800
Subject: [PATCH] 测试提交

---
 force-app/main/default/classes/NewQuoteEntryController.cls |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/classes/NewQuoteEntryController.cls b/force-app/main/default/classes/NewQuoteEntryController.cls
index 122d346..2547ecc 100644
--- a/force-app/main/default/classes/NewQuoteEntryController.cls
+++ b/force-app/main/default/classes/NewQuoteEntryController.cls
@@ -155,6 +155,7 @@
         }
       } else {
         quoId = System.currentPageReference().getParameters().get('copyid');
+        system.debug('copyid++++++++++++'+quoId);
         if (quoId != null) {
           // 銈炽償銉笺伄銉囥兗銈裤亴寰屻仹浣滄垚銇欍倠
         } else {
@@ -414,6 +415,7 @@
 
          From QuoteLineItem where Quoteid = :quoId Order by Item_Order__c, Id];
       String copyQuoId = System.currentPageReference().getParameters().get('copyid');
+      system.debug('copyid2++++++++++++'+copyQuoId);
       CheckItem = items;
 
       if (copyQuoId == null) {
@@ -2537,6 +2539,7 @@
   //SWAG-C9JCS8 銆愬鎵樸�戙�愮揣鎬ャ�戣浠稧Z-SP-GD0757135鎶ヤ环鍗曢棶棰� fy end
 
   public boolean dataEntry() {
+    system.debug('activities++++----****3'+activities);
     //SWAG-C9JCS8 銆愬鎵樸�戙�愮揣鎬ャ�戣浠稧Z-SP-GD0757135鎶ヤ环鍗曢棶棰� fy start
     // Boolean ifdecide=false;
     // List<Opportunity> oppsde = [Select Id, Estimation_Decision__c From Opportunity Where Id = : oppId];
@@ -2581,6 +2584,7 @@
         errormessage = System.Label.Error_Message3;
       }
       //decimal temSalesAmount1 = 0; // 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗皬璁″悎璁� end
+      system.debug('activities++++----****2'+activities);
       for (QELine a : activities) {
         if ((a.Asset_Model != null) && (a.Asset_Model != '')) {
           if (a.PageObject.Quantity__c == null || a.PageObject.Quantity__c == 0) {
@@ -2782,6 +2786,7 @@
 
       // 20150302 jo 瑕嬬銇富鏈哄畨瑁呭湴鐐广倰瑷畾
       List<String> pIds = new List<String>();
+      system.debug('activities++++----****1'+activities);
       for (QELine s : activities) {
         if (String.isBlank(s.PageObject.Id__c) == false) {
           pIds.add(s.PageObject.Id__c);
@@ -2858,6 +2863,7 @@
       //Sap閫佷俊,Print銇悎銈忋仜銇�1锝�
       Integer i = 1;
       if (activities.size() > 0) {
+        system.debug('activities++++----****'+activities);
         for (QELine s : activities) {
           if (s.Asset_Model != null && s.Asset_Model != '') {
             if (s.pageObject.PricebookEntryId != null) {
@@ -2903,6 +2909,7 @@
           }
         }
         System.debug('start save quote lines at: ' + System.currentTimeMillis());
+        system.debug('qlist+++---+++'+qlist);
         insert qlist;
         System.debug('finished save quote lines at: ' + System.currentTimeMillis());
 
@@ -3122,8 +3129,11 @@
       lastProductFLGList.add(qli.pageObject.PricebookEntry.Product2Id);
       quotlinitMap.put(qli.pageObject.PricebookEntry.Product2Id,qli.pageObject);
     }
+    System.debug('activities!!!'+activities);
+    System.debug('oppId!!!'+oppId);
+    System.debug('lastProductFLGList!!!'+lastProductFLGList);
     if(lastProductFLGList!=null){
-        List<LastbuyProduct__c> LastbuyObjList=[select id,LastbuyQuantity__c,InquiryCode__c,ProductName__c from LastbuyProduct__c where InquiryCode__c= : oppId and ProductName__c in :lastProductFLGList];
+        List<LastbuyProduct__c> LastbuyObjList=[select id,LastbuyQuantity__c,InquiryCode__c,ProductName__c,effectiveFLG__c from LastbuyProduct__c where InquiryCode__c= : oppId and ProductName__c in :lastProductFLGList and effectiveFLG__c = true];
         if(LastbuyObjList!=null){
             for(LastbuyProduct__c lastbuypr :LastbuyObjList){
               Decimal quoteLItemNum=0;

--
Gitblit v1.9.1