From 102afa21c115e8c8b9333a326c3d1af08fe76faf Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 22 一月 2024 22:08:58 +0800
Subject: [PATCH] backup0122

---
 force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml b/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
index 02e2637..581682b 100644
--- a/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_order_details2__c/fields/Province_Account__c.field-meta.xml
@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Province_Account__c</fullName>
+    <description>20240111ws淇敼鍓嶏細
+IF(not(isblank(Consumable_Sale_order__c))&amp;&amp; not(isblank( HospItal_Name__c )),Consumable_Sale_order__r.Order_ForHospital__r.OCM_man_province_txt__c, 
+
+IF(not(isblank(Consumable_Shipment_order__c))&amp;&amp; not(isblank(HospItal_Name__c)),Consumable_Shipment_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
+ IF(Used_Account_Type__c = &quot;濂戠磩&quot;,Account_province_txt__c,
+Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c)
+))
+杩藉姞鍑鸿揣鍏冿紙鎺ュ彛锛夌殑鐪侊紙瀹㈡埛锛夊彇鍊�</description>
     <externalId>false</externalId>
     <formula>IF(not(isblank(Consumable_Sale_order__c))&amp;&amp; not(isblank( HospItal_Name__c )),Consumable_Sale_order__r.Order_ForHospital__r.OCM_man_province_txt__c, 
 
 IF(not(isblank(Consumable_Shipment_order__c))&amp;&amp; not(isblank(HospItal_Name__c)),Consumable_Shipment_order__r.Order_ForHospital__r.OCM_man_province_txt__c,
  IF(Used_Account_Type__c = &quot;濂戠磩&quot;,Account_province_txt__c,
-Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c)
-))</formula>
+
+IF(  not(isblank(Consumable_Arrived_order__c)),Consumable_Arrived_order__r.Dealer_Info__r.OCM_man_province_txt__c,
+Dealer_Info_IF__r.OCM_man_province_txt__c
+)
+)))</formula>
     <label>鐪�(瀹㈡埛)</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1