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 | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls b/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
index 7b08027..393bc4a 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetReturnController.cls
@@ -2,16 +2,16 @@
private String cesIdsStr;
public String caIdStr {get;set;}
private List<String> cesIdList;
- public transient String c_apply_no { get; private set; }
+ public String c_apply_no { get; private set; }
public Boolean done_flg { get; set; }
private String keywdSort = null;
public FixtureDeliverySlip__c slip { get; set; }
- public transient String keepWher { get; set; }
- public transient String keyword { get; set; }
+ public String keepWher { get; set; }
+ public String keyword { get; set; }
public transient String keywordDate { get; set; }
- public transient Boolean saveBtnDisabled { get; private set; }
- public transient String userid {get;set;}
- public transient Map<Id, Consum_Apply_Equipment_Set_Detail__c> caesdVFMap { get; private set; }
+ public Boolean saveBtnDisabled { get; private set; }
+ public String userid {get;set;}
+ public Map<Id, Consum_Apply_Equipment_Set_Detail__c> caesdVFMap { get; private set; } //transient
private List<Consum_Apply_Equipment_Set_Detail__c> useCaesdList;
public ConsumEquipmentSetReturnController() {
@@ -25,8 +25,8 @@
public override Integer getSearchNumMax() {
//鍚勩儦銉笺偢銇埗寰°亗銈屻伆銆佹渶澶т欢鏁般倰鎸囧畾銇欍倠
// searchNumMax = Integer.valueOf(Label.Product_Select_Limit);
- // searchNumMax = 20;
- pagesize = '200';
+ searchNumMax = 370;
+ pagesize = '20';
return searchNumMax;
}
@@ -40,7 +40,7 @@
selectedDataSql += ')';
selectedDataSql += ' and Shippment_loaner_time2__c != null';
selectedDataSql += ' AND (Cancel_Select__c = false OR NG_Select_Again__c = true)';
- selectedDataSql += ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
+ selectedDataSql += ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last, name';
keepWher = selectedDataSql;
myComponentController.columnRightRW.put('Yi_Fa_Huo_Jia__c', 'r');
myComponentController.columnRightRW.put('Dao_Huo_OK_Jia__c', 'r');
@@ -97,7 +97,9 @@
, 'Return_DeliverySlip__c'
, 'Fixture_Model_No__c'
, 'SerialNumber_F__c'
- , 'EquipmentManagementCode__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'};
}
// getObjName 杩� getOriginObjName 鐨� FK
@@ -120,7 +122,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() {
@@ -210,7 +212,12 @@
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 + caesd.ManagementCode__c;
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
//瑕佸彂璐т欢鏁�
if(caesd.Return_DeliverySlip__c == null) {
//20211115 鑰楁潗杩芥函 yc 鏂规硶涓墍鏈夊緱 caesd.Asset__c-->caesd.Id 鍥犱负姝ゆ椂鐨勬暟鎹槸clone娌℃湁id鐨勬墍浠ョ敤asset鍔犱笂澶囧搧绠＄悊鐮佸仛key
@@ -229,7 +236,12 @@
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 + caesd.ManagementCode__c;
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
System.debug('zheli1'+sendAssetKey);
if (sendAssetKey.containsKey(asscodeX1)) {
Integer cnt = sendAssetKey.get(asscodeX1);
@@ -332,6 +344,7 @@
Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>> caesdMap = new Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>>();
// asset.Id-->鐢ㄤ簬鐢婚潰鏄剧ず鐨勫亣鏄庣粏
caesdVFMap = new Map<Id, Consum_Apply_Equipment_Set_Detail__c>();
+ Integer i = 0;
//20211018 鑰楁潗杩芥函 yc 鏂规硶涓墍鏈夊緱 caesd.Asset__c-->caesd.Id 鍥犱负鈥滃凡鍙戣揣浠舵暟鈥濅笉鐢ㄧ疮璁′簡锛岄渶瑕佸睍寮�
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
if (!caesdMap.containsKey(caesd.Id)) {
@@ -339,6 +352,9 @@
}
caesdMap.get(caesd.Id).add(caesd);
system.debug(caesdMap+'zheli5'+caesd.Id);
+
+ if (i == getSearchNumMax()) { break; }
+ i++;
if(!caesdVFMap.containsKey(caesd.Id)){
Consum_Apply_Equipment_Set_Detail__c caesdVF = caesd.clone();
caesdVF.Received_Confirm__c = null;
--
Gitblit v1.9.1