New xml file for PIPL20220310

buli

2022-03-10 a48ed9f335db52a433a2b343ff9636a28ee8a97f

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

@@ -43,7 +43,7 @@
        selectedDataSql += '   and Consum_Apply__r.AssetManageConfirm__c = true';
        //selectedDataSql += ' order by Id ASC nulls last';
        keepWher = selectedDataSql;
        selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
        selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last, name';
        myComponentController.columnRightRW.put('Hui_Ji_Jia__c', 'r');
        myComponentController.columnRightRW.put('WH_location__c', 'r');
        myComponentController.columnRightRW.put('Yi_Zhi_Bao_Fei_Jia__c', 'w');
@@ -115,7 +115,7 @@
    }

    public override String getOrderbyStr() {
        return 'order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
        return 'order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last,name';
    }

    public override Boolean getIsNeedRunSearch() {
@@ -211,10 +211,19 @@
            // baofeiAssetMap.put(caesd.Asset__c, baofei);
            // guoqiAssetMap.put(caesd.Asset__c, guoqi);
            // shangjiaAssetMap.put(caesd.Asset__c, shangjia);
            baofeiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, baofei);
            guoqiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, guoqi);
            shangjiaAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, shangjia);
            //update by youc 2021-12-08 start 之前是直接取保有设备和输入的值的 现在可以设置保有设备+小码为key 耗材追溯--发货修改
             //add by yc 20220217 处理老数据开的口 start
            if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
                baofeiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, baofei);
                guoqiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, guoqi);
                shangjiaAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, shangjia);
            }else{
                //update by youc 2021-12-08 start 之前是直接取保有设备和输入的值的 现在可以设置保有设备+小码为key 耗材追溯--发货修改
                baofeiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, baofei);
                guoqiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, guoqi);
                shangjiaAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, shangjia);

            }  
            //add by yc 20220217 处理老数据开的口 end
        }

        List<Consum_Apply_Equipment_Set_Detail__c> updList = new List<Consum_Apply_Equipment_Set_Detail__c>();
@@ -224,7 +233,13 @@
        for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
            //待报废
            //update by youc 2021-12-08 
            String asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode__c;
            //add by yc 20220217 处理老数据开的口 start
            String asscodeX = caesd.Asset__c + caesd.ManagementCode__c+caesd.EquipmentManagementCode__c;
            if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
                asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c;
            }  
            //add by yc 20220217 处理老数据开的口 end
            
            // if (baofeiAssetMap.containsKey(caesd.Asset__c) && baofeiAssetMap.get(caesd.Asset__c) > 0) {
            if (baofeiAssetMap.containsKey(asscodeX) && baofeiAssetMap.get(asscodeX) > 0) {
                // Integer cnt_last = baofeiAssetMap.get(caesd.Asset__c) - 1;
@@ -339,7 +354,7 @@
                if (assXiaoMaMap.containsKey(caesd.Asset__c) == false) {
                    assXiaoMaMap.put(caesd.Asset__c, new List<String>());
                }
                assXiaoMaMap.get(caesd.Asset__c).add(caesd.EquipmentManagementCode__c);
                assXiaoMaMap.get(caesd.Asset__c).add(caesd.ManagementCode__c+caesd.EquipmentManagementCode__c);
            }
            //add by youc 2021-12-07 end 存放小码
            whlocMap.put(caesd.Asset__c, caesd.Asset__r.WH_location__c);