From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/objects/QIS_Report__c/fields/CFDA_No_Formular__c.field-meta.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/CFDA_No_Formular__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/CFDA_No_Formular__c.field-meta.xml
index 49f9283..36ed2ff 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/CFDA_No_Formular__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/CFDA_No_Formular__c.field-meta.xml
@@ -4,7 +4,12 @@
     <description>20190101bak
 IF( TEXT(capital_or_consumable__c) = &apos;涓绘満&apos;, nonyushohin__r.Product2.SFDA_Approbation_No__c, 
  IF( TEXT(capital_or_consumable__c) = &apos;鑰楁潗&apos;, consumable__r.SFDA_Approbation_No__c ,NULL))
-2018/10/31澧炲姞鑰楁潗鍙栧�奸�昏緫锛�</description>
+2018/10/31澧炲姞鑰楁潗鍙栧�奸�昏緫锛�
+
+//20210826
+IF( TEXT(capital_or_consumable__c) = &apos;涓绘満&apos;, nonyushohin__r.Product2.RegisterNo_ALL__c + 
+   if(isblank(nonyushohin__r.Product2.RegisterNo_ALL2__c), &apos;&apos;, &apos;;&apos;+nonyushohin__r.Product2.RegisterNo_ALL2__c), 
+IF( TEXT(capital_or_consumable__c) = &apos;鑰楁潗&apos;, consumable__r.SFDA_Approbation_No__c ,NULL))</description>
     <externalId>false</externalId>
     <formula>IF( !isblank(nonyushohin__c), nonyushohin__r.Product2.RegisterNo_ALL__c + 
    if(isblank(nonyushohin__r.Product2.RegisterNo_ALL2__c), &apos;&apos;, &apos;;&apos;+nonyushohin__r.Product2.RegisterNo_ALL2__c), 

--
Gitblit v1.9.1