From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
index 23e3d37..72e4caf 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls
@@ -209,9 +209,19 @@
from Rental_Apply__c
where id=:Raid];
- if( RaTar.Campaign__r.Status == '鍙栨秷'){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
- return null;
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
+ // if( RaTar.Campaign__r.Status == '鍙栨秷'){
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
+ if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�' ){
+ String tempS = '';
+ if(RaTar.Campaign__r.Status == '鍙栨秷'){
+ tempS = '宸插彇娑�';
+ }else{
+ tempS = '鐢宠鍙栨秷涓�';
+ }
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細'+tempS+'锛屼笉鑳界户缁搷浣滀簡'));
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� end
+ return null;
}else if( RaTar.Repair__r.Repair_Final_Inspection_Date__c!=null){
--
Gitblit v1.9.1