From 00e147ec892cb1e89d0698787a8c60da1014cdb7 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 17:42:22 +0800
Subject: [PATCH] Community升级
---
force-app/main/default/classes/LexOutboundorderImportController.cls | 122 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/force-app/main/default/classes/LexOutboundorderImportController.cls b/force-app/main/default/classes/LexOutboundorderImportController.cls
index 9732707..aad8163 100644
--- a/force-app/main/default/classes/LexOutboundorderImportController.cls
+++ b/force-app/main/default/classes/LexOutboundorderImportController.cls
@@ -50,22 +50,29 @@
res.status = 'Success';
res.code = 200;
res.msg = '';
+ System.debug('res:' + res);
return res;
}
@AuraEnabled
- public static ResponseBodyLWC importCSVFile(String base64Data, String sqlagencyProType, String userWorkLocation, String accountName) {
+ public static ResponseBodyLWC importCSVFile(
+ String base64DataLwc,
+ String sqlagencyProTypeLwc,
+ String userWorkLocationLwc,
+ String accountNameLwc
+ ) {
System.debug('enter importCSVFile');
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
errorMsg = '';
- sqlagencyProType = sqlagencyProType;
- userWorkLocation = userWorkLocation;
- accountName = accountName;
- base64Data = EncodingUtil.urlDecode(base64Data, 'UTF-8');
+ sqlagencyProType = sqlagencyProTypeLwc;
+ userWorkLocation = userWorkLocationLwc;
+ accountName = accountNameLwc;
+ String base64Data = EncodingUtil.urlDecode(base64DataLwc, 'UTF-8');
csvFileBody = EncodingUtil.base64Decode(base64Data);
+ product2conMap = new Map<String, String>();
messageCount = 0;
errormessage = null;
@@ -96,7 +103,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];
}
@@ -157,21 +164,21 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, 'Barcode ' + bc + ' 涓嶅瓨鍦ㄦ垨鍗曚綅閿欒锛岃纭銆�')
// );
- errorMsg += 'Barcode ' + bc + ' 涓嶅瓨鍦ㄦ垨鍗曚綅閿欒锛岃纭銆俓n';
+ errorMsg += 'Barcode ' + bc + ' 涓嶅瓨鍦ㄦ垨鍗曚綅閿欒锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else if (exitpieceBarcodeMap.containsKey(bc) && exitpieceBarcodeMap.get(bc) < barcodePieceMap.get(bc)) {
if (messageCount >= 100)
break;
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'Barcode ' + bc + ' 搴撳瓨涓嶈冻锛岃纭銆�'));
- errorMsg += 'Barcode ' + bc + ' 搴撳瓨涓嶈冻锛岃纭銆俓n';
+ errorMsg += 'Barcode ' + bc + ' 搴撳瓨涓嶈冻锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
}
}
} catch (Exception e) {
//ApexPages.addMessages(e);
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
//return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
}
getorderinfo();
@@ -182,8 +189,10 @@
}
data.put('orderRecords', orderRecords);
data.put('saveFLGbln', saveFLGbln);
- data.put('csvRecordStr',csvRecordStr);
- data.put('barcodeList',barcodeList);
+ data.put('csvRecordStr', csvRecordStr);
+ data.put('barcodeList', barcodeList);
+ data.put('secondAgencyMap', secondAgencyMap);
+ data.put('hospitalSysMap', hospitalSysMap);
res.status = 'Success';
res.code = 200;
res.msg = errorMsg;
@@ -210,7 +219,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗� ' + csvRecordData[0] + '鍑鸿揣鐩殑涓虹┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '鍑鸿揣鐩殑涓虹┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '鍑鸿揣鐩殑涓虹┖锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
}
@@ -224,7 +233,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗� ' + cocObj.Name + '鐨勪骇鍝佷腑锛屽瓨鍦ㄥ嚭搴撴棩鏈熶负绌猴紝璇风‘璁ゃ��')
// );
- errorMsg += '鍑哄簱鍗� ' + cocObj.Name + '鐨勪骇鍝佷腑锛屽瓨鍦ㄥ嚭搴撴棩鏈熶负绌猴紝璇风‘璁ゃ�俓n';
+ errorMsg += '鍑哄簱鍗� ' + cocObj.Name + '鐨勪骇鍝佷腑锛屽瓨鍦ㄥ嚭搴撴棩鏈熶负绌猴紝璇风‘璁ゃ��<br />';
saveFLGbln = true;
messageCount++;
} else {
@@ -238,7 +247,7 @@
}
} catch (Exception e) {
//return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
}
}
@@ -260,7 +269,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗�' + ass.order.Name + '鍖婚櫌鐩稿叧淇℃伅涓嶈兘绌猴紝璇风‘璁ゃ��')
// );
- errorMsg += '鍑哄簱鍗�' + ass.order.Name + '鍖婚櫌鐩稿叧淇℃伅涓嶈兘绌猴紝璇风‘璁ゃ�俓n';
+ errorMsg += '鍑哄簱鍗�' + ass.order.Name + '鍖婚櫌鐩稿叧淇℃伅涓嶈兘绌猴紝璇风‘璁ゃ��<br />';
messageCount++;
saveFLGbln = true;
//return null;
@@ -272,7 +281,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆�<br />';
messageCount++;
saveFLGbln = true;
}
@@ -284,7 +293,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佷簩绾х粡閿�鍟嗭紝璇风‘璁ゃ��')
// );
- errorMsg += '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佷簩绾х粡閿�鍟嗭紝璇风‘璁ゃ�俓n';
+ errorMsg += '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佷簩绾х粡閿�鍟嗭紝璇风‘璁ゃ��<br />';
messageCount++;
saveFLGbln = true;
}
@@ -296,7 +305,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗�' + ass.order.Name + '缁忛攢鍟嗕俊鎭笉鑳界┖锛岃纭銆�<br />';
messageCount++;
saveFLGbln = true;
}
@@ -310,12 +319,13 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佸尰闄㈢浉鍏充俊鎭紝璇风‘璁ゃ��')
// );
- errorMsg += '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佸尰闄㈢浉鍏充俊鎭紝璇风‘璁ゃ�俓n';
+ errorMsg += '鍑哄簱鍗�' + ass.order.Name + '涓嶉渶瑕佸尰闄㈢浉鍏充俊鎭紝璇风‘璁ゃ��<br />';
messageCount++;
saveFLGbln = true;
}
}
}
+ System.debug('accountName = ' + accountName);
List<Agency_Hospital_Link__c> hospitalInfo = [
SELECT Hospital__c, Hospital__r.Management_Code__c, Hospital__r.Name
FROM Agency_Hospital_Link__c
@@ -333,6 +343,8 @@
secondAgencyMap.put(safo.Dealer_subordinate__r.Name, safo.Dealer_subordinate__c);
}
//鍑哄簱鍗曚俊鎭獙璇�
+ System.debug('hospitalconMap = ' + hospitalconMap);
+ System.debug('hospitalSysMap = ' + hospitalSysMap);
for (String widget : hospitalconMap.keySet()) {
if (!hospitalSysMap.containsKey(widget)) {
if (messageCount >= 100)
@@ -352,7 +364,7 @@
hospitalconMap.get(widget) +
' 鐨勫尰闄㈢紪鐮�' +
widget +
- ' 涓嶅瓨鍦ㄦ垨鑰呬笉鏄湰缁忛攢鍟嗚礋璐ｇ殑鍖婚櫌锛岃纭銆俓n';
+ ' 涓嶅瓨鍦ㄦ垨鑰呬笉鏄湰缁忛攢鍟嗚礋璐ｇ殑鍖婚櫌锛岃纭銆�<br />';
saveFLGbln = true;
}
}
@@ -382,7 +394,7 @@
// ' 涓嶅瓨鍦ㄥ嚭搴撳崟浣嶏紝璇风‘璁ゃ��'
// )
// );
- errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '鐨刡arcode ' + cod2Obj.Bar_Code__c + ' 涓嶅瓨鍦ㄥ嚭搴撳崟浣嶏紝璇风‘璁ゃ�俓n';
+ errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '鐨刡arcode ' + cod2Obj.Bar_Code__c + ' 涓嶅瓨鍦ㄥ嚭搴撳崟浣嶏紝璇风‘璁ゃ��<br />';
saveFLGbln = true;
messageCount++;
} else if (String.valueOf(csvRecordData[9]) != '鐩�' && String.valueOf(csvRecordData[9]) != '涓�') {
@@ -410,7 +422,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else if (String.isNotBlank(csvRecordData[8])) {
@@ -429,7 +441,7 @@
// '浜у搧鍑鸿揣鍗曚环涓嶈兘涓�0锛岃纭銆�'
// )
// );
- errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '浜у搧鍑鸿揣鍗曚环涓嶈兘涓�0锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '浜у搧鍑鸿揣鍗曚环涓嶈兘涓�0锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else {
@@ -447,7 +459,7 @@
// '鐨勪骇鍝佷腑锛屽瓨鍦╞arcode涓虹┖锛岃纭銆�'
// )
// );
- errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '鐨勪骇鍝佷腑锛屽瓨鍦╞arcode涓虹┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + cod2Obj.TracingCode__c + '鐨勪骇鍝佷腑锛屽瓨鍦╞arcode涓虹┖锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else if (String.isBlank(csvRecordData[12])) {
@@ -488,7 +500,7 @@
}
} catch (Exception e) {
//return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
}
}
@@ -507,7 +519,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鏁伴噺涓虹┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鏁伴噺涓虹┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鏁伴噺涓虹┖锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else if (Decimal.valueOf(csvRecordData[7]) > 1 && String.valueOf(csvRecordData[9]) == '鐩�') {
@@ -521,7 +533,7 @@
// '瀛樺湪鍗曚綅鏄洅锛屼骇鍝佸嚭璐ф暟閲忓ぇ浜�1锛岃纭銆�'
// )
// );
- errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '瀛樺湪鍗曚綅鏄洅锛屼骇鍝佸嚭璐ф暟閲忓ぇ浜�1锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '瀛樺湪鍗曚綅鏄洅锛屼骇鍝佸嚭璐ф暟閲忓ぇ浜�1锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
} else {
@@ -536,7 +548,7 @@
// ApexPages.addmessage(
// new ApexPages.message(ApexPages.severity.ERROR, '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆�')
// );
- errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆俓n';
+ errorMsg += '鍑哄簱鍗� ' + csvRecordData[0] + '鍑哄簱鍗� ' + csvRecordData[0] + '浜у搧鍑鸿揣鍗曚环涓虹┖锛岃纭銆�<br />';
saveFLGbln = true;
messageCount++;
}
@@ -551,28 +563,50 @@
}
} catch (Exception e) {
//return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
}
}
@AuraEnabled
- public static ResponseBodyLWC dataImport(List<String[]> csvRecordStr,List<ConsumableorderdetailsInfo> orderRecords,String sqlagencyProType, String userWorkLocation, String accountName) {
+ public static ResponseBodyLWC dataImport(
+ List<String[]> csvRecordStrLwc,
+ String orderRecordsLwc,
+ String sqlagencyProTypeLwc,
+ String userWorkLocationLwc,
+ String accountNameLwc,
+ String accountidLwc,
+ String agencyProTypeLwc,
+ Map<String, String> secondAgencyMapLwc,
+ Map<String, String> hospitalSysMapLwc
+ ) {
List<ConsumableorderdetailsInfo> orderdetRecords = new List<ConsumableorderdetailsInfo>();
List<ConsumableorderdetailsInfo> orderdet2BoxRecords = new List<ConsumableorderdetailsInfo>();
List<ConsumableorderdetailsInfo> orderdet2PieceRecords = new List<ConsumableorderdetailsInfo>();
+ product2conMap = new Map<String, String>();
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
- csvRecordStr = csvRecordStr;
- orderRecords = orderRecords;
- sqlagencyProType = sqlagencyProType;
- userWorkLocation = userWorkLocation;
- accountName = accountName;
- errorMessage = '';
+ csvRecordStr = csvRecordStrLwc;
+ orderRecords = (List<ConsumableorderdetailsInfo>) JSON.deserialize(orderRecordsLwc, List<ConsumableorderdetailsInfo>.class);
+ System.debug('orderRecords = ' + orderRecords);
+ sqlagencyProType = sqlagencyProTypeLwc;
+ userWorkLocation = userWorkLocationLwc;
+ accountName = accountNameLwc;
+ secondAgencyMap = secondAgencyMapLwc;
+ hospitalSysMap = hospitalSysMapLwc;
+ accountid = accountidLwc;
+ agencyProType = agencyProTypeLwc;
+ System.debug('agencyProType = ' + agencyProType);
+
+ errorMsg = '';
+ System.debug('csvRecordStr = ' + csvRecordStr);
orderdetRecords = getorderdetList(csvRecordStr);
orderdet2BoxRecords = getorderdet2BoxList(csvRecordStr);
orderdet2PieceRecords = getorderdet2pieceList(csvRecordStr);
+ System.debug('orderdetRecords = ' + orderdetRecords);
+ System.debug('orderdet2BoxRecords = ' + orderdet2BoxRecords);
+ System.debug('orderdet2PieceRecords = ' + orderdet2PieceRecords);
Savepoint sp = Database.setSavepoint();
try {
Map<String, String> orderInfoMap = new Map<String, String>();
@@ -591,6 +625,7 @@
ass.order.RecordTypeId = System.Label.RT_ConOrder_Sale;
coc.add(ass.order);
}
+ System.debug('coc = ' + coc);
if (coc.size() > 0) {
insert coc;
}
@@ -615,6 +650,7 @@
}
}
}
+ System.debug('cod = ' + cod);
if (cod.size() > 0) {
insert cod;
}
@@ -705,7 +741,7 @@
Database.rollback(sp);
// ApexPages.addMessages(e);
// return null;
- return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
+ return new ResponseBodyLWC('Error', 500, e.getMessage() + e.getStackTraceString(), '');
}
}
@@ -718,9 +754,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;
@@ -745,11 +779,13 @@
ass.orderdetails1.Shipment_Count__c = orderdetMap.get(ass.orderName + ass.productName + ass.orderdetails1.Box_Piece__c);
}
}
+ System.debug('orderdetRecords = ' + orderdetRecords);
return orderdetRecords;
} catch (Exception e) {
// ApexPages.addMessages(e);
// return null;
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
+ System.debug('orderdetRecords = null ' + e.getLineNumber());
return null;
}
}
@@ -787,7 +823,7 @@
} catch (Exception e) {
// ApexPages.addMessages(e);
// return null;
- errorMsg += e.getMessage();
+ errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
return null;
}
}
@@ -827,7 +863,7 @@
return null;
}
}
-
+ @TestVisible
class ConsumableorderdetailsInfo implements Comparable {
@AuraEnabled
public Consumable_order__c order { get; set; }
--
Gitblit v1.9.1