From 614b1b648eceb33e325ed7cf8d8cb6a7a71b9ddc Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 11:28:13 +0800
Subject: [PATCH] backup0626
---
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 98 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index ec7d5ab..13dca85 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -334,10 +334,9 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
-
List<String> raids = Raid.split(':');
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
- List<Rental_Apply__c> RaTarList = [select Name,Campaign__c,Repair__c,next_action__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
@@ -346,9 +345,29 @@
,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 = '';
@@ -360,11 +379,21 @@
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
+ // && RaTar.EquipmentGuaranteeFlg__c==false
+ if(System.Label.TradeComplianceStatusFlagBP =='true' && RaTar.AccDealerBlacklist__c == '1'){
+ 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;
@@ -415,9 +444,22 @@
// 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('銆�')+'瀛樺湪淇悊鏈�缁堟娴嬫棩锛屼笉鑳界户缁簡';
@@ -440,10 +482,21 @@
message += '鍗曞彿No.'+ message6.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add start
- if(String.isNotBlank(message6)){
- message += '鍗曞彿No.'+ message7.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜鐘舵�佷笉绗﹀悎闇�姹�';
+ 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;
}
@@ -531,8 +584,10 @@
}
List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c
, Campaign__r.IF_Approved__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
- , Campaign__r.Meeting_Approved_No__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 {
@@ -551,7 +606,11 @@
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;
@@ -560,10 +619,11 @@
Datetime endTime = Datetime.now();
Date endDate = Date.today();
// 瀹℃壒鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
- if(ocList[0].IsWorkDay__c == 0){
+ // if(ocList[0].IsWorkDay__c == 0){
+ if(ocMap.get(startDate) == '0'){
for(OlympusCalendar__c oc:ocList){
- if(oc.IsWorkDay__c == 1){
- startTime = oc.Date__c;
+ 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;
@@ -572,9 +632,9 @@
}
// 鍙戣揣鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
- for(Integer i = ocList.size() - 1; i <= 0;i--){
+ for(Integer i = ocList.size() - 1; i >= 0;i--){
if(ocList[i].IsWorkDay__c == 1){
- endTime = ocList[i].Date__c.addDays(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;
@@ -620,15 +680,15 @@
//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__c != null){
- ra.ApprovedNo_Delivery__c = ra.Campaign__r.Meeting_Approved_No__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
@@ -636,6 +696,9 @@
}
//if (needSaveDetail) ControllerUtil.updRAEquipmentSetDetail(eList);
if (needSaveDetail) {
+ // 澶囧搧浼樺寲杩藉姞 20230518 lc Start
+ RentalApplyEquipmentSetDetailHandler.skipUpdateAgain = true;
+ // 澶囧搧浼樺寲杩藉姞 20230518 lc End
FixtureUtil.withoutUpsertObjects(eList);
FixtureUtil.withoutUpsertObjects(raList);
}
@@ -647,7 +710,8 @@
return null;
} catch (Exception ex) {
system.debug('=====' + ex.getMessage());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ // 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