From 8532fb6e9d278f8dbd88e12bbe250c9c0a636556 Mon Sep 17 00:00:00 2001 From: sunxia <sunxia@prec-tech.com> Date: 星期三, 16 三月 2022 10:29:56 +0800 Subject: [PATCH] obpm新需求修改 --- force-app/main/default/classes/RentalFixtureSetAssignController.cls | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/classes/RentalFixtureSetAssignController.cls b/force-app/main/default/classes/RentalFixtureSetAssignController.cls index 85dabea..dd42ffe 100644 --- a/force-app/main/default/classes/RentalFixtureSetAssignController.cls +++ b/force-app/main/default/classes/RentalFixtureSetAssignController.cls @@ -290,6 +290,7 @@ // update銇犮亼浣跨敤銇欍倠 List<Rental_Apply_Equipment_Set__c> mfUpdate = new List<Rental_Apply_Equipment_Set__c>(); Savepoint sp = Database.setSavepoint(); + List<String> statusList = System.Label.StatusProcessState.split(','); try { Boolean updRAFlg = false; @@ -299,7 +300,8 @@ Asset_loaner_closed_day__c, Campaign__c, Campaign__r.IF_Approved__c, - Campaign__r.Meeting_Approved_No__c + Campaign__r.Meeting_Approved_No__c, + Campaign__r.Approved_Status__c //2022 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� FROM Rental_Apply__c WHERE Id = :parentId FOR Update]; @@ -318,7 +320,11 @@ if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){ throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖'); } - + //20220315 sx obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� start + else if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(raUpd.Campaign__r.Approved_Status__c) ){ + throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜鐘舵�佷笉绗﹀悎闇�姹�'); + } + //20220315 sx obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� end Integer indexNum = 1; // 20210708 ljh SFDC-C47CLV add start Set<Id> raeIdset = new Set<Id>(); -- Gitblit v1.9.1