From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/classes/OFSInsReportLayoutController.cls | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/classes/OFSInsReportLayoutController.cls b/force-app/main/default/classes/OFSInsReportLayoutController.cls
index 8c0174a..91730cb 100644
--- a/force-app/main/default/classes/OFSInsReportLayoutController.cls
+++ b/force-app/main/default/classes/OFSInsReportLayoutController.cls
@@ -584,6 +584,9 @@
*/
public PageReference exchangeAsset() {
isUpDown = false;
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'unCheckedInfoList+++++++++++++ size锛� ' + unCheckedInfoList.size()));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'unCheckedInfoListForThousend+++++++++++++ size锛� ' + unCheckedInfoListForThousend.size()));
+
System.debug('exchangeAsset start');
// 鐥呴櫌澶夋洿銉併偋銉冦偗
if (!this.checkHpChange()) {
@@ -600,35 +603,41 @@
} else {
if (ass.rec_checkBox_c) {
tmpChecked.add(ass);
+ system.debug('=====uncheck SerialNumber1:' + ass.rec.SerialNumber);
} else {
tmpUnChecked.add(ass);
}
}
}
- system.debug('=====unCheckedInfoList:' + unCheckedInfoList.size());
- for (AssetInfo Ai: unCheckedInfoList) {
- if (Ai.rec_checkBox_c) {
- system.debug('=====uncheck SerialNumber1:' + Ai.rec.SerialNumber);
- }
- }
- for (List < AssetInfo > Li: unCheckedInfoListForThousend) {
- for (AssetInfo Ai: Li) {
- if (Ai.rec_checkBox_c) {
- system.debug('=====uncheck SerialNumber2:' + Ai.rec.SerialNumber);
- }
- }
- }
+ // for (AssetInfo Ai: unCheckedInfoList) {
+ // if (Ai.rec_checkBox_c) {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '+++++++++++++++锛� ' + Ai.rec.SerialNumber));
+ // system.debug('=====uncheck SerialNumber1:' + Ai.rec.SerialNumber);
+ // }
+ // }
+ // for (List < AssetInfo > Li: unCheckedInfoListForThousend) {
+ // for (AssetInfo Ai: Li) {
+ // if (Ai.rec_checkBox_c) {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '---------------锛� ' + Ai.rec.SerialNumber));
+ // system.debug('=====uncheck SerialNumber2:' + Ai.rec.SerialNumber);
+ // }
+ // }
+ // }
+
if (ThousandFLG > 0) {
this.unCheckedInfoList.clear();
for (List < AssetInfo > Li: unCheckedInfoListForThousend) {
for (AssetInfo Ai: Li) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '---------------锛� ' + Ai.rec.SerialNumber));
unCheckedInfoList.add(Ai);
}
}
}
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'unCheckedInfoList size锛� ' + unCheckedInfoList.size()));
for (AssetInfo ass: this.unCheckedInfoList) {
if (ass.rec_checkBox_c) {
system.debug('=====uncheck SerialNumber3:' + ass.rec.SerialNumber);
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '3333333333333锛� ' + ass.rec.SerialNumber));
tmpChecked.add(ass);
} else {
tmpUnChecked.add(ass);
@@ -637,10 +646,12 @@
for (List < AssetInfo > Li: unCheckedInfoListForThousend) {
for (AssetInfo Ai: Li) {
if (Ai.rec_checkBox_c) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '4444444444444444 ' + Ai.rec.SerialNumber));
system.debug('=====uncheck SerialNumber4:' + Ai.rec.SerialNumber);
}
}
}
+ // return null;
this.checkedInfoList = new List < AssetInfo > ();
for (AssetInfo ass: tmpChecked) {
ass.lineNo = this.checkedInfoList.size();
@@ -1172,6 +1183,7 @@
// 妫�绱㈡寜閽�
public PageReference searchBtn() {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '66666666666:' + unCheckedInfoList.size()));
countorder = 1;
//楠岃瘉
assetSerialNumberList.clear();
@@ -1186,6 +1198,7 @@
text1ForSort = text1;
cond1ForSort = cond1;
val1ForSort = val1;
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '=====unCheckedInfoList:' + unCheckedInfoList.size()));
system.debug('=====unCheckedInfoList:' + unCheckedInfoList.size());
for (AssetInfo Ai: unCheckedInfoList) {
if (Ai.rec_checkBox_c) {
@@ -1199,6 +1212,7 @@
}
}
}
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '77777777777777777:' + unCheckedInfoList.size()));
return null;
}
// 鏄庣粏鎺掑簭
@@ -1232,6 +1246,7 @@
}
private List < Asset > getAsset(String txt, String con, String val) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '+++++++++++++++++鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��'));
String soql = this.makeSoqlconfim();
soql += makeTextSql(txt, con, val);
//if(assetSerialNumberList.size() > 0){
@@ -1301,7 +1316,7 @@
soql += ' AND Status = \'浣跨敤涓璡'';
}
// fxk 2021/8/4 鏂板姞 Start
- soql += ' and (Asset.CurrentContract_F__r.Status__c != \'濂戠磩\' or (Asset.CurrentContract_F__r.Status__c = \'濂戠磩\' and Asset.CurrentContract_F_asset__r.Check_object__c = false) or Asset.CurrentContract_F__c = null) ';
+ soql += ' and (Asset.CurrentContract_F__c = \'a0H100000156VLH\' OR Asset.CurrentContract_F__r.Status__c != \'濂戠磩\' or (Asset.CurrentContract_F__r.Status__c = \'濂戠磩\' and Asset.CurrentContract_F_asset__r.Check_object__c = false) or (Asset.CurrentContract_F__r.Status__c = \'濂戠磩\' and Asset.CurrentContract_F__r.Effective_Status__c = \'鏃犳晥\') or Asset.CurrentContract_F__c = null) ';
// fxk 2021/8/4 鏂板姞 End
if (assetSerialNumberList.size() > 0) {
soql += ' AND SerialNumber not in ' + sqlTail;
--
Gitblit v1.9.1