From 6c1807da003d3e11c25f6df9e3c40427a18c0073 Mon Sep 17 00:00:00 2001
From: Liu Cheng <liucheng@prec-tech.com>
Date: 星期五, 10 六月 2022 14:50:09 +0800
Subject: [PATCH] SFDC-CEZD9T 【委托】 【FY23系统课题12】-已购待货逻辑调整
---
force-app/main/default/classes/RentalApplyWebService.cls | 163 ++++++++++++++++++-------------
force-app/main/default/classes/RentalApplyWebServiceTest.cls | 103 ++++++++++++++++++++
2 files changed, 195 insertions(+), 71 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 0d5bf37..e73f5ce 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -1188,7 +1188,7 @@
return '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
}//20220301 sx obpm淇敼
else if(Ra.Campaign__r.IF_Approved__c && Ra.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(Ra.Campaign__r.Approved_Status__c)){
- return '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜鐘舵�佷笉绗﹀悎闇�姹�';
+ return '宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢';
}//20220315 sx obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
else{
return 'Fin';
@@ -1721,74 +1721,99 @@
/**
* 娉ㄦ畫鐢宠澶囧搧鐨勭鎺�
*/
- WebService static String RentalApplyCheckForSAoneEle(String SaID) {
- Statu_Achievements__c Sac = [select id,
- SalesChannel__c,
- Opportunity__r.Sales_Root__c,
- Status_1__c,
- Status_2_Formula__c,
- Opp_Number__c,
- ContractNO__c,
- FirstApproveDate__c,
- CreatedDate,
- X30_Deposit_Day__c,
- Deposit_In_Full_Day__c,
- DeliveryDate__c
- from Statu_Achievements__c where id = :SaID];
- if(Sac.Opportunity__r.Sales_Root__c == '璨╁２搴�'){
- if(Sac.Opp_Number__c.contains('GI')||Sac.Opp_Number__c.contains('BF')||Sac.Opp_Number__c.contains('ET') ){
- if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
- if((Date.today().addDays(-30)>Sac.Deposit_In_Full_Day__c)&&Sac.DeliveryDate__c == null){
- return 'Fin';
- }else{
- return '缁忛攢鍟嗗唴绉戣鍗曚笉鍦ㄧ敵璇锋湡鍐咃紝涓嶈兘鐢宠澶囧搧';
- }
- }else{
- return '缁忛攢鍟嗗唴绉戣鍗曠姸鎬佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
- }
- }else if(Sac.Opp_Number__c.contains('SP')){
- if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
- if((Date.today().addDays(-60)>Sac.X30_Deposit_Day__c )&&Sac.DeliveryDate__c == null){
- return 'Fin';
- }else{
- return '缁忛攢鍟哠P璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
- }
- }else{
- return '缁忛攢鍟哠P璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
- }
- }else{
- return '娉ㄦ畫閿�鍞笭閬撶被鍒笉鍦ㄥ彲鐢宠澶囧搧鑼冨洿鍐�';
- }
- }else if(Sac.Opportunity__r.Sales_Root__c == 'OCM鐩存帴璨╁２'){
- if(Sac.Opp_Number__c.contains('GI')||Sac.Opp_Number__c.contains('BF')||Sac.Opp_Number__c.contains('ET')){
- if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
-
- if((Date.today().addDays(-30)>Sac.FirstApproveDate__c )&&Sac.DeliveryDate__c == null){
- return 'Fin';
- }else{
- return 'OCM鐩撮攢鍐呯璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
- }
- }else{
- return 'OCM鐩撮攢鍐呯璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
- }
- }else if(Sac.Opp_Number__c.contains('SP')){
- if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
-
- if((Date.today().addDays(-60)>Sac.FirstApproveDate__c )&&Sac.DeliveryDate__c == null){
- return 'Fin';
- }else{
- return 'OCM鐩撮攢SP璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
- }
- }else{
- return 'OCM鐩撮攢SP璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
- }
- }else{
- return '娉ㄦ畫閿�鍞笭閬撶被鍒笉鍦ㄥ彲鐢宠澶囧搧鑼冨洿鍐呫��';
- }
- }else{
- return '閿�鍞笭閬撴湭鐭ワ紝涓嶈兘鏂板缓';
- }
- }
+ WebService static String RentalApplyCheckForSAoneEle(String SaID) {
+ Statu_Achievements__c Sac = [select id,
+ SalesChannel__c,
+ Opportunity__r.Sales_Root__c,
+ Status_1__c,
+ Status_2_Formula__c,
+ Opp_Number__c,
+ ContractNO__c,
+ FirstApproveDate__c,
+ CreatedDate,
+ X30_Deposit_Day__c,
+ Deposit_In_Full_Day__c,
+ DeliveryDate__c,
+ Backorder_complete_day__c,
+ DeliveryStatus__c
+ from Statu_Achievements__c where id = :SaID];
+ if(Sac.Opportunity__r.Sales_Root__c == '璨╁２搴�'){
+ if(Sac.Opp_Number__c.contains('GI')||Sac.Opp_Number__c.contains('BF')||Sac.Opp_Number__c.contains('ET') ){
+ //modify by lyh 20220606 start 宸茶喘寰呰揣閫昏緫璋冩暣
+ //瀹㈡埛GIR璁㈠崟锛屾敞娈嬬姸鎬�2鏄��12浠樺叏娆�-14宸插彂璐р�滆繖涓尯闂翠笖鍙戣揣鐘舵�佷负鈥濇湭浜や粯銆佸拰閮ㄥ垎浜や粯鈥滄椂锛岃嚜浠樻鏃ヨ捣绗�31澶╂湭鐢熸垚鈥濆鎴疯鍗曟渶缁堝彂璐ф棩鈥滄椂锛屾柟鍙互鎻愪氦鈥濆凡璐緟璐р�滅洰鐨勭殑澶囧搧鐢宠
+ //if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
+ // if((Date.today().addDays(-30)>Sac.Deposit_In_Full_Day__c)&&Sac.DeliveryDate__c == null){
+ if((Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�' || Sac.Status_2_Formula__c == '13 寰呭彂璐�' || Sac.Status_2_Formula__c == '14 宸插彂璐�')
+ && (Sac.DeliveryStatus__c == '鏈氦浠�' || Sac.DeliveryStatus__c == '閮ㄥ垎浜や粯')) {
+ if((Date.today().addDays(-30) > Sac.Deposit_In_Full_Day__c) && Sac.Backorder_complete_day__c == null) {
+ //modify by lyh 20220606 end 宸茶喘寰呰揣閫昏緫璋冩暣
+ return 'Fin';
+ } else {
+ return '缁忛攢鍟嗗唴绉戣鍗曚笉鍦ㄧ敵璇锋湡鍐咃紝涓嶈兘鐢宠澶囧搧';
+ }
+ }else{
+ return '缁忛攢鍟嗗唴绉戣鍗曠姸鎬佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else if(Sac.Opp_Number__c.contains('SP')){
+ //modify by lyh 20220606 start 宸茶喘寰呰揣閫昏緫璋冩暣
+ //瀹㈡埛SP璁㈠崟锛屾敞娈嬬姸鎬�2鏄��11浠樺畾閲�-14宸插彂璐р�滆繖涓尯闂翠笖鍙戣揣鐘舵�佷负鈥濇湭浜や粯銆佸拰閮ㄥ垎浜や粯鈥滄椂锛岃嚜浠樻鏃ヨ捣绗�61澶╂湭鐢熸垚鈥濆鎴疯鍗曟渶缁堝彂璐ф棩鈥滄椂锛屾柟鍙互鎻愪氦鈥濆凡璐緟璐р�滅洰鐨勭殑澶囧搧鐢宠
+ //if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
+ // if((Date.today().addDays(-60)>Sac.X30_Deposit_Day__c )&&Sac.DeliveryDate__c == null){
+ if((Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�'||Sac.Status_2_Formula__c=='14 宸插彂璐�')
+ && (Sac.DeliveryStatus__c == '鏈氦浠�' || Sac.DeliveryStatus__c == '閮ㄥ垎浜や粯')) {
+ if((Date.today().addDays(-60) > Sac.X30_Deposit_Day__c ) && Sac.Backorder_complete_day__c == null){
+ //modify by lyh 20220606 end 宸茶喘寰呰揣閫昏緫璋冩暣
+ return 'Fin';
+ }else{
+ return '缁忛攢鍟哠P璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else{
+ return '缁忛攢鍟哠P璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else{
+ return '娉ㄦ畫閿�鍞笭閬撶被鍒笉鍦ㄥ彲鐢宠澶囧搧鑼冨洿鍐�';
+ }
+ }else if(Sac.Opportunity__r.Sales_Root__c == 'OCM鐩存帴璨╁２'){
+ if(Sac.Opp_Number__c.contains('GI')||Sac.Opp_Number__c.contains('BF')||Sac.Opp_Number__c.contains('ET')){
+ //modify by lyh 20220606 start 宸茶喘寰呰揣閫昏緫璋冩暣
+ //娉ㄦ畫鐘舵��2鏄��9宸插綍璁㈠崟鏈粯娆�-14宸插彂璐р�滆繖涓尯闂翠笖鍙戣揣鐘舵�佷负鈥濇湭浜や粯銆佸拰閮ㄥ垎浜や粯鈥滀笖鈥滈攢鍞笭閬撲负鐩撮攢鏃垛�濓紝GIR璁㈠崟鑷鍗曞綍鍏ユ棩璧风31澶�/鏈敓鎴愨�濆鎴疯鍗曟渶缁堝彂璐ф棩鈥滄椂锛屾柟鍙互鎻愪氦鈥濆凡璐緟璐р�滅洰鐨勭殑澶囧搧鐢宠
+ //if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
+ // if((Date.today().addDays(-30)>Sac.FirstApproveDate__c )&&Sac.DeliveryDate__c == null){
+ if((Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�'||Sac.Status_2_Formula__c=='14 宸插彂璐�')
+ && (Sac.DeliveryStatus__c == '鏈氦浠�' || Sac.DeliveryStatus__c == '閮ㄥ垎浜や粯')){
+ if((Date.today().addDays(-30) > Sac.FirstApproveDate__c ) && Sac.Backorder_complete_day__c == null) {
+ //modify by lyh 20220606 end 宸茶喘寰呰揣閫昏緫璋冩暣
+ return 'Fin';
+ }else{
+ return 'OCM鐩撮攢鍐呯璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else{
+ return 'OCM鐩撮攢鍐呯璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else if(Sac.Opp_Number__c.contains('SP')){
+ //modify by lyh 20220606 start 宸茶喘寰呰揣閫昏緫璋冩暣
+ //娉ㄦ畫鐘舵��2鏄��9宸插綍璁㈠崟鏈粯娆�-14宸插彂璐р�滆繖涓尯闂翠笖鍙戣揣鐘舵�佷负鈥濇湭浜や粯銆佸拰閮ㄥ垎浜や粯鈥滀笖鈥滈攢鍞笭閬撲负鐩撮攢鏃垛�濓紝SP璁㈠崟61澶╂湭鐢熸垚鈥濆鎴疯鍗曟渶缁堝彂璐ф棩鈥滄椂锛屾柟鍙互鎻愪氦鈥濆凡璐緟璐р�滅洰鐨勭殑澶囧搧鐢宠
+ //if(Sac.Status_1__c == '娉ㄦ畫' && (Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�')){
+ // if((Date.today().addDays(-60)>Sac.FirstApproveDate__c )&&Sac.DeliveryDate__c == null){
+ if((Sac.Status_2_Formula__c == '09 宸插綍鍏ヨ鍗曟湭浠樻'||Sac.Status_2_Formula__c == '10 搴撳瓨宸查鐣欍兓鏈粯娆�'||Sac.Status_2_Formula__c == '11 宸茶璐с兓浠樿閲�'||Sac.Status_2_Formula__c == '12 宸茶璐с兓浠樺叏娆�'||Sac.Status_2_Formula__c == '13 寰呭彂璐�'||Sac.Status_2_Formula__c=='14 宸插彂璐�')
+ && (Sac.DeliveryStatus__c == '鏈氦浠�' || Sac.DeliveryStatus__c == '閮ㄥ垎浜や粯')) {
+ if((Date.today().addDays(-60) > Sac.FirstApproveDate__c ) && Sac.Backorder_complete_day__c == null) {
+ //modify by lyh 20220606 end 宸茶喘寰呰揣閫昏緫璋冩暣
+ return 'Fin';
+ }else{
+ return 'OCM鐩撮攢SP璁㈠崟涓嶅湪鐢宠鏈熷唴锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else{
+ return 'OCM鐩撮攢SP璁㈠崟鐘舵�佷笉绗﹀悎澶囧搧鐢宠璧勬牸锛屼笉鑳界敵璇峰鍝�';
+ }
+ }else{
+ return '娉ㄦ畫閿�鍞笭閬撶被鍒笉鍦ㄥ彲鐢宠澶囧搧鑼冨洿鍐呫��';
+ }
+ }else{
+ return '閿�鍞笭閬撴湭鐭ワ紝涓嶈兘鏂板缓';
+ }
+ }
+
//bp2
//public static String RentalApplyCheckForSA(String raid,String SaID) {
diff --git a/force-app/main/default/classes/RentalApplyWebServiceTest.cls b/force-app/main/default/classes/RentalApplyWebServiceTest.cls
index d8eb416..c59d9ba 100644
--- a/force-app/main/default/classes/RentalApplyWebServiceTest.cls
+++ b/force-app/main/default/classes/RentalApplyWebServiceTest.cls
@@ -3,6 +3,15 @@
// 澶囧搧鍊熷嚭鏃堕棿check
static testMethod void testMethodApprovalCheck() {
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
CreateRelationListPagingCmpCtrl cmp;
PageReference ref;
List<Rental_Apply__c> raObjs;
@@ -28,6 +37,16 @@
// 澶囧搧鍊熷嚭鏃堕棿check
static testMethod void testMethodApprovalCheck1() {
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
+
CreateRelationListPagingCmpCtrl cmp;
PageReference ref;
List<Rental_Apply__c> raObjs;
@@ -53,6 +72,15 @@
// 澶囧搧鍊熷嚭鏃堕棿check
static testMethod void testMethodApprovalCheck2() {
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
List<Rental_Apply__c> raObjs;
//Rental_Apply__c raObj;
@@ -100,6 +128,16 @@
}
// 20210812 ljh SFDC-C5HDC7 add start
static testMethod void testExtension_approval_processCheck() {
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
+
List<Rental_Apply__c> raObjs;
system.runAs(getUser()) {
setupTestData1();
@@ -405,6 +443,17 @@
// 鍙栨秷鐢宠鍗� 鍊熷嚭澶囧搧閰嶅涓�瑙堢姸鎬佸嵆鏃舵洿鏂�
static testMethod void testMethodRefreshStatus() {
+
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
+
CreateRelationListPagingCmpCtrl cmp;
PageReference ref;
List<Rental_Apply__c> raObjs;
@@ -449,6 +498,17 @@
// 鍒嗛厤楠岃瘉
static testMethod void testMethodAssignBtn() {
+
+ ControllerUtil.EscapeNFM001Trigger = true;
+ Oly_TriggerHandler.bypass(Product2Handler.Class.getName());
+ Oly_TriggerHandler.bypass(AssetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(FixtureSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
+ Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
+
CreateRelationListPagingCmpCtrl cmp;
PageReference ref;
List<Rental_Apply__c> raObjs;
@@ -618,7 +678,9 @@
Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
-
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
+
// 鐪�
Address_Level__c al = new Address_Level__c();
al.Name = '鏉变含';
@@ -635,6 +697,7 @@
al2.Level2_Sys_No__c = '9999999';
al2.Address_Level__c = al.id;
insert al2;
+
// 鐥呴櫌銈掍綔銈�
Account hospital = new Account();
hospital.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Account' and DeveloperName = 'HP'].id;
@@ -650,6 +713,7 @@
hospital.Town__c = '涓滀含';
insert hospital;
+
StaticParameter.EscapeAccountTrigger = true;
// 鎴︾暐绉戝銈掑緱銈�
Account[] strategicDep = [SELECT ID, Name FROM Account WHERE parentId = :hospital.Id AND recordType.DeveloperName = 'Department_Class_OTH'];
@@ -971,6 +1035,7 @@
Name='testOpp1',
StageName='寮曞悎',
CloseDate=Date.today(),
+ Close_Forecasted_Date__c=Date.today().addDays(-2),
AccountId=dep.Id,
Sales_Root__c = '璨╁２搴�',
Competitor__c ='A',
@@ -982,6 +1047,7 @@
Name='testOpp1',
StageName='寮曞悎',
CloseDate=Date.today(),
+ Close_Forecasted_Date__c=Date.today().addDays(-2),
AccountId=dep.Id,
Sales_Root__c = '璨╁２搴�',
Competitor__c ='A',
@@ -1094,6 +1160,7 @@
Name='testOpp1',
StageName='寮曞悎',
CloseDate=Date.today(),
+ Close_Forecasted_Date__c=Date.today().addDays(-2),
AccountId=dep.Id,
Competitor__c ='A',
Click_Close_Date__c = null,
@@ -1105,6 +1172,7 @@
Name='testOpp1',
StageName='寮曞悎',
CloseDate=Date.today(),
+ Close_Forecasted_Date__c=Date.today().addDays(-2),
AccountId=dep.Id,
Sales_Root__c = 'OCM鐩存帴璨╁２',
Competitor__c ='A',
@@ -1152,6 +1220,8 @@
Oly_TriggerHandler.bypass(RentalApplyTriggerHandler.Class.getName());
Oly_TriggerHandler.bypass(RentalApplyEquipmentSetHandler.Class.getName());
Oly_TriggerHandler.bypass(RentalApplyEquipmentSetDetailHandler.Class.getName());
+ Oly_TriggerHandler.bypass(ContactTriggerHandler.Class.getName());
+ Oly_TriggerHandler.bypass('AssetTrigger');
// 鐪�
Address_Level__c al = new Address_Level__c();
@@ -1487,6 +1557,13 @@
//raObj3.Campaign__c = cam.Id;
raObj3.SupplementCreated__c = true;
raObj3.Root_Rental_Apply__c = raObj2.Id;
+ raObj3.Hospital__c = hospital.Id;
+ raObj3.Strategic_dept__c = strategicDep[0].Id;
+ raObj3.Account__c = dep.Id;
+ raObj3.Hope_Lonaer_date_Num__c = 1; // 甯屾湜鍊熺敤澶╂暟
+ raObj3.Request_return_day__c = Date.toDay().addDays(10);
+ raObj3.Loaner_medical_Staff__c = contact2.Id;
+ raObj3.Assign_Person__c = Userinfo.getUserId();
insert raObj3;
// 澶囧搧閰嶅
@@ -1548,7 +1625,7 @@
//澶囧搧鍊熷嚭鐢宠
Rental_Apply__c raObj4 = new Rental_Apply__c();
- raObj4.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Rental_Apply__c' and DeveloperName = 'AgencyRequest'].id;
+ /*raObj4.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Rental_Apply__c' and DeveloperName = 'AgencyRequest'].id;
raObj4.Name = 'testra';
raObj4.Product_category__c = 'GI';
raObj4.Demo_purpose1__c = '缁翠慨浠ｇ敤';
@@ -1559,8 +1636,30 @@
raObj4.direct_shippment_address__c = '鍖椾含甯�';
raObj4.Request_shipping_day__c = Date.toDay(); // 甯屾湜鍒拌揣鏃�
raObj4.Phone_number__c = '1234567890';
+ raObj4.Repair__c=;
//raObj4.Campaign__c = cam.Id;
+ raObj4.SupplementCreated__c = true;*/
+ raObj4.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Rental_Apply__c' and DeveloperName = 'AgencyRequest'].id;
+ raObj4.Name = 'testra';
+ raObj4.Product_category__c = 'GI';
+ raObj4.Demo_purpose1__c = '浜у搧璇曠敤';
+ raObj4.demo_purpose2__c = FixtureUtil.raDemo_purpose2MAP.get('shiyongwuxunjia');
+ raObj4.direct_send__c = '鍖荤枟鏈烘瀯';
+ raObj4.Loaner_received_staff__c = '鐜嬩簲';
+ raObj4.Loaner_received_staff_phone__c = '110';
+ raObj4.direct_shippment_address__c = '鍖椾含甯�';
+ raObj4.Request_shipping_day__c = Date.toDay(); // 甯屾湜鍒拌揣鏃�
+ raObj4.Phone_number__c = '1234567890';
+ //raObj3.Campaign__c = cam.Id;
raObj4.SupplementCreated__c = true;
+ raObj4.Root_Rental_Apply__c = raObj2.Id;
+ raObj4.Hospital__c = hospital.Id;
+ raObj4.Strategic_dept__c = strategicDep[0].Id;
+ raObj4.Account__c = dep.Id;
+ raObj4.Hope_Lonaer_date_Num__c = 1; // 甯屾湜鍊熺敤澶╂暟
+ raObj4.Request_return_day__c = Date.toDay().addDays(10);
+ raObj4.Loaner_medical_Staff__c = contact2.Id;
+ raObj4.Assign_Person__c = Userinfo.getUserId();
insert raObj4;
Oly_TriggerHandler.clearAllBypasses();
--
Gitblit v1.9.1