From ea6a4eec81a6a74e214aefc5971d701242c3e7d3 Mon Sep 17 00:00:00 2001
From: Thhto <997058689@qq.com>
Date: 星期四, 17 十一月 2022 14:40:04 +0800
Subject: [PATCH] SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy
---
force-app/main/default/classes/NewQuoteIraiController.cls | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/classes/NewQuoteIraiController.cls b/force-app/main/default/classes/NewQuoteIraiController.cls
index 359a7ce..aad5885 100644
--- a/force-app/main/default/classes/NewQuoteIraiController.cls
+++ b/force-app/main/default/classes/NewQuoteIraiController.cls
@@ -6,6 +6,9 @@
public Id quoId {get;set;}
public String oppid;
public String leadid;
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ public String tenderid;
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
public Boolean productStatusUpdated {get;set;} // 鐘舵厠鏇存柊銆亄!$Label.Status_Update} 銈掓娂涓嬨仐銇熴亱銇┿亞銇�
public Boolean changedAfterPrint {get;set;} // true 銇牬鍚堛�佺敾闈€伀 confirm 銉°儍銈汇兗銈搞亴琛ㄧず銇椼伨銇欍�俼uoId銈掓柊銇椼亜insert銆傚垽瀹氥伅js銇仸瀹熸柦
@@ -15,7 +18,9 @@
public String errorProductmodel { get; set; }
public Boolean is_changed_opp { get; set; }
//lastbuy 2022/3/10 fy end
-
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 start
+ public String erroraxsdmodel { get; set; }
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 end
public String excel_text {get;set;}
public Integer select_index {get;set;} // excelImport灏傜敤銇с仚銇屻�乯s銇仸鍒跺尽銇欍倠銇撱仺銇仾銈嬨伄銇с�乀ODO katsu 鍓婇櫎浜堝畾
public String Product_text {get;set;}
@@ -161,13 +166,20 @@
// 鎷涙姇鏍囨姤浠峰鎵� 2021-06-21 update by gzw start
// 鎷涙姇鏍�
- String tenderid = System.currentPageReference().getParameters().get('tenderid');
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ // String tenderid = System.currentPageReference().getParameters().get('tenderid');
+ tenderid = System.currentPageReference().getParameters().get('tenderid');
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
+
// 鎷涙姇鏍囨姤浠峰鎵� 2021-06-21 update by gzw start
// 璇环id
oppid = System.currentPageReference().getParameters().get('oppid');
QuoteIrai__c quoteiraiobj = new QuoteIrai__c();
- if(oppid==null&&tenderid==null&&quoId!=null&&leadid==null&&agencyoppid==null){
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ if(oppid==null&&quoId!=null&&leadid==null&&agencyoppid==null){
+ // if(oppid==null&&tenderid==null&&quoId!=null&&leadid==null&&agencyoppid==null){
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
quoteiraiobj = [select id,Note__c,Noteplus__c from QuoteIrai__c where id=:quoId];
if(quoteiraiobj.Note__c!=null){
@@ -179,6 +191,8 @@
}
}
system.debug('oppid:++++'+oppid);
+ system.debug('leadid:++++'+leadid);
+ system.debug('tenderid:++++'+tenderid);
// 鎶ヤ环id
String oppquoid = System.currentPageReference().getParameters().get('oppquoid');
//灏嗘姤浠峰鎵樼殑甯佺涓庡璐稿竵绉嶄竴鑷� 闃叉鍚庣画澶栬锤鏈夐渶瑕佺敤USD鍒ゆ柇鏄剧ず鐨勫湴鏂� 绮剧悽鎶�鏈� wql 2021/01/06 start
@@ -207,7 +221,10 @@
}
// 缁忛攢鍟嗚浠锋姤浠峰鎵� 2020-02-28 update by vivek end
// 鎷涙姇鏍囨姤浠峰鎵� 2021-06-21 update by gzw start
- if (String.isNotBlank(tenderid)) {
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ // if (String.isNotBlank(tenderid)) {
+ if (String.isNotBlank(tenderid)&&String.isBlank(leadid)) {
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
quo.Note__c = Tender_information__c.sObjectType.getDescribe().getLabel() + '锛�' + baseUrl + '/' + tenderid;
}
// 鎷涙姇鏍囨姤浠峰鎵� 2021-06-21 update by gzw end
@@ -405,17 +422,17 @@
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/11 Start
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
- List<QuoteIrai__c> quoList = //obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c ,
- [ SELECT Id,Name,Cancel_Decide__c,Agency_Hospital_Link__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,Agency1_entrust__c,
+ List<QuoteIrai__c> quoList = //obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c ,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
+ [ SELECT Id,Name,Cancel_Decide__c,Agency_Hospital_Link__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,Agency1_entrust__c,cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Noteplus__c,Lead__c,Opportunity__c,
TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
Print_HP_Name__c,Account__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
FROM QuoteIrai__c Where Id =:quoId];
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/11 End
// CHAN-BHNBX6 2019/11/20 START
- List<QuoteIraiLineItem__c> items = //lastbuy 2022/3/10 fy start LastbuyProductFLG__c
+ List<QuoteIraiLineItem__c> items = //lastbuy 2022/3/10 fy start LastbuyProductFLG__c //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 start Is_DangerousChemicals__c
[Select Id,Asset_Model_No__c,SFDA_Status__c,Name__c,BSS_Category__c,QuoteIrai__r.Quote_Print_Date__c,
- Qty_Unit__c,Quantity__c,Product2__r.SFDA_Status__c,ProductCode__c,ListPrice__c,Product2__r.LastbuyProductFLG__c,
+ Qty_Unit__c,Quantity__c,Product2__r.SFDA_Status__c,ProductCode__c,ListPrice__c,Product2__r.LastbuyProductFLG__c,Product2__r.Is_DangerousChemicals__c,
Product2__r.Sales_Possibility__c,Product2__r.Name,Product2__c,ServicePrice__c,NoDiscountTotal__c,GuaranteePeriod__c
From QuoteIraiLineItem__c where QuoteIrai__c = :quoId Order by Item_Order__c, Id];
// CHAN-BHNBX6 2019/11/20 END
@@ -499,7 +516,15 @@
quo.Quote_Expiration_Date__c = Date.today() + 30;
}
//--Savebutton
- Save_button=true;
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ this.Save_button=false;
+ if(quo.QuoteIrai_Status__c != '鑽夋涓�'&& String.isNotBlank(quo.QuoteIrai_Status__c)){
+ this.Save_button=true;
+ }
+ // Save_button=true;
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
+ system.debug('===fff==='+quo.QuoteIrai_Status__c);
+ system.debug('===ccc==='+this.Save_button);
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy start
// if( quo.Note__c!=''){
if(String.isNotBlank(quo.Note__c)){
@@ -1060,6 +1085,11 @@
if (!String.isBlank(quo.Agency1_entrust__c)) {
description += '\r\n' + '绗竴缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency1_entrust__c;
}
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ if (!String.isBlank(tenderid)&&!description.contains('鎷涙爣椤圭洰') ) {
+ description += '\r\n' + '鎷涙爣椤圭洰' + '锛�' + baseUrl + '/' + tenderid;
+ }
+ //SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
//obsap 鏂板缁忛攢鍟�1瀛楁 fy end
// 鎷涙姇鏍囨姤浠峰鎵� 2020-06-21 update by gzw start
// if (!String.isBlank(quo.Tender_information__c)) {
@@ -1111,6 +1141,14 @@
if (quo.QuoteProportion__c != null) {
todoSubject += '锛� ' + quo.QuoteProportion__c + '%';
}
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ todoSubject += quo.cancelMultiyearInsurance__c=='涓嶈' ?'锛屽彇娑堝骞翠繚':'锛岄渶瑕佸骞翠繚';
+ // if (quo.cancelMultiyearInsurance__c=='涓嶈') {
+ // todoSubject += '锛屽彇娑堝骞翠繚';
+ // }else{
+ // todoSubject += '锛岄渶瑕佸骞翠繚';
+ // }
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
// String taskid = '';
// 鏀规垚瀵瑰浜虹殑
// if (tasks.size() > 0) {
@@ -1191,8 +1229,8 @@
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/11 Start
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
- quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,
- Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,
+ quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
+ Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
FROM QuoteIrai__c Where Id =:quoId];
@@ -1207,7 +1245,8 @@
// 鎷涙姇鏍囨姤浠峰鎵� 2020-06-21 update by gzw end
errorflg = true;
errorMessage = '閭欢鍙戦�佸畬鎴愩��';
-
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ this.Save_button=true;
//XLIU-CHY4KW 20220907 lt start --- 鎶ヤ环濮旀墭鍙戦�侀偖浠舵垚鍔熶箣鍚� 鍙嶅悜鏇存柊鎰忓悜 鎶ヤ环濮旀墭瀛楁涓�1
Lead lea = new Lead();
if(String.isNotBlank(leadid)){
@@ -1416,6 +1455,14 @@
}
//20220310 fy lastbuy end
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 start
+ String resalt = assdproductCheck();
+ if(resalt!='OK'){
+ errorflg = true;
+ errormessage = resalt ;
+ return false;
+ }
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 end
system.debug('鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆Welcome to dataCheck class!!鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆鈼嬧棆');
errorflg = false;
errormessage = null;
@@ -1440,8 +1487,8 @@
if (error == true){
if (quoId != null) {
Map<String,QuoteIraiLineItem__c> itemmap = new Map<String,QuoteIraiLineItem__c>();
- for (QuoteIraiLineItem__c item : [//lastbuy 2022/3/10 fy start LastbuyProductFLG__c
- Select Id,Product2__r.SFDA_Status__c,Product2__r.Name,Product2__c,Product2__r.LastbuyProductFLG__c
+ for (QuoteIraiLineItem__c item : [//lastbuy 2022/3/10 fy start LastbuyProductFLG__c //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 start Product2__r.Is_DangerousChemicals__c
+ Select Id,Product2__r.SFDA_Status__c,Product2__r.Name,Product2__c,Product2__r.LastbuyProductFLG__c,Product2__r.Is_DangerousChemicals__c
From QuoteIraiLineItem__c where QuoteIrai__c = :quoId Order by Item_Order__c, Id]) {
itemmap.put(item.Product2__c,item);
}
@@ -1542,10 +1589,10 @@
q = New QuoteIrai__c();
}else{
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/11 Start
- List<QuoteIrai__c> qs = New List<QuoteIrai__c>();//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,
+ List<QuoteIrai__c> qs = New List<QuoteIrai__c>();//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
- qs = [select Id,Account__c,Agency_Hospital_Link__c,Name,IraiUser__c,IraiSubject__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,
+ qs = [select Id,Account__c,Agency_Hospital_Link__c,Name,IraiUser__c,IraiSubject__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
Preferential_Trading_Price__c,Discount__c,Pricing__c,Unit_Price__c,Offer_Amount__c,TOTAL__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
Contract__c,Print_HP_Name__c,Quote_Expiration_Date__c,Quote_Comment__c,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
From QuoteIrai__c Where Id =:quoId];
@@ -1574,6 +1621,9 @@
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
q.Agency1_entrust__c = quo.Agency1_entrust__c;
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ q.cancelMultiyearInsurance__c = quo.cancelMultiyearInsurance__c;
+ // SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
q.QuoteProportion__c = quo.QuoteProportion__c;
q.CurrencyIsoCode = quo.CurrencyIsoCode;
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy start
@@ -1609,8 +1659,8 @@
}
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
- quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,
- Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,
+ quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
+ Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
FROM QuoteIrai__c Where Id =:q.Id];
@@ -1785,6 +1835,40 @@
system.debug('filg====='+filg);
return filg;
}
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 start
+ //闃胯タ璧涘楠岃瘉
+ public String assdproductCheck(){
+ Boolean falg = false;
+ String str = 'OK';
+ List<Product2> axsdQuoteIItem = new List<Product2>();
+ List<Product2> QuoteIItem = new List<Product2>();
+ List<Id> Product2List = new List<Id>();
+ System.debug('activities111111!!!'+activities);
+ for(QELine aaa :activities){
+ if(String.isNotBlank(aaa.pageObject.Product2__c)){
+ Product2List.add(aaa.pageObject.Product2__c);
+ }
+ }
+ List<Product2> productlist = [select id,Is_DangerousChemicals__c from Product2 where id in:Product2List];
+ for(Product2 pro :productlist){
+ System.debug('Is_DangerousChemicals__c111111!!!'+pro.Is_DangerousChemicals__c);
+ if(pro.Is_DangerousChemicals__c){
+ falg = true;
+ axsdQuoteIItem.add(pro);
+ }else if(!pro.Is_DangerousChemicals__c){
+ QuoteIItem.add(pro);
+ }
+ }
+ if(QuoteIItem.size() > 0 && axsdQuoteIItem.size() > 0){
+ str = '闃胯タ璧涘浜у搧涓嶈兘鍜屽叾浠栦骇鍝佷竴璧锋姤浠�';
+ }else{
+ if(falg){
+ str = OpportunityWebService.checkDangerItem(quo.Agency1_entrust__c);
+ }
+ }
+ return str;
+ }
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 end
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/11 Start
public class QuoteBean {
--
Gitblit v1.9.1