From 88abd49ebcdfcbff8cb60e9b0fb20b1e2e7eb613 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 23 三月 2022 11:32:19 +0800
Subject: [PATCH] obpm备品相关提示修改
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index 47cf35d..76d8b19 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -1,3 +1,4 @@
+// RentalFixtureSetAssignAgencyCtrlTest
public with sharing class RentalFixtureSetAssignAgencyController {
public List<EsdInfo> esdList { get; set; }
public FixtureDeliverySlip__c slip { get; set; }
@@ -48,9 +49,9 @@
+ ', 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__c, Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c'
- + ', Campaign__r.Meeting_Approved_No__r.ProcessState__c'
- + ', Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c' //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗
+ + ', Campaign__r.IF_Approved__c' // 20220315 ljh add
+ + ', 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);
@@ -251,6 +252,7 @@
, 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
@@ -427,18 +429,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.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 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
@@ -480,10 +486,18 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃�,涓嶈兘缁х画浜�'));
return false;
}//1822 yc 20211108 end
- //20220225 sx add obpm 鍔炰簨澶勫鍔犲垽鏂細鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
+ //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;
}
@@ -1714,7 +1728,7 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '娌℃湁鏄庣粏锛屼笉鑳藉彂璐�!'));
return;
}
- Map<String, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<String, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀�
+ 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;
@@ -1774,13 +1788,13 @@
// 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.format())){
- tempRaesdL = approvalMap.get(keyDt.format());
+ if(approvalMap.containsKey(keyDt)){
+ tempRaesdL = approvalMap.get(keyDt);
}else{
tempRaesdL = new List<Rental_Apply_Equipment_Set_Detail__c>();
}
tempRaesdL.add(raesd);
- approvalMap.put(keyDt.format(),tempRaesdL);
+ approvalMap.put(keyDt,tempRaesdL);
// 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� end
updateRaesdList.add(raesd);
}
@@ -1811,16 +1825,6 @@
return;
}
//20201209 ljh update end
-
- //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗
- if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c) {
- if (String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__c)
- || String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇ョ敵璇峰崟宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖,涓嶈兘鍙戣揣锛�'));
- return;
- }
- }
-
// 鍒犻櫎link
if(!mainIdList.isEmpty()) {
Oly_TriggerHandler.bypass(AssetHandlerCheck.class.getName());
@@ -1830,27 +1834,21 @@
if(!updateRaesdList.isEmpty()) {
slip.Shippment_loaner_time__c = now;
FixtureUtil.withoutUpsertObjects(new List<FixtureDeliverySlip__c> {slip});
- // 鏄庣粏鍜岀敵璇疯繛鍒板彂璐у崟涓�
- for(Rental_Apply_Equipment_Set_Detail__c raesd: updateRaesdList) {
- if(!raesd.Cancel_Select__c) {
- raesd.DeliverySlip__c = slip.Id;
- }
- }
// 20220309 ljh SFDC-CC6CLJ phase5涓婄嚎璇鹃131 鎻愪氦鐢宠鍒板鍝佸嚭搴撴椂闀� start
map<String,Decimal> ApplyToShipmentMap = new map<String,Decimal>();
if(approvalMap.size() > 0 ){
// dtList[0] 绗竴涓氨鏄渶灏忔椂闂�
- List<String> dtList = new List<String>(approvalMap.keySet());
- Date startDateSOQL = date.newinstance(Datetime.valueOf(dtList[0]).year(), Datetime.valueOf(dtList[0]).month(), Datetime.valueOf(dtList[0]).day());
+ 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(String dt:dtList){
+ for(Datetime dt:dtList){
Boolean startFlag = false;
Boolean endFlag = false;
- Datetime startTime = Datetime.valueOf(dt);
+ Datetime startTime = dt;
Date startDate = Date.newInstance(startTime.year(),startTime.month(),startTime.day());
Datetime endTime = Datetime.now();
Date endDate = Date.today();
@@ -1858,7 +1856,7 @@
if(ocList[0].IsWorkDay__c == 0){
for(OlympusCalendar__c oc:ocList){
if(oc.IsWorkDay__c == 1){
- startTime = oc.Date__c;
+ 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;
@@ -1869,7 +1867,7 @@
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);
+ 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;
@@ -1888,7 +1886,7 @@
timeDifLast = time11/time12;
Integer tempWeek = 0;
for(OlympusCalendar__c oc:ocList){
- if(startDate < oc.Date__c && oc.Date__c < endDate){
+ if(oc.IsWorkDay__c == 0 && startDate < oc.Date__c && oc.Date__c < endDate){
tempWeek++;
}
}
@@ -1901,6 +1899,17 @@
}
}
// 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
// Rental_Apply__c ra = new Rental_Apply__c(Id=parentObj.Id, DeliverySlip__c = slip.Id, Delivery_Agency__c = parentObj.Delivery_Agency__c, Agency_Address_Id__c = addressId );
@@ -1916,8 +1925,10 @@
//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__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});
}
@@ -1934,7 +1945,8 @@
}
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);
// 杩愯緭鍗曟彃鍏ユ垚鍔燂紝浣嗘槑缁嗘垨鐢宠鏇存柊澶辫触鏃讹紝杩愯緭鍗曠殑鍋嘔d瑕佹竻鎺�
if(insertSlip) {
--
Gitblit v1.9.1