From fb04e7c01d119c60632b4298d18fd93f3ccb3d79 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 06 四月 2022 10:32:05 +0800
Subject: [PATCH] 20220405DeployProduction
---
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger | 120 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
index 3606100..66423b2 100644
--- a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
+++ b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
@@ -1,6 +1,6 @@
trigger ConsumableOrderDetail2Trigger on Consumable_order_details2__c (after insert, after update, after delete) {
Set<String> orderSet = new Set<String>();
-
+
if (StaticParameter.EscapeOrderDetail2Trigger) {
return ;
}
@@ -27,7 +27,6 @@
}
-
if (orderSet.size()>0){
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇挎崲 SQL start by 寮犵帀灞�
list<Consumable_order_details2__c> allresults =
@@ -102,72 +101,103 @@
//鏇存柊娑堣�楀搧璁㈠崟鐨勫彂璐ф棩鏈�
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇挎崲涓嬮潰鍘熸湁SQL 浣跨敤 map 瀹屾垚璧嬪�� start by 寮犵帀灞�
- map<string,Date> DeliverdateResults = new map<string,Date>();
+ Set<string> resultsKeySet = new Set<String>();
+ map<string,Date> DeliverdateResults = new map<string,Date>();//鏈�鏂板彂璐ф椂闂�
+ map<string,Date> DeliverdateminResults = new map<string,Date>();//鏈�鏃╁彂璐ф椂闂�
for(Consumable_order_details2__c results1 : allresults){
if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
continue;
}
string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
-
if(DeliverdateResults.containsKey(Consumable_order_minor_str)){
if(DeliverdateResults.get(Consumable_order_minor_str)
< results1.Deliver_date__c
){
DeliverdateResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ resultsKeySet.add(Consumable_order_minor_str);
}
-
}else{
DeliverdateResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ resultsKeySet.add(Consumable_order_minor_str);
}
- }
-
- consumableOrderlist = new List<Consumable_Order__c>();
- for (string key : DeliverdateResults.keySet()) {
- if(DeliverdateResults.get(key)!=null){
- Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
- consumableOrder1.Id = key;
- consumableOrder1.Shipment_Date__c = DeliverdateResults.get(key);
- consumableOrderlist.add(consumableOrder1);
- }
-
- }
- // 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇挎崲涓嬮潰鍘熸湁SQL 浣跨敤 map 瀹屾垚璧嬪�� end by 寮犵帀灞�
-
- //鑾峰彇鏃╁彂璐ф棩鏈� start
- system.debug('DeliverdateResults==============' + DeliverdateResults);
- system.debug('璧板埌鏈�鏃╁彂璐ф棩鏈�');
- map<string,Date> DeliverdateminResults = new map<string,Date>();
- for(Consumable_order_details2__c results1 : allresults){
- if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
- continue;
- }
- string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
+ //鑾峰彇鏈�鏃╁彂璐ф椂闂� pk part1 start
if(DeliverdateminResults.containsKey(Consumable_order_minor_str)){
if(DeliverdateminResults.get(Consumable_order_minor_str)
> results1.Deliver_date__c
){
- DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ resultsKeySet.add(Consumable_order_minor_str);
}
-
}else{
DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ resultsKeySet.add(Consumable_order_minor_str);
}
+ //鑾峰彇鏈�鏃╁彂璐ф椂闂� pk part1 end
}
- List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();
- for (string key : DeliverdateminResults.keySet()) {
- if(DeliverdateminResults.get(key)!=null){
- Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
- consumableOrder1.Id = key;
- consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
- consumableOrderminlist.add(consumableOrder1);
+
+ //涓や釜DeliverdateResults.keySet()锛孌eliverdateminResults.keySet() 鍚堝苟浣滀负涓�涓狶ist 锛岄亶鍘哃ist
+ //鑾峰彇鏈�鏃╁彂璐ф椂闂� pk part2 start
+ consumableOrderlist = new List<Consumable_Order__c>();
+ for(string temp : resultsKeySet){
+ Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
+ consumableOrder1.Id = temp;
+ if(DeliverdateResults.get(temp)!=null){
+ consumableOrder1.Shipment_Date__c = DeliverdateResults.get(temp);
}
+ if(DeliverdateminResults.get(temp)!=null){
+ consumableOrder1.First_Delivery__c = DeliverdateResults.get(temp);
+ }
+ consumableOrderlist.add(consumableOrder1);
}
+
+ //鑾峰彇鏈�鏃╁彂璐ф椂闂� pk part2 end
+ // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();//鏈�鏃╁彂璐ф椂闂�
+ // for (string key : DeliverdateminResults.keySet()) {
+ // if(DeliverdateminResults.get(key)!=null){
+ // Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
+ // consumableOrder1.Id = key;
+ // consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
+ // consumableOrderminlist.add(consumableOrder1);
+ // }
+ // }
+
+ // 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇挎崲涓嬮潰鍘熸湁SQL 浣跨敤 map 瀹屾垚璧嬪�� end by 寮犵帀灞�
+
+ //鑾峰彇鏃╁彂璐ф棩鏈� start
+ // system.debug('DeliverdateResults==============' + DeliverdateResults);
+ // system.debug('璧板埌鏈�鏃╁彂璐ф棩鏈�');
+ // map<string,Date> DeliverdateminResults = new map<string,Date>();
+ // for(Consumable_order_details2__c results1 : allresults){
+ // if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
+ // continue;
+ // }
+ // string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
+ // if(DeliverdateminResults.containsKey(Consumable_order_minor_str)){
+ // if(DeliverdateminResults.get(Consumable_order_minor_str)
+ // > results1.Deliver_date__c
+ // ){
+ // DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ // }
- if(consumableOrderminlist.size() > 0){
- update consumableOrderminlist;
- }
- system.debug('DeliverdateResults==============' + DeliverdateResults);
- //鑾峰彇鏈�鏃╁彂璐ф棩鏈� end
+ // }else{
+ // DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
+ // }
+ // }
+ // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();
+ // for (string key : DeliverdateminResults.keySet()) {
+ // if(DeliverdateminResults.get(key)!=null){
+ // Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
+ // consumableOrder1.Id = key;
+ // consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
+ // consumableOrderminlist.add(consumableOrder1);
+ // }
+ // }
+
+ // if(consumableOrderminlist.size() > 0){
+ // update consumableOrderminlist;
+ // }
+ // system.debug('DeliverdateResults==============' + DeliverdateResults);
+ // //鑾峰彇鏈�鏃╁彂璐ф棩鏈� end
/* 2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熸湁SQL 涓庤祴鍊� start by 寮犵帀灞�
AggregateResult[] results1 = [SELECT Consumable_order_minor__c,max(Deliver_date__c) Deliver_date__c
@@ -190,7 +220,7 @@
if (consumableOrderlist.size() > 0){
update consumableOrderlist;
}
-
+
//鏇存柊寰呯‘璁ゆ敹璐ф暟閲�
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇挎崲涓嬮潰鍘熸湁SQL 浣跨敤 map 瀹屾垚璧嬪�� start by 寮犵帀灞�
map<string,Integer> resultsMap2 = new map<string,Integer>();
@@ -295,7 +325,6 @@
Map<Id, Consumable_order__c> arrivedMap = new Map<Id, Consumable_order__c>([select Id, RecordType.DeveloperName, Name from Consumable_order__c where Id in :arrivedSet]);
List<Consumable_orderdetails__c> detail1List = [select Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c from Consumable_orderdetails__c where Consumable_order__c in :arrivedSet];
Map<String,Consumable_orderdetails__c> detail1Map = new Map<String,Consumable_orderdetails__c>();
-
for (Consumable_orderdetails__c detail1 : detail1List) {
String key = '' + detail1.Consumable_order__c + detail1.Asset_Model_No__c;
detail1Map.put(key, detail1);
@@ -316,7 +345,7 @@
AND (RemoveBox_No__c=null or RemoveBox_No__c=1)
group by Consumable_Arrived_order__c, Asset_Model_No__c];
Map<String, Integer> keyCount = new Map<String, Integer>();
-
+
for(AggregateResult ar: results){
String key = '' + ar.get('Consumable_Arrived_order__c') + ar.get('Asset_Model_No__c');
keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
@@ -355,7 +384,6 @@
//if (trigger.isUpdate && detail2.ManualRegisteredStock__c == true) continue;
if (detail2.Consumable_Arrived_order__c == null) continue;
String key = '' + detail2.Consumable_Arrived_order__c + detail2.Asset_Model_No__c;
-
//if (upsertMap.get(key) != null) continue;
Integer count = keyCount.get(key);
Consumable_orderdetails__c detail1 = detail1Map.get(key);
--
Gitblit v1.9.1