fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -40,22 +40,30 @@
        codPageRecords = new List<orderBean>();
        overduePageRecords = new List<orderBean>();
        // 获取用户和经销商信息
<<<<<<< HEAD
        user Useracc = [
            SELECT Accountid, Work_Location__c, UserPro_Type__c
            FROM user
            WHERE id = :UserInfo.getUserId()
        ];
=======
        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
>>>>>>> LEXCommunityLiJun
        userWorkLocation = Useracc.Work_Location__c;
        agencyProType = Useracc.UserPro_Type__c;
        if (String.isBlank(Useracc.UserPro_Type__c)) {
            agencyProType = 'ET';
        }
        sqlagencyProType = '%' + agencyProType + '%';
<<<<<<< HEAD
        accountInfo = [
            SELECT id, Name, Dealer_discount__c
            FROM account
            WHERE id = :Useracc.accountid
        ];
=======
        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
>>>>>>> LEXCommunityLiJun
        // 过期库存汇总信息
        List<AggregateResult> orderDetZaiku = [
            SELECT count(Id) countsum, Consumable_Product__c prodid, Consumable_Product__r.Name_Text__c prodname, Box_Piece__c boxPiece
@@ -111,6 +119,7 @@
        userWorkLocation = userWorkLocationLWC;
        // add by Wang Xueqin 2023/04/12
        // 获取用户和经销商信息
<<<<<<< HEAD
        user Useracc = [
            SELECT Accountid, Work_Location__c, UserPro_Type__c
            FROM user
@@ -121,6 +130,10 @@
            FROM account
            WHERE id = :Useracc.accountid
        ];
=======
        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
>>>>>>> LEXCommunityLiJun

        iSinventory = true;
        Set<String> barCodeoverdue = new Set<String>();
@@ -270,6 +283,7 @@
        // List<Consumable_order_details2__c> overdueList = (List<Consumable_order_details2__c>)JSON.deserialize(saveoverdueList,List<Consumable_order_details2__c>.class);
        // add by Wang Xueqin 2023/04/12
        // 获取用户和经销商信息
<<<<<<< HEAD
        user Useracc = [
            SELECT Accountid, Work_Location__c, UserPro_Type__c
            FROM user
@@ -280,6 +294,10 @@
            FROM account
            WHERE id = :Useracc.accountid
        ];
=======
        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
>>>>>>> LEXCommunityLiJun

        // 跳过明细2不必要更新
        StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
@@ -312,11 +330,15 @@
        po.RecordTypeid = System.Label.RT_ConOrder_Overdue;
        try {
            insert po;
<<<<<<< HEAD
            Consumable_order__c order = [
                SELECT Name
                FROM Consumable_order__c
                WHERE id = :po.id
            ];
=======
            Consumable_order__c order = [SELECT Name FROM Consumable_order__c WHERE id = :po.id];
>>>>>>> LEXCommunityLiJun
            List<Consumable_orderdetails__c> InsList = new List<Consumable_orderdetails__c>();
            for (orderBean header : codPageRecords) {
                if (header.check == true) {
@@ -379,6 +401,7 @@
            Buff.add(A + barcodeCountMap.get(A));
        }
        return Buff;
<<<<<<< HEAD
    }

    // Data Bean
@@ -433,3 +456,59 @@
        }
    }
}
=======
    }

    // Data Bean
    @TestVisible
    class orderBean implements Comparable {
        @AuraEnabled
        public Consumable_order_details2__c orderdetails2 { get; set; }
        @AuraEnabled
        public Product2__c Prod { get; set; }
        @AuraEnabled
        public Boolean check { get; set; }

        // 过期库存
        @AuraEnabled
        public Integer overlimitCount { get; set; }
        // 销存数量
        @AuraEnabled
        public Integer pandian { get; set; }
        // 销存原因
        @AuraEnabled
        public String diffReason { get; set; }
        // 单位
        @AuraEnabled
        public String boxPiece { get; set; }
        @AuraEnabled
        public String prodname { get; set; }
        @AuraEnabled
        public String prodid { get; set; }
        orderBean(Consumable_order_details2__c e, string str) {
            orderdetails2 = e;
            Prod = e.Consumable_Product__r;
            DiffReason = str;
        }
        public orderBean(AggregateResult e) {
            check = false;
            overlimitCount = Integer.valueOf(e.get('countsum'));
            prodname = String.valueOf(e.get('prodname'));
            prodid = String.valueOf(e.get('prodid'));
            boxPiece = String.valueOf(e.get('BoxPiece'));
            pandian = 0;
        }
        // 排序
        public Integer compareTo(Object compareTo) {
            orderBean compareToesd = (orderBean) compareTo;
            Integer returnValue = 0;
            if (overlimitCount > compareToesd.overlimitCount) {
                returnValue = -1;
            } else if (overlimitCount < compareToesd.overlimitCount) {
                returnValue = 1;
            }
            return returnValue;
        }
    }
}
>>>>>>> LEXCommunityLiJun