From 985edf54edeaac1b70a0b00c5fa975ab3add78b4 Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 31 三月 2022 18:20:01 +0800
Subject: [PATCH] WLIG-CCT9UG关于市场多年保计提金调整
---
force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
index ef9ed08..b89c7b8 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
@@ -173,12 +173,22 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
+ List<String> statusList = System.Label.StatusProcessState.split(',');
+
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
- 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];
+ 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];
if( RaTar.Campaign__r.Status == '鍙栨秷'){
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
@@ -209,10 +219,18 @@
//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>();
Map<Id, Boolean> stockDownMap = new Map<Id, Boolean>();
--
Gitblit v1.9.1