From fbd4bea7bd57b4d4a33cb9ed0ebc15d9bf6551c0 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 12 七月 2023 17:54:54 +0800
Subject: [PATCH] 近日更新按钮,页面以及apex类

---
 force-app/main/default/classes/lexPCLLostReportLwcController.cls |  365 +++++++++++----------------------------------------
 1 files changed, 80 insertions(+), 285 deletions(-)

diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 1c42b9f..aa1edac 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -31,29 +31,6 @@
 	public static integer secondNum {get; set;}
 	// add tcm 20211122 end
 
-	@AuraEnabled
-	public static LostReport getLostReport(){
-		try {
-			return LostReport;
-		} catch (Exception e) {
-			throw new AuraHandledException(e.getMessage());
-		}
-	}
-
-	@AuraEnabled( cacheable = true ) 
-    public static List< Account > getAccounts() { 
-      
-        return [ SELECT Id, Name, Industry FROM Account LIMIT 10 ]; 
-         
-    } 
-     
-    @AuraEnabled( cacheable = true )
-    public static void saveAccounts(List<Account> accList){
-        Insert accList;
-        /*if(accList.size()>0 && accList != null){
-            insert accList;
-        }*/
-    } 
 
 	@AuraEnabled
     public static String getPickList(String objectName, String fieldName) {
@@ -103,27 +80,6 @@
 		pickList.put('鍏朵粬', qita);
         return JSON.serialize(pickList);
     }
-	@AuraEnabled
-	public static String getPickListByFilter(String objectName,String fieldName,String controlFieldName,String controlFieldValue){
-		try {
-			Schema.DescribeFieldResult fieldDescribe = Schema.getGlobalDescribe().get(objectName).getDescribe().fields.getMap().get(fieldName).getDescribe();
-			// 濡傛灉璇ュ瓧娈典负閫夐」鍒楄〃绫诲瀷锛屽垯鑾峰彇閫夐」鍒楄〃
-			List<Schema.PicklistEntry> picklistValues = fieldDescribe.getPicklistValues();
-			// 鏍规嵁鎺у埗瀛楁鐨勫�肩瓫閫夊嚭瀵瑰簲鐨勯�夐」
-			List<Map<String, Object>> lstPickvals = new List<Map<String, Object>>();
-			for (Schema.PicklistEntry entry : picklistValues) {
-				if (entry.isActive() && entry.getValue().startsWith(controlFieldValue)) {
-					lstPickvals.add(new Map<String, Object>{'label' => entry.getValue(), 'value' => entry.getValue()});
-				}
-			}
-			String jsonStr = JSON.serialize(lstPickvals);
-			return jsonStr;
-		} catch (Exception e) {
-			throw new AuraHandledException(e.getMessage());
-		}
-	}
-
-
 	@AuraEnabled
 	public static Map<string,object> init (string oppId1,string lostReportId1,string pageStatus1,string lostType1,string submitFlag1){
 		try {
@@ -288,176 +244,6 @@
 		maps.put('LostReport', LostReport);
 		return maps;
 	}
-	//鍐欏埌js
-	// 缂栬緫 鍙湁绯荤粺绠$悊鍛樻垨鑰呰崏妗堜腑鍙互缂栬緫
-	@AuraEnabled
-	public static String edit2(){
-		if( userinfo.getProfileId() == (ID) '00e10000000Y3o5AAC' ||
-		    '鑽夋'.equals(LostReport.LostReport.Report_Status__c)
-		    ) {
-			pageStatus = 'Edit';
-			init1();
-		}
-		else{
-			return '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�';
-		}
-		return null;
-	}
-	// 璁剧疆鍝佺墝
-	@AuraEnabled
-	public static void setBrand(){
-		list<LostBrand> LostBrandlist =  LostReport.LostBrands;
-		LostBrand tempBrand = LostBrandlist.get(setBrandNo);
-		string brandName = tempBrand.lostBrand.Lost_By_Company__c;
-		// fy SWAG-CCC6F6 start
-		if(!'鍏朵粬'.equals(tempBrand.lostBrand.Lost_By_Company_Mannual__c)){
-			tempBrand.lostBrand.Lost_By_Company_Mannual__c = null;
-		}
-		system.debug('aaa5+++'+tempBrand.lostBrand.Lost_By_Company_Mannual__c);
-		// fy SWAG-CCC6F6 end
-		// ID compID = CompetitionMap.get(brandName);
-		for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
-			// test
-			// tempLostProduct.LostProductss.Competitor__c = compID;
-			tempLostProduct.LostProductss.LostBrandName__c = brandName;
-			tempLostProduct.LostProductss.LostProduct__c = null;
-			tempLostProduct.LostProductss.LostProductMannual__c = null;
-			tempLostProduct.LostProductss.Quantity__c = null;
-			tempLostProduct.LostProductss.ProductClass__c = null;
-			tempLostProduct.LostProductss.ProductCategory__c = null;
-			tempLostProduct.bool=false;
-		}
-	}
-	// 璁剧疆鍝佺墝
-	@AuraEnabled
-	public static void setbrandmannual(){
-		list<LostBrand> LostBrandlist =  LostReport.LostBrands;
-		LostBrand tempBrand = LostBrandlist.get(setBrandNo);
-		string brandName = tempBrand.lostBrand.Lost_By_Company__c;
-		String brandNameMannual = tempBrand.lostBrand.Lost_By_Company_Mannual__c;
-		// ID compID = CompetitionMap.get(brandName);
-		for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
-			// test
-			// tempLostProduct.LostProductss.Competitor__c = compID;
-			system.debug('aaaa3++'+brandNameMannual);
-			if ('鍏朵粬'.equals(brandName) && brandNameMannual != null && !''.equals(brandNameMannual)) {
-				tempLostProduct.LostProductss.LostBrandName__c = brandNameMannual;
-				// tempLostProduct.LostProductss.LostProduct__c = null;
-				// tempLostProduct.LostProductss.LostProductMannual__c = null;
-				// tempLostProduct.LostProductss.Quantity__c = null;
-				// tempLostProduct.LostProductss.ProductClass__c = null;
-				// tempLostProduct.LostProductss.ProductCategory__c = null;
-				// tempLostProduct.bool=false;
-			}
-		}
-	}
-	// 淇濆瓨
-	// @AuraEnabled
-	// public static String save(LostReport report){
-	// 	try {
-	// 		if(!dataEntry(report)) {
-	// 			return null;
-	// 		}
-	
-	// 		// brandCount = LostReport.LostBrands.size();
-	// 		pageStatus = 'View';
-	// 		return '淇濆瓨鎴愬姛锛�';
-	// 	} catch (Exception e) {
-	// 		return e.getMessage();
-	// 	}
-	// }
-	//璇诲彇骞舵瀯寤虹珵浜夊鎵嬪搧鐗�
-	// public void BrandmapSet(){
-	// 	CompetitionMap = new map<string, id>();
-	// 	list <Competition_Company__c> competitionList
-	// 	    =  [select id,name from Competition_Company__c];
-	// 	for(Competition_Company__c tempComp : competitionList ) {
-	// 		CompetitionMap.put(tempComp.name, tempComp.id);
-	// 	}
-
-	// }
-	// 鏁版嵁妫�鏌�
-	@AuraEnabled
-	public static boolean DataCheck(LostReport report){
-		LostReport = report;
-		boolean dataCheck = true;
-		if(string.isBlank(LostReport.LostReport.LostType__c))
-		{
-			LostReport.LostReport.LostType__c.addError('蹇呴』濉啓澶卞崟绫诲瀷锛�');
-			dataCheck = false;
-		}
-		for(LostBrand tempLostBrand : LostReport.LostBrands ) {
-			system.debug('aaaa1++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
-			if(string.isblank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
-				tempLostBrand.lostBrand.Lost_By_Company__c.addError('璇峰~鍐欏け鍗曞搧鐗岋紒');
-				dataCheck = false;
-			}// fy SWAG-CCC6F6 start
-			else if('鍏朵粬'.equals(tempLostBrand.lostBrand.Lost_By_Company__c)&&string.isblank(tempLostBrand.lostBrand.Lost_By_Company_Mannual__c)){
-				tempLostBrand.lostBrand.Lost_By_Company_Mannual__c.addError('璇峰~鍐欏け鍗曞搧鐗岋紙鎵嬪姩锛夛紒');
-				dataCheck = false;
-			}// fy SWAG-CCC6F6 end
-			system.debug('aaaa2++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
-			if(tempLostBrand.lostBrand.LostPrice__c == null) {
-				tempLostBrand.lostBrand.LostPrice__c.addError('澶卞崟閲戦蹇呭~锛�');
-				dataCheck = false;
-			}
-			if(string.isblank(tempLostBrand.lostBrand.Lost_reason_main__c )) {
-				tempLostBrand.lostBrand.Lost_reason_main__c.addError('澶卞崟鐞嗙敱(涓�)蹇呭~锛�');
-				dataCheck = false;
-			}
-			if(string.isblank(tempLostBrand.lostBrand.Agency__c )) {
-				tempLostBrand.lostBrand.Agency__c.addError('涓爣缁忛攢鍟嗗繀濉紒');
-				dataCheck = false;
-			}
-			// 妫�鏌ユ槸鍚︽湁瓒呰繃1涓湁鏁扮殑浜у搧
-			integer productCount = 0;
-			for( PCLLostProducts temlostProduct : tempLostBrand.LostProducts) {
-				if (temlostProduct.LostProductss.LostProduct__c != null || temlostProduct.LostProductss.LostProductMannual__c != null) {
-					System.debug('澶卞崟鍨嬪彿' + temlostProduct.LostProductss.LostProduct__c);
-					System.debug('澶卞崟鍨嬪彿鎵嬪姩' + temlostProduct.LostProductss.LostProductMannual__c);
-					productCount ++;
-				}
-				// update tcm 20211123 start
-				if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&(temlostProduct.LostProductss.Quantity__c==null || temlostProduct.LostProductss.Quantity__c ==0)) {
-					temlostProduct.LostProductss.Quantity__c.addError('璇峰~鍐欏け鍗曟暟閲忥紒');
-					dataCheck = false;
-				}
-				if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&temlostProduct.LostProductss.ProductCategory__c==null) {
-					if (temlostProduct.LostProductss.ProductClass__c==null) {
-						temlostProduct.LostProductss.ProductClass__c.addError('澶卞崟浜у搧绫诲埆蹇呭~锛�');
-						temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭~锛�');
-					}else {
-						temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭~锛�');
-					}
-					dataCheck = false;
-				}
-				// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
-				if ((temlostProduct.LostProductss.LostProduct__c==null && temlostProduct.LostProductss.LostProductMannual__c==null)&&(temlostProduct.LostProductss.ProductCategory__c!=null||temlostProduct.LostProductss.Quantity__c!=null)) {
-					if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
-						temlostProduct.LostProductss.LostProduct__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
-					} else{
-						temlostProduct.LostProductss.LostProductMannual__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
-					}
-					dataCheck = false;
-				}
-				// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
-				// update tcm 20211123 end
-			}
-			// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
-			if (productCount == 0 && tempLostBrand.LostProducts != null && tempLostBrand.LostProducts.size() > 0) {
-				if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
-					tempLostBrand.LostProducts[0].LostProductss.LostProduct__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
-				}else{
-					tempLostBrand.LostProducts[0].LostProductss.LostProductMannual__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
-				}
-				dataCheck = false;
-			}
-			// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
-		}
-		
-
-		return dataCheck;
-	}
 	@AuraEnabled
 	public static String searchBrands(){
 		String ObjectApi_name = 'PCLLostBrand__c';
@@ -481,20 +267,9 @@
 		String jsonStr = JSON.serialize(lstPickvals);
         return jsonStr;
 	}
-	public static list<LostBrand> brandcopy(LostReport report){
-		list<LostBrand> tempbrands = new list<LostBrand>();
-		for(LostBrand tempbrand: report.LostBrands) {
-			LostBrand LostBrand =
-				new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
-			LostBrand.lostBrand = tempbrand.lostBrand.clone();
-			LostBrand.lostBrand.id = tempbrand.lostBrand.id;
-			tempbrands.add(LostBrand);
-		}
-		return tempbrands;
-	}
 	// 鏁版嵁褰曞叆
 	@AuraEnabled
-	public static Map<String,String> dataEntry(String report1){
+	public static Map<String,String> dataEntry(String report1,List<Id> deleteBrandIdList,List<Id> deleteProductIdList){
 		LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
 		Map<String,String> messageMap = new Map <String,String>();
 		system.debug('save---start:');
@@ -543,30 +318,32 @@
 			map<string,PCLLostProduct__c> upsertLostProductMap = new map<string,PCLLostProduct__c>();
 			// 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
 			list<PCLLostProduct__c> deleteLostProductList = new list<PCLLostProduct__c>();
+			Integer lineNo = 0;
 			for(LostBrand tempLostBrand : report.LostBrands ) {
 				// 濡傛灉鏈夊け鍗曞搧鐗岋紝閭d箞灏辫鎻掑叆鏇存柊锛�
 				system.debug('tempLostBrand.lostBrand.Lost_By_Company__c:'+tempLostBrand.lostBrand.Lost_By_Company__c);
 				if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
-					upsertLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
-					tempLostBrand.lostBrand.Lost_cancel_report__c = report.lostReport.id;
+					upsertLostBrandMap.put(lineNo,tempLostBrand.lostBrand);
+					tempLostBrand.lostBrand.Lost_cancel_report__c = report.lostReport.Id;
 					tempLostBrand.lostBrand.Name = tempLostBrand.lostBrand.Lost_By_Company__c;
 					integer tempNo = 0;
 					for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
 						system.debug('Name:'+ tempLostProduct.LostProductss.Name );
 						if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
 							tempLostProduct.LostProductss.Name = tempLostBrand.lostBrand.Name + tempLostProduct.LostProductss.Quantity__c;
-							upsertLostProductMap.put(tempLostBrand.lineNo +':'+ tempNo,tempLostProduct.LostProductss);
-						}else if(string.isNotBlank(tempLostProduct.LostProductss.id)) {
+							upsertLostProductMap.put(lineNo +':'+ tempNo,tempLostProduct.LostProductss);
+						}else if(string.isNotBlank(tempLostProduct.LostProductss.Id)) {
 							deleteLostProductList.add(tempLostProduct.LostProductss);
 						}
 						tempNo++;
 					}
 				}
 				// 濡傛灉娌℃湁鍝佺墝锛屼絾鏄湁id锛� 杩欐牱鏁版嵁闇�瑕佸垹闄�
-				else if(string.isNotBlank(tempLostBrand.lostBrand.id)) {
-					deleteLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
+				else if(string.isNotBlank(tempLostBrand.lostBrand.Id )) {
+					deleteLostBrandMap.put(lineNo,tempLostBrand.lostBrand);
 					// 杩欓噷鍙兘闇�瑕佷篃鍒ゆ柇涓�涓嬪け鍗曞瀷鍙锋湁娌℃湁闇�瑕佸垹鎺�
 				}
+				lineNo++;
 			}
 			if(upsertLostBrandMap.size()>0) {
 				upsert upsertLostBrandMap.values();
@@ -574,7 +351,7 @@
 			for( string productNo :upsertLostProductMap.keyset()) {
 				PCLLostProduct__c tempLostProduct = upsertLostProductMap.get(productNo);
 				integer brandNo = integer.valueof(productNo.split(':')[0]);
-				tempLostProduct.PCLLostBrand__c = upsertLostBrandMap.get(brandNo).id;
+				tempLostProduct.PCLLostBrand__c = upsertLostBrandMap.get(brandNo).Id;
 			}
 			if(upsertLostProductMap.size()>0) {
 				upsert upsertLostProductMap.values();
@@ -582,13 +359,20 @@
 			if(deleteLostBrandMap.size()>0) {
 				delete deleteLostBrandMap.values();
 				for(PCLLostBrand__c pcl: deleteLostBrandMap.values()) {
-					pcl.id = null;
+					pcl.Id = null;
 				}
+			}
+			if (deleteProductIdList.size()>0) {
+				database.delete(deleteProductIdList);
+				
+			}
+			if (deleteBrandIdList.size()>0) {
+				database.delete(deleteBrandIdList);
 			}
 			if(deleteLostProductList.size()>0) {
 				delete deleteLostProductList;
 				for(PCLLostProduct__c pclp: deleteLostProductList) {
-					pclp.id = null;
+					pclp.Id = null;
 				}
 			}
 			if(deleteBrandIDSet.size() > 0) {
@@ -615,8 +399,30 @@
 					}
 				}
 			}
+			if (report.lostReport.Report_Status__c != '鑽夋') {
+				ProcessInstance pro = [
+				SELECT 
+				ProcessDefinition.Name,
+				 (
+					SELECT 
+					Id,
+					StepStatus, 
+					IsPending,
+					Comments,
+					CreatedDate,
+					Actor.Name,  
+					OriginalActor.Name,
+					ProcessNode.Name FROM StepsAndWorkitems order by IsPending DESC, CreatedDate DESC 
+				)
+				FROM ProcessInstance where TargetObjectId =:reportId order by CreatedDate DESC
+				];
+				List<ProcessInstanceHistory> items = new List<ProcessInstanceHistory>();
+				items.addall(pro.StepsAndWorkitems);
+				report.approvalHistorys = items;
+			}
 			// lostReportId = report.lostReport.id;
 			system.debug('save---end:');
+			messageMap.put('LostReport',JSON.serialize(report));
 		}catch (Exception ex) {
 			Database.rollback(sp);
 			// 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
@@ -649,6 +455,25 @@
 			objs.put('Id', reportId);
 			objs.put('pageStatus', 'View');
 			objs.put('submitFlag', '1');
+			ProcessInstance pro = [
+				SELECT 
+				ProcessDefinition.Name,
+				 (
+					SELECT 
+					Id,
+					StepStatus, 
+					IsPending,
+					Comments,
+					CreatedDate,
+					Actor.Name,  
+					OriginalActor.Name,
+					ProcessNode.Name FROM StepsAndWorkitems order by IsPending DESC, CreatedDate DESC 
+				)
+				FROM ProcessInstance where TargetObjectId =:reportId order by CreatedDate DESC
+			];
+			List<ProcessInstanceHistory> items = new List<ProcessInstanceHistory>();
+			items.addall(pro.StepsAndWorkitems);
+			objs.put('approvalHistorys',items);
 			return objs;
 		}catch(exception ex) {
 			Database.rollback(sp);
@@ -669,51 +494,17 @@
 		return lostBrand;
 	}
 
-	// 鍒犻櫎鍝佺墝 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄垹闄ら偅涓搧鐗�
 	@AuraEnabled
-	public static String Remove(){
-		system.debug('RemoveBrandNo:'+RemoveBrandNo);
-		list<LostBrand> tempLostBrands = new List<lostBrand>();
-		Integer i = 0;
-		for(integer j = 0; j< LostReport.LostBrands.size(); j++ ) {
-			LostBrand templostBrand  = LostReport.LostBrands.get(j);
-			if(j != RemoveBrandNo) {
-				templostBrand.lineNo = i;
-				tempLostBrands.add(templostBrand);
-				i++;
-			}else if(!string.isBlank(templostBrand.lostBrand.id)) {
-				deleteBrandIDSet.add(templostBrand.lostBrand.id);
-			}
-		}
-
-		LostReport.LostBrands =  tempLostBrands;
-
-		brandCount = LostReport.LostBrands.size();
-		return null;
-	}
-	// 娣诲姞鍨嬪彿锛� 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄坊鍔犲埌閭d釜鍝佺墝
-	// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� start
-	@AuraEnabled
-	public static String addProduct(){
-		system.debug('brandNo:'+brandNo);
-		LostBrand tempLostBrand = LostReport.LostBrands.get(brandNo);
-		// PCLLostProduct__c plp = new PCLLostProduct__c(Competitor__c=CompetitionMap.get(LostReport.LostBrands[brandNo].lostBrand.Lost_By_Company__c));
-		string brandName = tempLostBrand.lostBrand.Lost_By_Company__c;
-		PCLLostProduct__c plp = new PCLLostProduct__c();
-		plp.LostBrandName__c = brandName;
-		tempLostBrand.LostProducts.add(new PCLLostProducts(tempLostBrand.LostProducts.size(),plp));
-		tempLostBrand.ProductSize = tempLostBrand.LostProducts.size();
-		return null;
-	}
-	@AuraEnabled
-	public static PCLLostProducts getLostProduct(){
+	public static PCLLostProducts getNewLostProduct(Integer lineNo2){
+		PCLLostProducts pro = null;
 		try {
-			PCLLostProduct__c plp = new PCLLostProduct__c();
-			return new PCLLostProducts(0,plp);
+			pro = new PCLLostProducts(lineNo2);
 		} catch (Exception e) {
-			throw new AuraHandledException(e.getMessage());
+			System.debug(e.getMessage());
 		}
+		return pro;
 	}
+
 	// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� end
 	// 椤甸潰鐨勬暟鎹粨鏋�
 	public class LostReport {
@@ -721,17 +512,22 @@
 		public Lost_cancel_report__c lostReport { get; set; }
 		@AuraEnabled
 		public list<LostBrand> LostBrands { get; set; }
+		@AuraEnabled
+		public list<ProcessInstanceHistory> approvalHistorys { get; set; }
 		public LostReport(){
 			lostReport = new Lost_cancel_report__c();
 			LostBrands = new list<LostBrand> {new LostBrand(0)};
+			approvalHistorys = new list<ProcessInstanceHistory>();
 		}
 		public LostReport(Lost_cancel_report__c lostReport){
 			this.lostReport = lostReport;
 			LostBrands = new list<LostBrand> {new LostBrand(0)};
+			approvalHistorys = new list<ProcessInstanceHistory>();
 		}
 		public LostReport(Lost_cancel_report__c lostReport,  list<LostBrand> LostBrands){
 			this.lostReport = lostReport;
 			this.LostBrands = LostBrands;
+			approvalHistorys = new list<ProcessInstanceHistory>();
 		}
 	}
 
@@ -772,6 +568,8 @@
 		public PCLLostProduct__c LostProductss;
 		@AuraEnabled
 		public Boolean bool;
+		@AuraEnabled
+		public String productName;
 		@AuraEnabled
 		public List<Map<String, String>> productOptions = new List<Map<String, String>>();
 		public PCLLostProducts() {
@@ -815,20 +613,17 @@
 			}
 		}
 	}
-	// add tcm 20211118 end
-
 	@AuraEnabled
-	public static List<Product2> searchProduct(){
+	public static string searchProduct(String lostProduct){
+		Product2 prd = null;
 		try {
-			List<Product2> products = [
-				select
-				Id,name
-				from Product2 
-				where Brand_Name__c = 'STORZ' limit 10
-			];
-			return products;
+			prd = [select Id,ProductClass__c, ProductCategory__c from Product2 where Id =:lostProduct];
 		} catch (Exception e) {
 			throw new AuraHandledException(e.getMessage());
 		}
+		return JSON.serialize(prd);
 	}
+
+	// add tcm 20211118 end
+
 }
\ No newline at end of file

--
Gitblit v1.9.1