From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index 06a125b..13d3208 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -7,8 +7,8 @@
public Boolean saveBtnDisabled { get; private set; }
public boolean ReturnRefuse {get;private set;}
public String ErrorMessage {get; set;}
- public String CDSFinished {get;set;}
- public boolean LostFlg {get;set;}
+ // public String CDSFinished {get;set;}
+ // public boolean LostFlg {get;set;}
public String Step_status { get; private set; }
public Boolean needCDS { get; private set; }
public Boolean done_flg { get; set; }
@@ -338,7 +338,7 @@
List<String> raids = Raid.split(':');
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
List<Rental_Apply__c> RaTarList = [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.Status,Campaign__r.IF_Approved__c,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c
from Rental_Apply__c
where id in :raids];//20210602 ljh update 澧炲姞鏌ヨName SFDC-C3LBNL
//20210604 ljh update SFDC-C3LBNL start
@@ -350,9 +350,24 @@
String message = '';
String message4 = '';//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
String message5 = '';//1822 yc 20211108 绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ヤ笉鑳藉嚭搴�
+ String message6 = '';
+
+ Set<Id> ids = new Set<Id>();
+ for (Rental_Apply__c RaTar : RaTarList) {
+ if (String.isNotBlank(RaTar.Campaign__c) && RaTar.Campaign__r.IF_Approved__c){
+ ids.add(RaTar.Campaign__c);
+ }
+ }
+ //鏌ユ壘澶囧搧鐢宠瀵瑰簲瑁佸喅鐢宠
+ Map<Id, Campaign> campMap = new Map<Id, Campaign>([
+ SELECT Id, IF_Approved__c, Meeting_Approved_No__c,
+ Meeting_Approved_No__r.ProcessState__c,
+ Meeting_Approved_No__r.MeetingApprovedNo__c
+ FROM Campaign
+ WHERE id IN :ids]);
+
for (Rental_Apply__c RaTar : RaTarList) {
if( RaTar.Campaign__r.Status == '鍙栨秷'){
-
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
// return null;
errorFlag = true;
@@ -382,8 +397,17 @@
}else if(RaTar.demo_purpose2__c=='绱㈣禂QIS' && RaTar.next_action__c=='鏃犲伩鏇存崲' && RaTar.QIS_number__r.ReplaceDeliveryDate__c!= null){
errorFlag = true;
message5 += RaTar.Name+'銆�';
- }
+ }
//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
+ else if (!campMap.isEmpty() && campMap.containsKey(RaTar.Campaign__c) && campMap.get(RaTar.Campaign__c).IF_Approved__c){
+ if (String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__c)
+ || String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c)) {
+ errorFlag = true;
+ message6 = RaTar.Name + '銆�';
+ }
+ }
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.3 鍦ㄥ嚭搴撴椂澧炲姞鍒ゆ柇锛屽垽鏂浼氭槸鍚︾敵璇峰喅瑁侊紝濡傛灉鏄殑璇濓紝鍐嶅垽鏂喅瑁佺紪鍙锋槸鍚︿笉涓虹┖锛屾弧瓒虫潯浠舵墠鑳藉嚭搴擄紝鍚﹀垯鎻愮ず閿欒
+
}
if(errorFlag){
if(String.isNotBlank(message0)){
@@ -406,7 +430,10 @@
message += '鍗曞彿NO.'+message5.removeEnd('銆�')+'绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ワ紝涓嶈兘缁х画浜�';
}
//1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
+ if(String.isNotBlank(message6)){
+ message += '鍗曞彿No.'+ message6.removeEnd('銆�')+ '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
+ }
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
return null;
}
//20210604 ljh update SFDC-C3LBNL end
@@ -479,7 +506,7 @@
slip.Shippment_loaner_time__c = Datetime.now();
needSaveDetail = true;
}
- List<Rental_Apply__c> raList = [select Id, DeliverySlip__c from Rental_Apply__c where Id in :raSet];
+ List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c from Rental_Apply__c where Id in :raSet];
Savepoint sp = Database.setSavepoint();
try {
//if (needSaveSet) ControllerUtil.upRAdEquipmentSet(es);
@@ -495,6 +522,12 @@
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
ra.Is_keyPoint_Product__c = keyPointProduct.get(ra.Id);
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
+
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
+ if (!campMap.isEmpty() && campMap.containsKey(ra.Campaign__c) && campMap.get(ra.Campaign__c).IF_Approved__c){
+ 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 (needSaveDetail) ControllerUtil.updRAEquipmentSetDetail(eList);
--
Gitblit v1.9.1