blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
binxie
2023-06-26 1b3fb93f787b8b546a307bf063183f5295d183f8 
 force-app/main/default/classes/InventoryViewController.cls


@@ -4,10 +4,10 @@


    public List<List<ConsumableorderdetailsInfo>> consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();




    //page


    Public Integer pagesize{get; set;} 


    Public Integer totalcount{get; set;} 


    Public Integer pagecount{get; set;} 


    Public Integer currentpage{get; set;} 


    public Integer pagesize { get; set; }


    public Integer totalcount { get; set; }


    public Integer pagecount { get; set; }


    public Integer currentpage { get; set; }


    public Boolean hasPrevious{get; set;}


    public Boolean hasNext{get; set;}


    public List<ConsumableorderdetailsInfo> pageRecords { get; set; }


@@ -17,9 +17,17 @@


    public String preSortKey { get; private set; }


    public Boolean sortOrderAsc { get; private set; }


    public String[] sortOrder { get; private set; }


    private String[] columus = new String[]{ 'Product2__c.Name__c','Asset_Model_No__c','','Category3__c','Category4__c','Category5__c',''};


    private String[] columus = new List<String>{


        'Product2__c.Name__c',


        'Asset_Model_No__c',


        '',


        'Category3__c',


        'Category4__c',


        'Category5__c',


        ''


    };


    


    String[] proLimitAndDate =new String[]{};


    String[] proLimitAndDate = new List<String>{};


    private Map<String,Date> productkucun = new Map<String,Date>();


    public List<SelectOption> categoryOptionList{get;set;}


    public List<SelectOption> category4OptionList{get;set;}


@@ -64,17 +72,15 @@


    }


    // 画面初始化


    public void init() {




        this.sortKey = '2';


        this.preSortKey = '2';


        this.sortOrderAsc = false;


        this.sortOrder = new String[8];


        this.sortOrder = new String[]{' ','',' ',' ','','','','↓'};




        this.sortOrder = new List<String>{ ' ', '', ' ', ' ', '', '', '', '↓' };


         


        //取用户ID


        String userId = UserInfo.getUserId();


        User useracc = [select Accountid, Work_Location__c,UserPro_Type__c FROM user WHERE id =:userId];


        User useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];


        accountid = useracc.accountid;


        userWorkLocation = useracc.Work_Location__c;


        agencyProType = Useracc.UserPro_Type__c;


@@ -97,24 +103,28 @@


        //库存明细取得


        sqlagencyProType = '%' + agencyProType + '%';


        orderDetZaikuList = new List<String>();


        List<AggregateResult>  orderDetZaiku = [SELECT count(Id),


                                                      Consumable_Product__c


        List<AggregateResult> orderDetZaiku = [


            SELECT count(Id), Consumable_Product__c


                                                FROM Consumable_order_details2__c


                                                WHERE Dealer_Arrive__c = true


                                                AND Dealer_Shipment__c = false


                                                AND Dealer_Saled__c = false


                                                AND Lose_Flag__c = false


                                                AND Dealer_Returned__c = false


                                                AND Bar_Code__c !=null


                                                AND Product_Type__c like : sqlagencyProType


            WHERE


                Dealer_Arrive__c = TRUE


                AND Dealer_Shipment__c = FALSE


                AND Dealer_Saled__c = FALSE


                AND Lose_Flag__c = FALSE


                AND Dealer_Returned__c = FALSE


                AND Bar_Code__c != NULL


                AND Product_Type__c LIKE :sqlagencyProType


                                                AND Dealer_Info_text__c = :accountName


                                                AND Cancellation_Flag__c = false


                AND Cancellation_Flag__c = FALSE


                                                AND Arrive_Owner_Work_Location__c =: userWorkLocation


                                                group by Consumable_Product__c];


            GROUP BY Consumable_Product__c


        ];


        for(AggregateResult zaikuId : orderDetZaiku){


            orderDetZaikuList.add(String.valueOf(zaikuId.get('Consumable_Product__c')));


        }


        List<Consumable_order_details2__c> CountDel = [SELECT Id,


        List<Consumable_order_details2__c> CountDel = [


            SELECT


                Id,


                            Bar_Code__c,


                            Name,


                            Inventory_date__c,


@@ -125,26 +135,35 @@


                            Box_Piece__c,


                            hospitalSpecialOffer__c


                        FROM Consumable_order_details2__c


                        WHERE Dealer_Arrive__c = true


                        AND Dealer_Shipment__c = false


                        AND Dealer_Saled__c = false


                        AND Dealer_Returned__c = false


                        AND Lose_Flag__c = false


                        AND Cancellation_Flag__c = false


                        AND Bar_Code__c !=null


                        AND Product_Type__c like : sqlagencyProType


            WHERE


                Dealer_Arrive__c = TRUE


                AND Dealer_Shipment__c = FALSE


                AND Dealer_Saled__c = FALSE


                AND Dealer_Returned__c = FALSE


                AND Lose_Flag__c = FALSE


                AND Cancellation_Flag__c = FALSE


                AND Bar_Code__c != NULL


                AND Product_Type__c LIKE :sqlagencyProType


                        AND Dealer_Info_text__c = :accountName


                        AND Arrive_Owner_Work_Location__c =: userWorkLocation


                        ];


        List<Product2__c> product2Selected = [select Id, Name,Name__c,Intra_Trade_List_RMB__c,


        List<Product2__c> product2Selected = [


            SELECT


                Id,


                Name,


                Name__c,


                Intra_Trade_List_RMB__c,


                                Asset_Model_No__c,


                                Category3__c,Category4__c,Category5__c,


                Category3__c,


                Category4__c,


                Category5__c,


                                SFDA_Status__c,


                                Product2__r.SFDA_Approbation_No__c,


                                Product2__r.SFDA_Expiration_Date__c,


                                Product2__r.Packing_list_manual__c


                            FROM Product2__c


                            WHERE Id in : orderDetZaikuList ];


            WHERE Id IN :orderDetZaikuList


        ];


        for (Integer i = 0; i < product2Selected.size(); i++) {


            MidMap.put(product2Selected[i].Id, product2Selected[i]);


        }


@@ -160,7 +179,8 @@


                    tex = 'B';


                }


                if(newMidBoxMap.containsKey(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex)){


                    ConsumableorderdetailsInfo Jstage = newMidBoxMap.get(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex).clone();


                    ConsumableorderdetailsInfo Jstage = newMidBoxMap.get(CountDel[i].Consumable_Product__c + CountDel[i].Box_Piece__c + tex)


                        .clone();


                    Jstage.allnumber = Jstage.allnumber+1 ;


                    if(CountDel[i].Isoverdue__c == 1){


                        Jstage.limitCount = Jstage.limitCount + 1;


@@ -187,7 +207,10 @@


                    tex = 'B';


                }


                if(newMidPieceMap.containsKey(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c  + tex)){


                    ConsumableorderdetailsInfo Jstage = newMidPieceMap.get(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex).clone();


                    ConsumableorderdetailsInfo Jstage = newMidPieceMap.get(


                            CountDel[i].Consumable_Product__c + CountDel[i].Box_Piece__c + tex


                        )


                        .clone();


                    Jstage.allnumber = Jstage.allnumber+1 ;


                    if(CountDel[i].Isoverdue__c == 1){


                        Jstage.limitCount = Jstage.limitCount + 1;


@@ -210,7 +233,6 @@


                        Jstage.hospitalSpecialOffer = true;


                    }else {


                        Jstage.hospitalSpecialOffer = false;


                        


                    }


                    newMidPieceMap.put(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex, Jstage);


                }


@@ -265,7 +287,6 @@


                consumableorderdetailsRecords.add(newMidPieceMap.get(bss.Prod.Id + '个A'));


            }


        }




        


        /////////////////////====================================update by rentx




@@ -369,7 +390,12 @@


        //add by rentx 2021-3-10 end


        //listCut();




        AggregateResult[] categoryList = [select Count(id), Category3_text__c c3c from Product2__c WHERE Estimation_Entry_Possibility__c = '○' AND Product_Type__c like :agencyProType AND Category3_text__c != null group by Category3_text__c];


        AggregateResult[] categoryList = [


            SELECT Count(id), Category3_text__c c3c


            FROM Product2__c


            WHERE Estimation_Entry_Possibility__c = '○' AND Product_Type__c LIKE :agencyProType AND Category3_text__c != NULL


            GROUP BY Category3_text__c


        ];


        


         categoryOptionList = new List<SelectOption>();


         categoryOptionList.add(new SelectOption('', '-无-'));


@@ -377,7 +403,6 @@


            String deliverycnt = String.valueOf(category3Search.get('c3c'));


            categoryOptionList.add(new SelectOption(deliverycnt,deliverycnt));


         }






         category4OptionList = new List<SelectOption>();


         category4OptionList.add(new SelectOption('', '-无-'));


@@ -392,10 +417,19 @@


        //显示第一页


        moveToFirst();


        makeCurrentPageRecords();




    }


  public void categoryAllload() {


         AggregateResult[] category4List = [select Count(id), Category4_text__c c4c from Product2__c WHERE Estimation_Entry_Possibility__c = '○' AND Category3_text__c=:category3 AND Product_Type__c like :agencyProType AND Category4_text__c != null AND Category5_text__c != null group by Category4_text__c];


        AggregateResult[] category4List = [


            SELECT Count(id), Category4_text__c c4c


            FROM Product2__c


            WHERE


                Estimation_Entry_Possibility__c = '○'


                AND Category3_text__c = :category3


                AND Product_Type__c LIKE :agencyProType


                AND Category4_text__c != NULL


                AND Category5_text__c != NULL


            GROUP BY Category4_text__c


        ];


         category4OptionList = new List<SelectOption>();


         category4OptionList.add(new SelectOption('', '-无-'));


         for(AggregateResult category4Search : category4List) {


@@ -403,7 +437,17 @@


            category4OptionList.add(new SelectOption(deliverycnt4,deliverycnt4));


         }




           AggregateResult[] category5List = [select Count(id), Category5_text__c c5c from Product2__c WHERE Estimation_Entry_Possibility__c = '○' AND Category3_text__c=:category3 AND Product_Type__c like :agencyProType AND Category4_text__c != null AND Category5_text__c != null group by Category5_text__c];


        AggregateResult[] category5List = [


            SELECT Count(id), Category5_text__c c5c


            FROM Product2__c


            WHERE


                Estimation_Entry_Possibility__c = '○'


                AND Category3_text__c = :category3


                AND Product_Type__c LIKE :agencyProType


                AND Category4_text__c != NULL


                AND Category5_text__c != NULL


            GROUP BY Category5_text__c


        ];


        


         category5OptionList = new List<SelectOption>();


         category5OptionList.add(new SelectOption('', '-无-'));


@@ -411,11 +455,20 @@


            String deliverycnt5 = String.valueOf(category5Search.get('c5c'));


            category5OptionList.add(new SelectOption(deliverycnt5,deliverycnt5));


         }




    }


    


    public void categoryload() {


         AggregateResult[] category4List = [select Count(id), Category4_text__c c4c from Product2__c WHERE Estimation_Entry_Possibility__c = '○' AND Category3_text__c=:category3 AND Product_Type__c like :agencyProType AND Category4_text__c != null AND Category5_text__c != null group by Category4_text__c];


        AggregateResult[] category4List = [


            SELECT Count(id), Category4_text__c c4c


            FROM Product2__c


            WHERE


                Estimation_Entry_Possibility__c = '○'


                AND Category3_text__c = :category3


                AND Product_Type__c LIKE :agencyProType


                AND Category4_text__c != NULL


                AND Category5_text__c != NULL


            GROUP BY Category4_text__c


        ];


         category4OptionList = new List<SelectOption>();


         category4OptionList.add(new SelectOption('', '-无-'));


         for(AggregateResult category4Search : category4List) {


@@ -423,7 +476,17 @@


            category4OptionList.add(new SelectOption(deliverycnt4,deliverycnt4));


         }




           AggregateResult[] category5List = [select Count(id), Category5_text__c c5c from Product2__c WHERE Estimation_Entry_Possibility__c = '○' AND Category3_text__c=:category3 AND Product_Type__c like :agencyProType AND Category4_text__c=:category4 AND Category5_text__c != null group by Category5_text__c];


        AggregateResult[] category5List = [


            SELECT Count(id), Category5_text__c c5c


            FROM Product2__c


            WHERE


                Estimation_Entry_Possibility__c = '○'


                AND Category3_text__c = :category3


                AND Product_Type__c LIKE :agencyProType


                AND Category4_text__c = :category4


                AND Category5_text__c != NULL


            GROUP BY Category5_text__c


        ];


        


         category5OptionList = new List<SelectOption>();


         category5OptionList.add(new SelectOption('', '-无-'));


@@ -431,7 +494,6 @@


            String deliverycnt5 = String.valueOf(category5Search.get('c5c'));


            category5OptionList.add(new SelectOption(deliverycnt5,deliverycnt5));


         }




    }


        // 检索


    public void searchConsumableorderdetails() {


@@ -439,10 +501,12 @@


        this.preSortKey = '2';


        this.sortOrderAsc = false;


        this.sortOrder = new String[8];


        this.sortOrder = new String[]{' ','',' ',' ','','','','↓'};


        this.sortOrder = new List<String>{ ' ', '', ' ', ' ', '', '', '', '↓' };




        List<ConsumableorderdetailsInfo> reSet = new List<ConsumableorderdetailsInfo>();


        List<Consumable_order_details2__c> CountDel = [SELECT Id,


        List<Consumable_order_details2__c> CountDel = [


            SELECT


                Id,


                            Bar_Code__c,


                            Name,


                            Inventory_date__c,


@@ -453,13 +517,14 @@


                            Box_Piece__c,


                            hospitalSpecialOffer__c 


                        FROM Consumable_order_details2__c


                        WHERE Dealer_Arrive__c = true


                        AND Dealer_Shipment__c = false


                        AND Dealer_Saled__c = false


                        AND Dealer_Returned__c = false


                        AND Lose_Flag__c = false


                        AND Bar_Code__c !=null


                        AND Product_Type__c like : sqlagencyProType


            WHERE


                Dealer_Arrive__c = TRUE


                AND Dealer_Shipment__c = FALSE


                AND Dealer_Saled__c = FALSE


                AND Dealer_Returned__c = FALSE


                AND Lose_Flag__c = FALSE


                AND Bar_Code__c != NULL


                AND Product_Type__c LIKE :sqlagencyProType


                        AND Dealer_Info_text__c = :accountName 


                        AND Arrive_Owner_Work_Location__c =: userWorkLocation


                        ];


@@ -469,9 +534,9 @@


        Map<String,ConsumableorderdetailsInfo> newMidBoxMap = new Map<String,ConsumableorderdetailsInfo>();


        Map<String,ConsumableorderdetailsInfo> newMidPieceMap = new Map<String,ConsumableorderdetailsInfo>();


      


        


        // 所有产品取得


        String soql = this.makeSoql(category1,category_Goods,category3,category4,category5);


        System.debug('====>soql11' + soql);


        //soql += ' ORDER BY ' + this.columus[Integer.valueOf(this.sortKey)] + ' ' + (this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last');


        List<Product2__c> queryList = Database.query(soql);


        for (Integer i = 0; i < queryList.size(); i++) {


@@ -628,7 +693,8 @@


                    tex = 'B';


                }


                if(newMidBoxMap.containsKey(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex)){


                    ConsumableorderdetailsInfo Jstage = newMidBoxMap.get(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex).clone();


                    ConsumableorderdetailsInfo Jstage = newMidBoxMap.get(CountDel[i].Consumable_Product__c + CountDel[i].Box_Piece__c + tex)


                        .clone();


                    Jstage.allnumber = Jstage.allnumber+1 ;


                    if(CountDel[i].Isoverdue__c == 1){


                        Jstage.limitCount = Jstage.limitCount + 1;


@@ -655,7 +721,10 @@


                    tex = 'B';


                }


                if(newMidPieceMap.containsKey(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c  + tex)){


                    ConsumableorderdetailsInfo Jstage = newMidPieceMap.get(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex).clone();


                    ConsumableorderdetailsInfo Jstage = newMidPieceMap.get(


                            CountDel[i].Consumable_Product__c + CountDel[i].Box_Piece__c + tex


                        )


                        .clone();


                    Jstage.allnumber = Jstage.allnumber+1 ;


                    if(CountDel[i].Isoverdue__c == 1){


                        Jstage.limitCount = Jstage.limitCount + 1;


@@ -678,7 +747,6 @@


                        Jstage.hospitalSpecialOffer = true;


                    }else {


                        Jstage.hospitalSpecialOffer = false;


                        


                    }


                    newMidPieceMap.put(CountDel[i].Consumable_Product__c+CountDel[i].Box_Piece__c + tex, Jstage);


                }


@@ -735,7 +803,6 @@


            }


        }




        


        /////////////////////====================================update by rentx


        /*//把Boxmap里的值从新赋给boxRecords


        for(ConsumableorderdetailsInfo bss : newMidBoxMap.values()){


@@ -782,7 +849,7 @@


        this.preSortKey = '2';


        this.sortOrderAsc = false;


        this.sortOrder = new String[8];


        this.sortOrder = new String[]{' ','',' ',' ','','','','↓'};


        this.sortOrder = new List<String>{ ' ', '', ' ', ' ', '', '', '', '↓' };




        //总件数


        totalcount = consumableorderdetailsRecords.size();


@@ -809,27 +876,33 @@


        }


        for(ConsumableorderdetailsInfo ass : consumableorderdetailsRecords){


            if(productLimt.containsKey(ass.Prod.Asset_Model_No__c)){


              ass.lowerlimit = decimal.valueOf(productLimt.get(ass.Prod.Asset_Model_No__c).subString(0, productLimt.get(ass.Prod.Asset_Model_No__c).indexOf( '|')));


              ass.upperlimit = decimal.valueOf(productLimt.get(ass.Prod.Asset_Model_No__c).subString(productLimt.get(ass.Prod.Asset_Model_No__c).indexOf( '|')+1));


                ass.lowerlimit = decimal.valueOf(


                    productLimt.get(ass.Prod.Asset_Model_No__c).subString(0, productLimt.get(ass.Prod.Asset_Model_No__c).indexOf('|'))


                );


                ass.upperlimit = decimal.valueOf(


                    productLimt.get(ass.Prod.Asset_Model_No__c).subString(productLimt.get(ass.Prod.Asset_Model_No__c).indexOf('|') + 1)


                );


           }


        }


    }




    public void datelimitSearch(){


        List<String> barcodekucun = new List<String>();


        List<Consumable_order_details2__c> orderkucun = [SELECT Id,Bar_Code__c, Name,Consumable_Product__c,Recordtypeid,


                                                            Guarantee_period_for_products__c,Sterilization_limit__c


        List<Consumable_order_details2__c> orderkucun = [


            SELECT Id, Bar_Code__c, Name, Consumable_Product__c, Recordtypeid, Guarantee_period_for_products__c, Sterilization_limit__c


                                                        FROM Consumable_order_details2__c


                                                        WHERE Dealer_Arrive__c = true


                                                        AND Dealer_Shipment__c = false


                                                        AND Dealer_Saled__c = false


                                                        AND Dealer_Returned__c = false


                                                        AND Lose_Flag__c = false


                                                        AND Bar_Code__c !=null


                                                        AND Product_Type__c like : sqlagencyProType


            WHERE


                Dealer_Arrive__c = TRUE


                AND Dealer_Shipment__c = FALSE


                AND Dealer_Saled__c = FALSE


                AND Dealer_Returned__c = FALSE


                AND Lose_Flag__c = FALSE


                AND Bar_Code__c != NULL


                AND Product_Type__c LIKE :sqlagencyProType


                                                        AND Dealer_Info_text__c = :accountName


                                                        AND Arrive_Owner_Work_Location__c =: userWorkLocation


                                                        ORDER BY Consumable_Product__c, Sterilization_limit__c asc];


            ORDER BY Consumable_Product__c, Sterilization_limit__c ASC


        ];


        for(Integer i = 0 ; i< orderkucun.size();i++){


            if(productkucun.containsKey(orderkucun[i].Consumable_Product__c)){


                continue;


@@ -856,12 +929,15 @@


        this.preSortKey = this.sortKey;


        // 所有产品取得


        String soql = this.makeSoql(null,null,null,null,null);


        soql += ' ORDER BY ' + this.columus[Integer.valueOf(this.sortKey)] + ' ' + (this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last');


        soql +=


            ' ORDER BY ' +


            this.columus[Integer.valueOf(this.sortKey)] +


            ' ' +


            (this.sortOrderAsc == true ? 'asc nulls first' : 'desc nulls last');


        List<Product2__c> queryList = Database.query(soql);


        for (Integer i = 0; i < queryList.size(); i++) {


            MidMap.put(queryList[i].Id + '盒', null);


            MidMap.put(queryList[i].Id + '个', null);




        }




        //update by rentx 2020-12-29


@@ -888,7 +964,6 @@


        //update byr entx 2020-12-29


        //再把map里的值从新赋给CpageRecords


        for(ConsumableorderdetailsInfo bss : MidMap.values()){




            if(bss != null){


                pageRecords.add(bss);


                if (newMap.get(bss.Prod.Id+bss.BoxPiece) != null) {


@@ -944,42 +1019,54 @@


        soql += ' SFDA_Status__c,Product2__r.SFDA_Approbation_No__c,Product2__r.SFDA_Expiration_Date__c,Product2__r.Packing_list_manual__c FROM Product2__c ';


        soql += ' WHERE Id in' + sqlTail;


        if(!String.isBlank(CateName)){


            soql += ' AND (Name__c like \'%' + String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) + '%\' or Asset_Model_No__c like \'%' + String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) + '%\')';


        }if(!String.isBlank(Category3)){


            soql +=


                ' AND (Name__c like \'%' +


                String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) +


                '%\' or Asset_Model_No__c like \'%' +


                String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) +


                '%\')';


        }


        if (!String.isBlank(Category3)) {


            soql += ' AND Category3__c = \'' +  Category3 + '\'';


        }if(!String.isBlank(Category4)){


        }


        if (!String.isBlank(Category4)) {


            soql += ' AND Category4__c = \'' +  Category4 + '\'';


        }if(!String.isBlank(Category5)){


        }


        if (!String.isBlank(Category5)) {


            soql += ' AND Category5__c = \'' +  Category5 + '\'';


        }


        System.debug('====>soql' + soql);


        return soql;




    }




    //首页


    public void moveToFirst(){


        if(currentpage == 1) return;


        if (currentpage == 1)


            return;


        currentpage = 1;


        canMove();


    }




    //尾页


    public void moveToLast(){


        if(currentpage >= pagecount) return;


        if (currentpage >= pagecount)


            return;


        currentpage = pagecount;


        canMove();


    }




   //上一页


   public void moveToPrevious(){


        if(currentpage == 1) return;


        if (currentpage == 1)


            return;


        currentpage = currentpage -1;


        canMove();


    }




    //下一页


    public void moveToNext(){


        if(currentpage >= pagecount) return;


        if (currentpage >= pagecount)


            return;




        currentpage = currentpage + 1;


        canMove();


@@ -989,10 +1076,11 @@


    public void canMove(){


        hasPrevious = false;


        hasNext = false;


        if(pagecount > 1 && currentpage > 1) hasPrevious = true;


        if(pagecount > 1 && currentpage < pagecount)  hasNext = true;


        if (pagecount > 1 && currentpage > 1)


            hasPrevious = true;


        if (pagecount > 1 && currentpage < pagecount)


            hasNext = true;


    }






    //刷新当前页


    public PageReference refreshPageSize() {


@@ -1061,7 +1149,6 @@


                }


                return returnValue;


            }




        }


    }


}