From 3d655e80eec6c770dce06f3d9cf04fffe607f644 Mon Sep 17 00:00:00 2001
From: yangjieke <yangjieke@prec-tech.com>
Date: 星期二, 22 三月 2022 17:53:32 +0800
Subject: [PATCH] SWAG-CCL6R7
---
force-app/main/default/classes/NFM202Controller.cls | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 1c7ce0c..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
@@ -257,7 +266,7 @@
PricebookEntry.Product2.GuranteeType__c
//lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 start
- ,PricebookEntry.Product2.DeliveryDate__c
+ ,DeliveryDate__c
//lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end
from OpportunityLineItem
@@ -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>();
@@ -589,7 +601,7 @@
detail.Quantity = oppLine.Quantity;
//lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 浜よ揣鏈� start
- detail.DeliveryDate = oppLine.PricebookEntry.Product2.DeliveryDate__c;
+ detail.DeliveryDate = oppLine.DeliveryDate__c;
//lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end
// LHJ SWAG-C9F9P8 20211206 澧炲姞瑙勬牸 Start
--
Gitblit v1.9.1