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/EquipmentSetShippmentReceived3Controller.cls | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 214 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index 56ca581..3b6f55c 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -7,8 +7,8 @@
public Boolean saveBtnDisabled { get; private set; }
public boolean ReturnRefuse {get;private set;}
public String ErrorMessage {get; set;}
- public String CDSFinished {get;set;}
- public boolean LostFlg {get;set;}
+ // public String CDSFinished {get;set;}
+ // public boolean LostFlg {get;set;}
public String Step_status { get; private set; }
public Boolean needCDS { get; private set; }
public Boolean done_flg { get; set; }
@@ -334,13 +334,45 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
+ // 澶囧搧浼樺寲涓存椂楠岃瘉杩藉姞 20230409 lc Start
+ /*StaticParameter.EscapeVMCTrigger = true;
+ Oly_TriggerHandler.bypass('AssetHandler');*/
+ // 澶囧搧浼樺寲涓存椂楠岃瘉杩藉姞 20230409 lc End
List<String> raids = Raid.split(':');
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
- List<Rental_Apply__c> RaTarList = [select Name,Campaign__c,Repair__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,
- Campaign__r.Status,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c
+ List<Rental_Apply__c> RaTarList = [select Id,Name,Campaign__c,Repair__c,next_action__c
+ ,QIS_number__r.ReplaceDeliveryDate__c,demo_purpose2__c
+ ,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c
+ ,Campaign__r.Status
+ ,Campaign__r.IF_Approved__c
+ ,Campaign__r.Meeting_Approved_No__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ ,Campaign__r.Approved_Status__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ ,repair__r.Return_Without_Repair_Date__c
+ ,Repair__r.Repair_Final_Inspection_Date__c
+ ,AccDealerBlacklist__c//璐告槗鍚堣 you
+ ,EquipmentGuaranteeFlg__c//璐告槗鍚堣 you
+ ,Repair__r.Repair_Shipped_Date__c
from Rental_Apply__c
where id in :raids];//20210602 ljh update 澧炲姞鏌ヨName SFDC-C3LBNL
+
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 start
+ Map<Id, String> rentalApplyNameMap = new Map<Id, String>();
+ List<Rental_Apply_Equipment_Set__c> RAESRecords = [
+ SELECT Id,Rental_Apply__c,Rental_Apply__r.Name
+ FROM Rental_Apply_Equipment_Set__c
+ WHERE Rental_Apply__c in :raids
+ AND Cancel_Select__c = False
+ AND Rental_Start_Date__c <> :Date.today()
+ ORDER BY Rental_Apply__c];
+
+ for (Rental_Apply_Equipment_Set__c RAES : RAESRecords) {
+ if (rentalApplyNameMap.isEmpty() || !rentalApplyNameMap.containsKey(RAES.Rental_Apply__c)) {
+ rentalApplyNameMap.put(RAES.Rental_Apply__c, RAES.Rental_Apply__r.Name);
+ }
+ }
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
+
//20210604 ljh update SFDC-C3LBNL start
Boolean errorFlag = false;
String message0 = '';
@@ -350,9 +382,22 @@
String message = '';
String message4 = '';//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
String message5 = '';//1822 yc 20211108 绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ヤ笉鑳藉嚭搴�
+ String message6 = '';
+ String message7 = '';// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� end
+ String message8 = '';//add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣
+ String message9 = '';//璐告槗鍚堣 you
+ // 瑕佸垽鏂喅瑁佺姸鎬佷笉鑳芥槸鑽夌/椹冲洖/缁堟鐢宠/鍙栨秷/鍒犻櫎
+ List<String> statusList = System.Label.StatusProcessState.split(',');
+ Map<Id, Rental_Apply__c> RaMap = new Map<Id, Rental_Apply__c>();
for (Rental_Apply__c RaTar : RaTarList) {
- if( RaTar.Campaign__r.Status == '鍙栨秷'){
-
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
+ // if( RaTar.Campaign__r.Status == '鍙栨秷'){
+ //璐告槗鍚堣 you
+ if(System.Label.TradeComplianceStatusFlagBP =='true' && RaTar.AccDealerBlacklist__c == '1' && RaTar.EquipmentGuaranteeFlg__c==false){
+ errorFlag = true;
+ message9 += RaTar.Name+'銆�';
+ }else if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�'){
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� end
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
// return null;
errorFlag = true;
@@ -382,12 +427,43 @@
}else if(RaTar.demo_purpose2__c=='绱㈣禂QIS' && RaTar.next_action__c=='鏃犲伩鏇存崲' && RaTar.QIS_number__r.ReplaceDeliveryDate__c!= null){
errorFlag = true;
message5 += RaTar.Name+'銆�';
- }
+ }
//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� start
+ // else if (!campMap.isEmpty() && campMap.containsKey(RaTar.Campaign__c) && campMap.get(RaTar.Campaign__c).IF_Approved__c){
+ // if (String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__c)
+ // || String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c)) {
+ // errorFlag = true;
+ // message6 = RaTar.Name + '銆�';
+ // }
+ // }
+ else if(RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c == null) {
+ errorFlag = true;
+ message6 += RaTar.Name + '銆�';
+ }
+ else if(RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(RaTar.Campaign__r.Approved_Status__c)) {
+ errorFlag = true;
+ message7 += RaTar.Name + '銆�';
+ }
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� end
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.3 鍦ㄥ嚭搴撴椂澧炲姞鍒ゆ柇锛屽垽鏂浼氭槸鍚︾敵璇峰喅瑁侊紝濡傛灉鏄殑璇濓紝鍐嶅垽鏂喅瑁佺紪鍙锋槸鍚︿笉涓虹┖锛屾弧瓒虫潯浠舵墠鑳藉嚭搴擄紝鍚﹀垯鎻愮ず閿欒
}
+
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 start
+ if (!rentalApplyNameMap.isEmpty()) {
+ errorFlag = true;
+ for (String rentalApplyKey : rentalApplyNameMap.keySet()) {
+ message8 += rentalApplyNameMap.get(rentalApplyKey) + '銆�';
+ }
+ }
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
+
if(errorFlag){
if(String.isNotBlank(message0)){
- message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�';
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
+ // message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�';
+ message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堟垨鑰呭彇娑堢敵璇蜂腑锛屼笉鑳界户缁搷浣滀簡';
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
}
if(String.isNotBlank(message1)){
message += '鍗曞彿NO.'+message1.removeEnd('銆�')+'瀛樺湪淇悊鏈�缁堟娴嬫棩锛屼笉鑳界户缁簡';
@@ -406,7 +482,26 @@
message += '鍗曞彿NO.'+message5.removeEnd('銆�')+'绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ワ紝涓嶈兘缁х画浜�';
}
//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
+ if(String.isNotBlank(message6)){
+ message += '鍗曞彿No.'+ message6.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
+ }
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add start
+ if(String.isNotBlank(message7)){
+ message += '鍗曞彿No.'+ message7.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢';
+ }
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add end
+
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 start
+ if(String.isNotBlank(message8)){
+ message += '鍗曞彿No.'+ message8.removeEnd('銆�')+ '鐨勫鍝侀璁″嚭璐ф棩搴旇绛変簬浠婂ぉ锛屽惁鍒欎笉鑳藉彂璐�';
+ }
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
+
+ if(String.isNotBlank(message9)){
+ message += '鍗曞彿No.'+ message9.removeEnd('銆�')+ System.Label.IFTradeComplianceAlertBP;
+ }
+
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
return null;
}
//20210604 ljh update SFDC-C3LBNL end
@@ -432,6 +527,7 @@
Asset__r.Remark__c, Asset__r.ImageAsset__c, Asset__r.ImageSerial__c, Asset__r.ImageAssetUploadedTime__c, Asset__r.ImageSerialUploadedTime__c,
Loaner_CDS_Info__c, Inspection_result__c, Check_lost_Item__c, Pre_disinfection__c, Water_leacage_check__c, Inspection_result_after__c, Arrival_in_wh__c,
Asset__r.Pre_Reserve_RAES_Detail__c, Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c,
+ Rental_Apply__r.Request_approval_time__c , Add_Request_approval_time__c ,ApplyToShipmentWorkTime__c, //20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
Inspection_result_after_ng__c, Inspection_result_ng__c, Lost_item_giveup__c, CDS_complete__c, Loaner_accsessary__c,Key_product__c
from Rental_Apply_Equipment_Set_Detail__c where Id in :eSet for update];
Boolean needSaveSet = false;
@@ -441,6 +537,7 @@
Map<String,boolean> keyPointProduct = new Map<String,boolean>();
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 end
Set<Id> astForLock = new Set<Id>();
+ Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
for (Rental_Apply_Equipment_Set_Detail__c esd : eList) {
if (esd.Inspection_result__c <> null && esd.StockDown__c == false) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '澶囧搧set鏈笅鏋讹紝涓嶈兘濉啓鍙戣揣鍓嶆鏌ョ粨鏋�'));
@@ -459,12 +556,22 @@
}
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 end
astForLock.add(esd.Asset__c);
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
+ Datetime keyDt = esd.Add_Request_approval_time__c != null?esd.Add_Request_approval_time__c:esd.Rental_Apply__r.Request_approval_time__c;
+ List<Rental_Apply_Equipment_Set_Detail__c> tempRaesdL;
+ if(approvalMap.containsKey(keyDt)){
+ tempRaesdL = approvalMap.get(keyDt);
+ }else{
+ tempRaesdL = new List<Rental_Apply_Equipment_Set_Detail__c>();
+ }
+ tempRaesdL.add(esd);
+ approvalMap.put(keyDt,tempRaesdL);
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
}
List<Asset> astLock = [select Id
from Asset
where id in :astForLock
for update];
-
if (Step_status == '鏄庣粏') {
needDeliverySlip = true;
//if (slip.Id == null) {
@@ -479,15 +586,97 @@
slip.Shippment_loaner_time__c = Datetime.now();
needSaveDetail = true;
}
- List<Rental_Apply__c> raList = [select Id, DeliverySlip__c from Rental_Apply__c where Id in :raSet];
+ List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c
+ , Campaign__r.IF_Approved__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ , Campaign__r.Meeting_Approved_No__r.Name // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ , Campaign__r.Approved_Status__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ , Hospital__r.TradeComplianceStatus__c//璐告槗鍚堣 you
+ //, Outbound_TradeStatus__c//璐告槗鍚堣 you
+ from Rental_Apply__c where Id in :raSet];
Savepoint sp = Database.setSavepoint();
try {
//if (needSaveSet) ControllerUtil.upRAdEquipmentSet(es);
if (needDeliverySlip) {
FixtureUtil.withoutUpsertObjects(new List<FixtureDeliverySlip__c>{ slip });
//ControllerUtil.updRADeliverySlipDetail(slip);
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
+ map<String,Decimal> ApplyToShipmentMap = new map<String,Decimal>();
+ if(approvalMap.size() > 0 ){
+ // dtList[0] 绗竴涓氨鏄渶灏忔椂闂�
+ List<Datetime> dtList = new List<Datetime>(approvalMap.keySet());
+ Date startDateSOQL = date.newinstance(dtList[0].year(), dtList[0].month(), dtList[0].day());
+ List<OlympusCalendar__c> ocList = [SELECT Id, Date__c,IsWorkDay__c
+ FROM OlympusCalendar__c
+ WHERE Date__c >= :startDateSOQL
+ AND Date__c <= :Date.today()
+ ORDER BY Date__c ASC];
+ Map<Date,String> ocMap = new Map<Date,String>();
+ for(OlympusCalendar__c oc:ocList){
+ String IsWorkDay = oc.IsWorkDay__c.format();
+ ocMap.put(oc.Date__c,IsWorkDay);
+ }
+ for(Datetime dt:dtList){
+ Boolean startFlag = false;
+ Boolean endFlag = false;
+ Datetime startTime = dt;
+ Date startDate = Date.newInstance(startTime.year(),startTime.month(),startTime.day());
+ Datetime endTime = Datetime.now();
+ Date endDate = Date.today();
+ // 瀹℃壒鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
+ // if(ocList[0].IsWorkDay__c == 0){
+ if(ocMap.get(startDate) == '0'){
+ for(OlympusCalendar__c oc:ocList){
+ if(startDate < oc.Date__c && oc.IsWorkDay__c == 1){
+ startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0);
+ startDate = oc.Date__c;
+ startFlag = true;
+ break;
+ }
+ }
+ }
+ // 鍙戣揣鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
+ if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
+ for(Integer i = ocList.size() - 1; i >= 0;i--){
+ if(ocList[i].IsWorkDay__c == 1){
+ endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0);
+ endDate = ocList[i].Date__c.addDays(1);
+ endFlag = true;
+ break;
+ }
+ }
+ }
+ Decimal timeDifLast;
+ if(ocList[0].IsWorkDay__c == 0 && ocList[ocList.size() - 1].IsWorkDay__c == 0 && !startFlag && !endFlag){
+ timeDifLast = 0;
+ }else{
+ Long startL = startTime.getTime();
+ Long tendL = endTime.getTime();
+ Long timeDif = tendL - startL;
+ Decimal time11 = timeDif*1.00;
+ Decimal time12 = 24*3600*1000*1.00;
+ timeDifLast = time11/time12;
+ Integer tempWeek = 0;
+ for(OlympusCalendar__c oc:ocList){
+ if(oc.IsWorkDay__c == 0 && startDate < oc.Date__c && oc.Date__c < endDate){
+ tempWeek++;
+ }
+ }
+ timeDifLast = timeDifLast - tempWeek;
+ }
+ // dtestLast 鍥涜垗浜斿叆 淇濈暀1浣嶅皬鏁�
+ for(Rental_Apply_Equipment_Set_Detail__c raesd00:approvalMap.get(dt)){
+ ApplyToShipmentMap.put(raesd00.Id,timeDifLast.setScale(1));
+ }
+ }
+ }
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
for (Rental_Apply_Equipment_Set_Detail__c esd : eList) {
esd.DeliverySlip__c = slip.Id;
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
+ if(ApplyToShipmentMap.containsKey(esd.Id)){
+ esd.ApplyToShipmentWorkTime__c = ApplyToShipmentMap.get(esd.Id);
+ }
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
}
for (Rental_Apply__c ra : raList) {
@@ -495,6 +684,18 @@
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
ra.Is_keyPoint_Product__c = keyPointProduct.get(ra.Id);
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
+ //ra.Outbound_TradeStatus__c = ra.Hospital__r.TradeComplianceStatus__c;//璐告槗鍚堣 you
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� update start
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
+ // if (!campMap.isEmpty() && campMap.containsKey(ra.Campaign__c) && campMap.get(ra.Campaign__c).IF_Approved__c){
+ // ra.ApprovedNo_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c;
+ // ra.Approved_State_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.ProcessState__c;
+ // }
+ if (ra.Campaign__c != null&& ra.Campaign__r.IF_Approved__c && ra.Campaign__r.Meeting_Approved_No__r.Name != null){
+ ra.ApprovedNo_Delivery__c = ra.Campaign__r.Meeting_Approved_No__r.Name;
+ ra.Approved_State_Delivery__c = ra.Campaign__r.Approved_Status__c;
+ }
+ // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� update end
}
}
//if (needSaveDetail) ControllerUtil.updRAEquipmentSetDetail(eList);
@@ -510,7 +711,8 @@
return null;
} catch (Exception ex) {
system.debug('=====' + ex.getMessage());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getMessage()+'( '+Step_status+' )'));
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ ApexPages.addMessages(ex);
Database.rollback(sp);
done_flg = false;
return null;
--
Gitblit v1.9.1