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/EquipmentSetShippmentReceived1Controller.cls | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
index ef9ed08..c5364f7 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
@@ -173,16 +173,36 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
- //妫�鏌ユ槸鍚﹀彲浠ョ户缁�
- Rental_Apply__c RaTar = [select Name,Campaign__c,Repair__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,
- Campaign__r.Status,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c,
- Campaign__r.IF_Approved__c,Campaign__r.Meeting_Approved_No__c
- from Rental_Apply__c
- where id=:Raid];
+ List<String> statusList = System.Label.StatusProcessState.split(',');
- if( RaTar.Campaign__r.Status == '鍙栨秷'){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
- return null;
+ //妫�鏌ユ槸鍚﹀彲浠ョ户缁�
+ Rental_Apply__c RaTar = [select Name,Campaign__c,
+ Repair__c,
+ next_action__c,
+ QIS_number__r.ReplaceDeliveryDate__c,
+ demo_purpose2__c,
+ Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,
+ Campaign__r.Status,
+ repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c,
+ Campaign__r.IF_Approved__c,
+ Campaign__r.Meeting_Approved_No__c,
+ Campaign__r.Approved_Status__c //20220315 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ from Rental_Apply__c
+ where id=:Raid];
+
+ // 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){
@@ -209,9 +229,17 @@
//20220225 sx start obpm 涓嬫灦澧炲姞 鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
else if ( RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c == null){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍗曞彿No.'+ RaTar.Name + '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖'));
+ return null;
}
//20220225 sx end 涓嬫灦澧炲姞鍒ゆ柇
+
+ //20220315 sx start obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ else if ( RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(RaTar.Campaign__r.Approved_Status__c) ){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢'));
+ return null;
+ }
+ //20220315 sx end obpm obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
String userid = Userinfo.getUserId();
List<Rental_Apply_Equipment_Set_Detail__c> eList = new List<Rental_Apply_Equipment_Set_Detail__c>();
@@ -356,4 +384,36 @@
}
}
}
+
+ // 娴嬭瘯绫讳腑姝ｇ‘鍦烘櫙閮借蛋鍒颁簡 宸偣鐐瑰氨i++l
+ @TestVisible private void test() {
+ Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1