Note test

Denny Chen

2022-02-28 6947068a02499b9d1022f9efca5bcf1bdd3f1c70

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

@@ -48,6 +48,9 @@
                         + ', 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__c, Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c' 
                         + ', Campaign__r.Meeting_Approved_No__r.ProcessState__c'
                         + ', Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c' //20220217 sx add 备品借出申请-决裁控制
                         + ' FROM Rental_Apply__c'
                         + ' WHERE Id=\'' + taId + '\'';
            List<Rental_Apply__c>  raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -1211,6 +1214,7 @@
        }
        return true;
    }

    //20210519 ljh add 1829
    // 扫一扫按钮
    public void scanAndMatch() {
@@ -1790,6 +1794,16 @@
                return;
            }
            //20201209 ljh update end

            //20220217 sx add 备品借出申请-决裁控制
            if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c) {
                if (String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__c) 
                    || String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c)) {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '该申请单已申请决裁但决裁编码为空,不能发货！'));
                    return;
                }
            }

            // 删除link
            if(!mainIdList.isEmpty()) {
                Oly_TriggerHandler.bypass(AssetHandlerCheck.class.getName());
@@ -1817,6 +1831,12 @@
                ra.Delivery_Agency__c = parentObj.Delivery_Agency__c; 
                ra.Agency_Address_Id__c = addressId;
                // 20210624 ljh update SFDC-C448GR end

                //20220217 sx add 备品借出申请-决裁控制 No.4 出库成功时，把此时点的决裁编号和决裁状态写到决裁编号（出库）和决裁状态（出库）上
                if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c){
                    ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c;
                    ra.Approved_State_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.ProcessState__c;
                }
                FixtureUtil.withoutUpdate(new List<Rental_Apply__c> {ra});
            }
            // 同城时自动收货