From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/OpdPlanWebService.cls | 39 ++-------------------------------------
1 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/force-app/main/default/classes/OpdPlanWebService.cls b/force-app/main/default/classes/OpdPlanWebService.cls
index feff96e..e0ee7ec 100644
--- a/force-app/main/default/classes/OpdPlanWebService.cls
+++ b/force-app/main/default/classes/OpdPlanWebService.cls
@@ -20,6 +20,8 @@
return rtn;
}
+ // 20230215 ljh DB202301265636 褰撲細璁腑鏈夊鍝佸嚭搴撶殑鏃跺�欏厑璁歌繘琛屼細璁彇娑堢敵璇� 姝ゆ柟娉曚笉鍦ㄤ娇鐢�
+ // 鏆傛椂娌℃湁娉ㄩ噴 鏄负浜嗚鐩栫巼
WebService static String changeCampaign(String campaignId) { //瀛︿細鍙栨秷寰楃獥鍙ｈ皟鐢�
List<Rental_Apply__c> raList = [select Yi_loaner_arranged__c, Shipment_request_Cnt__c from Rental_Apply__c where Campaign__c = :campaignId];
String rtn = 'OK';
@@ -44,43 +46,6 @@
return rtn;
}
- // 20230118 ljh DB202301265636 start
- /**
- * @fuction [褰撲細璁腑鏈夊鍝佸嚭搴撶殑鏃跺�欏厑璁歌繘琛屼細璁彇娑堢敵璇�,
- * 浼氳鍙栨秷鐨勬椂鍊欏搴旂殑OPD璁″垝涔熼渶瑕佸彇娑�
- * 棰勮鍥炴敹鏃ラ渶瑕佷慨鏀筣
- * @Author lijinhuan
- * @DateTime 2023-01-18T15:10:48+0800
- * @version [version]
- * @param campaignId [description]
- * @return [description]
- */
- WebService static String changeCampaignCancel(String campaignId) { //瀛︿細鍙栨秷寰楃獥鍙ｈ皟鐢�
- List<Rental_Apply_Equipment_Set__c> raesList = [select Id,Rental_End_Date__c from Rental_Apply_Equipment_Set__c where Rental_End_Date__c != null
- AND Shippment_loaner_time2__c != null
- AND Rental_Apply__r.RA_Status__c != '瀹屼簡'
- AND Rental_Apply__r.RA_Status__c != '鍙栨秷'
- AND Rental_Apply__r.Campaign__c = :campaignId ];
- String rtn = 'OK';
- Savepoint sp = Database.setSavepoint();
- try{
- if (null != raesList && raesList.size() > 0) {
- for (Rental_Apply_Equipment_Set__c raes : raesList) {
- raes.Rental_End_Date__c = Date.today().addDays(5);
- }
- update raesList;
- }
- }catch (Exception ex) {
- System.debug(ex.getStackTraceString());
- System.debug('ex.getMessage()***'+ ex.getMessage()+ex.getLineNumber());
- ApexPages.addMessages(ex);
- Database.rollback(sp);
- rtn = ex.getMessage();
- }
- return rtn;
- }
- // 20230118 ljh DB202301265636 end
-
WebService static String dataCheck(String rentalApplyId) {
string result = 'OK';
if (String.isBlank(rentalApplyId)) {
--
Gitblit v1.9.1