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 | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/LexOutboundorderImportController.cls b/force-app/main/default/classes/LexOutboundorderImportController.cls
index a1f00f6..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;
@@ -50,6 +58,7 @@
res.status = 'Success';
res.code = 200;
res.msg = '';
+ System.debug('res:' + res);
return res;
}
@@ -102,7 +111,7 @@
barcodePieceMap.put(csvRecordData[6], Integer.valueOf(csvRecordData[7]));
}
}
- String[] csvRecordDataStr = new List<String>(13);
+ String[] csvRecordDataStr = new String[13];
for (Integer j = 0; j < csvRecordData.size(); j++) {
csvRecordDataStr[j] = csvRecordData[j];
}
@@ -179,6 +188,7 @@
//ApexPages.addMessages(e);
errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
//return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
+<<<<<<< HEAD
}
getorderinfo();
dataInfoconfim();
@@ -186,12 +196,21 @@
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);
data.put('barcodeList', barcodeList);
- data.put('secondAgencyMap',secondAgencyMap);
- data.put('hospitalSysMap',hospitalSysMap);
+ data.put('secondAgencyMap', secondAgencyMap);
+ data.put('hospitalSysMap', hospitalSysMap);
res.status = 'Success';
res.code = 200;
res.msg = errorMsg;
@@ -587,7 +606,7 @@
res.entity = data;
csvRecordStr = csvRecordStrLwc;
- orderRecords = (List<ConsumableorderdetailsInfo>)JSON.deserialize(orderRecordsLwc, List<ConsumableorderdetailsInfo>.class);
+ orderRecords = (List<ConsumableorderdetailsInfo>) JSON.deserialize(orderRecordsLwc, List<ConsumableorderdetailsInfo>.class);
System.debug('orderRecords = ' + orderRecords);
sqlagencyProType = sqlagencyProTypeLwc;
userWorkLocation = userWorkLocationLwc;
@@ -753,9 +772,7 @@
string[] csvRecordData = csvRecordStr[i];
if (orderdetMap.containsKey(csvRecordData[0] + csvRecordData[12] + csvRecordData[9])) {
orderdetMap.put(
- csvRecordData[0] +
- csvRecordData[12] +
- csvRecordData[9],
+ csvRecordData[0] + csvRecordData[12] + csvRecordData[9],
orderdetMap.get(csvRecordData[0] + csvRecordData[12] + csvRecordData[9]) + Decimal.valueOf(csvRecordData[7])
);
continue;
@@ -786,7 +803,7 @@
// ApexPages.addMessages(e);
// return null;
errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
- System.debug('orderdetRecords = null ' + e.getLineNumber());
+ System.debug('orderdetRecords = null ' + e.getLineNumber());
return null;
}
}
@@ -864,7 +881,7 @@
return null;
}
}
-
+ @TestVisible
class ConsumableorderdetailsInfo implements Comparable {
@AuraEnabled
public Consumable_order__c order { get; set; }
@@ -916,4 +933,8 @@
return null;
}
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1