贸易合规20230429

游畅

2023-04-29 cc266a1e4080bb3ecc47ea4a202dd549545111e1

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

@@ -52,6 +52,7 @@
                         + ', Campaign__r.IF_Approved__c' // 20220315 ljh add
                         + ', Campaign__r.Meeting_Approved_No__r.Name' // 20220315 ljh add 
                         + ', Campaign__r.Approved_Status__c' // 20220315 ljh add 
                         //+ ', Hospital__r.TradeComplianceStatus__c' // 贸易合规 you 
                         + ' FROM Rental_Apply__c'
                         + ' WHERE Id=\'' + taId + '\'';
            List<Rental_Apply__c>  raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -450,6 +451,8 @@
                 , demo_purpose2__c //1822 yc 20211025 已购待货目的，新品已有发货日不能出库
                 , Follow_UP_Opp__r.Shipping_Finished_Day_Func__c //1822 yc 20211025 已购待货目的，新品已有发货日不能出库
                 , next_action__c //1822 yc 20211108
                 ,AccDealerBlacklist__c//贸易合规 you
                 ,EquipmentGuaranteeFlg__c//贸易合规 you
                 , QIS_number__r.ReplaceDeliveryDate__c //1822 yc 20211108
              FROM Rental_Apply__c
             WHERE id =:taId
@@ -458,7 +461,11 @@
            // 20230215 ljh DB202301265636 学会取消申请也拦截 start
            // if( RaTar.Campaign__r.Status == '取消'){
            //     ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消，不能继续操作了'));
            if( RaTar.Campaign__r.Status == '取消' || RaTar.Campaign__r.Status == '取消申请中' ){
             //贸易合规 you
            if(System.Label.TradeComplianceStatusFlagBP =='true' && RaTar.AccDealerBlacklist__c == '1' && RaTar.EquipmentGuaranteeFlg__c==false){
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, System.Label.IFTradeComplianceAlertBP));
                return false; 
            }else if( RaTar.Campaign__r.Status == '取消' || RaTar.Campaign__r.Status == '取消申请中' ){
                String tempS = '';
                if(RaTar.Campaign__r.Status == '取消'){
                    tempS = '已取消';
@@ -1938,6 +1945,7 @@
                ra.DeliverySlip__c = slip.Id;
                ra.Delivery_Agency__c = parentObj.Delivery_Agency__c; 
                ra.Agency_Address_Id__c = addressId;
                //ra.Outbound_TradeStatus__c = parentObj.Hospital__r.TradeComplianceStatus__c;//贸易合规 you
                // 20210624 ljh update SFDC-C448GR end

                //20220217 sx add 备品借出申请-决裁控制 No.4 出库成功时，把此时点的决裁编号和决裁状态写到决裁编号（出库）和决裁状态（出库）上