fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -31,11 +31,15 @@
        messageCount = 0;
        errorflg = false;
        errorMessage = null;
<<<<<<< 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
        accountid = Useracc.accountid;
        userWorkLocation = Useracc.Work_Location__c;
        agencyProType = Useracc.UserPro_Type__c;
@@ -184,6 +188,7 @@
                //ApexPages.addMessages(e);
                errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
                //return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
<<<<<<< HEAD
            }
            getorderinfo();
            dataInfoconfim();
@@ -191,6 +196,15 @@
            if (saveFLGbln == false) {
                getorderdetinfo(csvRecordStr);
            }
=======
            }
            getorderinfo();
            dataInfoconfim();
            getorderdet2info(csvRecordStr);
            if (saveFLGbln == false) {
                getorderdetinfo(csvRecordStr);
            }
>>>>>>> LEXCommunityLiJun
            data.put('orderRecords', orderRecords);
            data.put('saveFLGbln', saveFLGbln);
            data.put('csvRecordStr', csvRecordStr);
@@ -919,4 +933,8 @@
            return null;
        }
    }
<<<<<<< HEAD
}
=======
}
>>>>>>> LEXCommunityLiJun