Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -325,11 +325,7 @@
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过arrivedset  start by 张玉山
        if (arrivedSet.size() > 0) {
            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
                ]
                [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
@@ -556,11 +552,7 @@
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过returnSet  start by 张玉山
        if (returnSet.size() > 0) {
            Map<Id, Consumable_order__c> returnMap = new Map<Id, Consumable_order__c>(
                [
                    SELECT Id, RecordType.DeveloperName, Name
                    FROM Consumable_order__c
                    WHERE Id IN :returnSet
                ]
                [SELECT Id, RecordType.DeveloperName, Name FROM Consumable_order__c WHERE Id IN :returnSet]
            );
            List<Consumable_orderdetails__c> detail1List = [
                SELECT Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c