From cc7487a59bd4b0fa5bed1dd59f6d0565ace81b8b Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期五, 21 四月 2023 09:48:22 +0800
Subject: [PATCH] opd计划Cl3

---
 force-app/main/default/classes/PCLLostReportController.cls |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/classes/PCLLostReportController.cls b/force-app/main/default/classes/PCLLostReportController.cls
index eb40a5d..2af0b9e 100644
--- a/force-app/main/default/classes/PCLLostReportController.cls
+++ b/force-app/main/default/classes/PCLLostReportController.cls
@@ -337,6 +337,15 @@
 				}
 				// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
 				// update tcm 20211123 end
+				// 20230418 ljh DB202304320022 start
+				String LostBrandNameS = tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'?tempLostBrand.lostBrand.Lost_By_Company__c:tempLostBrand.lostBrand.Lost_By_Company_Mannual__c;
+				String LostBrandName = temlostProduct.LostProductss.LostBrandName__c;
+				if(LostBrandNameS != LostBrandName){
+					temlostProduct.LostProductss.LostBrandName__c.addError('澶卞崟鍝佺墝鍚嶄笉涓�鑷达紝璇风‘璁�');
+					dataCheck = false;
+				}
+				// 20230418 ljh DB202304320022 end
+				
 			}
 			// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
 			if (productCount == 0 && tempLostBrand.LostProducts != null && tempLostBrand.LostProducts.size() > 0) {
@@ -575,7 +584,10 @@
 		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;
+		// 20230418 ljh DB202304320022 start
+		// string brandName = tempLostBrand.lostBrand.Lost_By_Company__c;
+		string brandName = tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'?tempLostBrand.lostBrand.Lost_By_Company__c:tempLostBrand.lostBrand.Lost_By_Company_Mannual__c;		
+		// 20230418 ljh DB202304320022 end
 		PCLLostProduct__c plp = new PCLLostProduct__c();
 		plp.LostBrandName__c = brandName;
 		tempLostBrand.LostProducts.add(new PCLLostProducts(tempLostBrand.LostProducts.size(),plp));

--
Gitblit v1.9.1