lightningupdate.git

			@@ -105,7 +105,7 @@
			soql = this.makeSoql1('', '');
			assetListed = Database.query(soql);
			assetListed = noSubmittedList(assetListed);


			if (assetListed.size() > 0) {
			ambc.rawAccount__c = assetListed[0].Account.Id;
			}
			@@ -180,7 +180,8 @@
			Map<String, AssetModifyBelongsChangeDetailInfo> MidMap = new Map<String, AssetModifyBelongsChangeDetailInfo>();
			List<Asset> asListed = new List<Asset>();
			soql = this.makeSoql1(text1, val1);
			asListed = Database.query(soql);
			System.debug('soql:'+soql);
			asListed = Database.query(soql);
			asListed = noSubmittedList(asListed);
			for (AssetModifyBelongsChangeDetailInfo bss : assetModifyBelongsChangeDetailRecordsview) {
			if (bss.check == true) {
			@@ -224,10 +225,10 @@
			Map<String,String> submittedMap = new Map<String,String>();
			List<AssetModifyBelongsChangeDetail__c> changeDetailList = new List<AssetModifyBelongsChangeDetail__c>();
			// 查找保有设备所属变更明细
			changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
			changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
			from AssetModifyBelongsChangeDetail__c
			where ChangeAndChangeDetail__c In:ambcIdList];


			if (changeDetailList.size() > 0) {
			for(AssetModifyBelongsChangeDetail__c ambcDetail:changeDetailList){
			submittedMap.put(ambcDetail.Asset__r.Id, ambcDetail.Asset__r.Id);
			@@ -239,9 +240,9 @@
			}
			}
			}


			} else {
			noSubmittedList = asListed;
			noSubmittedList = asListed;
			}

			if (noSubmittedList.size() > 200) {
			@@ -254,13 +255,13 @@
			} else{
			break;
			}


			}
			} else {
			asListed = noSubmittedList;
			}
			}


			return asListed;
			// WLIG-BYZ9UF XHL 20210311 End

			@@ -271,6 +272,7 @@
			val1 = val1.trim();
			}
			String soql='';
			//update by liwentao 20230705 start
			System.debug(RawAccountId);
			RawAccountId='';
			if(String.isBlank(RawAccountId)){
			@@ -281,6 +283,7 @@
			soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
			System.debug('id is not null');
			}
			//update by liwentao 20230705 start
			if (!String.isBlank(text1)) {
			if (text1 == 'Order_No__c' && checkexact) {
			soql += ' AND (' + text1 + ' = \'' + String.escapeSingleQuotes(val1) + '\' )';
			@@ -345,6 +348,7 @@
			//跳转到上传附件页面
			public PageReference uploadingAttachment() {
			PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);

			ref.setRedirect(true);
			return ref;
			}
			@@ -353,7 +357,7 @@
			public PageReference uploadingAttachmentLightning() {
			//PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
			PageReference ref = new Pagereference('/lightning/n/lightning?backgroundContext=%2Flightning%2Fr%2FAssetModifyBelongsChange__c%2F'+Id+'%2Fedit%3Fcount%3D1&0.recordId='+Id+'');


			ref.setRedirect(true);
			return ref;
			}
			@@ -386,7 +390,7 @@
			//提交之前验证保有设备是否在原客户下，不在报错。
			List<AssetModifyBelongsChangeDetail__c> getAmBdList = new List<AssetModifyBelongsChangeDetail__c>();
			getAmBdList = [SELECT Id, Name,Asset__r.SerialNumber,AssetNotAccount__c,Asset__r.Account.Name,ChangeAndChangeDetail__r.rawAccount__r.Name
			FROM AssetModifyBelongsChangeDetail__c
			FROM AssetModifyBelongsChangeDetail__c
			WHERE ChangeAndChangeDetail__c = : Id AND AssetNotAccount__c = true];
			if (getAmBdList.size() > 0) {
			for (AssetModifyBelongsChangeDetail__c ambcd: getAmBdList ) {
			@@ -394,11 +398,11 @@
			String rawAccountName = ' 不在客户【 ' + ambcd.ChangeAndChangeDetail__r.rawAccount__r.Name +' 】下，';
			String accountName = ' 在客户【 ' +ambcd.Asset__r.Account.Name +' 】下，';
			ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, serialNumber+rawAccountName+accountName+' 无法提交，请确认'));


			}
			return null;
			}


			try {
			Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
			psr.setObjectId(Id);
			@@ -628,4 +632,4 @@
			}

			}
			}
			}