gzw 正式环境最新代码更新

高章伟

2023-03-02 e3c02c03dd2de442bbced87236f60a13a1cd154e

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

@@ -26,6 +26,13 @@
        };
    }
    //20210806 ljh 管理编码 end
    // 20230117 ljh DB202301096735 start
    public List<ReceivingNoteDetail__c>  rndInfo { 
        get {
            return  [select id,Fixture_Arrival_Product__c FROM ReceivingNoteDetail__c  where Fixture_Arrival_Product__c = ''  LIMIT 1 ];
        }
    }
    // 20230117 ljh DB202301096735 end

    public ReceivingNoteWaitingReceiptController() {
        parId = System.currentPageReference().getParameters().get('parId');
@@ -528,7 +535,7 @@
                                    }
                                }else{
                                    key1 += 'N0;';
                                    if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12)){
                                    if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16){
                                        key1 += ass.Product_category__c+';'+locationMap.get(ass.Internal_asset_location__c);
                                    }else if(SalesdepartmentI < 7){
                                        key1 += ass.Product_category__c;
@@ -567,7 +574,7 @@
                                }else{
                                    key2 += 'N0;';
                                    key2 += String.isNotBlank(RNde.Product_category__c)?RNde.Product_category__c:RNde.Product_category_F__c;
                                    if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12)){
                                    if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16){
                                        key2 +=';'+locationMap.get(RNde.Internal_asset_location__c);
                                    }
                                }