Denny Chen
2022-02-28 6947068a02499b9d1022f9efca5bcf1bdd3f1c70
force-app/main/default/classes/RentalApplyWebService.cls
@@ -430,11 +430,15 @@
        }
        //1388 yc 20211021 跨区域分配不能出库 end
        // 20220211 ljh add 备品FY23课题01 start
        /*AggregateResult[] resultsET = [SELECT Rental_Start_Date__c,count(Id) cnt
        AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt
                                     FROM Rental_Apply_Equipment_Set__c
                                     WHERE Rental_Apply__c = :rentalApplyId
                                     Cancel_Select__c = false
                                     group by Rental_Start_Date__c];*/
                                     WHERE Rental_Apply__c = :rentalApplyId
                                     AND Cancel_Select__c = false
                                     group by Rental_Start_Date__c];
        If(resultsRas.size() > 1){
           returnStr = '所有一览备品预计出货日应一致,不一致不能做出库指示';
            return returnStr;
        }
        // 20220211 ljh add 备品FY23课题01 end
//bp2        // 备品借出历史取得
@@ -1688,6 +1692,7 @@
            if (!raess.isEmpty()) {
                update raess;
            }
            return '状态更新到已出库指示';
        } else {
            Database.rollback(sp);