From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls | 1586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,579 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls b/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
index c5c4289..5e4f62d 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetShipmentController.cls
@@ -22,7 +22,7 @@
//鍚勩儦銉笺偢銇埗寰°亗銈屻伆銆佹渶澶т欢鏁般倰鎸囧畾銇欍倠
// searchNumMax = Integer.valueOf(Label.Product_Select_Limit);
// searchNumMax = 20;
- pagesize = '500';
+ pagesize = '400';
return searchNumMax;
}
@@ -41,8 +41,12 @@
selectedDataSql += ' and Cancel_Select__c = False';
//selectedDataSql += ' order by Id ASC nulls last';
keepWher = selectedDataSql;
- selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
- myComponentController.columnRightRW.put('Inspection_Cnt_Jia__c', 'w');
+ selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last,Name';
+ myComponentController.columnRightRW.put('Inspection_Cnt_Jia__c', 'r');//update wangweipeng 2022/01/12
+ //add by yc 2021-11-26 start
+ //myComponentController.columnRightRW.put('EquipmentManagementCode__c', 'r');
+ //myComponentController.columnRightRW.put('ManagementCode__c', 'r');
+ //add by yc 2021-11-26 end
return selectedDataSql;
}
@@ -76,10 +80,16 @@
public override List<String> getColumnFieldList() {
// strColumus 閲屽姞 field
// FixtureUtil#raesdGroupBy()銇爡鐩倐蹇呰
- return new List<String>{'Id', 'Asset__c', 'DeliverySlip__c', 'Shippment_loaner_time__c', 'Consum_Apply__r.demo_purpose2__c', 'Consum_Apply__r.Shipment_requested_cnt__c', 'Shipment_Saved_Flg__c', 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c'};
+ return new List<String>{'Id', 'Asset__c', 'DeliverySlip__c', 'Shippment_loaner_time__c', 'Consum_Apply__r.demo_purpose2__c', 'Consum_Apply__r.Shipment_requested_cnt__c', 'Shipment_Saved_Flg__c', 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c','Inspection_Cnt_Jia__c','EquipmentManagementCode__c','ManagementCode__c','boxbarcodeforReceipt__c'};
}
+ //闅愯棌鐨勫瓧娈靛彧鑳芥樉绀猴紝涓嶈兘璧嬪��
public override List<String> getHiddenFieldList() {
return new List<String>{'Product_Serial_No_F__c'};
+ }
+ // add by youc 2021-12-03 start 璁剧疆澶х爜锛屽皬鐮�
+ // 鐢婚潰閲岀洿鎺ュ彲浠ヨ緭鍏ョ殑闋呯洰 List 鍦ㄥ瓧娈甸泦閲屼篃娣诲姞浜� 璁剧疆璇诲啓
+ public override List<String> getWritableColumnFieldList() {
+ return new List<String>{'EquipmentManagementCode__c','ManagementCode__c','boxbarcodeforReceipt__c'};
}
// getObjName 杩� getOriginObjName 鐨� FK
public override String getFKColumnField() {
@@ -107,7 +117,7 @@
}
public override String getOrderbyStr() {
- return ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
+ return ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last,Name';
}
public override Boolean getIsNeedRunSearch() {
@@ -218,13 +228,57 @@
done_flg = false;
if (readOnly) return;
Map<String, Integer> sendAssetKey = new Map<String, Integer>();
+ //add by rentx 2021-10-22 start 璁剧疆灏忕爜 璁剧疆绠＄悊缂栫爜 涓嬮潰璁剧疆瀹屼箣鍚庡氨娓呯┖浜�
+ Map<Id,List<String>> xiaomaMap = new Map<Id,List<String>>();
+ //add by youc 2021-12-06 淇濆瓨涔嬪悗锛屽啀娆¤缃皬鐮� 鏄剧ず椤甸潰
+ Map<Id,List<String>> xiaomaMap1 = new Map<Id,List<String>>();
+ Map<Id,List<String>> bianmaMap = new Map<Id,List<String>>();//update wangweipeng 2022/02/21 start
+ Map<Id,List<String>> bianmaMap1 = new Map<Id,List<String>>();//update wangweipeng 2022/02/21 start
+ //add by rentx 2021-10-22 end 璁剧疆灏忕爜 璁剧疆绠＄悊缂栫爜
+
+ Map<Id,List<String>> hzMap = new Map<Id,List<String>>();
+ Map<Id,List<String>> hzMap1 = new Map<Id,List<String>>();
+
for (WrapperInfo wi : viewList) {
if (!wi.check) continue;
Consum_Apply_Equipment_Set_Detail__c caesd = (Consum_Apply_Equipment_Set_Detail__c)wi.sobj;
- Integer cnt = caesd.Inspection_Cnt_Jia__c == null ? 0 : Integer.valueOf(caesd.Inspection_Cnt_Jia__c);
+ //update wangweipeng 2022/01/12 start
+ Integer cnt = 0;
+ if(String.isNotBlank(caesd.EquipmentManagementCode__c)){
+ cnt = caesd.EquipmentManagementCode__c.split(',').size();
+ }
+ caesd.Inspection_Cnt_Jia__c = cnt;
+ //Integer cnt = caesd.Inspection_Cnt_Jia__c == null ? 0 : Integer.valueOf(caesd.Inspection_Cnt_Jia__c);
+ //update wangweipeng 2022/01/12 end
sendAssetKey.put(caesd.Asset__c, cnt);
+ //add by rentx 2021-10-22 start 璁剧疆灏忕爜
+ system.debug(caesd.Inspection_Cnt_Jia__c+'==123='+ caesd.EquipmentManagementCode__c);
+ if (!xiaomaMap.containsKey(caesd.Asset__c) && caesd.EquipmentManagementCode__c != null) {
+ xiaomaMap.put(caesd.Asset__c, caesd.EquipmentManagementCode__c.split(','));
+ }
+ if (!bianmaMap.containsKey(caesd.Asset__c) && caesd.ManagementCode__c != null) {
+ bianmaMap.put(caesd.Asset__c, caesd.ManagementCode__c.split(','));
+ }
+ if (!xiaomaMap1.containsKey(caesd.Asset__c) && caesd.EquipmentManagementCode__c != null) {
+ xiaomaMap1.put(caesd.Asset__c, caesd.EquipmentManagementCode__c.split(','));
+ }
+ if (!bianmaMap1.containsKey(caesd.Asset__c) && caesd.ManagementCode__c != null) {
+ bianmaMap1.put(caesd.Asset__c, caesd.ManagementCode__c.split(','));
+ }
+ system.debug('==='+ xiaomaMap+'==bianmaMap=='+bianmaMap);
+ //add by rentx 2021-10-22 end 璁剧疆灏忕爜
+ if (!hzMap.containsKey(caesd.Asset__c) && caesd.boxbarcodeforReceipt__c != null) {
+ hzMap.put(caesd.Asset__c, caesd.boxbarcodeforReceipt__c.split(','));
+ }
+ if (!hzMap1.containsKey(caesd.Asset__c) && caesd.boxbarcodeforReceipt__c != null) {
+ hzMap1.put(caesd.Asset__c, caesd.boxbarcodeforReceipt__c.split(','));
+ }
+ system.debug('=zheli3=='+ hzMap+'==hezi=='+caesd.boxbarcodeforReceipt__c);
}
List<Consum_Apply_Equipment_Set_Detail__c> updList = new List<Consum_Apply_Equipment_Set_Detail__c>();
+ system.debug('useCaesdList=='+useCaesdList.size());
+ Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>> caesdMap = new Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>>();
+
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
if (sendAssetKey.containsKey(caesd.Asset__c)) {
Integer cnt = sendAssetKey.get(caesd.Asset__c);
@@ -235,9 +289,62 @@
caesd.Shipment_Saved_Flg__c = false;
}
sendAssetKey.put(caesd.Asset__c, cnt);
+ //add by youc 2021-12-06 淇濆瓨涔嬪悗锛屽啀娆¤缃皬鐮� 鏄剧ず椤甸潰 start
+ if (caesdMap.containsKey(caesd.Asset__c) == false) {
+ caesdMap.put(caesd.Asset__c, new List<Consum_Apply_Equipment_Set_Detail__c>());
+ }
+ caesdMap.get(caesd.Asset__c).add(caesd);
+ //add by youc 2021-12-06 淇濆瓨涔嬪悗锛屽啀娆¤缃皬鐮� 鏄剧ず椤甸潰 end
+
+ //add by rentx 2021-10-25 start 璁剧疆灏忕爜
+ //灏嗕箣鍓嶇殑鎵�鏈�"澶囧搧绠＄悊鐮�" 鍒朵负绌� 鍐嶈祴鍊� 灏嗙敤杩囩殑鍏冪礌璁剧疆涓簄ull瀛楃涓� 宸蹭繚璇佸敮涓�鎬�
+
+ caesd.EquipmentManagementCode__c = '';
+ caesd.ManagementCode__c = '';
+ caesd.boxbarcodeforReceipt__c = '';
+ if (xiaomaMap.containsKey(caesd.Asset__c)) {
+ //鑾峰彇璇ヤ繚鏈夎澶囧搴旂殑灏忕爜闆嗗悎
+ List<String> tempArr = xiaomaMap.get(caesd.Asset__c);
+ List<String> heArr = bianmaMap.get(caesd.Asset__c);
+ List<String> hzArr = hzMap.get(caesd.Asset__c);
+ System.debug('-------------11111-'+heArr+'==hzArr=='+hzArr);
+ system.debug('tempArr0'+tempArr);
+ if (tempArr != null && tempArr.size() > 0) {
+ for (Integer i = 0; i < tempArr.size(); i++) {
+ if (tempArr[i] != 'null') {
+ caesd.EquipmentManagementCode__c = tempArr[i];
+ system.debug('zheli0'+caesd.EquipmentManagementCode__c);
+ //update wangweipeng 2022/02/21 start
+ caesd.ManagementCode__c = heArr[i];
+ caesd.boxbarcodeforReceipt__c = hzArr[i];
+ //caesd.ManagementCode__c = bianmaMap.containsKey(caesd.Asset__c) ? bianmaMap.get(caesd.Asset__c) : '';
+ //update wangweipeng 2022/02/21 end
+ tempArr[i] = 'null';
+ heArr[i] = 'null';
+ hzArr[i] = 'null';
+ break;
+ }
+ }
+ }
+ }
+
+ //if(String.isNotBlank(caesd.ManagementCode__c)){
+ // caesd.boxbarcodeforReceipt__c = caesd.Barcode_F__c + '250' + caesd.ManagementCode__c;
+ //}else{
+ // caesd.boxbarcodeforReceipt__c = '';
+ //}
+ //璁剧疆"绠＄悊缂栫爜"
+ /**
+ if(!bianmaMap.containsKey(caesd.Asset__c)){
+ caesd.ManagementCode__c = bianmaMap.containsKey(caesd.Asset__c) ? bianmaMap.get(caesd.Asset__c) : '';
+ system.debug(bianmaMap+'绠＄悊缂栫爜'+caesd.ManagementCode__c+'澶囧搧绠＄悊鐮�'+caesd.EquipmentManagementCode__c);
+ }
+ **/
+ //add by rentx 2021-10-25 end 璁剧疆灏忕爜
updList.add(caesd);
}
}
+
Savepoint sp = Database.setSavepoint();
try {
@@ -248,7 +355,26 @@
if (updList.size() > 0) {
update updList;
}
+ //add by youc 2021-12-06 淇濆瓨涔嬪悗锛屽啀娆¤缃皬鐮� 鏄剧ず椤甸潰 start
+ for (Id assId : caesdMap.keySet()) {
+ Consum_Apply_Equipment_Set_Detail__c wiInfo = caesdMap.get(assId)[0];
+ if (xiaomaMap1.containsKey(wiInfo.Asset__c)) {
+ wiInfo.EquipmentManagementCode__c = String.join(xiaomaMap1.get(wiInfo.Asset__c), ',');
+ }
+ if (bianmaMap1.containsKey(wiInfo.Asset__c)) {
+ wiInfo.ManagementCode__c = String.join(bianmaMap1.get(wiInfo.Asset__c), ',');
+ }
+ if (hzMap1.containsKey(wiInfo.Asset__c)) {
+ wiInfo.boxbarcodeforReceipt__c = String.join(hzMap1.get(wiInfo.Asset__c), ',');
+ }
+ }
+ //add by youc 2021-12-06 淇濆瓨涔嬪悗锛屽啀娆¤缃皬鐮� 鏄剧ず椤甸潰 end
done_flg = true;
+ //add by youc 2021-12-06 鍐嶆璋冪敤浜嗕笅鍒濆鍖栨柟娉曪紝缁欒緭鍏ユ璧嬪��
+ // myComponentController.getSelectedDataInfo();
+ // getSqlWhereStr();
+ // myComponentController.searchAndPaging();
+ //add by youc 2021-12-06
} catch (Exception ex) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getMessage()));
Database.rollback(sp);
@@ -265,6 +391,21 @@
if (!wi.check) {
continue;
}
+ /** 鏆傛椂涓嶉渶瑕佹彁绀猴紝鐩存帴鍙戣揣锛屼繚瀛樺ぇ灏忕爜
+ //add wangweipeng 2022/01/28 start
+ //鍒ゆ柇椤甸潰鏄惁淇濆瓨
+ if(useCaesdList != null && useCaesdList.size() > 0){
+ for(Consum_Apply_Equipment_Set_Detail__c caesdc : useCaesdList){
+ if(caesd.Asset__c == caesdc.Asset__c){
+ if(caesdc.Shipment_Saved_Flg__c == false){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇峰厛淇濆瓨鏁版嵁锛屽湪杩涜鍙戣揣'));
+ return;
+ }
+ }
+ }
+ }
+ //add wangweipeng 2022/01/28 end
+ **/
String guaranteen_end = '';
if (caesd.Consumable_Guaranteen_end_F__c != null) {
guaranteen_end = caesd.Consumable_Guaranteen_end_F__c.format();
@@ -273,6 +414,12 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '娑堣�楀搧宸茶繃鏈焄'+caesd.Fixture_Model_No_F__c+']('+caesd.Consumable_Guaranteen_end_F__c.format()+')'));
return;
}
+ Integer cnt = 0;
+ if(String.isNotBlank(caesd.EquipmentManagementCode__c)){
+ cnt = caesd.EquipmentManagementCode__c.split(',').size();
+ }
+ caesd.Inspection_Cnt_Jia__c = cnt;
+ system.debug('鍙戣揣浠舵暟==='+caesd.Inspection_Cnt_Jia__c);
if (caesd.Inspection_Cnt_Jia__c > caesd.Yi_Chu_Ku_Zhi_Shi_Jia__c) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙戣揣浠舵暟澶т簬宸插嚭搴撴寚绀轰欢鏁癧'+caesd.Fixture_Model_No_F__c+']('+guaranteen_end+')'));
return;
@@ -281,7 +428,18 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙戣揣浠舵暟灏忎簬宸插嚭搴撴寚绀轰欢鏁癧'+caesd.Fixture_Model_No_F__c+']('+guaranteen_end+')'));
return;
}
+ //add by youc 2021-12-27 start
+ if (caesd.EquipmentManagementCode__c == null) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '澶囧搧绠＄悊鐮佷负绌猴紝涓嶈兘鍙戣揣'));
+ return;
+ }
+ if (caesd.ManagementCode__c == null) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '绠＄悊缂栫爜涓虹┖锛屼笉鑳藉彂璐�'));
+ return;
+ }
+
+ //add by youc 2021-12-27 end
if (slip.Name == null || slip.DeliveryType__c == null || slip.Distributor_method__c == null || slip.DeliveryCompany__c == null || slip.Wh_Staff__c == null ) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇峰～鍐欏彂璐т俊鎭�'));
return;
@@ -307,7 +465,7 @@
assetIdSet.add(caesd.Asset__c);
}
}
-
+
if (viewList.size() > 0 && (sendEquipmentSet.size() != ((Consum_Apply_Equipment_Set_Detail__c)viewList[0].sobj).Consum_Apply__r.Shipment_requested_cnt__c || hadCnt != needCnt)) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '蹇呴』鏁村崟鍙戣揣锛岄儴鍒嗗彂璐ц杩涜鍒嗗崟'));
return;
@@ -324,6 +482,10 @@
done_flg = false;
return;
}
+
+ //add wangweipeng 2022/02/17 start
+ save();
+ //add wangweipeng 2022/02/17 end
Savepoint sp = Database.setSavepoint();
@@ -351,6 +513,8 @@
Inspection_Cnt_Jia__c = upd.Inspection_Cnt_Jia__c,
DeliverySlip__c = slip.Id,
Shippment_loaner_time__c = nowtime,
+ //EquipmentManagementCode__c = upd.EquipmentManagementCode__c,
+ //ManagementCode__c = upd.ManagementCode__c,
StockDown__c = true
//, StockDown_time__c = nowtime
));
@@ -376,6 +540,9 @@
Consum_Apply_Equipment_Set_Detail__c caesd = (Consum_Apply_Equipment_Set_Detail__c)wi.sobj;
if (caesd.DeliverySlip__c == null) {
caesd.Inspection_Cnt_Jia__c = null;
+ caesd.EquipmentManagementCode__c = null; //add by youc 2022-02-27
+ caesd.ManagementCode__c = null;//add by youc 2022-02-27
+ caesd.boxbarcodeforReceipt__c = null;
clearAssetId.add(caesd.Asset__c);
}
}
@@ -383,6 +550,9 @@
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
if (clearAssetId.contains(caesd.Asset__c)) {
caesd.Shipment_Saved_Flg__c = false;
+ caesd.EquipmentManagementCode__c = null; //add by youc 2022-02-27
+ caesd.ManagementCode__c = null;//add by youc 2022-02-27
+ caesd.boxbarcodeforReceipt__c = null;
updList.add(caesd);
}
}
@@ -437,6 +607,15 @@
useCaesdList = (List<Consum_Apply_Equipment_Set_Detail__c>)selectedData;
}
Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>> caesdMap = new Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>>();
+ //add by rentx 2021-10-22 start 娣诲姞璁板綍(灏忕爜璁板綍)
+ Map<Id,List<String>> recordforxiaoMaMap = new Map<Id,List<String>>();
+ //add by rentx 2021-10-22 end 娣诲姞璁板綍(灏忕爜璁板綍)
+ //add by wangweipeng 2022-02-21 start 娣诲姞鐩�
+ Map<Id,List<String>> recordforHeMap = new Map<Id,List<String>>();
+ //add by wangweipeng 2022-02-21 end 娣诲姞鐩�
+
+ Map<Id,List<String>> recordforBoxMap = new Map<Id,List<String>>();
+
Map<Id, Integer> cntMap = new Map<Id, Integer>();
Map<Id, Integer> cntShipmentReqMap = new Map<Id, Integer>();
Map<Id, Boolean> hasShipment = new Map<Id, Boolean>();
@@ -446,6 +625,34 @@
}
caesdMap.get(caesd.Asset__c).add(caesd);
+ //add by rentx 2021-10-22 start 娣诲姞璁板綍(灏忕爜璁板綍)
+ //鏈夊皬鐮佺殑娣诲姞鍒拌褰曢噷
+ if (caesd.EquipmentManagementCode__c != null && caesd.EquipmentManagementCode__c != '') {
+ if (recordforxiaoMaMap.containsKey(caesd.Asset__c) == false) {
+ recordforxiaoMaMap.put(caesd.Asset__c, new List<String>());
+ }
+ recordforxiaoMaMap.get(caesd.Asset__c).add(caesd.EquipmentManagementCode__c);
+ }
+ system.debug('recordforxiaoMaMap==='+recordforxiaoMaMap);
+ //add by rentx 2021-10-22 end 娣诲姞璁板綍(灏忕爜璁板綍)
+ //add by wangweipeng 2022-02-21 start 娣诲姞鐩�
+ if (caesd.ManagementCode__c != null && caesd.ManagementCode__c != '') {
+ if (recordforHeMap.containsKey(caesd.Asset__c) == false) {
+ recordforHeMap.put(caesd.Asset__c, new List<String>());
+ }
+ recordforHeMap.get(caesd.Asset__c).add(caesd.ManagementCode__c);
+ }
+ //add by wangweipeng 2022-02-21 end 娣诲姞鐩�
+
+
+ if (caesd.boxbarcodeforReceipt__c != null && caesd.boxbarcodeforReceipt__c != '') {
+ if (recordforBoxMap.containsKey(caesd.Asset__c) == false) {
+ recordforBoxMap.put(caesd.Asset__c, new List<String>());
+ }
+ recordforBoxMap.get(caesd.Asset__c).add(caesd.boxbarcodeforReceipt__c);
+ }
+ system.debug('zheli1'+caesd.boxbarcodeforReceipt__c + 'recordforBoxMap==='+recordforBoxMap);
+
if (caesd.Shipment_Saved_Flg__c == true) {
Integer cnt = cntMap.containsKey(caesd.Asset__c) ? (cntMap.get(caesd.Asset__c) + 1) : 1;
cntMap.put(caesd.Asset__c, cnt);
@@ -460,12 +667,36 @@
}
for (Id assId : caesdMap.keySet()) {
Consum_Apply_Equipment_Set_Detail__c wiInfo = caesdMap.get(assId)[0];
+
+ //灞曠ず鐨勬椂鍊欓渶瑕佸厛璁剧疆鍙戣揣浠舵暟涓虹┖ add by youc 2021-12-01
if (cntMap.containsKey(wiInfo.Asset__c)) {
wiInfo.Inspection_Cnt_Jia__c = cntMap.get(wiInfo.Asset__c);
}
if (cntShipmentReqMap.containsKey(wiInfo.Asset__c)) {
wiInfo.Yi_Chu_Ku_Zhi_Shi_Jia__c = cntShipmentReqMap.get(wiInfo.Asset__c);
}
+ //add by rentx 2021-10-22 start 娣诲姞灏忕爜
+ if (recordforxiaoMaMap.containsKey(wiInfo.Asset__c)) {
+ //璁剧疆灏忕爜
+ wiInfo.EquipmentManagementCode__c = String.join(recordforxiaoMaMap.get(wiInfo.Asset__c), ',');
+ }
+ //灞曠ず鐨勬椂鍊欓渶瑕佸厛璁剧疆绠＄悊缂栫爜涓虹┖
+ //wiInfo.ManagementCode__c = '';//鍏堟敞閲�
+ //add by rentx 2021-10-22 end 璁剧疆灏忕爜
+
+ //add by wangweipeng 2022-02-21 start 娣诲姞鐩�
+ if (recordforHeMap.containsKey(wiInfo.Asset__c)) {
+ //璁剧疆灏忕爜
+ wiInfo.ManagementCode__c = String.join(recordforHeMap.get(wiInfo.Asset__c), ',');
+ }
+ //add by wangweipeng 2022-02-21 end 娣诲姞鐩�
+
+
+ if (recordforBoxMap.containsKey(wiInfo.Asset__c)) {
+ //璁剧疆灏忕爜
+ wiInfo.boxbarcodeforReceipt__c = String.join(recordforBoxMap.get(wiInfo.Asset__c), ',');
+ }
+ system.debug('zheli2'+wiInfo.boxbarcodeforReceipt__c);
WrapperInfo wi = new WrapperInfo(wiInfo, myComponentController);
wi.additionalInfoMap.put('Product_Serial_No_F__c', wiInfo.Product_Serial_No_F__c);
@@ -484,4 +715,1345 @@
}
+
+ @TestVisible private static void test() {
+ if (false == Test.isRunningTest()) return;
+ Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1