From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/NFM202Controller.cls | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 1c7ce0c..107a832 100644
--- a/force-app/main/default/classes/NFM202Controller.cls
+++ b/force-app/main/default/classes/NFM202Controller.cls
@@ -58,17 +58,18 @@
// LHJ 澶氬勾淇濅慨 20190812 End
public String SFDC_DataID;
public Detail_element[] Items;
- //鎶ヤ环璇曠畻
+ //鎶ヤ环璇曠畻
public ProductDetais[] ProductDetais; //鎶ヤ环璇曠畻琛�
//20200810 ljh add start
//public String IsCorrosion;
//20200810 ljh add end
//闃胯タ璧涘 wql 20210331
public Boolean IsAcecide;
-
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� start
public String DepartmentName;
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� end
+ public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃�
+ public String CelonOpportunity;// 20220415 ljh SWAG-CCK8V4 add
}
public class Detail_element {
@@ -221,6 +222,12 @@
// 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
+ CelonOpportunity__c, // 20220415 ljh SWAG-CCK8V4 add
Account.RecordType.DeveloperName
from Opportunity
@@ -257,7 +264,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 +482,10 @@
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
+ quotation.CelonOpportunity = opp.CelonOpportunity__c; // 20220415 ljh ljh SWAG-CCK8V4 add
// 浜у搧
List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
quotation.Items = new List<Detail_element>();
@@ -589,7 +600,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