From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/InventoryResultRecordController.cls | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/InventoryResultRecordController.cls b/force-app/main/default/classes/InventoryResultRecordController.cls
index 78797f3..d0b84a9 100644
--- a/force-app/main/default/classes/InventoryResultRecordController.cls
+++ b/force-app/main/default/classes/InventoryResultRecordController.cls
@@ -225,7 +225,10 @@
fixAssetMap = getInitData(new List<AggregateResult>(), 'fix');
consumAssetMap = getInitData(new List<AggregateResult>(), 'consum');
if (ihList.size() == 0){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ // 20230918 ljh update 鎻愮ず棰滆壊 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ // 20230918 ljh update 鎻愮ず棰滆壊 end
}
for(Inventory_Header__c ih:ihList){
if(String.isBlank(ih.Fixture_Header__c)) {
@@ -600,7 +603,10 @@
return;
} else {
if (ihList[0].Inventory_Status__c <> '宸叉壒鍑�') {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鏈夋湭缁撴潫鐨勭洏鐐�'));
+ // 20230911 ljh update start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鏈夋湭缁撴潫鐨勭洏鐐�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '鏈夋湭缁撴潫鐨勭洏鐐�'));
+ // 20230911 ljh update end
} else {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鏈粨搴撴湰鏈堝凡杩涜杩囩洏鐐�'));
}
@@ -722,7 +728,7 @@
} catch (exception e) {
doneFlg = false;
System.debug(e.getStackTraceString());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,e.getDmlMessage(0)));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,e.getMessage()));
}
}
@@ -761,7 +767,10 @@
if(ihList.isEmpty()) {
inventoryDetailList = new List<Inventory_Detail__c>();
consumInventoryDetailList = new List<Consum_Inventory_Detail__c>();
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ // 20230918 ljh update 鎻愮ず棰滆壊 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '娌℃湁寮�濮嬩腑鐨勭洏鐐癸紝璇风偣鍑诲紑濮嬬洏鐐�'));
+ // 20230918 ljh update 鎻愮ず棰滆壊 end
unfixAssetMap = getInitData(new List<AggregateResult>(), 'unfix');
fixAssetMap = getInitData(new List<AggregateResult>(), 'fix');
consumAssetMap = getInitData(new List<AggregateResult>(), 'consum');
@@ -884,7 +893,7 @@
consumInventoryDetailList = Database.query(soqlAsset);
if (consumInventoryDetailList.size() > 1000) {
consumInventoryDetailList.remove(1000);
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶囧搧鏁伴噺瓒呰繃1000鏉★紝璇锋寜璐ф灦鍙风洏鐐规垨澧炲姞妫�绱㈡潯浠躲��'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '澶囧搧鏁伴噺瓒呰繃1000鏉★紝璇锋寜璐ф灦鍙风洏鐐规垨澧炲姞妫�绱㈡潯浠躲��'));
}
for (Consum_Inventory_Detail__c idl : consumInventoryDetailList) {
// 鍐荤粨鐨勬暟鎹笉鍙壂鐮�
@@ -909,7 +918,7 @@
system.debug('--鍦ㄨ繖閲�--'+inventoryDetailList.size());
if (inventoryDetailList.size() > 1000) {
inventoryDetailList.remove(1000);
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶囧搧鏁伴噺瓒呰繃1000鏉★紝璇锋寜璐ф灦鍙风洏鐐规垨澧炲姞妫�绱㈡潯浠躲��'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '澶囧搧鏁伴噺瓒呰繃1000鏉★紝璇锋寜璐ф灦鍙风洏鐐规垨澧炲姞妫�绱㈡潯浠躲��'));
}
for (Inventory_Detail__c idl : inventoryDetailList) {
// 鍐荤粨鐨勬暟鎹笉鍙壂鐮�
--
Gitblit v1.9.1