From 88abd49ebcdfcbff8cb60e9b0fb20b1e2e7eb613 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 23 三月 2022 11:32:19 +0800
Subject: [PATCH] obpm备品相关提示修改
---
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index ec7d5ab..d0c0cea 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -441,7 +441,7 @@
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add start
if(String.isNotBlank(message6)){
- message += '鍗曞彿No.'+ message7.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜鐘舵�佷笉绗﹀悎闇�姹�';
+ message += '鍗曞彿No.'+ message7.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢';
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add end
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
@@ -563,7 +563,7 @@
if(ocList[0].IsWorkDay__c == 0){
for(OlympusCalendar__c oc:ocList){
if(oc.IsWorkDay__c == 1){
- startTime = oc.Date__c;
+ startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0);
startDate = oc.Date__c;
startFlag = true;
break;
@@ -574,7 +574,7 @@
if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
for(Integer i = ocList.size() - 1; i <= 0;i--){
if(ocList[i].IsWorkDay__c == 1){
- endTime = ocList[i].Date__c.addDays(1);
+ endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0);
endDate = ocList[i].Date__c.addDays(1);
endFlag = true;
break;
@@ -647,7 +647,8 @@
return null;
} catch (Exception ex) {
system.debug('=====' + ex.getMessage());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ ApexPages.addMessages(ex);
Database.rollback(sp);
done_flg = false;
return null;
--
Gitblit v1.9.1