From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/QIS_Report__c/fields/ProduceCompany_formular__c.field-meta.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/ProduceCompany_formular__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/ProduceCompany_formular__c.field-meta.xml
index 8f508de..25c2f9a 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/ProduceCompany_formular__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/ProduceCompany_formular__c.field-meta.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>ProduceCompany_formular__c</fullName>
-    <description>2018/10/31澧炲姞鑰楁潗鍙栧�奸�昏緫锛宯onyushohin__r.Product2.ProduceCompany__c銆�</description>
+    <description>2018/10/31澧炲姞鑰楁潗鍙栧�奸�昏緫锛宯onyushohin__r.Product2.ProduceCompany__c銆�
+//20210826
+IF( TEXT(capital_or_consumable__c) = &apos;涓绘満&apos;, nonyushohin__r.Product2.ProduceCompanySummary__c, 
+ IF( TEXT(capital_or_consumable__c) = &apos;鑰楁潗&apos;,  consumable__r.ProduceCompanySummary__c  ,NULL))</description>
     <externalId>false</externalId>
     <formula>/*
    CHAN-C4X63A 鍒涘缓鐢熶骇浼佷笟姹囨�诲瓧娈碉紝鏇挎崲鍘熸潵鐨勫瓧娈�

--
Gitblit v1.9.1