gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

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

@@ -91,7 +91,6 @@
                                    Consumable_Product__r.Product2__r.SalesPackagingUnit_Chinese__c,
                                    Consumable_Product__r.Product2__r.ProduceCompany_F__c,
                                    Consumable_Product__r.Product2__r.ProduceCompany__c,
                                    Consumable_Product__r.Product2__r.ProduceCompanySummary__c,
                                    Sum_of_money__c,
                                    Dealer_Custom_Price__c,
                                    Lose_reason__c,
@@ -123,21 +122,21 @@
                nowRightAsstModelNo = '';
            }
            nameStringArray = new List<String>();
            repeatCount = (nowName.length() / nameMax) + ( Math.mod( nowName.length(), nameMax) > 0 ? 1 : 0);
            // 20220824 ljh SWAG-CHKAMM update start
            // repeatCount = (nowName.length() / nameMax) + ( Math.mod( nowName.length(), nameMax) > 0 ? 1 : 0);
            if(String.isBlank(nowName)){
                repeatCount = 1;
            }else{
                repeatCount = (nowName.length() / nameMax) + ( Math.mod( nowName.length(), nameMax) > 0 ? 1 : 0);
            }
            // 20220824 ljh SWAG-CHKAMM update end
            //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, 'repeatCount!' + repeatCount));
            // 生产企业 注释原代码
            // nowCompany = itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompany_F__c;
            String nowCompany = null;

            //CHAN-C4X63A 【委托】NFM204字段“生产企业地址”优化 XHL 20210716 Start
            //if(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompany__c !=null){
            //    nowCompany = getProduceCompanyName(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompany__c);
            //}
            if(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompanySummary__c !=null){
                nowCompany = getProduceCompanyName(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompanySummary__c);
            if(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompany__c !=null){
                nowCompany = getProduceCompanyName(itemsOrg[i].Consumable_Product__r.Product2__r.ProduceCompany__c);
            }
            //CHAN-C4X63A 【委托】NFM204字段“生产企业地址”优化 XHL 20210716 End
            
            if (nowCompany == null) nowCompany = '';
            //hasEnglish = Pattern.matches('.*[a-zA-Z]+.*', nowCompany);
            //Integer companyMax = hasEnglish ? 16 : 12;