From 9909cdba659d1933abb3c63e9cc5dc7e719f90e6 Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期五, 11 三月 2022 14:30:34 +0800
Subject: [PATCH] OBPM 上线比较文件差异注释解开
---
force-app/main/default/classes/RentalFixtureSetAssignController.cls | 14 +++++++-------
force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
index 77cf12d..63fb18a 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
@@ -114,7 +114,7 @@
Asset__r.Remark__c, Asset__r.ImageAsset__c, Asset__r.ImageSerial__c, Asset__r.ImageAssetUploadedTime__c, Asset__r.ImageSerialUploadedTime__c,
Loaner_CDS_Info__c, Inspection_result__c, Check_lost_Item__c, Pre_disinfection__c, Water_leacage_check__c, Inspection_result_after__c, Arrival_in_wh__c,
Asset__r.Pre_Reserve_RAES_Detail__c, Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c,
- Inspection_result_after_ng__c, Inspection_result_ng__c, Lost_item_giveup__c, CDS_complete__c, Loaner_accsessary__c
+ Inspection_result_after_ng__c, Inspection_result_ng__c, Lost_item_giveup__c, CDS_complete__c, Loaner_accsessary__c, Pre_NG_abord_reason__c
from Rental_Apply_Equipment_Set_Detail__c
where Rental_Apply_Equipment_Set__c in :esIds
and Cancel_Select__c = False
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignController.cls b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
index e7e3efe..85dabea 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
@@ -296,10 +296,10 @@
Rental_Apply__c raUpd = [
SELECT Id, Shipment_request_Cnt__c,
Asset_loaner_start_day__c,
- // Campaign__c,
- // Campaign__r.IF_Approved__c,
- // Campaign__r.Meeting_Approved_No__c,
- Asset_loaner_closed_day__c
+ Asset_loaner_closed_day__c,
+ Campaign__c,
+ Campaign__r.IF_Approved__c,
+ Campaign__r.Meeting_Approved_No__c
FROM Rental_Apply__c
WHERE Id = :parentId
FOR Update];
@@ -315,9 +315,9 @@
}
//20220228 sx obpm淇敼 鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
- // if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
- // throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖');
- // }
+ if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
+ throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖');
+ }
Integer indexNum = 1;
// 20210708 ljh SFDC-C47CLV add start
--
Gitblit v1.9.1