gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

 force-app/main/default/classes/NFM301Rest.cls

@@ -108,6 +108,7 @@

        String rowDataStr = NFMUtil.getRowDataStr(rowData);
        List<GeneralData> geDataList = (List<GeneralData>) JSON.deserialize(rowDataStr, List<GeneralData>.class);
        System.debug('zheli00:'+geDataList.size());
        if (geDataList == null || geDataList.size() == 0) {
            return;
        }
@@ -316,6 +317,7 @@

            //查找变更资本化日期的保有设备(根据公司代码和固定资产编号)
            List<Asset> assetNumberAssetList = null;
            System.debug('zheli11:'+InternalAssetnumberkeyList.size());
            if (InternalAssetnumberkeyList.size() > 0) {

                assetNumberAssetList = [Select Id, Name, Product2.ProductCode, Product2.Dealer_special_Object__c , Product2.Dealer_Object__c,
@@ -335,6 +337,7 @@
                    }
                }
            }
            System.debug('zheli22:'+companyCodeAssetNumberMap.size());
            
            List<String> fixtureSetId = new List<String>();
            Map<String,String> fixmodelNo_proIdMap = new Map<String,String>();
@@ -376,7 +379,7 @@
                fixtrueSetDetailMap.put(fixSetDetail.UniqueKey__c,fixSetDetail.Id);
            }


            System.debug('zheli01:'+genlDatas.size());            
            if (genlDatas.size() > 0) {
                List<String> receivingNoteOnlyInsertList = new List<String>(); 

@@ -521,6 +524,7 @@
                        }

                        if (String.isBlank(dnInfo.SerialNumber)) {
                            System.debug('zheli99');
                            continue;
                        }

@@ -657,7 +661,10 @@
                            continue;
                        }

                        if (String.isBlank(dnInfo.SerialNumber)) {
                        // 20230221 ljh start 
                        // if (String.isBlank(dnInfo.SerialNumber)) {
                        if (info.ProcessType == '1' &&  String.isBlank(dnInfo.SerialNumber)) {
                        // 20230221 ljh end 
                            continue;
                        }

@@ -836,7 +843,7 @@
                        } else {
                            //ProcessType(处理方式)为2时，更新保有设备的Asset_day__c(资产化日期)
                            String assetNumberStr = info.CompanyCode + dnInfo.AssetNumber;
                            // System.debug('====='+Integer.valueOf(assetNumberStr+companyCodeAssetNumberMap));
                            System.debug('zheli====='+Integer.valueOf(assetNumberStr+companyCodeAssetNumberMap));
                            if ( companyCodeAssetNumberMap.containsKey(assetNumberStr)) {

                                assetZB = companyCodeAssetNumberMap.get(assetNumberStr);