~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
			@@ -199,9 +199,13 @@
			// 保存按钮
			public PageReference save() {

			List<String> statusList = System.Label.StatusProcessState.split(',');

			//检查是否可以继续
			Rental_Apply__c RaTar = [select Campaign__c,Repair__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,
			Campaign__r.Status,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c
			Campaign__r.Status,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c,
			Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c,
			Campaign__r.Approved_Status__c //20220315 sx obpm备品决裁状态相关修改
			from Rental_Apply__c
			where id=:Raid];

			@@ -232,6 +236,20 @@
			return null;
			}
			//1822 yc 20211108 end

			//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 null;
			}
			//20220225 sx end 下架增加判断

			//20220315 sx start obpm备品决裁状态相关修改
			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 null;
			}
			//20220315 sx end obpm备品决裁状态相关修改

			String userid = Userinfo.getUserId();
			List<Rental_Apply_Equipment_Set_Detail__c> eList = new List<Rental_Apply_Equipment_Set_Detail__c>();
			@@ -283,7 +301,7 @@
			return null;
			} catch (Exception ex) {
			system.debug('=====' + ex.getMessage());
			ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getMessage()+'( '+Step_status+' )'));
			ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
			Database.rollback(sp);
			done_flg = false;
			return null;