From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexOutboundorderImportController.cls | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexOutboundorderImportController.cls b/force-app/main/default/classes/LexOutboundorderImportController.cls
index aad8163..f09d489 100644
--- a/force-app/main/default/classes/LexOutboundorderImportController.cls
+++ b/force-app/main/default/classes/LexOutboundorderImportController.cls
@@ -31,7 +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;
@@ -180,6 +188,7 @@
//ApexPages.addMessages(e);
errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
//return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
+<<<<<<< HEAD
}
getorderinfo();
dataInfoconfim();
@@ -187,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);
@@ -915,4 +933,8 @@
return null;
}
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1