OlyMEBGProduct.git

			@@ -10,7 +10,7 @@
			if (rectCotac.size() == 0) {
			return;
			}
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证'];
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効');
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効');
			insert new Product2[]{prod01,prod02};

			@@ -132,11 +132,12 @@
			CarbonCopy = CarbonCopy.length() > 0 ? CarbonCopy.substring(0, CarbonCopy.lastIndexOf(',')) : '';
			cam.Shared_Editing__c = SharedEditing;
			cam.Carbon_Copy__c = CarbonCopy;
			cam.Is_Upload_To_OBPM_Success__c = true;
			camList.add(cam);
			}
			errorStr = '';
			Savepoint sp = Database.setSavepoint();
			// try {
			try {
			if(camList.size() > 0){
			update camList;

			@@ -145,13 +146,12 @@
			cam_ids.add(cam.Id);
			NFM703Controller.callout(null,cam_ids);
			}
			// } catch (System.Exception e) {
			// Database.rollback(sp);
			// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, e.getMessage()));
			// errorStr = e.getMessage();
			// hasError = true;
			// return null;
			// }
			} catch (System.Exception e) {
			Database.rollback(sp);
			ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, e.getMessage()));
			errorStr = e.getMessage();
			hasError = true;
			}
			}

			public class OBPMInfo {

			@@ -1,7 +1,15 @@
			trigger ConsumableOrderTrigger on Consumable_order__c (before insert, before update) {
			if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
			// CHAN-CBYBBF 【委托】经销商ET账号显示界面维护-广东汇晨 start
			// 注释跳过发货时要计算 SAP合同号
			// if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
			// return;
			// }
			// CHAN-CBYBBF 【委托】经销商ET账号显示界面维护-广东汇晨 end
			//add by rentx 20210618 start
			if (StaticParameter.ConsumableOrderTrigger) {
			return ;
			}
			//ad by rentx 20210618 end
			Set<String> contactIdSet = new Set<String>();
			Map<String, String> rprIdList = new Map<String, String>();
			Map<String, String> contactIdMap = new Map<String, String>();

	force-app/main/default/classes/ConsumableOrderTriggerTest.cls	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/UploadOBPMController.cls	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/triggers/ConsumableOrderTrigger.trigger	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史