From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份
---
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index d0c0cea..117d880 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -440,7 +440,7 @@
message += '鍗曞彿No.'+ message6.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add start
- if(String.isNotBlank(message6)){
+ if(String.isNotBlank(message7)){
message += '鍗曞彿No.'+ message7.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢';
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� add end
@@ -531,7 +531,7 @@
}
List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c
, Campaign__r.IF_Approved__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
- , Campaign__r.Meeting_Approved_No__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ , Campaign__r.Meeting_Approved_No__r.Name // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
, Campaign__r.Approved_Status__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
from Rental_Apply__c where Id in :raSet];
Savepoint sp = Database.setSavepoint();
@@ -551,7 +551,11 @@
WHERE Date__c >= :startDateSOQL
AND Date__c <= :Date.today()
ORDER BY Date__c ASC];
-
+ Map<Date,String> ocMap = new Map<Date,String>();
+ for(OlympusCalendar__c oc:ocList){
+ String IsWorkDay = oc.IsWorkDay__c.format();
+ ocMap.put(oc.Date__c,IsWorkDay);
+ }
for(Datetime dt:dtList){
Boolean startFlag = false;
Boolean endFlag = false;
@@ -560,9 +564,10 @@
Datetime endTime = Datetime.now();
Date endDate = Date.today();
// 瀹℃壒鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
- if(ocList[0].IsWorkDay__c == 0){
+ // if(ocList[0].IsWorkDay__c == 0){
+ if(ocMap.get(startDate) == '0'){
for(OlympusCalendar__c oc:ocList){
- if(oc.IsWorkDay__c == 1){
+ if(startDate < oc.Date__c && oc.IsWorkDay__c == 1){
startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0);
startDate = oc.Date__c;
startFlag = true;
@@ -572,7 +577,7 @@
}
// 鍙戣揣鏃堕棿鏄潪濂ユ灄宸存柉宸ヤ綔鏃�
if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
- for(Integer i = ocList.size() - 1; i <= 0;i--){
+ for(Integer i = ocList.size() - 1; i >= 0;i--){
if(ocList[i].IsWorkDay__c == 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);
@@ -627,8 +632,8 @@
// ra.ApprovedNo_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c;
// ra.Approved_State_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.ProcessState__c;
// }
- if (ra.Campaign__c != null&& ra.Campaign__r.IF_Approved__c && ra.Campaign__r.Meeting_Approved_No__c != null){
- ra.ApprovedNo_Delivery__c = ra.Campaign__r.Meeting_Approved_No__c;
+ if (ra.Campaign__c != null&& ra.Campaign__r.IF_Approved__c && ra.Campaign__r.Meeting_Approved_No__r.Name != null){
+ ra.ApprovedNo_Delivery__c = ra.Campaign__r.Meeting_Approved_No__r.Name;
ra.Approved_State_Delivery__c = ra.Campaign__r.Approved_Status__c;
}
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� update end
--
Gitblit v1.9.1