From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/PrintConsumblePDFController.cls | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/PrintConsumblePDFController.cls b/force-app/main/default/classes/PrintConsumblePDFController.cls
index 5f4e3f5..2da5d21 100644
--- a/force-app/main/default/classes/PrintConsumblePDFController.cls
+++ b/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 銆愬鎵樸�慛FM204瀛楁鈥滅敓浜т紒涓氬湴鍧�鈥濅紭鍖� 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 銆愬鎵樸�慛FM204瀛楁鈥滅敓浜т紒涓氬湴鍧�鈥濅紭鍖� XHL 20210716 End
-
if (nowCompany == null) nowCompany = '';
//hasEnglish = Pattern.matches('.*[a-zA-Z]+.*', nowCompany);
//Integer companyMax = hasEnglish ? 16 : 12;
--
Gitblit v1.9.1