obpm备品相关提示修改

李金换

2022-03-23 88abd49ebcdfcbff8cb60e9b0fb20b1e2e7eb613

 force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls

@@ -1,3 +1,4 @@
// RentalFixtureSetAssignAgencyCtrlTest
public with sharing class RentalFixtureSetAssignAgencyController {
    public List<EsdInfo> esdList { get; set; }
    public FixtureDeliverySlip__c slip { get; set; }
@@ -48,6 +49,7 @@
                         + ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you
                         + ', Equipment_Type_F__c' //20210508 LJH ADD 1672
                         + ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start
                         + ', Campaign__r.IF_Approved__c' // 20220315 ljh add
                         + ', Campaign__r.Meeting_Approved_No__c' // 20220315 ljh add 
                         + ', Campaign__r.Approved_Status__c' // 20220315 ljh add 
                         + ' FROM Rental_Apply__c'
@@ -492,7 +494,7 @@
            //20220225 sx end obpm 办事处增加判断：是否申请决裁勾着没有决裁编号不能进行操作
            //20220315 sx  obpm备品决裁状态相关修改 add start
            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, '已申请决裁但决裁编码状态不符合需求'));
                ApexPages.addMessage(new ApexPages.message(ApexPages.severity.Error, '已申请决裁但决裁状态不符合条件'));
                return false;
            }
            //20220315 sx  obpm备品决裁状态相关修改 add end
@@ -1854,7 +1856,7 @@
                        if(ocList[0].IsWorkDay__c == 0){
                            for(OlympusCalendar__c oc:ocList){
                                if(oc.IsWorkDay__c == 1){
                                    startTime = oc.Date__c;
                                    startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0);
                                    startDate = oc.Date__c;
                                    startFlag = true;
                                    break;
@@ -1865,7 +1867,7 @@
                        if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
                            for(Integer i = ocList.size() - 1; i <= 0;i--){
                                if(ocList[i].IsWorkDay__c == 1){
                                    endTime = ocList[i].Date__c.addDays(1);
                                    endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0);
                                    endDate = ocList[i].Date__c.addDays(1);
                                    endFlag = true;
                                    break;
@@ -1943,7 +1945,8 @@
        }
        catch (Exception ex) {
            system.debug('=====' + ex.getMessage());
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
            ApexPages.addMessages(ex);
            Database.rollback(sp);
            // 运输单插入成功，但明细或申请更新失败时，运输单的假Id要清掉
            if(insertSlip) {