SWAG-CE6C45,WLIG-CEG5L5

李彤

2022-05-17 c84f6ee3f51a1ca76952b27eb6f118248fbaa6a3

SWAG-CE6C45,WLIG-CEG5L5

 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

        // 在进行NFM110处理时跳过消耗品明细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;

 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);
                }