~liucheng/OlyMEBG.git

			@@ -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

			@@ -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

	force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/RentalFixtureSetAssignController.cls	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史