obpm备品相关提示修改

李金换

2022-03-23 88abd49ebcdfcbff8cb60e9b0fb20b1e2e7eb613

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

@@ -441,7 +441,7 @@
            }
            // 20220315 ljh obpm备品决裁状态相关修改 add start
            if(String.isNotBlank(message6)){
                message += '单号No.'+ message7.removeEnd('、')+ '已申请决裁但决裁编码状态不符合需求';
                message += '单号No.'+ message7.removeEnd('、')+ '已申请决裁但决裁状态不符合条件';
            }
            // 20220315 ljh obpm备品决裁状态相关修改 add end
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
@@ -563,7 +563,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;
@@ -574,7 +574,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;
@@ -647,7 +647,8 @@
            return null;
        } 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);
            done_flg = false;
            return null;