From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/classes/ConsumEquipmentSetReturnController.cls | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls b/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
index b1c8bdc..393bc4a 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
@@ -25,7 +25,7 @@
public override Integer getSearchNumMax() {
//鍚勩儦銉笺偢銇埗寰°亗銈屻伆銆佹渶澶т欢鏁般倰鎸囧畾銇欍倠
// searchNumMax = Integer.valueOf(Label.Product_Select_Limit);
- searchNumMax = 350;
+ searchNumMax = 370;
pagesize = '20';
return searchNumMax;
}
@@ -97,6 +97,7 @@
, 'Return_DeliverySlip__c'
, 'Fixture_Model_No__c'
, 'SerialNumber_F__c'
+ , 'ManagementCode__c'
, 'EquipmentManagementCode__c' //add by yc 20220217
, 'EquipmentManagementCode_OldData__c' //add by yc 20220217
, 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c'};
@@ -211,10 +212,10 @@
return null;
}
Integer cnt = caesd.Hui_Ji_Jia__c == null ? 0 : Integer.valueOf(caesd.Hui_Ji_Jia__c);
- String asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode__c;
+ String asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode__c + caesd.ManagementCode__c;
//add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
- asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c;
+ asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c + caesd.ManagementCode__c;
}
//add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
//瑕佸彂璐т欢鏁�
@@ -235,10 +236,10 @@
continue;
}
//20211115 鑰楁潗杩芥函 yc 瀹氫箟key
- String asscodeX1 = caesd.Asset__c + caesd.EquipmentManagementCode__c;
+ String asscodeX1 = caesd.Asset__c + caesd.EquipmentManagementCode__c + caesd.ManagementCode__c;
//add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
- asscodeX1 = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c;
+ asscodeX1 = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c + caesd.ManagementCode__c;
}
//add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
System.debug('zheli1'+sendAssetKey);
--
Gitblit v1.9.1