From 9b197b7fac92278fb591ea8f4942c7d5687cb5ce Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期一, 28 三月 2022 18:01:22 +0800
Subject: [PATCH] LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备0328
---
force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls b/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
index 7ff9ba3..f2d4a88 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
@@ -43,7 +43,7 @@
selectedDataSql += ' and Consum_Apply__r.AssetManageConfirm__c = true';
//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';
+ 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('Hui_Ji_Jia__c', 'r');
myComponentController.columnRightRW.put('WH_location__c', 'r');
myComponentController.columnRightRW.put('Yi_Zhi_Bao_Fei_Jia__c', 'w');
@@ -115,7 +115,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() {
@@ -211,10 +211,19 @@
// baofeiAssetMap.put(caesd.Asset__c, baofei);
// guoqiAssetMap.put(caesd.Asset__c, guoqi);
// shangjiaAssetMap.put(caesd.Asset__c, shangjia);
- baofeiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, baofei);
- guoqiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, guoqi);
- shangjiaAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode__c, shangjia);
- //update by youc 2021-12-08 start 涔嬪墠鏄洿鎺ュ彇淇濇湁璁惧鍜岃緭鍏ョ殑鍊肩殑 鐜板湪鍙互璁剧疆淇濇湁璁惧+灏忕爜涓簁ey 鑰楁潗杩芥函--鍙戣揣淇敼
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
+ if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
+ baofeiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, baofei);
+ guoqiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, guoqi);
+ shangjiaAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, shangjia);
+ }else{
+ //update by youc 2021-12-08 start 涔嬪墠鏄洿鎺ュ彇淇濇湁璁惧鍜岃緭鍏ョ殑鍊肩殑 鐜板湪鍙互璁剧疆淇濇湁璁惧+灏忕爜涓簁ey 鑰楁潗杩芥函--鍙戣揣淇敼
+ baofeiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, baofei);
+ guoqiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, guoqi);
+ shangjiaAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, shangjia);
+
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
}
List<Consum_Apply_Equipment_Set_Detail__c> updList = new List<Consum_Apply_Equipment_Set_Detail__c>();
@@ -224,7 +233,13 @@
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
//寰呮姤搴�
//update by youc 2021-12-08
- String asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode__c;
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
+ String asscodeX = caesd.Asset__c + caesd.ManagementCode__c+caesd.EquipmentManagementCode__c;
+ if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
+ asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c;
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
+
// if (baofeiAssetMap.containsKey(caesd.Asset__c) && baofeiAssetMap.get(caesd.Asset__c) > 0) {
if (baofeiAssetMap.containsKey(asscodeX) && baofeiAssetMap.get(asscodeX) > 0) {
// Integer cnt_last = baofeiAssetMap.get(caesd.Asset__c) - 1;
@@ -339,7 +354,7 @@
if (assXiaoMaMap.containsKey(caesd.Asset__c) == false) {
assXiaoMaMap.put(caesd.Asset__c, new List<String>());
}
- assXiaoMaMap.get(caesd.Asset__c).add(caesd.EquipmentManagementCode__c);
+ assXiaoMaMap.get(caesd.Asset__c).add(caesd.ManagementCode__c+caesd.EquipmentManagementCode__c);
}
//add by youc 2021-12-07 end 瀛樻斁灏忕爜
whlocMap.put(caesd.Asset__c, caesd.Asset__r.WH_location__c);
--
Gitblit v1.9.1