From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls b/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
index 5e4f62d..9b14d83 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
@@ -80,7 +80,7 @@
public override List<String> getColumnFieldList() {
// strColumus 閲屽姞 field
// FixtureUtil#raesdGroupBy()銇爡鐩倐蹇呰
- return new List<String>{'Id', 'Asset__c', 'DeliverySlip__c', 'Shippment_loaner_time__c', 'Consum_Apply__r.demo_purpose2__c', 'Consum_Apply__r.Shipment_requested_cnt__c', 'Shipment_Saved_Flg__c', 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c','Inspection_Cnt_Jia__c','EquipmentManagementCode__c','ManagementCode__c','boxbarcodeforReceipt__c'};
+ return new List<String>{'Id', 'Asset__c','Consum_Apply__r.AccDealerBlacklist__c', 'DeliverySlip__c', 'Shippment_loaner_time__c', 'Consum_Apply__r.demo_purpose2__c', 'Consum_Apply__r.Shipment_requested_cnt__c', 'Shipment_Saved_Flg__c', 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c','Inspection_Cnt_Jia__c','EquipmentManagementCode__c','ManagementCode__c','boxbarcodeforReceipt__c'};
}
//闅愯棌鐨勫瓧娈靛彧鑳芥樉绀猴紝涓嶈兘璧嬪��
public override List<String> getHiddenFieldList() {
@@ -406,6 +406,12 @@
}
//add wangweipeng 2022/01/28 end
**/
+
+ //璐告槗鍚堣 you
+ if(System.Label.TradeComplianceStatusFlagBP =='true' && caesd.Consum_Apply__r.AccDealerBlacklist__c == '1'){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, System.Label.IFTradeComplianceAlertBP));
+ return ;
+ }
String guaranteen_end = '';
if (caesd.Consumable_Guaranteen_end_F__c != null) {
guaranteen_end = caesd.Consumable_Guaranteen_end_F__c.format();
--
Gitblit v1.9.1