From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index 3915451..ae50a30 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -383,7 +383,10 @@
List<String> statusList = System.Label.StatusProcessState.split(',');
Map<Id, Rental_Apply__c> RaMap = new Map<Id, Rental_Apply__c>();
for (Rental_Apply__c RaTar : RaTarList) {
- if( RaTar.Campaign__r.Status == '鍙栨秷'){
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
+ // if( RaTar.Campaign__r.Status == '鍙栨秷'){
+ if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�'){
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� end
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
// return null;
errorFlag = true;
@@ -446,7 +449,10 @@
if(errorFlag){
if(String.isNotBlank(message0)){
- message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�';
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
+ // message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�';
+ message += '鍗曞彿NO.'+message0.removeEnd('銆�')+'瀛︿細宸插彇娑堟垨鑰呭彇娑堢敵璇蜂腑锛屼笉鑳界户缁搷浣滀簡';
+ // 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
}
if(String.isNotBlank(message1)){
message += '鍗曞彿NO.'+message1.removeEnd('銆�')+'瀛樺湪淇悊鏈�缁堟娴嬫棩锛屼笉鑳界户缁簡';
--
Gitblit v1.9.1