【委托】【phase5上线课题132】-紧急-耗材ET展箱借用目的没有锁定已过期库存

LiJinHuan

2022-03-11 56cab641be7c6c0aaab0ae2ca7eeaee9be6d5a69

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

@@ -10,9 +10,11 @@
    // 2021-03-05  mzy  WLIG-BYHD79  SFDC环境batch合并调查  start
    global ConsumAutoSelectBatch( ) {
    }
    global ConsumAutoSelectBatch(Boolean NeedExecute) {
        this.IsNeedExecute = NeedExecute;
    }
    // 20220309 ljh  SFDC-CC73U5 132 动物实验&ET展箱 锁定已过期库存 start
    // global ConsumAutoSelectBatch(Boolean NeedExecute) {
    //     this.IsNeedExecute = NeedExecute;
    // }
    // 20220309 ljh  SFDC-CC73U5 132 动物实验&ET展箱 锁定已过期库存 end
    // 2021-03-05  mzy  WLIG-BYHD79  SFDC环境batch合并调查  end

    /**
@@ -24,6 +26,7 @@
                + ', demo_purpose2__c'
            + ' from Consum_Apply__c'
            + ' where (Status__c = \'已批准\' OR Status__c = \'已出库指示\')'
            // + ' and demo_purpose2__c !=\'动物实验\' and demo_purpose2__c !=\'ET展箱\''
            + ' and Wei_Shipment_request__c > 0'
            + ' and Yi_loaner_arranged__c = 0'
            + ' order by Id';
@@ -47,7 +50,7 @@
                      AND Cancel_Select__c = false
                      AND Shipment_request_time2__c = null];
            List<Consum_Apply_Equipment_Set_Detail__c> caesdList = new List<Consum_Apply_Equipment_Set_Detail__c>();

            
            Boolean haveChangeAss = ConsumDefaultSelectController.reSetAsset(selectedData, caesdList, csmApyList[0], false, true);
            if (caesdList.size() > 0) {
                update caesdList;
@@ -99,10 +102,10 @@
        }

        //2021-03-05  mzy  WLIG-BYHD79  SFDC环境batch合并调查  start
        if(!Test.isRunningTest() &&IsNeedExecute==true){
            //batch里调用下一个batch时，希望跟原有的Schedule里面传的条数保持一致
            Id execBTId = Database.executebatch(new SetOlympusCalendarWorkDayBatch(true),200);
        }
        // if(!Test.isRunningTest() &&IsNeedExecute==true){
        //     //batch里调用下一个batch时，希望跟原有的Schedule里面传的条数保持一致
        //     Id execBTId = Database.executebatch(new SetOlympusCalendarWorkDayBatch(true),200);
        // }
        //2021-03-05  mzy  WLIG-BYHD79  SFDC环境batch合并调查 end
    }