gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

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

@@ -213,7 +213,15 @@
                    bieCunFangDi = parentObj.Rental_Apply__r.Internal_asset_location_F__c;
                    pCunFangDi = bieCunFangDi;
                    // 本部初始值
                    // Modify by Liu 20220908 Solution本部课题对应 start
                    if (parentObj.Rental_Apply__r.Salesdepartment__c == '16.消化·呼吸领域解决方案本部') {
                        bieBenBu = '16.Solution本部';
                    } else {
                    bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c;
                    }
                    //bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c;
                    // Modify by Liu 20220908 Solution本部课题对应 end
                    
                    /*if (String.isNotBlank(sonObj.QuenType__c) && String.isNotBlank(sonObj.Salesdepartment_before__c)) {
                        bieBenBu = sonObj.Salesdepartment_before__c;
                    } else {
@@ -1319,7 +1327,10 @@
        //别本部
        if (String.isNotBlank(bieBenBu) && !bieBenBu.contains('全部')) {
            // soql += ' and Salesdepartment__c = \'' + String.escapeSingleQuotes(bieBenBu) + '\'';
            List<String> bieBenBuList = bieBenBu.split(',');
            // Modify by Liu 20220908 Solution本部课题对应 start
            //List<String> bieBenBuList = bieBenBu.split(',');
            List<String> bieBenBuList = bieBenBu.replace('16.Solution本部', '16.消化·呼吸领域解决方案本部').split(',');
            // Modify by Liu 20220908 Solution本部课题对应 end
            soql += RentalFixtureSetAssignController.setSoql('Salesdepartment__c', bieBenBuList);
            /*String benbuStr = '';
            for (String benbu : bieBenBuList) {
@@ -2040,7 +2051,12 @@
                applyObj.campaignType = campaignType;
                obj = RentalFixtureSetAssignController.getdefultInfo(raesd,applyObj,bieCunFangDi);
                // 排队后，默认排队值需要在画面端显示  本部
                bieBenBu = obj.salesdepartments;

                // Modify by Liu 20220908 Solution本部课题对应 start
                //bieBenBu = obj.salesdepartments;
                bieBenBu = obj.salesdepartments.replace('16.消化·呼吸领域解决方案本部', '16.Solution本部');
                // Modify by Liu 20220908 Solution本部课题对应 end

                // 排队后，默认排队值需要在画面端显示  备品分类
                bieBeiPinFenLei = obj.equipmenttypes;
                // 备品存放地和产品分类默认是申请单上的数据，不用特意设置
@@ -2051,7 +2067,12 @@
                keyObj.productType = String.isBlank(bieChanPinFenLei)?'GI,SP':bieChanPinFenLei;
                System.debug('bieBeiPinFenLei===========================' + bieBeiPinFenLei);
                keyObj.equipmenttypes = bieBeiPinFenLei;
                keyObj.salesdepartments = bieBenBu;

                // Modify by Liu 20220908 Solution本部课题对应 start
                //keyObj.salesdepartments = bieBenBu;
                keyObj.salesdepartments = bieBenBu.replace('16.Solution本部', '16.消化·呼吸领域解决方案本部');
                // Modify by Liu 20220908 Solution本部课题对应 end

                RentalFixtureSetAssignController.getsequencekeyList(keyObj);
                obj = keyObj;
                System.debug('obj.equipmenttypes===========================' + obj.equipmenttypes);