From 5fa4c7d6c8d987891ffe5ef8fae615b33e032886 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 20 七月 2023 10:32:10 +0800
Subject: [PATCH] button-lexRentalFixtureSetAssignAgency
---
force-app/main/default/classes/RentalApplyWebService.cls | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index a78f66b..af448ab 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -377,6 +377,7 @@
rasdid = rentalApplyId.subString(rentalApplyId.indexOf(';') + 1);
rentalApplyId = rentalApplyId.subString(0, rentalApplyId.indexOf(';'));
}
+ system.debug(rentalApplyId+'==aaa');
//1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
//澶囧搧鍊熷嚭鐢宠
Rental_Apply__c[] rentalApply = [select Id,repair__r.Repair_Final_Inspection_Date__c,Bollow_Date__c,repair__r.Return_Without_Repair_Date__c,
@@ -384,6 +385,7 @@
demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c
from Rental_Apply__c
where Id = :rentalApplyId];
+ system.debug(rentalApplyId+'==aaa'+rentalApply.size());
if (rentalApply.size() == 0) {
returnStr = '娌℃湁澶囧搧鍊熷嚭鐢宠锛岃纭銆�';
return returnStr;
@@ -725,13 +727,13 @@
if(raescc != null && raescc.size() > 0){
for(Rental_Apply_Equipment_Set__c rr : raescc){
if ((rr.Received_Confirm__c == 'OK' || rr.Received_Confirm__c == '榛樿绛炬敹-OK') && rr.Asset_return_time__c != null) {
- return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠躲��';
+ return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠�01銆�';
}
}
return '1';
}
}else{
- return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠躲��';
+ return '姝ゅ崟涓嶆弧瓒冲欢鏈熸潯浠�02銆�';
}
}else{
return '2';
@@ -1183,6 +1185,7 @@
// return Raesc.size();
// }
// 鍒嗛厤楠岃瘉
+ @AuraEnabled
Webservice static String AssignBtn(String Rid){
List<String> statusList = System.Label.StatusProcessState.split(',');
@@ -1276,7 +1279,7 @@
// }
// return '1';
// }
-
+ @AuraEnabled
Webservice static String postponeCheck(String endDate, Integer d) {
Date before5day = getWD_addday(date.parse(endDate), d);
if (Date.today() > before5day) {
@@ -1761,6 +1764,7 @@
/**
* 娉ㄦ畫鐢宠澶囧搧鐨勭鎺�
*/
+ @AuraEnabled
WebService static String RentalApplyCheckForSAoneEle(String SaID) {
Statu_Achievements__c Sac = [select id,
SalesChannel__c,
--
Gitblit v1.9.1