From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新

---
 force-app/main/default/classes/Opportunity_Shipments_ForecastBatch.cls |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/classes/Opportunity_Shipments_ForecastBatch.cls b/force-app/main/default/classes/Opportunity_Shipments_ForecastBatch.cls
index 0f80904..ce7cb71 100644
--- a/force-app/main/default/classes/Opportunity_Shipments_ForecastBatch.cls
+++ b/force-app/main/default/classes/Opportunity_Shipments_ForecastBatch.cls
@@ -47,6 +47,10 @@
 			query += ' and Sales_Root__c != \'\'';
 			//20190107 --------addEnd---------
 			query += ' and Salesdepartment_Owner__c != \'澶栫浜嬩笟鏈儴\'';
+			// 20220928 ljh SWAG-CJMCZ4 start
+			query += ' and (ConfirmationofAward__c != \'绔炰簤瀵规墜涓爣\''; 
+			query += ' OR (ConfirmationofAward__c = \'绔炰簤瀵规墜涓爣\' and Competitor__c != \'A1\' and Competitor__c != \'A\'))';
+			// 20220928 ljh SWAG-CJMCZ4 end
 			System.debug('+++11111111--query--111111111111+++++' + query);
 			return Database.getQueryLocator(query);
 			
@@ -61,6 +65,10 @@
 			query += ' and StageName__c != \'澶卞崟\'';
 			query += ' and Sales_Root__c != \'\'';
 			query += ' and Salesdepartment_Owner__c != \'澶栫浜嬩笟鏈儴\'';
+			// 20220928 ljh SWAG-CJMCZ4 start
+			query += ' and (ConfirmationofAward__c != \'绔炰簤瀵规墜涓爣\''; 
+			query += ' OR (ConfirmationofAward__c = \'绔炰簤瀵规墜涓爣\' AND Competitor__c != \'A1\' and Competitor__c != \'A\'))';
+			// 20220928 ljh SWAG-CJMCZ4 end
 			System.debug('+++11111111--姝ｅ父Batch鎵цquery--111111111111+++++' + query);
 			return Database.getQueryLocator(query);
 			

--
Gitblit v1.9.1