From c84f6ee3f51a1ca76952b27eb6f118248fbaa6a3 Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期二, 17 五月 2022 13:47:03 +0800
Subject: [PATCH] SWAG-CE6C45,WLIG-CEG5L5
---
force-app/main/default/classes/NFM501FutureController.cls | 8 ++++----
force-app/main/default/classes/NFM110Rest.cls | 41 ++++++++++++++++++++++++++++++++++++-----
2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/NFM110Rest.cls b/force-app/main/default/classes/NFM110Rest.cls
index 92df810..0af0ae8 100644
--- a/force-app/main/default/classes/NFM110Rest.cls
+++ b/force-app/main/default/classes/NFM110Rest.cls
@@ -108,6 +108,22 @@
main(rowData_Id);
}
global static void main(String rowData_Id) {
+
+ // WLIG-CCT9UG 20220512 lt start
+ Map<String, String> transferMap = new Map<String, String>();
+ List<BatchIF_Transfer__c> transferList = [select Table__c,
+ Column__c,
+ External_value__c,
+ Internal_value__c
+ from BatchIF_Transfer__c
+ where Dropped_Flag__c = false
+ and (Table__c = 'NFM110')
+ ];
+ for (BatchIF_Transfer__c t : transferList) {
+ transferMap.put(t.Column__c + t.External_value__c, t.Internal_value__c);
+ }
+ // WLIG-CCT9UG 20220512 lt end
+
// 鍦ㄨ繘琛孨FM110澶勭悊鏃惰烦杩囨秷鑰楀搧鏄庣粏2 arrived return 澶勭悊 HWAG-B3D9UV 2018/8/14 start
StaticParameter.ConsumableAssetHanderTrigger = true;
StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
@@ -1514,7 +1530,10 @@
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
}
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
- ast.warrantyType__c = dnInfo.GuaranteeType;
+ // WLIG-CCT9UG 20220512 lt start
+ //ast.warrantyType__c = dnInfo.GuaranteeType;
+ ast.warrantyType__c = NFMUtil.getMapValue(transferMap, 'warrantyType__c', string.valueof(dnInfo.GuaranteeType), iflog);
+ // WLIG-CCT9UG 20220512 lt end
if (String.isNotBlank(dnInfo.MaintenancePrice)) {
Decimal mPrice = Decimal.valueOf(dnInfo.MaintenancePrice.trim());
ast.Maintenance_Price_Year__c = oppMap.get(InquiryNoStr).Trade__c == '鍐呰部'?
@@ -1756,7 +1775,10 @@
gPrice : gPrice * Decimal.valueOf(Label.Account_Exc);
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
}
- ast.warrantyType__c = dnInfo.GuaranteeType;
+ // WLIG-CCT9UG 20220512 lt start
+ //ast.warrantyType__c = dnInfo.GuaranteeType;
+ ast.warrantyType__c = NFMUtil.getMapValue(transferMap, 'warrantyType__c', string.valueof(dnInfo.GuaranteeType), iflog);
+ // WLIG-CCT9UG 20220512 lt end
if (String.isNotBlank(dnInfo.MaintenancePrice)) {
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
Decimal mPrice = Decimal.valueOf(dnInfo.MaintenancePrice.trim());
@@ -2094,7 +2116,10 @@
gPrice : gPrice * Decimal.valueOf(Label.Account_Exc);
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
}
- ast.warrantyType__c = dnInfo.GuaranteeType;
+ // WLIG-CCT9UG 20220512 lt start
+ //ast.warrantyType__c = dnInfo.GuaranteeType;
+ ast.warrantyType__c = NFMUtil.getMapValue(transferMap, 'warrantyType__c', string.valueof(dnInfo.GuaranteeType), iflog);
+ // WLIG-CCT9UG 20220512 lt end
if (String.isNotBlank(dnInfo.MaintenancePrice)) {
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
Decimal mPrice = Decimal.valueOf(dnInfo.MaintenancePrice.trim());
@@ -2462,7 +2487,10 @@
gPrice : gPrice * Decimal.valueOf(Label.Account_Exc);
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
}
- ast.warrantyType__c = dnInfo.GuaranteeType;
+ // WLIG-CCT9UG 20220512 lt start
+ //ast.warrantyType__c = dnInfo.GuaranteeType;
+ ast.warrantyType__c = NFMUtil.getMapValue(transferMap, 'warrantyType__c', string.valueof(dnInfo.GuaranteeType), iflog);
+ // WLIG-CCT9UG 20220512 lt end
if (String.isNotBlank(dnInfo.MaintenancePrice)) {
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� start
Decimal mPrice = Decimal.valueOf(dnInfo.MaintenancePrice.trim());
@@ -2550,7 +2578,10 @@
ast.Department_Class__c = olympus_return.ParentId; //'Olympus绀惧唴 鍏朵粬'
ast.AccountID = olympus_return.Id; //'Olympus绀惧唴 鍏朵粬 閫�璐�'
ast.Order_No__c = '';
- ast.Posting_Date__c = null;
+ // CHAN-CCR6MW gzw 銆愬鎵樸�戙�愪繚鏈夎澶囥�戜繚鏈夎澶囧彂璐ф棩閫昏緫 start
+ // ast.Posting_Date__c = null;
+ ast.Posting_Date__c = Date.today();
+ // CHAN-CCR6MW gzw 銆愬鎵樸�戙�愪繚鏈夎澶囥�戜繚鏈夎澶囧彂璐ф棩閫昏緫 end
ast.DeliveryNote__c = '';
ast.InstallDate = null;
ast.Guarantee_period_for_products__c = null;
diff --git a/force-app/main/default/classes/NFM501FutureController.cls b/force-app/main/default/classes/NFM501FutureController.cls
index 5a9f148..b974e7a 100644
--- a/force-app/main/default/classes/NFM501FutureController.cls
+++ b/force-app/main/default/classes/NFM501FutureController.cls
@@ -262,7 +262,7 @@
//杞崲琛紙閫夐」鍒楄〃鐨勪笅鎷夐�夐」锛�
//鎺ュ彛浼犳潵鍏朵粬鍏憡
if (String.isBlank(te1.Id)) { //鍒ゆ柇鎷涙爣椤圭洰鏄惁瀛樺湪
- if ('5'.equals(LI.infoType)) {
+ if ('5'.equals(LI.infoType) || '2'.equals(LI.infoType)) { //20220510 lt SWAG-CE6C45
//鎷涙姇鏍囬」鐩悕绉�
te1.InfoTitle__c = LI.infoTitle == null ? te1.InfoTitle__c : LI.infoTitle;
//椤圭洰闃舵
@@ -311,19 +311,19 @@
}
// 棰勫憡璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌棰勫憡鐨勫綋鍓嶆椂闂�
// 濡傛灉鏈夊�硷紝涓嶆槸绗竴娆★紝濡傛灉娌″��
- if ('1'.equals(LI.infoType) && te1.noticeDate__c == null) {
+ if (('1'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.noticeDate__c == null) { //20220510 lt SWAG-CE6C45
te1.noticeDate__c = Date.today();
System.debug('noticeDate__c:' + te1.noticeDate__c);
}
System.debug('LI.infoType:' + LI.infoType);
System.debug('te1.ResultDate__c:' + te1.ResultDate__c);
// 缁撴灉璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌缁撴灉鐨勫綋鍓嶆椂闂�
- if ('3'.equals(LI.infoType) && te1.ResultDate__c == null) {
+ if (('3'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.ResultDate__c == null) { //20220510 lt SWAG-CE6C45
te1.ResultDate__c = Date.today();
System.debug('ResultDate__c:' + te1.ResultDate__c);
}
// 鍏憡璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌鍏憡鐨勫綋鍓嶆椂闂�
- if ('0'.equals(LI.infoType) && te1.publicDate__c == null) {
+ if (('0'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.publicDate__c == null) { //20220510 lt SWAG-CE6C45
te1.publicDate__c = Date.today();
System.debug('publicDate__c:' + te1.publicDate__c);
}
--
Gitblit v1.9.1