fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -32,11 +32,15 @@
        res.entity = data;

        String UserName = UserInfo.getUserId();
<<<<<<< HEAD
        user useracc = [
            SELECT Accountid, Work_Location__c
            FROM user
            WHERE id = :UserName
        ];
=======
        user useracc = [SELECT Accountid, Work_Location__c FROM user WHERE id = :UserName];
>>>>>>> LEXCommunityLiJun
        accountid = useracc.Accountid;
        userWorkLocation = useracc.Work_Location__c;
        Account accountInfo = [SELECT Name FROM account WHERE id = :accountid];
@@ -259,11 +263,15 @@
        }
        Map<String, String> proHosMap = new Map<String, String>();
        Map<String, String> proIdMap = new Map<String, String>();
<<<<<<< HEAD
        List<hospitalprice__c> hpList = [
            SELECT id, hospital__c, product__c
            FROM hospitalprice__c
            WHERE account__c = :accountid
        ];
=======
        List<hospitalprice__c> hpList = [SELECT id, hospital__c, product__c FROM hospitalprice__c WHERE account__c = :accountid];
>>>>>>> LEXCommunityLiJun
        if (hpList != null && hpList.size() > 0) {
            for (hospitalprice__c hp : hpList) {
                if (hp.product__c != null && String.valueof(hp.product__c).length() >= 15) {
@@ -285,7 +293,11 @@
                    errorIdMap.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
                }
                if (coc.OutPattern__c == true) {
<<<<<<< HEAD
                    System.debug('testPattern:' + newdet2[j].Product_Pattern__c + '---' + orderdetails[i].Product_Pattern__c);
=======
                    System.debug('testPattern:'+newdet2[j].Product_Pattern__c+'---'+orderdetails[i].Product_Pattern__c);
>>>>>>> LEXCommunityLiJun
                    if (newdet2[j].Product_Pattern__c == orderdetails[i].Product_Pattern__c) {
                        //add by rentx 2021-03-22 start
                        if (newdet2[j].exchangeOutPattern__c == true) {
@@ -1214,6 +1226,7 @@
        res.code = 200;
        System.debug('res = ' + res);
        return res;
<<<<<<< HEAD
    }

    public static integer Getconsumableorderdetails2Nobox() {
@@ -1326,3 +1339,117 @@
        }
    }
}
=======
    }

    public static integer Getconsumableorderdetails2Nobox() {
        if (String.isBlank(barcode)) {
            return 0;
        }
        List<String> barCodeListP = ParseBarCode(barcode);
        consumableorderdetails2Nobox = new List<Consumable_order_details2__c>();
        BarcodeCntMap.clear();
        consumableorderdetails2Nobox = [
            SELECT
                Id,
                Name,
                recordtypeid,
                Used_account__c,
                Product_Pattern__c,
                Consumable_Product__r.Name,
                Sterilization_limit__c,
                Deliver_date__c,
                Bar_Code__c,
                Arrive_date__c,
                Send_Date__c,
                Consumable_order_minor__r.Name,
                Consumable_order_minor__c,
                Intra_Trade_List_RMB__c,
                Asset_Model_No__c,
                Isoverdue__c,
                Box_Piece__c,
                ProductPacking_list_manual__c,
                Guarantee_period_for_products__c,
                hospitalSpecialOffer__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 Bar_Code__c != NULL
                AND Dealer_Info_text__c = :accountName
                AND Bar_Code__c IN :barCodeListP
                AND Arrive_Owner_Work_Location__c = :userWorkLocation
                AND Box_Piece__c = '个'
            ORDER BY RemoveBox_No__c DESC
        ];

        AggregateResult[] results = [
            SELECT Bar_Code__c, count(Id) recordCount
            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 Bar_Code__c != NULL
                AND Dealer_Info_text__c = :accountName
                AND Bar_Code__c IN :barCodeListP
                AND Arrive_Owner_Work_Location__c = :userWorkLocation
                AND Box_Piece__c = '个'
            GROUP BY Bar_Code__c
        ];

        for (AggregateResult ar : results) {
            String key = '' + ar.get('Bar_Code__c');
            BarcodeCntMap.put(key, Integer.valueOf(ar.get('recordCount')));
        }
        return consumableorderdetails2Nobox.size();
    }

    @TestVisible
    class ConsumableorderdetailsInfo implements Comparable {
        @AuraEnabled
        public Consumable_orderdetails__c orderdetails1 { get; set; }
        @AuraEnabled
        public Consumable_order_details2__c orderdetails2 { get; set; }
        @AuraEnabled
        public Product2__c Prod { get; set; }
        @AuraEnabled
        public String oldConsumableCount { get; set; }
        @AuraEnabled
        public String ErrorReason { get; set; }
        @AuraEnabled
        public Decimal outboundCount { get; set; }

        public ConsumableorderdetailsInfo(Consumable_order_details2__c e, string str) {
            orderdetails1 = new Consumable_orderdetails__c();
            orderdetails2 = e;
            Prod = e.Consumable_Product__r;
            oldConsumableCount = e.name;
            ErrorReason = str;
        }

        public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
            orderdetails1 = new Consumable_orderdetails__c();
            orderdetails2 = e;
            Prod = e.Consumable_Product__r;
            if (e.Box_Piece__c == '盒') {
                outboundCount = 1;
            }
            oldConsumableCount = e.name;
        }

        public ConsumableorderdetailsInfo(Consumable_orderdetails__c e) {
            orderdetails1 = e;
            Prod = e.Consumable_Product__r;
            outboundCount = e.Shipment_Count__c;
        }
        // 排序
        public Integer compareTo(Object compareTo) {
            return null;
        }
    }
}
>>>>>>> LEXCommunityLiJun