From 08757a34e87bde82f3d1e3065f40d4204cd9f103 Mon Sep 17 00:00:00 2001
From: yangjieke <yangjieke@prec-tech.com>
Date: 星期二, 22 三月 2022 17:55:11 +0800
Subject: [PATCH] Merge branch 'SWAG-CCL6R7'
---
force-app/main/default/classes/NFM206Rest.cls | 2 +-
force-app/main/default/classes/NFM202Controller.cls | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 0bf1180..8e4e6d0 100644
--- a/force-app/main/default/classes/NFM202Controller.cls
+++ b/force-app/main/default/classes/NFM202Controller.cls
@@ -69,6 +69,10 @@
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� start
public String DepartmentName;
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� end
+
+
+ public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃�
+
}
public class Detail_element {
@@ -221,6 +225,11 @@
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� start
Department_Name__c,
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� end
+
+ //SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� start
+ Closing_Bid_Date_Bid__c,
+ Closing_Bid_Date__c,
+ //SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� end
Account.RecordType.DeveloperName
from Opportunity
@@ -475,6 +484,9 @@
quotation.DepartmentName = opp.Department_Name__c;
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� end
+ //SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� start
+ quotation.winBiddingDate = opp.Closing_Bid_Date_Bid__c ==null? NFMUtil.formatDate2Str(opp.Closing_Bid_Date__c) : NFMUtil.formatDate2Str(opp.Closing_Bid_Date_Bid__c);
+ //SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� end
// 浜у搧
List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
quotation.Items = new List<Detail_element>();
diff --git a/force-app/main/default/classes/NFM206Rest.cls b/force-app/main/default/classes/NFM206Rest.cls
index 6cba549..2845e21 100644
--- a/force-app/main/default/classes/NFM206Rest.cls
+++ b/force-app/main/default/classes/NFM206Rest.cls
@@ -165,7 +165,7 @@
opportunityInfo.Contract_DB_request_reason__c = gda.Contract_DB_request_reason;
opportunityInfo.Contract_DB_complite_day__c = NFMUtil.parseStr2Date(gda.Contract_DB_complite_day);
opportunityInfo.Assistant_Applied_Date__c = NFMUtil.parseStr2Date(gda.Assistant_Applied_Date);
- opportunityInfo.Closing_Bid_Date__c = NFMUtil.parseStr2Date(gda.Closing_Bid_Date);
+ //opportunityInfo.Closing_Bid_Date__c = NFMUtil.parseStr2Date(gda.Closing_Bid_Date); //SWAG-CCL6R7 2022-3-22 yjk 娉ㄩ噴鎺変腑鏍囨棩閫昏緫
opportunityInfo.Contract_DB_SalesDept_complite_day__c = NFMUtil.parseStr2Date(gda.Contract_DB_SalesDept_complite_day);
opportunityInfo.Contract_Invalid_Date__c = null;
opportunityInfo.Contract_Authorize_Lock__c = true;
--
Gitblit v1.9.1