From ecca7a53814c487494b9ebed42c22992de40fca0 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期二, 15 三月 2022 18:27:40 +0800
Subject: [PATCH] Merge branch 'SFDC-CC6CLJ'
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 123 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index c97b2ca..a8cdc30 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -48,6 +48,8 @@
+ ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you
+ ', Equipment_Type_F__c' //20210508 LJH ADD 1672
+ ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start
+ + ', Campaign__r.Meeting_Approved_No__c' // 20220315 ljh add
+ + ', Campaign__r.Approved_Status__c' // 20220315 ljh add
+ ' FROM Rental_Apply__c'
+ ' WHERE Id=\'' + taId + '\'';
List<Rental_Apply__c> raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -243,10 +245,12 @@
, Rental_Apply_Equipment_Set__r.Irreplaceable_flag__c //20210519 ljh add 1829 start
, Rental_Apply_Equipment_Set__r.canDelete__c //20210519 ljh add 1829 start
, Rental_Apply_Equipment_Set__r.Substitute_flag__c //20210526 ljh 1829 add
- ,Rental_Apply_Equipment_Set__r.RAES_Status__c
- ,Rental_Apply_Equipment_Set__r.Shippment_loaner_time2__c
- ,Rental_Apply__r.Status__c
- //20210519 ljh add 1829 end
+ , Rental_Apply_Equipment_Set__r.RAES_Status__c
+ , Rental_Apply_Equipment_Set__r.Shippment_loaner_time2__c
+ , Rental_Apply__r.Status__c //20210519 ljh add 1829 end
+ , Rental_Apply__r.Request_approval_time__c //20220309 SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
+ , Add_Request_approval_time__c //20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
+ , ApplyToShipmentWorkTime__c //20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
, Rental_Num__c
, Rental_Start_Date__c
, Select_Time__c
@@ -423,16 +427,22 @@
}
}
private Boolean isRaStatusOK() {
+
+ List<String> statusList = System.Label.StatusProcessState.split(',');
+
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
// 20210809 ljh SFDC-C5HDC7 update start
List<Rental_Apply__c> RaTarList = [
SELECT Campaign__c
, Repair__c
, Campaign__r.Status
+ , Campaign__r.IF_Approved__c
+ , Campaign__r.Meeting_Approved_No__c
+ , Campaign__r.Approved_Status__c //20220315 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
// ,repair__r.Return_Without_Repair_Date__c
, Return_Without_Repair_Date_F__c
// , Repair__r.Repair_Final_Inspection_Date__c
- ,Repair_Final_Inspection_Date_F__c
+ , Repair_Final_Inspection_Date_F__c
// , Repair__r.Repair_Shipped_Date__c
, RC_return_to_office__c
, demo_purpose2__c //1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
@@ -474,6 +484,18 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃�,涓嶈兘缁х画浜�'));
return false;
}//1822 yc 20211108 end
+ //20220225 sx start obpm 鍔炰簨澶勫鍔犲垽鏂細鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
+ else if(RaTar.Campaign__c != null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c == null){
+ ApexPages.addMessage(new ApexPages.message(ApexPages.severity.Error, '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖'));
+ return false;
+ }
+ //20220225 sx end obpm 鍔炰簨澶勫鍔犲垽鏂細鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
+ //20220315 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add start
+ 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)){
+ ApexPages.addMessage(new ApexPages.message(ApexPages.severity.Error, '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜鐘舵�佷笉绗﹀悎闇�姹�'));
+ return false;
+ }
+ //20220315 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add end
}
return true;
}
@@ -1704,6 +1726,7 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '娌℃湁鏄庣粏锛屼笉鑳藉彂璐�!'));
return;
}
+ Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
for(EsdInfo esd:esdList) {
if(!raesdMap.containsKey(esd.rec.Id)) {
continue;
@@ -1760,7 +1783,17 @@
raesd.Inspection_result__c = 'OK';
// 鍙戣揣鍓嶆娴嬫椂闂村拰妫�娴嬩汉鍦╰rigger閲岃
raesd.Shippment_loaner_time__c = now;
-
+ // 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
+ Datetime keyDt = raesd.Add_Request_approval_time__c != null?raesd.Add_Request_approval_time__c:raesd.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(raesd);
+ approvalMap.put(keyDt,tempRaesdL);
+ // 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
updateRaesdList.add(raesd);
}
else {
@@ -1799,11 +1832,81 @@
if(!updateRaesdList.isEmpty()) {
slip.Shippment_loaner_time__c = now;
FixtureUtil.withoutUpsertObjects(new List<FixtureDeliverySlip__c> {slip});
+ // 20220309 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];
+ 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){
+ for(OlympusCalendar__c oc:ocList){
+ if(oc.IsWorkDay__c == 1){
+ startTime = oc.Date__c;
+ 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 = ocList[i].Date__c.addDays(1);
+ 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));
+ }
+ }
+ }
+ // 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
// 鏄庣粏鍜岀敵璇疯繛鍒板彂璐у崟涓�
for(Rental_Apply_Equipment_Set_Detail__c raesd: updateRaesdList) {
if(!raesd.Cancel_Select__c) {
raesd.DeliverySlip__c = slip.Id;
}
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
+ if(ApplyToShipmentMap.containsKey(raesd.Id)){
+ raesd.ApplyToShipmentWorkTime__c = ApplyToShipmentMap.get(raesd.Id);
+ }
+ // 20220315 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
}
FixtureUtil.withoutUpdate(updateRaesdList);
// 20210624 ljh update SFDC-C448GR start
@@ -1817,6 +1920,14 @@
ra.Delivery_Agency__c = parentObj.Delivery_Agency__c;
ra.Agency_Address_Id__c = addressId;
// 20210624 ljh update SFDC-C448GR end
+
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
+ if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c){
+ // ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c;
+ // ra.Approved_State_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.ProcessState__c;
+ ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__c;
+ ra.Approved_State_Delivery__c = parentObj.Campaign__r.Approved_Status__c;
+ }
FixtureUtil.withoutUpdate(new List<Rental_Apply__c> {ra});
}
// 鍚屽煄鏃惰嚜鍔ㄦ敹璐�
--
Gitblit v1.9.1