From 22bd41f13147fce1df6ff35b592720c9cb387de9 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期四, 18 一月 2024 15:19:29 +0800
Subject: [PATCH] ali5 workflow backup0118
---
force-app/main/default/workflows/Account.workflow-meta.xml | 162 +++
force-app/main/default/workflows/Consumable_order__c.workflow-meta.xml | 12
force-app/main/default/workflows/Maintenance_Contract_Asset__c.workflow-meta.xml | 8
force-app/main/default/workflows/SLAReportInfo__c.workflow-meta.xml | 4
force-app/main/default/workflows/Product2.workflow-meta.xml | 22
force-app/main/default/workflows/Asset.workflow-meta.xml | 40
force-app/main/default/workflows/eSignForm__c.workflow-meta.xml | 14
force-app/main/default/workflows/Consum_Apply__c.workflow-meta.xml | 4
force-app/main/default/workflows/Enquiry_No_Bidding_Apply__c.workflow-meta.xml | 12
force-app/main/default/workflows/Maintenance_Contract_Estimate__c.workflow-meta.xml | 8
force-app/main/default/workflows/IS_Opportunity_Demand__c.workflow-meta.xml | 20
force-app/main/default/workflows/SI_Attachment__c.workflow-meta.xml | 20
force-app/main/default/workflows/NewMaintenanceReport_Task__c.workflow-meta.xml | 2
force-app/main/default/workflows/Opportunity.workflow-meta.xml | 165 ++-
force-app/main/default/workflows/Request_tedner_doc__c.workflow-meta.xml | 4
force-app/main/default/workflows/BatchIF_Log__c.workflow-meta.xml | 59 +
force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml | 75 +
force-app/main/default/workflows/ReceivingNoteDetail__c.workflow-meta.xml | 2
force-app/main/default/workflows/IS_Opportunity_Demand_Operating__c.workflow-meta.xml | 2
force-app/main/default/workflows/SolutionProjectRequirements__c.workflow-meta.xml | 2
force-app/main/default/workflows/SMARM__c.workflow-meta.xml | 2
force-app/main/default/workflows/OPDPlan__c.workflow-meta.xml | 2
force-app/main/default/workflows/User.workflow-meta.xml | 6
force-app/main/default/workflows/AssessmentReport__c.workflow-meta.xml | 10
force-app/main/default/workflows/Event__c.workflow-meta.xml | 16
force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml | 613 +++++++++++++--
force-app/main/default/workflows/Instruct_report__c.workflow-meta.xml | 6
force-app/main/default/workflows/Quote.workflow-meta.xml | 3
force-app/main/default/workflows/SubAuthorized__c.workflow-meta.xml | 20
force-app/main/default/workflows/RepairAgainAn__c.workflow-meta.xml | 4
force-app/main/default/workflows/Product_Documentation__c.workflow-meta.xml | 10
force-app/main/default/workflows/QuoteLineItem.workflow-meta.xml | 2
force-app/main/default/workflows/Visit_Report__c.workflow-meta.xml | 4
force-app/main/default/workflows/Campaign.workflow-meta.xml | 32
force-app/main/default/workflows/QIS_M_BC__c.workflow-meta.xml | 2
force-app/main/default/workflows/Lead.workflow-meta.xml | 18
manifest/packagewf.xml | 2
force-app/main/default/workflows/OpportunityLineItem.workflow-meta.xml | 77 +
force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml | 13
force-app/main/default/workflows/Report__c.workflow-meta.xml | 91 ++
force-app/main/default/workflows/Repair__c.workflow-meta.xml | 247 ++++--
force-app/main/default/workflows/ReceivingNote__c.workflow-meta.xml | 4
force-app/main/default/workflows/Case.workflow-meta.xml | 10
force-app/main/default/workflows/Statu_Achievements__c.workflow-meta.xml | 27
force-app/main/default/workflows/Contact.workflow-meta.xml | 13
force-app/main/default/workflows/Inspection_Item__c.workflow-meta.xml | 11
force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml | 247 +++---
force-app/main/default/workflows/Solution.workflow-meta.xml | 2
force-app/main/default/workflows/QIS_SC_Report__c.workflow-meta.xml | 1
force-app/main/default/workflows/ReceivingNoteSummary__c.workflow-meta.xml | 4
force-app/main/default/workflows/Bid_Announcement__c.workflow-meta.xml | 4
force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml | 29
force-app/main/default/workflows/Tender_information__c.workflow-meta.xml | 29
force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml | 92 +
54 files changed, 1,628 insertions(+), 662 deletions(-)
diff --git a/force-app/main/default/workflows/Account.workflow-meta.xml b/force-app/main/default/workflows/Account.workflow-meta.xml
index 0bb806d..c018d3b 100644
--- a/force-app/main/default/workflows/Account.workflow-meta.xml
+++ b/force-app/main/default/workflows/Account.workflow-meta.xml
@@ -88,9 +88,9 @@
</alerts>
<alerts>
<fullName>Approach_Confirm</fullName>
- <ccEmails>wei_yin@olympus.com.cn.invalid</ccEmails>
- <ccEmails>dongfeng_li@olympus.com.cn.invalid</ccEmails>
- <ccEmails>xiaochang_yu@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>wei_yin@olympus.com.cn</ccEmails>
+ <ccEmails>dongfeng_li@olympus.com.cn</ccEmails>
+ <ccEmails>xiaochang_yu@olympus.com.cn</ccEmails>
<description>瀹℃壒閫氳繃</description>
<protected>false</protected>
<recipients>
@@ -104,7 +104,19 @@
<description>璧勮川瀹℃壒閫氳繃閭欢</description>
<protected>false</protected>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jing_zhu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>jingjing_zhou@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>lewei_li@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -112,7 +124,27 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>lu_zheng@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>meng_cao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>qi_qiao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>wenjun_du@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>xiaoqian_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>xue3_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -883,7 +915,11 @@
<type>FieldUpdate</type>
</actions>
<active>false</active>
- <formula>AND( Submit_Customer_target__c = TRUE, Plan_approved__c = TRUE, NOT(ISBLANK(Review_FSE__c)), ISCHANGED(FSEManager_feedback_check_FSE__c))</formula>
+ <formula>AND(
+Submit_Customer_target__c = TRUE,
+Plan_approved__c = TRUE,
+NOT(ISBLANK(Review_FSE__c)),
+ISCHANGED(FSEManager_feedback_check_FSE__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -901,7 +937,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target_FSE__c = true, Plan_approved_FSE__c = true, NOT(ISBLANK(Review_FSE__c)), NOT(ISBLANK(FSEManager_feedback_check_FSE__c)), ISCHANGED(FSEManager_feedback_check_FSE__c), OR(month(today())=4,month(today())=5,month(today())=6))</formula>
+ <formula>AND(
+Submit_Customer_target_FSE__c = true,
+Plan_approved_FSE__c = true,
+NOT(ISBLANK(Review_FSE__c)),
+NOT(ISBLANK(FSEManager_feedback_check_FSE__c)),
+ISCHANGED(FSEManager_feedback_check_FSE__c),
+OR(month(today())=4,month(today())=5,month(today())=6))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -919,7 +961,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target_FSE__c = true, Plan_approved_FSE__c = true, NOT(ISBLANK(Review_FSE__c)), NOT(ISBLANK(FSEManager_feedback_check_FSE__c)), ISCHANGED(FSEManager_feedback_check_FSE__c), OR(month(today())=7,month(today())=8,month(today())=9))</formula>
+ <formula>AND(
+Submit_Customer_target_FSE__c = true,
+Plan_approved_FSE__c = true,
+NOT(ISBLANK(Review_FSE__c)),
+NOT(ISBLANK(FSEManager_feedback_check_FSE__c)),
+ISCHANGED(FSEManager_feedback_check_FSE__c),
+OR(month(today())=7,month(today())=8,month(today())=9))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -937,7 +985,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target_FSE__c = true, Plan_approved_FSE__c = true, NOT(ISBLANK(Review_FSE__c)), NOT(ISBLANK(FSEManager_feedback_check_FSE__c)), ISCHANGED(FSEManager_feedback_check_FSE__c), OR(month(today())=10,month(today())=11,month(today())=12))</formula>
+ <formula>AND(
+Submit_Customer_target_FSE__c = true,
+Plan_approved_FSE__c = true,
+NOT(ISBLANK(Review_FSE__c)),
+NOT(ISBLANK(FSEManager_feedback_check_FSE__c)),
+ISCHANGED(FSEManager_feedback_check_FSE__c),
+OR(month(today())=10,month(today())=11,month(today())=12))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -955,7 +1009,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target_FSE__c = true, Plan_approved_FSE__c = true, NOT(ISBLANK(Review_FSE__c)), NOT(ISBLANK(FSEManager_feedback_check_FSE__c)), ISCHANGED(FSEManager_feedback_check_FSE__c), OR(month(today())=1,month(today())=2,month(today())=3))</formula>
+ <formula>AND(
+Submit_Customer_target_FSE__c = true,
+Plan_approved_FSE__c = true,
+NOT(ISBLANK(Review_FSE__c)),
+NOT(ISBLANK(FSEManager_feedback_check_FSE__c)),
+ISCHANGED(FSEManager_feedback_check_FSE__c),
+OR(month(today())=1,month(today())=2,month(today())=3))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -972,12 +1032,12 @@
<criteriaItems>
<field>Account.Submit_Customer_target_FSE__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Account.Plan_approved_FSE__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Account.FSE_activity_target_Plan_check_day__c</field>
@@ -1011,7 +1071,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_FSE__c), OR(text(month(today()))="4",text(month(today()))="5",text(month(today()))="6"))</formula>
+ <formula>AND(ISCHANGED(Review_FSE__c),
+ OR(text(month(today()))="4",text(month(today()))="5",text(month(today()))="6"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1025,7 +1086,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_Sales__c), OR(text(month(today()))="4",text(month(today()))="5",text(month(today()))="6"))</formula>
+ <formula>AND(ISCHANGED(Review_Sales__c),
+ OR(text(month(today()))="4",text(month(today()))="5",text(month(today()))="6"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1039,7 +1101,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_FSE__c), OR(text(month(today()))="7",text(month(today()))="8",text(month(today()))="9"))</formula>
+ <formula>AND(ISCHANGED(Review_FSE__c),
+OR(text(month(today()))="7",text(month(today()))="8",text(month(today()))="9"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1053,7 +1116,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_Sales__c), OR(text(month(today()))="7",text(month(today()))="8",text(month(today()))="9"))</formula>
+ <formula>AND(ISCHANGED(Review_Sales__c),
+OR(text(month(today()))="7",text(month(today()))="8",text(month(today()))="9"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1067,7 +1131,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_FSE__c), OR(text(month(today()))="10",text(month(today()))="11",text(month(today()))="12"))</formula>
+ <formula>AND(ISCHANGED(Review_FSE__c),
+OR(text(month(today()))="10",text(month(today()))="11",text(month(today()))="12"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1081,7 +1146,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_Sales__c), OR(text(month(today()))="10",text(month(today()))="11",text(month(today()))="12"))</formula>
+ <formula>AND(ISCHANGED(Review_Sales__c),
+OR(text(month(today()))="10",text(month(today()))="11",text(month(today()))="12"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1095,7 +1161,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_FSE__c), OR(text(month(today()))="1",text(month(today()))="2",text(month(today()))="3"))</formula>
+ <formula>AND(ISCHANGED(Review_FSE__c),
+OR(text(month(today()))="1",text(month(today()))="2",text(month(today()))="3"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1109,7 +1176,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(ISCHANGED(Review_Sales__c), OR(text(month(today()))="1",text(month(today()))="2",text(month(today()))="3"))</formula>
+ <formula>AND(ISCHANGED(Review_Sales__c),
+OR(text(month(today()))="1",text(month(today()))="2",text(month(today()))="3"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1119,7 +1187,12 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>OR( ISCHANGED(Name) , ISCHANGED(Site), ISCHANGED(Alias_Name2__c), ISCHANGED(City_Master__c), ISCHANGED(Town__c), ISCHANGED(Street__c))</formula>
+ <formula>OR( ISCHANGED(Name) ,
+ISCHANGED(Site),
+ISCHANGED(Alias_Name2__c),
+ISCHANGED(City_Master__c),
+ISCHANGED(Town__c),
+ISCHANGED(Street__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1375,7 +1448,14 @@
</actions>
<active>false</active>
<description>銉偝銉笺儔銈裤偆銉楀绱勩伄鏅傘仩銇戝嫊銇嶃伨銇欍��</description>
- <formula>Or( And( Isnew(), Not(ISPICKVAL(Contract_Fiscal_Period__c, '')) ), Ischanged(Contract_Fiscal_Period__c), RecordType.DeveloperName = 'AgencyContract' )</formula>
+ <formula>Or(
+ And(
+ Isnew(),
+ Not(ISPICKVAL(Contract_Fiscal_Period__c, ''))
+ ),
+ Ischanged(Contract_Fiscal_Period__c),
+ RecordType.DeveloperName = 'AgencyContract'
+)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1403,7 +1483,11 @@
<type>FieldUpdate</type>
</actions>
<active>false</active>
- <formula>AND( Submit_Customer_target__c = TRUE, Plan_approved__c = TRUE, NOT(ISBLANK(Review_Sales__c)), ISCHANGED(Manager_feedback_check__c))</formula>
+ <formula>AND(
+Submit_Customer_target__c = TRUE,
+Plan_approved__c = TRUE,
+NOT(ISBLANK(Review_Sales__c)),
+ISCHANGED(Manager_feedback_check__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1421,7 +1505,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target__c = true, Plan_approved__c = true, NOT(ISBLANK(Review_Sales__c)), NOT(ISBLANK(Manager_feedback_check__c)), ISCHANGED(Manager_feedback_check__c), OR(month(today())=4,month(today())=5,month(today())=6) )</formula>
+ <formula>AND(
+Submit_Customer_target__c = true,
+Plan_approved__c = true,
+NOT(ISBLANK(Review_Sales__c)),
+NOT(ISBLANK(Manager_feedback_check__c)),
+ISCHANGED(Manager_feedback_check__c),
+OR(month(today())=4,month(today())=5,month(today())=6) )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1439,7 +1529,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target__c = true, Plan_approved__c = true, NOT(ISBLANK(Review_Sales__c)), NOT(ISBLANK(Manager_feedback_check__c)), ISCHANGED(Manager_feedback_check__c), OR(month(today())=7,month(today())=8,month(today())=9) )</formula>
+ <formula>AND(
+Submit_Customer_target__c = true,
+Plan_approved__c = true,
+NOT(ISBLANK(Review_Sales__c)),
+NOT(ISBLANK(Manager_feedback_check__c)),
+ISCHANGED(Manager_feedback_check__c),
+OR(month(today())=7,month(today())=8,month(today())=9) )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1457,7 +1553,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target__c = true, Plan_approved__c = true, NOT(ISBLANK(Review_Sales__c)), NOT(ISBLANK(Manager_feedback_check__c)), ISCHANGED(Manager_feedback_check__c), OR(month(today())=10,month(today())=11,month(today())=12) )</formula>
+ <formula>AND(
+Submit_Customer_target__c = true,
+Plan_approved__c = true,
+NOT(ISBLANK(Review_Sales__c)),
+NOT(ISBLANK(Manager_feedback_check__c)),
+ISCHANGED(Manager_feedback_check__c),
+OR(month(today())=10,month(today())=11,month(today())=12) )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1475,7 +1577,13 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND( Submit_Customer_target__c = true, Plan_approved__c = true, NOT(ISBLANK(Review_Sales__c)), NOT(ISBLANK(Manager_feedback_check__c)), ISCHANGED(Manager_feedback_check__c), OR(month(today())=1,month(today())=2,month(today())=3) )</formula>
+ <formula>AND(
+Submit_Customer_target__c = true,
+Plan_approved__c = true,
+NOT(ISBLANK(Review_Sales__c)),
+NOT(ISBLANK(Manager_feedback_check__c)),
+ISCHANGED(Manager_feedback_check__c),
+OR(month(today())=1,month(today())=2,month(today())=3) )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1492,12 +1600,12 @@
<criteriaItems>
<field>Account.Submit_Customer_target__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Account.Plan_approved__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Account.Sales_activity_target_Plan_check_day__c</field>
diff --git a/force-app/main/default/workflows/AssessmentReport__c.workflow-meta.xml b/force-app/main/default/workflows/AssessmentReport__c.workflow-meta.xml
index dcecd84..fced33a 100644
--- a/force-app/main/default/workflows/AssessmentReport__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/AssessmentReport__c.workflow-meta.xml
@@ -7,7 +7,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/AssessmentReportApprovalEmailTemplateService</template>
</alerts>
@@ -18,7 +18,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/AssessmentReportApprovalEmailTemplateService</template>
</alerts>
@@ -29,7 +29,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_AssessmentNotApproved</template>
</alerts>
@@ -40,7 +40,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/teachingReportApprovalEmailTemplateService</template>
</alerts>
@@ -51,7 +51,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/teachingReportApprovalEmailTemplateService</template>
</alerts>
diff --git a/force-app/main/default/workflows/Asset.workflow-meta.xml b/force-app/main/default/workflows/Asset.workflow-meta.xml
index b1266c1..f5de8cb 100644
--- a/force-app/main/default/workflows/Asset.workflow-meta.xml
+++ b/force-app/main/default/workflows/Asset.workflow-meta.xml
@@ -760,7 +760,7 @@
<criteriaItems>
<field>Asset.IF_Information_From__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.AssetMark__c</field>
@@ -818,7 +818,7 @@
<criteriaItems>
<field>Asset.CIC_call_back_check__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.CIC_call_back_confirm_day__c</field>
@@ -833,7 +833,10 @@
<type>FieldUpdate</type>
</actions>
<active>false</active>
- <formula>OR(ISCHANGED(Status), ISCHANGED(Installation_Site__c), ISCHANGED(Final_Examination_Date__c), ISCHANGED(Hospital_Manage_Number__c))</formula>
+ <formula>OR(ISCHANGED(Status),
+ISCHANGED(Installation_Site__c),
+ISCHANGED(Final_Examination_Date__c),
+ISCHANGED(Hospital_Manage_Number__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -864,12 +867,12 @@
<name>Product_Code_Plus_Serial_No</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 AND NOT(2 AND 3 AND 4 AND 5)</booleanFilter>
<criteriaItems>
<field>Asset.IsCompetitorProduct</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.Manage_type__c</field>
@@ -884,12 +887,12 @@
<criteriaItems>
<field>Asset.Loaner_accsessary__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.unknow_serial_NO_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -903,7 +906,7 @@
<criteriaItems>
<field>Asset.IsCompetitorProduct</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -921,7 +924,7 @@
<criteriaItems>
<field>Asset.unknow_serial_NO_product__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -936,7 +939,7 @@
<criteriaItems>
<field>Asset.IsCompetitorProduct</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.Manage_type__c</field>
@@ -951,12 +954,12 @@
<criteriaItems>
<field>Asset.Loaner_accsessary__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.unknow_serial_NO_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1026,7 +1029,7 @@
<criteriaItems>
<field>Asset.Request_manager_deleter_manaual_input__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1039,7 +1042,8 @@
<active>false</active>
<description>涓�閮ㄥ垎璋冩嫧鍚庤澶囨湁闂锛屽洖搴撳悗闇�瑕佺珛鍗充慨鏀�
add lxy 20221104 鍥炲簱鍚庤窡UK-21-4041997 寤虹珛Link</description>
- <formula>CONTAINS('02i10000003awbi', LEFT(Id,15)) && ISCHANGED(Rental_Count__c)</formula>
+ <formula>CONTAINS('02i10000003awbi', LEFT(Id,15))
+&& ISCHANGED(Rental_Count__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1168,7 +1172,7 @@
<criteriaItems>
<field>Asset.New_logic_data__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Asset.Guarantee_period_year__c</field>
@@ -1255,7 +1259,7 @@
<name>Installation_ToDo_Normal</name>
<type>Task</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>AND(ISCHANGED( Inspection_Result__c ) , ISPICKVAL( Inspection_Result__c , "姝ｅ父"))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1468,7 +1472,9 @@
</actions>
<active>false</active>
<description>AccountId = '0011000000VAiwz' && RecordTypeId = '01210000000kOPR' && Delete_Flag__c= TRUE</description>
- <formula>((ISCHANGED(RecordTypeId) && RecordTypeId = '01210000000kOPR') || (ISCHANGED(AccountId) && AccountId = '0011000000VAiwz' )) && Delete_Flag__c= TRUE</formula>
+ <formula>((ISCHANGED(RecordTypeId) && RecordTypeId = '01210000000kOPR') ||
+(ISCHANGED(AccountId) && AccountId = '0011000000VAiwz' ))
+&& Delete_Flag__c= TRUE</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<tasks>
diff --git a/force-app/main/default/workflows/BatchIF_Log__c.workflow-meta.xml b/force-app/main/default/workflows/BatchIF_Log__c.workflow-meta.xml
index db8907e..47b15ad 100644
--- a/force-app/main/default/workflows/BatchIF_Log__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/BatchIF_Log__c.workflow-meta.xml
@@ -9,7 +9,7 @@
<type>user</type>
</recipients>
<recipients>
- <recipient>ling_zhu@olympus.com.cn</recipient>
+ <recipient>ling_zhu@olympus.com.cn23</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -57,6 +57,10 @@
<type>group</type>
</recipients>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -66,6 +70,10 @@
</recipients>
<recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>lu_zheng@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -102,6 +110,10 @@
<type>group</type>
</recipients>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -111,6 +123,10 @@
</recipients>
<recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>lu_zheng@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -173,8 +189,13 @@
</alerts>
<alerts>
<fullName>BatchIF_NFM109_Error</fullName>
+ <ccEmails>gaozhangwei@prec-tech.com</ccEmails>
<description>BatchIF_NFM109_Error</description>
<protected>false</protected>
+ <recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
@@ -211,6 +232,10 @@
</recipients>
<recipients>
<recipient>chunyan_jia@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -336,6 +361,10 @@
<ccEmails>gzw@prec-tech.com</ccEmails>
<description>BatchIF_NFM401_Error</description>
<protected>false</protected>
+ <recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
@@ -511,7 +540,7 @@
<type>group</type>
</recipients>
<recipients>
- <recipient>ling_zhu@olympus.com.cn</recipient>
+ <recipient>ling_zhu@olympus.com.cn23</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -542,11 +571,15 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
- <recipient>ling_zhu@olympus.com.cn</recipient>
+ <recipient>ling_zhu@olympus.com.cn23</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -561,7 +594,7 @@
<type>group</type>
</recipients>
<recipients>
- <recipient>ling_zhu@olympus.com.cn</recipient>
+ <recipient>ling_zhu@olympus.com.cn23</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -609,7 +642,11 @@
<type>Alert</type>
</actions>
<active>true</active>
- <formula>Is_Error__c = 1 && ( Type__c = "PushNotification" || BEGINS(Type__c, "DataLoaderBatch:") ) && !CONTAINS(Log__c, "鐜扮姸鍒嗘瀽PDF") && !CONTAINS(Log__c, "澶囧搧澶囦唤")</formula>
+ <formula>Is_Error__c = 1 &&
+( Type__c = "PushNotification"
+|| BEGINS(Type__c, "DataLoaderBatch:")
+) && !CONTAINS(Log__c, "鐜扮姸鍒嗘瀽PDF")
+&& !CONTAINS(Log__c, "澶囧搧澶囦唤")</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -815,7 +852,7 @@
<criteriaItems>
<field>BatchIF_Log__c.RowDataFlg__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -958,7 +995,7 @@
<criteriaItems>
<field>BatchIF_Log__c.RowDataFlg__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1629,7 +1666,10 @@
<type>Alert</type>
</actions>
<active>true</active>
- <formula>Is_Error__c = 1 && Type__c = "PushNotification" && CONTAINS(Log__c, "鐜扮姸鍒嗘瀽PDF") && !CONTAINS(Log__c, "澶囧搧澶囦唤")</formula>
+ <formula>Is_Error__c = 1 &&
+Type__c = "PushNotification"
+&& CONTAINS(Log__c, "鐜扮姸鍒嗘瀽PDF")
+&& !CONTAINS(Log__c, "澶囧搧澶囦唤")</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1655,7 +1695,8 @@
<active>true</active>
<description>//灏嗗浼氫笂鐨勫伐浣滄祦瑙勫垯 '鏇存柊浼氳寮�濮嬪墠7澶╂彁閱掗偖浠舵爣璇�' 澶嶅埗涓篵atch
褰撴洿鏂版姤閿欐椂,鍙戦�佺數瀛愰偖浠�</description>
- <formula>Type__c = "updateCampaignMailflg7BeTrue" && NOT(ISBLANK(ErrorLog__c))</formula>
+ <formula>Type__c = "updateCampaignMailflg7BeTrue"
+&& NOT(ISBLANK(ErrorLog__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/Bid_Announcement__c.workflow-meta.xml b/force-app/main/default/workflows/Bid_Announcement__c.workflow-meta.xml
index 61d437b..0bfc535 100644
--- a/force-app/main/default/workflows/Bid_Announcement__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Bid_Announcement__c.workflow-meta.xml
@@ -18,7 +18,9 @@
<type>Alert</type>
</actions>
<active>false</active>
- <formula>AND(ISCHANGED( Status__c ), ISPICKVAL(Status__c, "鐢宠涓�"), Request_staff_BranchCD__c ="鍖椾含")</formula>
+ <formula>AND(ISCHANGED( Status__c ),
+ISPICKVAL(Status__c, "鐢宠涓�"),
+ Request_staff_BranchCD__c ="鍖椾含")</formula>
<triggerType>onAllChanges</triggerType>
</rules>
</Workflow>
diff --git a/force-app/main/default/workflows/Campaign.workflow-meta.xml b/force-app/main/default/workflows/Campaign.workflow-meta.xml
index 8b6ba5a..347ea26 100644
--- a/force-app/main/default/workflows/Campaign.workflow-meta.xml
+++ b/force-app/main/default/workflows/Campaign.workflow-meta.xml
@@ -7,7 +7,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_PlanApproved</template>
</alerts>
@@ -22,7 +22,7 @@
<field>ServiceDesignDep__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_PlanNotApproved</template>
</alerts>
@@ -33,7 +33,7 @@
<recipients>
<type>accountOwner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_CostApprovalEmailTemplate</template>
</alerts>
@@ -44,7 +44,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_CostNotApprovalEmailTemplate</template>
</alerts>
@@ -55,7 +55,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/CancelServiceEmailTemplate</template>
</alerts>
@@ -70,7 +70,7 @@
<field>OCM_MP_Admin_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meeting_Remind_Rental_Apply</template>
</alerts>
@@ -85,7 +85,7 @@
<field>ServiceDesignDep__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/DateModifiedEmailgetApproval</template>
</alerts>
@@ -96,7 +96,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_Plan</template>
</alerts>
@@ -107,7 +107,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_Report</template>
</alerts>
@@ -118,7 +118,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/CancleShenpiEmail</template>
</alerts>
@@ -685,17 +685,17 @@
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
- <offsetFromField>Campaign.StartDate</offsetFromField>
- <timeLength>-7</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
<actions>
<name>SendMail_before15</name>
<type>FieldUpdate</type>
</actions>
<offsetFromField>Campaign.StartDate</offsetFromField>
<timeLength>-15</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <offsetFromField>Campaign.StartDate</offsetFromField>
+ <timeLength>-7</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
</rules>
@@ -914,7 +914,7 @@
<criteriaItems>
<field>Campaign.RecordTypeId</field>
<operation>equals</operation>
- <value>4.鏈嶅姟鍩硅/鎶�甯堝煿鍏�</value>
+ <value>5.鏈嶅姟鍩硅/鎶�甯堝煿鍏�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml b/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml
index 9cdd223..638d338 100644
--- a/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml
@@ -54,27 +54,7 @@
<reevaluateOnChange>false</reevaluateOnChange>
</fieldUpdates>
<fieldUpdates>
- <fullName>ExtensionPlanStatusUpdate2</fullName>
- <field>Status__c</field>
- <literalValue>寤舵湡鎴愬姛</literalValue>
- <name>寤舵湡鐘舵�佹洿鏂�</name>
- <notifyAssignee>false</notifyAssignee>
- <operation>Literal</operation>
- <protected>false</protected>
- <reevaluateOnChange>false</reevaluateOnChange>
- </fieldUpdates>
- <fieldUpdates>
<fullName>StatusUpdate1</fullName>
- <field>Status__c</field>
- <literalValue>鍙栨秷鎴愬姛</literalValue>
- <name>鐘舵�佹洿鏂�</name>
- <notifyAssignee>false</notifyAssignee>
- <operation>Literal</operation>
- <protected>false</protected>
- <reevaluateOnChange>false</reevaluateOnChange>
- </fieldUpdates>
- <fieldUpdates>
- <fullName>StatusUpdate11</fullName>
<field>Status__c</field>
<literalValue>鍙栨秷鎴愬姛</literalValue>
<name>鐘舵�佹洿鏂�</name>
@@ -90,7 +70,7 @@
<type>Alert</type>
</actions>
<active>true</active>
- <booleanFilter>1 AND 2 AND 3</booleanFilter>
+ <booleanFilter>1 AND 2</booleanFilter>
<criteriaItems>
<field>CancelPostponePlan__c.Status__c</field>
<operation>equals</operation>
@@ -99,12 +79,7 @@
<criteriaItems>
<field>CancelPostponePlan__c.if_HaveRental_Apply__c</field>
<operation>equals</operation>
- <value>True</value>
- </criteriaItems>
- <criteriaItems>
- <field>CancelPostponePlan__c.cancelReasonCombobox__c</field>
- <operation>notEqual</operation>
- <value>澶囧搧涓嶈冻</value>
+ <value>鐪�</value>
</criteriaItems>
<description>opd鍙栨秷鎴愬姛涔嬪悗缁檕pd鎷呭綋鍙戦偖浠�</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
diff --git a/force-app/main/default/workflows/Case.workflow-meta.xml b/force-app/main/default/workflows/Case.workflow-meta.xml
index 37f1ba6..995f84d 100644
--- a/force-app/main/default/workflows/Case.workflow-meta.xml
+++ b/force-app/main/default/workflows/Case.workflow-meta.xml
@@ -21,16 +21,6 @@
<reevaluateOnChange>false</reevaluateOnChange>
</fieldUpdates>
<fieldUpdates>
- <fullName>ChangePriorityToHigh</fullName>
- <field>Priority</field>
- <literalValue>High</literalValue>
- <name>Changes the case priority to high.</name>
- <notifyAssignee>false</notifyAssignee>
- <operation>Literal</operation>
- <protected>false</protected>
- <reevaluateOnChange>false</reevaluateOnChange>
- </fieldUpdates>
- <fieldUpdates>
<fullName>Set_Case_Status_to_Closed</fullName>
<field>Status</field>
<literalValue>銈儹銉笺偤</literalValue>
diff --git a/force-app/main/default/workflows/Consum_Apply__c.workflow-meta.xml b/force-app/main/default/workflows/Consum_Apply__c.workflow-meta.xml
index 9fcb1f5..440be38 100644
--- a/force-app/main/default/workflows/Consum_Apply__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Consum_Apply__c.workflow-meta.xml
@@ -761,7 +761,7 @@
<criteriaItems>
<field>Consum_Apply__c.HP_received_sign_NG__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Consum_Apply__c.HP_received_sign_NG_Reason__c</field>
@@ -803,7 +803,7 @@
<criteriaItems>
<field>Consum_Apply__c.Need_Send_Trial_Upload_Email__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Consumable_order__c.workflow-meta.xml b/force-app/main/default/workflows/Consumable_order__c.workflow-meta.xml
index 176066d..1ed67ff 100644
--- a/force-app/main/default/workflows/Consumable_order__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Consumable_order__c.workflow-meta.xml
@@ -38,7 +38,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/Order_Warn_HTML</template>
</alerts>
@@ -176,12 +176,12 @@
<criteriaItems>
<field>Consumable_order__c.Invoice_attachment__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Consumable_order__c.Invoicedet_attachment__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Consumable_order__c.Invoice_status__c</field>
@@ -202,12 +202,12 @@
<criteriaItems>
<field>Consumable_order__c.Invoice_attachment__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Consumable_order__c.Invoicedet_attachment__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鏇存柊鍙戠エ鐘舵�� 宸插畬鎴�</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -243,7 +243,7 @@
<criteriaItems>
<field>Consumable_order__c.Shipment_date__c</field>
<operation>lessOrEqual</operation>
- <value>7 DAYS AGO</value>
+ <value>7 澶╁墠</value>
</criteriaItems>
<criteriaItems>
<field>Consumable_order__c.Delivery_detail_count__c</field>
diff --git a/force-app/main/default/workflows/Contact.workflow-meta.xml b/force-app/main/default/workflows/Contact.workflow-meta.xml
index e845af7..12c486c 100644
--- a/force-app/main/default/workflows/Contact.workflow-meta.xml
+++ b/force-app/main/default/workflows/Contact.workflow-meta.xml
@@ -193,7 +193,11 @@
<description>瀹㈡埛浜哄憳鎵嬫満鍙峰敮涓�楠岃瘉娓呯┖(鍦ㄧ嚎甯傚満娲诲姩)
瀹㈡埛浜哄憳鏃犳晥锛�
灏嗗敮涓�瀛楁娓呯┖</description>
- <formula>AND( OR(RecordType.DeveloperName = 'Agency',RecordType.DeveloperName = 'Doctor'), ISCHANGED(Isactive__c), OR(TEXT(Isactive__c) ='鏃犳晥(閫�浼�)',TEXT(Isactive__c) ='鏃犳晥(閲嶅)') )</formula>
+ <formula>AND(
+OR(RecordType.DeveloperName = 'Agency',RecordType.DeveloperName = 'Doctor'),
+ISCHANGED(Isactive__c),
+OR(TEXT(Isactive__c) ='鏃犳晥(閫�浼�)',TEXT(Isactive__c) ='鏃犳晥(閲嶅)')
+)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -207,7 +211,12 @@
瀹㈡埛浜哄憳鏈夋晥:
鏂板瀹㈡埛浜哄憳骞朵笖鎵嬫満鍙风爜鏈夊�硷紝灏嗘墜鏈哄彿璧嬪�肩粰鍞竴瀛楁
鏇存柊瀹㈡埛浜哄憳鎵嬫満鍙凤紝灏嗘墜鏈哄彿璧嬪�肩粰鍞竴瀛楁</description>
- <formula>AND( OR(RecordType.DeveloperName = 'Agency',RecordType.DeveloperName = 'Doctor'), OR(ISNEW() && NOT(ISBLANK(MobilePhone)) && NOT(ISNULL(MobilePhone)), ISCHANGED(MobilePhone), TEXT(Isactive__c) ='鏈夋晥') )</formula>
+ <formula>AND(
+ OR(RecordType.DeveloperName = 'Agency',RecordType.DeveloperName = 'Doctor'),
+ OR(ISNEW() && NOT(ISBLANK(MobilePhone)) && NOT(ISNULL(MobilePhone)), ISCHANGED(MobilePhone),
+ TEXT(Isactive__c) ='鏈夋晥')
+
+)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/Enquiry_No_Bidding_Apply__c.workflow-meta.xml b/force-app/main/default/workflows/Enquiry_No_Bidding_Apply__c.workflow-meta.xml
index 694e634..3366a09 100644
--- a/force-app/main/default/workflows/Enquiry_No_Bidding_Apply__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Enquiry_No_Bidding_Apply__c.workflow-meta.xml
@@ -11,7 +11,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespApproval</template>
</alerts>
@@ -30,7 +30,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespApproval</template>
</alerts>
@@ -49,7 +49,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespApproval</template>
</alerts>
@@ -64,7 +64,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespReject</template>
</alerts>
@@ -79,7 +79,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespReject</template>
</alerts>
@@ -94,7 +94,7 @@
<field>leading_Cadre_Assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Opp_notRespReject</template>
</alerts>
diff --git a/force-app/main/default/workflows/Event__c.workflow-meta.xml b/force-app/main/default/workflows/Event__c.workflow-meta.xml
index 83ebfa6..79e248e 100644
--- a/force-app/main/default/workflows/Event__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Event__c.workflow-meta.xml
@@ -22,7 +22,7 @@
<field>MainResponsibilityMinister__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/EmailTemplate4</template>
</alerts>
@@ -278,7 +278,7 @@
<criteriaItems>
<field>Event__c.NotSendEmail__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Daily_Report__c.Status__c</field>
@@ -288,12 +288,12 @@
<criteriaItems>
<field>Event__c.Minister__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Event__c.Manager__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>SWAG-BD9A76 銆愬鎵樸�� 鏃ユ姤鐘舵�佷负鎵瑰噯鏃讹紝璁剧疆閭欢鎻愰啋鍔熻兘</description>
<triggerType>onAllChanges</triggerType>
@@ -317,7 +317,10 @@
<active>true</active>
<description>銆愬彂鐜版ā浠垮珜鐤戝搧銆戞椂鍊欏嬀閫塮lag 閭欢閫氱煡
/*Status_With_Check__c='鐢宠涓�' && (Find_Imitations_Flag__c == true) && NOT(ISBLANK(Imitation_Mail__c))*/</description>
- <formula>(Find_Imitations_Flag__c == true)&& NOT(ISBLANK(Imitation_Mail__c))&& Mail_Send_Btn__c!=null&& PRIORVALUE(Mail_Send_Btn__c)!='1'&& PRIORVALUE(Mail_Send_Btn__c)!='0'</formula>
+ <formula>(Find_Imitations_Flag__c == true)&& NOT(ISBLANK(Imitation_Mail__c))&&
+Mail_Send_Btn__c!=null&&
+PRIORVALUE(Mail_Send_Btn__c)!='1'&&
+PRIORVALUE(Mail_Send_Btn__c)!='0'</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -333,7 +336,8 @@
<rules>
<fullName>鏃ユ姤鍙樻垚鐢宠涓�%EF%BC%8C鍙慐mail</fullName>
<active>false</active>
- <formula>/* 灏卞綋鐐逛簡鎸夐挳 */ ISCHANGED( Mail_Send_Btn__c ) && ISPICKVAL(Activity_Type2__c, "鐥呴櫌")</formula>
+ <formula>/* 灏卞綋鐐逛簡鎸夐挳 */
+ISCHANGED( Mail_Send_Btn__c ) && ISPICKVAL(Activity_Type2__c, "鐥呴櫌")</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/IS_Opportunity_Demand_Operating__c.workflow-meta.xml b/force-app/main/default/workflows/IS_Opportunity_Demand_Operating__c.workflow-meta.xml
index e8bec21..0b46e19 100644
--- a/force-app/main/default/workflows/IS_Opportunity_Demand_Operating__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/IS_Opportunity_Demand_Operating__c.workflow-meta.xml
@@ -16,7 +16,7 @@
<name>SetName</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>IS_Opportunity_Demand_Operating__c.Name</field>
<operation>equals</operation>
diff --git a/force-app/main/default/workflows/IS_Opportunity_Demand__c.workflow-meta.xml b/force-app/main/default/workflows/IS_Opportunity_Demand__c.workflow-meta.xml
index c9e0804..9a8db00 100644
--- a/force-app/main/default/workflows/IS_Opportunity_Demand__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/IS_Opportunity_Demand__c.workflow-meta.xml
@@ -28,6 +28,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>Opportunity_sub_owner__c</field>
<type>userLookup</type>
</recipients>
@@ -49,6 +53,10 @@
<protected>false</protected>
<recipients>
<type>owner</type>
+ </recipients>
+ <recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<field>Opportunity_sub_owner__c</field>
@@ -105,6 +113,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>Opportunity_sub_owner__c</field>
<type>userLookup</type>
</recipients>
@@ -125,6 +137,10 @@
<protected>false</protected>
<recipients>
<type>creator</type>
+ </recipients>
+ <recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
<template>Prospect/SI_ISO_Submit_Mail</template>
@@ -180,7 +196,7 @@
<type>creator</type>
</recipients>
<recipients>
- <recipient>ocm_te2ampj@olympus.com.cn</recipient>
+ <recipient>uat_02@uat.olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -320,7 +336,7 @@
<criteriaItems>
<field>IS_Opportunity_Demand__c.Submint_TF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Inspection_Item__c.workflow-meta.xml b/force-app/main/default/workflows/Inspection_Item__c.workflow-meta.xml
index 2fcf8ab..d159f4e 100644
--- a/force-app/main/default/workflows/Inspection_Item__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Inspection_Item__c.workflow-meta.xml
@@ -8,7 +8,15 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>daisuke_goto@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>yoshihiko_terabori@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -41,7 +49,8 @@
<type>Alert</type>
</actions>
<active>false</active>
- <formula>AND( ISBLANK(AssetId__c),not(ISBLANK(Product_Manual__c)), InsReportStatus__c = "鐢宠涓�")</formula>
+ <formula>AND(
+ ISBLANK(AssetId__c),not(ISBLANK(Product_Manual__c)), InsReportStatus__c = "鐢宠涓�")</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/Instruct_report__c.workflow-meta.xml b/force-app/main/default/workflows/Instruct_report__c.workflow-meta.xml
index a867d4b..cf6aa10 100644
--- a/force-app/main/default/workflows/Instruct_report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Instruct_report__c.workflow-meta.xml
@@ -7,7 +7,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/instructReportApprovalEmailTemplateService</template>
</alerts>
@@ -18,7 +18,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/instructReportApprovalEmailTemplateService</template>
</alerts>
@@ -29,7 +29,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>CampainFolder/Meetting_InstructNotApproved</template>
</alerts>
diff --git a/force-app/main/default/workflows/Lead.workflow-meta.xml b/force-app/main/default/workflows/Lead.workflow-meta.xml
index 5e708e5..43a964d 100644
--- a/force-app/main/default/workflows/Lead.workflow-meta.xml
+++ b/force-app/main/default/workflows/Lead.workflow-meta.xml
@@ -7,7 +7,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Lead/SendMailToLeadOwner</template>
</alerts>
@@ -204,6 +204,20 @@
<reevaluateOnChange>false</reevaluateOnChange>
</fieldUpdates>
<rules>
+ <fullName>LeadUpdateTemp</fullName>
+ <actions>
+ <name>UpdateMethod1</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <active>true</active>
+ <criteriaItems>
+ <field>Lead.Sales_Method__c</field>
+ <operation>equals</operation>
+ <value>鍏紑鎷涙爣</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
<fullName>OCSM绠＄悊鐪�%28瀹㈡埛%29鏂囨湰鏇存柊</fullName>
<actions>
<name>OSCM_Province_cus</name>
@@ -379,7 +393,7 @@
<criteriaItems>
<field>Lead.SendMailToOwner__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOnly</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Maintenance_Contract_Asset__c.workflow-meta.xml b/force-app/main/default/workflows/Maintenance_Contract_Asset__c.workflow-meta.xml
index b4a7778..b2b81e4 100644
--- a/force-app/main/default/workflows/Maintenance_Contract_Asset__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Maintenance_Contract_Asset__c.workflow-meta.xml
@@ -74,7 +74,7 @@
<name>Maintenance_Price_Amount_Text</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2 OR 3</booleanFilter>
<criteriaItems>
<field>Maintenance_Contract_Asset__c.Maintenance_Price_Amount__c</field>
@@ -96,7 +96,7 @@
<name>startDateGuranteeToText</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Maintenance_Contract_Asset__c.startDateGurantee__c</field>
<operation>notEqual</operation>
@@ -109,7 +109,7 @@
<name>endDateGuranteeToText</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Maintenance_Contract_Asset__c.endDateGurantee__c</field>
<operation>notEqual</operation>
@@ -122,7 +122,7 @@
<name>Gurantee_startDatecopy</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Maintenance_Contract_Asset__c.Gurantee_Estimate_startDateF__c</field>
<operation>notEqual</operation>
diff --git a/force-app/main/default/workflows/Maintenance_Contract_Estimate__c.workflow-meta.xml b/force-app/main/default/workflows/Maintenance_Contract_Estimate__c.workflow-meta.xml
index b25c2a6..106fdcf 100644
--- a/force-app/main/default/workflows/Maintenance_Contract_Estimate__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Maintenance_Contract_Estimate__c.workflow-meta.xml
@@ -387,6 +387,10 @@
<recipients>
<type>creator</type>
</recipients>
+ <recipients>
+ <recipient>miaomiao_gui@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<senderType>CurrentUser</senderType>
<template>Olympus_OCM/ApproveProcess_MaintenanceContractEstimate_Discount</template>
</alerts>
@@ -412,6 +416,10 @@
<recipients>
<type>creator</type>
</recipients>
+ <recipients>
+ <recipient>tingting_jiang@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<senderType>CurrentUser</senderType>
<template>Olympus_OCM/ApproveProcess_MaintenanceContractEstimate_Discount</template>
</alerts>
diff --git a/force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml b/force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml
index 7f2ff26..bf0e30a 100644
--- a/force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml
@@ -16,7 +16,7 @@
<field>Service_Contract_Staff__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/Before_30_Days_Contract_End</template>
</alerts>
@@ -37,7 +37,7 @@
<field>Service_Contract_Staff__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/Before_7_Days_Contract_End</template>
</alerts>
@@ -57,7 +57,7 @@
<field>Service_Contract_Staff__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/Before_90_Days_Contract_End</template>
</alerts>
@@ -97,7 +97,7 @@
<field>Service_Contract_Staff__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Contract_Folder/ConsumptionRateIntervalRemind</template>
</alerts>
@@ -241,7 +241,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-1锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -272,7 +272,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay_2</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-2锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -304,7 +304,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay_3</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-3锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -332,7 +332,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay_4</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-4锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -364,7 +364,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay_5</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-5锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -396,7 +396,7 @@
</alerts>
<alerts>
<fullName>FifteenDaysBeforePayDay_Prepay_6</fullName>
- <ccEmails>SFDC_LiJin@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>SFDC_LiJin@olympus.com.cn</ccEmails>
<description>15鏃ュ墠鎻愰啋-6锛堝厛娆撅級</description>
<protected>false</protected>
<recipients>
@@ -876,6 +876,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>daisuke_goto@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -889,6 +893,10 @@
</recipients>
<recipients>
<recipient>jue_xu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>kazuyuki_tada@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -1359,7 +1367,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.Approval1__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1389,7 +1397,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.old_Is_RecognitionModel__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1471,7 +1479,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.Contract_End_Date__c</field>
<operation>greaterThan</operation>
- <value>TODAY</value>
+ <value>浠婂ぉ</value>
</criteriaItems>
<criteriaItems>
<field>Maintenance_Contract__c.RecordTypeId</field>
@@ -1521,7 +1529,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.DevApply__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1867,7 +1875,9 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>Isblank(Text(SalesOfficeCode_selection__c)) && Case(Service_Contract_Staff__r.Province__c,'娴欐睙鐪�', IF(NOT(OR(Hospital__r.City_Master__r.Name == '鑸熷北甯�',Hospital__r.City_Master__r.Name == '缁嶅叴甯�',Hospital__r.City_Master__r.Name == '瀹佹尝甯�')),1,0), 0) == 1</formula>
+ <formula>Isblank(Text(SalesOfficeCode_selection__c))
+&& Case(Service_Contract_Staff__r.Province__c,'娴欐睙鐪�',
+ IF(NOT(OR(Hospital__r.City_Master__r.Name == '鑸熷北甯�',Hospital__r.City_Master__r.Name == '缁嶅叴甯�',Hospital__r.City_Master__r.Name == '瀹佹尝甯�')),1,0), 0) == 1</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
<rules>
@@ -1877,7 +1887,9 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>Isblank(Text(SalesOfficeCode_selection__c)) && Case(Service_Contract_Staff__r.Province__c, '涓婃捣甯�', 1, '绂忓缓鐪�', 1, '姹熻嫃鐪�', 1, '姹熻タ鐪�', 1, '瀹夊窘鐪�', 1 ,'娴欐睙鐪�', if(OR(Hospital__r.City_Master__r.Name == '鑸熷北甯�',Hospital__r.City_Master__r.Name == '缁嶅叴甯�',Hospital__r.City_Master__r.Name == '瀹佹尝甯�'),1,0) , 0 ) == 1</formula>
+ <formula>Isblank(Text(SalesOfficeCode_selection__c)) && Case(Service_Contract_Staff__r.Province__c, '涓婃捣甯�', 1, '绂忓缓鐪�', 1, '姹熻嫃鐪�', 1, '姹熻タ鐪�', 1, '瀹夊窘鐪�', 1
+ ,'娴欐睙鐪�', if(OR(Hospital__r.City_Master__r.Name == '鑸熷北甯�',Hospital__r.City_Master__r.Name == '缁嶅叴甯�',Hospital__r.City_Master__r.Name == '瀹佹尝甯�'),1,0)
+ , 0 ) == 1</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
<rules>
@@ -1911,7 +1923,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.Switch_TimeBase_WF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
@@ -1935,7 +1947,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.Switch_TimeBase_WF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
@@ -1959,7 +1971,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.Switch_TimeBase_WF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
@@ -1993,12 +2005,12 @@
<criteriaItems>
<field>Maintenance_Contract__c.Switch_TimeBase_WF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Maintenance_Contract__c.Contract_End_Date__c</field>
<operation>greaterOrEqual</operation>
- <value>TODAY</value>
+ <value>浠婂ぉ</value>
</criteriaItems>
<description>鏈潵鏃堕棿鐨勫伐浣滄祦</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -2027,12 +2039,12 @@
<criteriaItems>
<field>Maintenance_Contract__c.Switch_TimeBase_WF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Maintenance_Contract__c.Contract_End_Date__c</field>
<operation>lessThan</operation>
- <value>TODAY</value>
+ <value>浠婂ぉ</value>
</criteriaItems>
<description>濂戠磩绲備簡鏃ャ倰閬庡幓鏃ャ伀鏇存柊銇椼仧鏅�</description>
<triggerType>onAllChanges</triggerType>
@@ -2089,7 +2101,20 @@
</actions>
<active>false</active>
<description>褰撴洿鏂拌繃璇环璺熻繘淇℃伅涓换鎰忎竴涓俊鎭紝鍒欑粰鍙樻洿鏃ユ湡璧嬪��=鏈�鍚庢洿鏂版棩鏈�</description>
- <formula>OR(ISCHANGED(Opportunity_Stage__c), ISCHANGED(Sales_Method__c), ISCHANGED(Sales_Method_Other__c), ISCHANGED(Next_Action__c), ISCHANGED(Negotiation_Start_Date__c), ISCHANGED(Quotation_Submission_Date__c), ISCHANGED(Quotation_Decision_Date__c), ISCHANGED(Last_Update_Date__c), ISCHANGED(Expected_Check_Back_Date__c), ISCHANGED(Cumulative_Followup__c), ISCHANGED(Renewal_Status__c), ISCHANGED(No_Renewal_Reason__c) ) = true && ($User.ProfileId !='00e10000000Y3o5' && $User.Batch_User__c != true) && !ISNEW()</formula>
+ <formula>OR(ISCHANGED(Opportunity_Stage__c),
+ISCHANGED(Sales_Method__c),
+ISCHANGED(Sales_Method_Other__c),
+ISCHANGED(Next_Action__c),
+ISCHANGED(Negotiation_Start_Date__c),
+ISCHANGED(Quotation_Submission_Date__c),
+ISCHANGED(Quotation_Decision_Date__c),
+ISCHANGED(Last_Update_Date__c),
+ISCHANGED(Expected_Check_Back_Date__c),
+ISCHANGED(Cumulative_Followup__c),
+ISCHANGED(Renewal_Status__c),
+ISCHANGED(No_Renewal_Reason__c)
+) = true
+&& ($User.ProfileId !='00e10000000Y3o5' && $User.Batch_User__c != true) && !ISNEW()</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -2098,7 +2123,7 @@
<criteriaItems>
<field>Maintenance_Contract__c.duplicate_deleate_request__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/NewMaintenanceReport_Task__c.workflow-meta.xml b/force-app/main/default/workflows/NewMaintenanceReport_Task__c.workflow-meta.xml
index c3169da..473621e 100644
--- a/force-app/main/default/workflows/NewMaintenanceReport_Task__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/NewMaintenanceReport_Task__c.workflow-meta.xml
@@ -20,7 +20,7 @@
<criteriaItems>
<field>NewMaintenanceReport_Task__c.OverOrCurrent_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>//2021-07-30 鏀逛负鐢盉atch璧嬪��</description>
<triggerType>onAllChanges</triggerType>
diff --git a/force-app/main/default/workflows/OPDPlan__c.workflow-meta.xml b/force-app/main/default/workflows/OPDPlan__c.workflow-meta.xml
index 9adf018..5837885 100644
--- a/force-app/main/default/workflows/OPDPlan__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/OPDPlan__c.workflow-meta.xml
@@ -508,7 +508,7 @@
<criteriaItems>
<field>OPDPlan__c.IsJump__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鏇存柊鎻掗槦鐨勬椂鍊欙紝椤轰究鏇存柊鎻掗槦鏃ユ湡</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
diff --git a/force-app/main/default/workflows/Opportunity.workflow-meta.xml b/force-app/main/default/workflows/Opportunity.workflow-meta.xml
index e2b0683..59afca8 100644
--- a/force-app/main/default/workflows/Opportunity.workflow-meta.xml
+++ b/force-app/main/default/workflows/Opportunity.workflow-meta.xml
@@ -12,7 +12,7 @@
<field>Sales_assistant_name_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/AgencyIntelligenceExpire_HTMLModel</template>
</alerts>
@@ -24,7 +24,7 @@
<field>Sales_assistant_name_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/AgencyQuolified_Expire</template>
</alerts>
@@ -209,7 +209,7 @@
<field>Sales_assistant_name_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/opp_alert_01_template</template>
</alerts>
@@ -229,7 +229,7 @@
<field>Sales_window_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/opp_alert_02_template</template>
</alerts>
@@ -249,8 +249,7 @@
<field>Sales_window_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
- <senderType>OrgWideEmailAddress</senderType>
+ <senderType>CurrentUser</senderType>
<template>Prospect/opp_alert_03_template</template>
</alerts>
<alerts>
@@ -269,7 +268,7 @@
<field>Sales_window_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/opp_alert_04_template</template>
</alerts>
@@ -1512,7 +1511,24 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>OR( ISCHANGED(Last_Follow_Up_Date__c) , ISCHANGED(Num_Of_OPD__c), ISCHANGED(Status_Formula__c), ISCHANGED( Competitor__c ), ISCHANGED(Bid_Date__c), ISCHANGED(Bid_Planned_Date__c), ISCHANGED(Closing_Bid_Date__c), ISCHANGED( Close_Forecasted_Date__c ), ISCHANGED(CloseDate), ISCHANGED(Wholesale_Price__c), ISCHANGED(Follow_up_comment__c), ISCHANGED(Sales_Shop_Hospital_Contract__c), ISCHANGED(Agency_Contract_Date1__c), ISCHANGED(Next_action__c))</formula>
+ <formula>OR(
+ ISCHANGED(Last_Follow_Up_Date__c) ,
+ISCHANGED(Num_Of_OPD__c),
+ISCHANGED(Status_Formula__c),
+ISCHANGED( Competitor__c ),
+ISCHANGED(Bid_Date__c),
+ISCHANGED(Bid_Planned_Date__c),
+ISCHANGED(Closing_Bid_Date__c),
+ISCHANGED( Close_Forecasted_Date__c ),
+ISCHANGED(CloseDate),
+
+ISCHANGED(Wholesale_Price__c),
+ISCHANGED(Follow_up_comment__c),
+ISCHANGED(Sales_Shop_Hospital_Contract__c),
+ISCHANGED(Agency_Contract_Date1__c),
+
+
+ISCHANGED(Next_action__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1672,7 +1688,7 @@
<criteriaItems>
<field>Opportunity.If_Have_EPT1__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1686,7 +1702,7 @@
<criteriaItems>
<field>Opportunity.If_Have_EPT1__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1749,7 +1765,7 @@
<criteriaItems>
<field>Opportunity.If_Have_OERAW_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1848,7 +1864,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鍘熷厛鏄�01 杩樻病鎷滆</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -1874,7 +1890,7 @@
<criteriaItems>
<field>Opportunity.GeneralInquirySeparateBill__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOnly</triggerType>
</rules>
@@ -1989,7 +2005,10 @@
澶栬部-浠樸亼銈�
鍐呰部-銇仛銇�
鈫� 2013/01/31 銇仸鐒″姽銇仐銇俱仐銇熴�佷綔銇ｃ仧銇傘仺鍐呰部澶栬部澶夋洿銇椼仸銈傘�佸紩鍚堛亜鐣彿銈掓洿鏂般仐銇亜 by 鏈涙湀</description>
- <formula>AND( NOT( ISBLANK(Opportunity_No_read__c) ), ISCHANGED( Trade__c ) )</formula>
+ <formula>AND(
+ NOT( ISBLANK(Opportunity_No_read__c) ),
+ ISCHANGED( Trade__c )
+)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -2045,12 +2064,12 @@
<criteriaItems>
<field>Opportunity.New_Opportunity__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>纰鸿獚娓堛伩鏃ヨō瀹�</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -2081,12 +2100,12 @@
<criteriaItems>
<field>Opportunity.Fixed_Check__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>閲嶈锛氬鏋滀互鍓嶇殑璇环锛堟病鏈夋敞娈嬬殑璇环锛変篃鏇存柊鐨勮瘽锛岄渶瑕佹棤鏁堬紝骞跺敖蹇冩洿鏂�</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -2106,12 +2125,12 @@
<criteriaItems>
<field>Opportunity.Fixed_Check__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>娉ㄦ畫銇仾銇ｃ仧鏃ヤ粯銈掕ō瀹氥仚銈嬨��</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -2136,7 +2155,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2161,12 +2180,12 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.If_Account_Change__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.Contract_DB_complite_day__c</field>
@@ -2202,7 +2221,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.StageName</field>
@@ -2217,7 +2236,7 @@
<criteriaItems>
<field>Opportunity.SAP_Send_OK__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.StageName</field>
@@ -2255,7 +2274,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2296,6 +2315,19 @@
<type>FieldUpdate</type>
</actions>
<offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
+ <timeLength>42</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>InyiteSendEmailFlagUpdate</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <actions>
+ <name>set_last_alert_to_user_update</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
<timeLength>21</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
@@ -2310,19 +2342,6 @@
</actions>
<offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
<timeLength>77</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>InyiteSendEmailFlagUpdate</name>
- <type>FieldUpdate</type>
- </actions>
- <actions>
- <name>set_last_alert_to_user_update</name>
- <type>FieldUpdate</type>
- </actions>
- <offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
- <timeLength>42</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
<workflowTimeTriggers>
@@ -2444,19 +2463,6 @@
<type>FieldUpdate</type>
</actions>
<offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
- <timeLength>56</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>opp_alert_02</name>
- <type>Alert</type>
- </actions>
- <actions>
- <name>set_last_alert_to_user_update</name>
- <type>FieldUpdate</type>
- </actions>
- <offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
<timeLength>21</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
@@ -2497,6 +2503,19 @@
</actions>
<offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
<timeLength>28</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>opp_alert_02</name>
+ <type>Alert</type>
+ </actions>
+ <actions>
+ <name>set_last_alert_to_user_update</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <offsetFromField>Opportunity.Bid_Date__c</offsetFromField>
+ <timeLength>56</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
<workflowTimeTriggers>
@@ -2596,7 +2615,7 @@
<criteriaItems>
<field>Opportunity.Authorized_start__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鍘熸潵鏄�03 宸叉巿鏉�</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -2837,6 +2856,19 @@
<type>FieldUpdate</type>
</actions>
<offsetFromField>Opportunity.Closing_Bid_Date__c</offsetFromField>
+ <timeLength>42</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>SightSendEmailFlagUpdate</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <actions>
+ <name>set_last_alert_to_user_update</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <offsetFromField>Opportunity.Closing_Bid_Date__c</offsetFromField>
<timeLength>21</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
@@ -2942,19 +2974,6 @@
</actions>
<offsetFromField>Opportunity.Closing_Bid_Date__c</offsetFromField>
<timeLength>35</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>SightSendEmailFlagUpdate</name>
- <type>FieldUpdate</type>
- </actions>
- <actions>
- <name>set_last_alert_to_user_update</name>
- <type>FieldUpdate</type>
- </actions>
- <offsetFromField>Opportunity.Closing_Bid_Date__c</offsetFromField>
- <timeLength>42</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
</rules>
@@ -3228,7 +3247,7 @@
<criteriaItems>
<field>Opportunity.IsAuthorized__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.OpportunitySource__c</field>
@@ -3252,12 +3271,12 @@
<criteriaItems>
<field>Opportunity.SAP_Send_OK__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.Estimation_Decision__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>寮曞悎浣滄垚鏅傘伅瑕嬬姹哄畾銇⊿AP閫佷俊OK銉曘儵銈般倰OFF銇仚銈嬨��
锛堛偝銉斻兗姗熻兘瀵惧繙锛�</description>
@@ -3282,7 +3301,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -3301,7 +3320,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -3325,7 +3344,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Opportunity.Shipping_Finished_Day__c</field>
@@ -3348,7 +3367,7 @@
<criteriaItems>
<field>Opportunity.IsImport__c</field>
<operation>notEqual</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/OpportunityLineItem.workflow-meta.xml b/force-app/main/default/workflows/OpportunityLineItem.workflow-meta.xml
index 440ff46..0f46099 100644
--- a/force-app/main/default/workflows/OpportunityLineItem.workflow-meta.xml
+++ b/force-app/main/default/workflows/OpportunityLineItem.workflow-meta.xml
@@ -137,9 +137,28 @@
<name>Important_Rroduct_update</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>5鏈�22鏃ワ細杩藉姞閲嶇偣浜у搧鍏紡锛�16-20涓級</description>
- <formula>Or( OCM_Sales_Forecast_Product1__c != 0, OCM_Sales_Forecast_Product2__c != 0, OCM_Sales_Forecast_Product3__c != 0, OCM_Sales_Forecast_Product4__c != 0, OCM_Sales_Forecast_Product5__c != 0, OCM_Sales_Forecast_Product6__c != 0, OCM_Sales_Forecast_Product7__c != 0, OCM_Sales_Forecast_Product8__c != 0, OCM_Sales_Forecast_Product9__c != 0, OCM_Sales_Forecast_Product10__c != 0, OCM_Sales_Forecast_Product11__c != 0, OCM_Sales_Forecast_Product12__c != 0, OCM_Sales_Forecast_Product13__c != 0, OCM_Sales_Forecast_Product14__c != 0, OCM_Sales_Forecast_Product15__c != 0, OCM_Sales_Forecast_Product16__c != 0, OCM_Sales_Forecast_Product17__c != 0, OCM_Sales_Forecast_Product18__c != 0, OCM_Sales_Forecast_Product19__c != 0, OCM_Sales_Forecast_Product20__c != 0 )</formula>
+ <formula>Or( OCM_Sales_Forecast_Product1__c != 0,
+OCM_Sales_Forecast_Product2__c != 0,
+OCM_Sales_Forecast_Product3__c != 0,
+OCM_Sales_Forecast_Product4__c != 0,
+OCM_Sales_Forecast_Product5__c != 0,
+OCM_Sales_Forecast_Product6__c != 0,
+OCM_Sales_Forecast_Product7__c != 0,
+OCM_Sales_Forecast_Product8__c != 0,
+OCM_Sales_Forecast_Product9__c != 0,
+OCM_Sales_Forecast_Product10__c != 0,
+OCM_Sales_Forecast_Product11__c != 0,
+OCM_Sales_Forecast_Product12__c != 0,
+OCM_Sales_Forecast_Product13__c != 0,
+OCM_Sales_Forecast_Product14__c != 0,
+OCM_Sales_Forecast_Product15__c != 0,
+OCM_Sales_Forecast_Product16__c != 0,
+OCM_Sales_Forecast_Product17__c != 0,
+OCM_Sales_Forecast_Product18__c != 0,
+OCM_Sales_Forecast_Product19__c != 0,
+OCM_Sales_Forecast_Product20__c != 0 )</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -148,9 +167,29 @@
<name>Important_Rroduct_Update2</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>5鏈�22鏃ワ細杩藉姞閲嶇偣浜у搧鍏紡锛�16-20涓級</description>
- <formula>And( OCM_Sales_Forecast_Product1__c = 0, OCM_Sales_Forecast_Product2__c = 0, OCM_Sales_Forecast_Product3__c = 0, OCM_Sales_Forecast_Product4__c = 0, OCM_Sales_Forecast_Product5__c = 0, OCM_Sales_Forecast_Product6__c = 0, OCM_Sales_Forecast_Product7__c = 0, OCM_Sales_Forecast_Product8__c = 0, OCM_Sales_Forecast_Product9__c = 0, OCM_Sales_Forecast_Product10__c = 0, OCM_Sales_Forecast_Product11__c = 0, OCM_Sales_Forecast_Product12__c = 0, OCM_Sales_Forecast_Product13__c = 0, OCM_Sales_Forecast_Product14__c = 0, OCM_Sales_Forecast_Product15__c = 0, OCM_Sales_Forecast_Product16__c = 0, OCM_Sales_Forecast_Product17__c = 0, OCM_Sales_Forecast_Product18__c = 0, OCM_Sales_Forecast_Product19__c = 0, OCM_Sales_Forecast_Product20__c = 0 )</formula>
+ <formula>And( OCM_Sales_Forecast_Product1__c = 0,
+OCM_Sales_Forecast_Product2__c = 0,
+OCM_Sales_Forecast_Product3__c = 0,
+OCM_Sales_Forecast_Product4__c = 0,
+OCM_Sales_Forecast_Product5__c = 0,
+OCM_Sales_Forecast_Product6__c = 0,
+OCM_Sales_Forecast_Product7__c = 0,
+OCM_Sales_Forecast_Product8__c = 0,
+OCM_Sales_Forecast_Product9__c = 0,
+OCM_Sales_Forecast_Product10__c = 0,
+OCM_Sales_Forecast_Product11__c = 0,
+OCM_Sales_Forecast_Product12__c = 0,
+OCM_Sales_Forecast_Product13__c = 0,
+OCM_Sales_Forecast_Product14__c = 0,
+OCM_Sales_Forecast_Product15__c = 0,
+OCM_Sales_Forecast_Product16__c = 0,
+OCM_Sales_Forecast_Product17__c = 0,
+OCM_Sales_Forecast_Product18__c = 0,
+OCM_Sales_Forecast_Product19__c = 0,
+OCM_Sales_Forecast_Product20__c = 0
+)</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -159,7 +198,7 @@
<name>OCM_man_province_txt_set</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISNEW() || OCM_man_province__c <> OCM_man_province_txt__c</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -169,7 +208,7 @@
<name>updateBackOfficeUseForecastProduct</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -179,11 +218,11 @@
<name>EPT1</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>OpportunityLineItem.If_EP_T1__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -193,7 +232,7 @@
<name>strategyProductToText</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>SWAG-BGCCB9</description>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
@@ -204,11 +243,11 @@
<name>oppPro_is170</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>OpportunityLineItem.If_170Pro_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -218,11 +257,11 @@
<name>oppPro_isOER_AW</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>OpportunityLineItem.If_OER_AW_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -232,11 +271,11 @@
<name>UpdateDangerousChemicals</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>OpportunityLineItem.Is_DangerousChemicals_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -246,11 +285,11 @@
<name>oppPro_isAH</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>OpportunityLineItem.If_AHPro_F__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -260,7 +299,7 @@
<name>OpplineItemTotalPrice_Set</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -270,7 +309,7 @@
<name>set_opp_deliver_date</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>true</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Product2.workflow-meta.xml b/force-app/main/default/workflows/Product2.workflow-meta.xml
index 7e91d6a..384d383 100644
--- a/force-app/main/default/workflows/Product2.workflow-meta.xml
+++ b/force-app/main/default/workflows/Product2.workflow-meta.xml
@@ -170,7 +170,7 @@
<name>X12_BSS_text</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -180,7 +180,7 @@
<name>NMPA_Change_to_True</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<booleanFilter>(1 OR 2 OR 3) AND 4 AND 5</booleanFilter>
<criteriaItems>
<field>Product2.Family</field>
@@ -216,7 +216,7 @@
<name>UpdateCategory5ByRecordType</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<booleanFilter>1 OR 2</booleanFilter>
<criteriaItems>
<field>Product2.RecordTypeId</field>
@@ -237,7 +237,7 @@
<name>ProductInvalidDateClear</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISCHANGED(SFDA_Status__c) && (TEXT(SFDA_Status__c) = '鏈夊姽' || TEXT(SFDA_Status__c) = '澶卞姽锛堟湡闄愬唴鐢熺敚娓堝湪搴蹇滐級' || TEXT(SFDA_Status__c) = '鏈夊姽锛堝啀鐢宠珛涓級' || TEXT(SFDA_Status__c) = '涓嶈')</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -247,7 +247,7 @@
<name>SetProductInvalidDate</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISCHANGED(SFDA_Status__c) && (TEXT(SFDA_Status__c) = '鍋滄' || TEXT(SFDA_Status__c) = '澶卞姽锛堝啀鐢宠珛涓級' || TEXT(SFDA_Status__c) = '澶卞姽锛堢敵璜嬬劇锛�' )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -257,7 +257,7 @@
<name>EndDateNull</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Product2.Product_Status__c</field>
<operation>notEqual</operation>
@@ -271,7 +271,7 @@
<name>EndDateUpdate</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Product2.Product_Status__c</field>
<operation>equals</operation>
@@ -289,7 +289,7 @@
<name>X12_BSS_text</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>True</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
@@ -299,7 +299,7 @@
<name>Last_active_update_staff</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISCHANGED(IsActive)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -309,7 +309,7 @@
<name>UpdateImporantProduct</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>!ISBLANK(Key_product_147P__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -319,7 +319,7 @@
<name>UpdateImporantProductNull</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISBLANK(Key_product_147P__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Product_Documentation__c.workflow-meta.xml b/force-app/main/default/workflows/Product_Documentation__c.workflow-meta.xml
index 6815b87..0a30ea4 100644
--- a/force-app/main/default/workflows/Product_Documentation__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Product_Documentation__c.workflow-meta.xml
@@ -16,7 +16,7 @@
<description>浜у搧璧勬枡鍏紑鐢宠-GI-</description>
<protected>false</protected>
<recipients>
- <recipient>manli_wu@olympus.com.cn</recipient>
+ <recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -40,6 +40,10 @@
<recipients>
<recipient>Te2am_member</recipient>
<type>group</type>
+ </recipients>
+ <recipients>
+ <recipient>dannym_ko@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>zhenlei_du@olympus.com.cn</recipient>
@@ -197,7 +201,7 @@
<criteriaItems>
<field>Product_Documentation__c.Close_material__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Product_Documentation__c.Material_status__c</field>
@@ -216,7 +220,7 @@
<criteriaItems>
<field>Product_Documentation__c.Material_deleate_request__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/QIS_M_BC__c.workflow-meta.xml b/force-app/main/default/workflows/QIS_M_BC__c.workflow-meta.xml
index bb4e556..b0a563c 100644
--- a/force-app/main/default/workflows/QIS_M_BC__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/QIS_M_BC__c.workflow-meta.xml
@@ -16,7 +16,7 @@
<field>OCM_Member_Mail__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/QISMBC_Updated_html</template>
</alerts>
diff --git a/force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml b/force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml
index 4aa1960..2eb0bcc 100644
--- a/force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml
@@ -9,10 +9,14 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/AE_Allowed1_QIS</template>
</alerts>
@@ -25,10 +29,14 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/AE_NonAEUpd_QIS</template>
</alerts>
@@ -45,6 +53,10 @@
<type>group</type>
</recipients>
<recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -56,7 +68,11 @@
<recipient>peiqiang_lin@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <recipients>
+ <recipient>yoichi_murata@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/AE_NonAllowed2_QIS</template>
</alerts>
@@ -107,11 +123,11 @@
</alerts>
<alerts>
<fullName>MDR_QIS</fullName>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>xizhi_ma@olympus.com.cn.invalid</ccEmails>
- <ccEmails>osh-sfdc-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
+ <ccEmails>xizhi_ma@olympus.com.cn</ccEmails>
+ <ccEmails>osh-sfdc-member@olympus.com.cn</ccEmails>
<description>2.QIS MDR閭欢</description>
<protected>false</protected>
<recipients>
@@ -135,6 +151,7 @@
<alerts>
<fullName>Need_Report_QIS1</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>shuting_wang@olympus.com.cn</ccEmails>
<description>OCSM瑕佹姤鍛婏紙EtQ宸茬‘璁わ級</description>
<protected>false</protected>
@@ -147,6 +164,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>hengtao_huang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -162,13 +183,14 @@
<recipient>peiqiang_lin@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>DOJ/Need_Report_QIS1</template>
</alerts>
<alerts>
<fullName>Need_Report_QIS2</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>shuting_wang@olympus.com.cn</ccEmails>
<description>OCSM瑕佹姤鍛婏紝AWARE DATE杩�10澶╁悗锛屽皻鏈彂鎶ュ憡锛屾彁閱掗偖浠�</description>
<protected>false</protected>
@@ -181,6 +203,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>hengtao_huang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -196,16 +222,16 @@
<recipient>peiqiang_lin@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>DOJ/Need_Report_QIS_5Days</template>
</alerts>
<alerts>
<fullName>OSH_finished</fullName>
- <ccEmails>OCM-Service-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
<description>5.OSH鍒ゅ畾纭畾鍚�</description>
<protected>false</protected>
<recipients>
@@ -241,7 +267,7 @@
</alerts>
<alerts>
<fullName>OSH_finished_Fanxiu_Aohui</fullName>
- <ccEmails>OSH-SORC-CC@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OSH-SORC-CC@olympus.com.cn</ccEmails>
<description>5.OSH鍒ゅ畾纭畾鍚庯紙缈讳慨锛夊ゥ杈�</description>
<protected>false</protected>
<recipients>
@@ -289,10 +315,15 @@
<fullName>PAE_Final_PAE_PAE</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禼ode鏈夊彉鍖栨洿鏂�</description>
<protected>false</protected>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -318,10 +349,15 @@
<fullName>PAE_Final_PAE_Unknown</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禼ode鍙樺寲Complaint_Number绌�</description>
<protected>false</protected>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -347,11 +383,16 @@
<fullName>PAE_Final_nonPAE_nonPAE</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>OSH-SFDC-member@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禼ode鍙樺寲Complaint_Number绌篒ntake鍜孎inal閮芥槸nonPAE</description>
<protected>false</protected>
<recipients>
<recipient>haijie_yin@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -361,10 +402,15 @@
<fullName>PAE_Intake</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<description>PAE--Intake鏃禔E/PAE/Unknown</description>
<protected>false</protected>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -440,14 +486,14 @@
<field>OCM_Manager_Mail__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/QIS_AE_QIS1</template>
</alerts>
<alerts>
<fullName>QIS_Cancel_submit_decline</fullName>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-SFDC-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-SFDC-member@olympus.com.cn</ccEmails>
<description>2.QIS鍙栨秷鐢宠椹冲洖</description>
<protected>false</protected>
<recipients>
@@ -485,7 +531,7 @@
<field>RC_Manager__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/QIS_GotProduct</template>
</alerts>
@@ -555,7 +601,7 @@
<recipients>
<type>owner</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/QIS_finish_all</template>
</alerts>
@@ -593,10 +639,10 @@
</alerts>
<alerts>
<fullName>RC_check_first</fullName>
- <ccEmails>OCM-Service-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
<description>4.OCM鍒ゅ畾纭畾鍚巁绗竴娆�</description>
<protected>false</protected>
<recipients>
@@ -639,10 +685,10 @@
</alerts>
<alerts>
<fullName>RC_finished</fullName>
- <ccEmails>OCM-Service-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
<description>4.OCM鍒ゅ畾纭畾鍚巁闈炲ゥ杈�</description>
<protected>false</protected>
<recipients>
@@ -689,14 +735,18 @@
</alerts>
<alerts>
<fullName>RC_finished_CIC</fullName>
- <ccEmails>OCM-Service-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-SORC-CC@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-SORC-CC@olympus.com.cn</ccEmails>
<description>4.OCM鍒ゅ畾纭畾鍚巁濂ヨ緣</description>
<protected>false</protected>
<recipients>
<type>owner</type>
+ </recipients>
+ <recipients>
+ <recipient>hiroshi_endo@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>shinichi_aihara@olympus.com.cn</recipient>
@@ -756,6 +806,10 @@
<description>4.OCM鐗瑰埆瀵瑰簲 宀╅噹鎬荤洃椹冲洖锛嶉儴闀匡紞鎶�鏈暀鑲茶</description>
<protected>false</protected>
<recipients>
+ <recipient>shinichi_iwano@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>RC_Manager__c</field>
<type>userLookup</type>
</recipients>
@@ -790,9 +844,9 @@
</alerts>
<alerts>
<fullName>SFDC_Cancel_Submit_Approve</fullName>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-SFDC-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-SFDC-member@olympus.com.cn</ccEmails>
<description>2.QIS鍙栨秷鐢宠鎵瑰噯閫氱煡</description>
<protected>false</protected>
<recipients>
@@ -835,9 +889,9 @@
</alerts>
<alerts>
<fullName>SFDC_Submit_Approve</fullName>
- <ccEmails>OCM-Service-member@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-manager@olympus.com.cn.invalid</ccEmails>
- <ccEmails>OSH-PB-member@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>OCM-Service-member@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-manager@olympus.com.cn</ccEmails>
+ <ccEmails>OSH-PB-member@olympus.com.cn</ccEmails>
<description>1.QIS鐢宠鎵瑰噯閫氱煡</description>
<protected>false</protected>
<recipients>
@@ -928,7 +982,7 @@
<field>Not_Get_Asset_Remind__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/HalfMonthNotReceiveRemind</template>
</alerts>
@@ -940,7 +994,7 @@
<field>Not_Get_Asset_Remind__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/OneMonthNotReceiveRemind</template>
</alerts>
@@ -952,7 +1006,7 @@
<field>Not_Get_Asset_Remind__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>QIS/twoMonthNotReceiveRemind</template>
</alerts>
@@ -1881,6 +1935,24 @@
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
+ <fullName>%22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && CreatedBy.Salesdepartment__c = "2.涓滃寳"</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>%22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88鍗庝笢%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && CreatedBy.Salesdepartment__c = "5.鍗庝笢"</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>%22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && (CreatedBy.Salesdepartment__c = "1.鍗庡寳" || CreatedBy.Salesdepartment__c = "3.瑗垮寳")</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
<fullName>AE鍙樻垚闈濧E_QIS</fullName>
<actions>
<name>AE_NONAE_QIS</name>
@@ -1894,7 +1966,7 @@
<criteriaItems>
<field>QIS_Report__c.ifDeadHurtChange__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>AE鍙樻垚闈濧E_QIS</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -1948,7 +2020,7 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>RecordTypeId='012C600000003Jw' && ISCHANGED(QIS_OSH_answerdate__c) && NOT(ISBLANK(QIS_OSH_answerdate__c))</formula>
+ <formula>RecordTypeId='01210000000RLWm' && ISCHANGED(QIS_OSH_answerdate__c) && NOT(ISBLANK(QIS_OSH_answerdate__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -2180,6 +2252,42 @@
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
+ <fullName>OCM鍒ゅ畾纭畾鍚巁QIS鏃犲伩缁翠慨鍝�</fullName>
+ <actions>
+ <name>QIS_FreeRepair</name>
+ <type>Alert</type>
+ </actions>
+ <active>true</active>
+ <booleanFilter>1 AND ( ( 2 AND 3 ) OR ( 4 AND 5 ) )</booleanFilter>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.OCM_judgement__c</field>
+ <operation>equals</operation>
+ <value>璐ㄩ噺闂</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.OCM_judgement__c</field>
+ <operation>equals</operation>
+ <value>璐ㄩ噺闂+闈炶川閲忛棶棰�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <description>涓轰簡宸ュ巶鍙楃悊浜哄憳鏇村ソ鐨勮瘑鍒玅IS鏃犲伩缁翠慨鍝佸苟鍙婃椂閫佸線鍝佷繚锛屻�怮IS鍒ゅ畾缁撴灉閫氱煡銆戦渶瑕佹柊澧炴妱閫佷汉鍛�</description>
+ <triggerType>onCreateOrTriggeringUpdate</triggerType>
+ </rules>
+ <rules>
<fullName>OCM鍒ゅ畾纭畾鍚巁濂ヨ緣</fullName>
<actions>
<name>RC_finished_CIC</name>
@@ -2194,7 +2302,7 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2213,7 +2321,7 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2237,7 +2345,7 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2252,13 +2360,36 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>AND(RecordTypeId=='01210000000RLWm', OR(AND(ISPICKVAL(OCM_judgement__c,'闈炶川閲忛棶棰�'), OR( ISPICKVAL(next_action__c,'鏈夊伩缁翠慨'), ISPICKVAL(next_action__c,'閫佸洖'), AND(ISPICKVAL(next_action__c,'鏃犲伩缁翠慨'), Special_follow__c = true), AND(ISPICKVAL(next_action__c,'鏃犲伩鏇存崲'), Special_follow__c = true) )), AND(ISPICKVAL(OCM_judgement__c,'鐜拌薄鏈彂鐜�'), ISPICKVAL(next_action__c,'閫佸洖'))), AND(NOT(TEXT(MDR_information__c)='鏄�'),NOT(TEXT(isPAE_Profile__c)='YES'),NOT(TEXT(isAE_Profile__c)='YES')))</formula>
+ <formula>AND(RecordTypeId=='01210000000RLWm', OR(AND(ISPICKVAL(OCM_judgement__c,'闈炶川閲忛棶棰�'), OR(
+ ISPICKVAL(next_action__c,'鏈夊伩缁翠慨'),
+ ISPICKVAL(next_action__c,'閫佸洖'),
+ AND(ISPICKVAL(next_action__c,'鏃犲伩缁翠慨'), Special_follow__c = true),
+ AND(ISPICKVAL(next_action__c,'鏃犲伩鏇存崲'), Special_follow__c = true)
+ )), AND(ISPICKVAL(OCM_judgement__c,'鐜拌薄鏈彂鐜�'), ISPICKVAL(next_action__c,'閫佸洖'))), AND(NOT(TEXT(MDR_information__c)='鏄�'),NOT(TEXT(isPAE_Profile__c)='YES'),NOT(TEXT(isAE_Profile__c)='YES')))</formula>
<triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>OCM鐢宠鏃跺彂淇�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>CreatedBy.Salesdepartment__c = "2.涓滃寳" && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庝笢%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>CreatedBy.Salesdepartment__c = "5.鍗庝笢" && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
</rules>
<rules>
<fullName>OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
<active>false</active>
<formula>(CreatedBy.Salesdepartment__c = "1.鍗庡寳" || CreatedBy.Salesdepartment__c = "3.瑗垮寳") && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庡崡%2F瑗垮崡%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>(CreatedBy.Salesdepartment__c = "6.鍗庡崡" || CreatedBy.Salesdepartment__c = "4.瑗垮崡") && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
<rules>
@@ -2314,7 +2445,7 @@
<criteriaItems>
<field>QIS_Report__c.Mail_Send_Status__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2481,12 +2612,12 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.Mail_Send_Status__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2505,7 +2636,7 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2529,12 +2660,12 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.Mail_Send_Status__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2803,21 +2934,6 @@
</workflowTimeTriggers>
</rules>
<rules>
- <fullName>QIS鏈洖绛�</fullName>
- <active>false</active>
- <criteriaItems>
- <field>QIS_Report__c.QIS_Status__c</field>
- <operation>equals</operation>
- <value>鑽夋涓�</value>
- </criteriaItems>
- <triggerType>onCreateOrTriggeringUpdate</triggerType>
- <workflowTimeTriggers>
- <offsetFromField>QIS_Report__c.QIS_Submit_day__c</offsetFromField>
- <timeLength>1</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- </rules>
- <rules>
<fullName>QIS姣庡洖瀹熻鍏紡鍙樻垚鍒版枃鏈�</fullName>
<actions>
<name>Account_State</name>
@@ -2857,7 +2973,7 @@
<criteriaItems>
<field>QIS_Report__c.Is_ProductGot__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
@@ -2978,6 +3094,338 @@
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
+ <fullName>delete %22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && CreatedBy.Salesdepartment__c = "2.涓滃寳閿�鍞湰閮�"</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete %22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88鍗庝笢%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && CreatedBy.Salesdepartment__c = "4.鍗庝笢閿�鍞湰閮�"</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete %22OCM鏈嶅姟鏈儴鏀跺埌瀹炵墿%22鎸変笅鍚庡彂淇�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>ISCHANGED(QIS_Status__c) && TEXT(QIS_Status__c) = "RC妫�娴嬩腑" && ISCHANGED(OCM_RC_RecievedDate__c) && OCM_RC_RecievedDate__c != null && PRIORVALUE(OCM_RC_RecievedDate__c) = null && (CreatedBy.Salesdepartment__c = "1.鍗庡寳閿�鍞湰閮�" || CreatedBy.Salesdepartment__c = "3.瑗垮寳閿�鍞湰閮�")</formula>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>2.涓滃寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88涓滃寳%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>2.涓滃寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88鍗庝笢%EF%BC%89</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>5.鍗庝笢</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88鍗庝笢%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>5.鍗庝笢</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>1.鍗庡寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>3.瑗垮寳</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>1.鍗庡寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>OSH妫�娴嬬敵璇�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>3.瑗垮寳</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鐢宠鏃跺彂淇�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>CreatedBy.Salesdepartment__c = "2.涓滃寳" && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庝笢%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>CreatedBy.Salesdepartment__c = "4.鍗庝笢" && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>(CreatedBy.Salesdepartment__c = "1.鍗庡寳" || CreatedBy.Salesdepartment__c = "3.瑗垮寳") && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OCM鐢宠鏃跺彂淇�%EF%BC%88鍗庡崡%2F瑗垮崡%EF%BC%89</fullName>
+ <active>false</active>
+ <formula>(CreatedBy.Salesdepartment__c = "6.鍗庡崡" || CreatedBy.Salesdepartment__c = "4.瑗垮崡") && TEXT(QIS_Status__c) = "OCM濉啓瀹屾瘯"</formula>
+ <triggerType>onCreateOnly</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88涓滃寳%EF%BC%89</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>2.涓滃寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88涓滃寳%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>2.涓滃寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>1.鍗庡寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>3.瑗垮寳</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡寳%2F瑗垮寳%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>1.鍗庡寳</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>3.瑗垮寳</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡崡%2F瑗垮崡%EF%BC%89</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>6.鍗庡崡</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>notEqual</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>4.瑗垮崡</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete OSH鍒ゅ畾纭畾鍚�%EF%BC%88鍗庡崡%2F瑗垮崡%EF%BC%89淇悊</fullName>
+ <active>false</active>
+ <booleanFilter>(1 OR 4 )AND 2 AND 3</booleanFilter>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>6.鍗庡崡</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>QIS_Report__c.next_action__c</field>
+ <operation>equals</operation>
+ <value>鏃犲伩缁翠慨,鏈夊伩缁翠慨,鏈夊伩缁翠慨+鏃犲伩缁翠慨</value>
+ </criteriaItems>
+ <criteriaItems>
+ <field>User.Salesdepartment__c</field>
+ <operation>equals</operation>
+ <value>4.瑗垮崡</value>
+ </criteriaItems>
+ <triggerType>onAllChanges</triggerType>
+ </rules>
+ <rules>
+ <fullName>delete QIS宸插洖绛�%2F瀹屾瘯</fullName>
+ <actions>
+ <name>RecordtypeUpdate</name>
+ <type>FieldUpdate</type>
+ </actions>
+ <active>false</active>
+ <criteriaItems>
+ <field>QIS_Report__c.QIS_Status__c</field>
+ <operation>equals</operation>
+ <value>宸插洖绛�,瀹屾瘯</value>
+ </criteriaItems>
+ <triggerType>onCreateOrTriggeringUpdate</triggerType>
+ </rules>
+ <rules>
<fullName>鍏紡鎷疯礉鏂囨湰QIS鍒嗙被</fullName>
<actions>
<name>update_qis</name>
@@ -3007,7 +3455,7 @@
<criteriaItems>
<field>QIS_Report__c.SC_JudgeDate_Four__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.Market_Opinion__c</field>
@@ -3026,7 +3474,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_ENG_T4__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -3044,7 +3492,7 @@
<criteriaItems>
<field>QIS_Report__c.SC_JudgeDate_Four__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.Market_Opinion__c</field>
@@ -3063,7 +3511,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_EndoRapid_T4__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<description>鍒ゅ畾鏃�+4涓伐浣滄棩鍐呭競鍦洪儴鎰忚浠嶄负绌烘椂鍙戦�丒ndoRapid閭欢</description>
<triggerType>onAllChanges</triggerType>
@@ -3082,7 +3530,7 @@
<criteriaItems>
<field>QIS_Report__c.SC_JudgeDate_Four__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.Market_Opinion__c</field>
@@ -3101,7 +3549,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_ET_T4__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -3115,7 +3563,7 @@
<criteriaItems>
<field>QIS_Report__c.Reply_QIS__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>褰換IS鍥炵瓟鍕鹃�夋椂榛樿鎿嶄綔鏃ユ湡</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -3130,7 +3578,7 @@
<criteriaItems>
<field>QIS_Report__c.Submit_QIS__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鎻愪氦QIS鍕鹃�夋椂榛樿鎿嶄綔鏃ユ湡</description>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -3163,7 +3611,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_ENG__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -3195,7 +3643,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_ET__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -3227,7 +3675,7 @@
<criteriaItems>
<field>QIS_Report__c.Sent_EndoRapid__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -3241,7 +3689,7 @@
<criteriaItems>
<field>QIS_Report__c.is_aohui_product__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>QIS_Report__c.QIS_Status__c</field>
@@ -3258,7 +3706,8 @@
</actions>
<active>true</active>
<description>杩欎竴宸ヤ綔娴佸湪瀹夊叏淇℃伅閫夋嫨鏄椂锛屽垵濮嬪寲瀹夊叏鍐呭涓�'璇�24h鍐呭洖澶嶉偖浠堕棶棰�'锛屾墍浠ュ叧鎺夎繖涓�宸ヤ綔娴佹椂锛岃閲嶆柊鍚敤鍘熸湁楠岃瘉瑙勫垯Request_MDR_request_detail</description>
- <formula>ISPICKVAL(MDR_information__c, '鏄�') && isblank(MDR_detail__c)</formula>
+ <formula>ISPICKVAL(MDR_information__c, '鏄�') &&
+isblank(MDR_detail__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/QIS_SC_Report__c.workflow-meta.xml b/force-app/main/default/workflows/QIS_SC_Report__c.workflow-meta.xml
index 0d3a0d9..856ada8 100644
--- a/force-app/main/default/workflows/QIS_SC_Report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/QIS_SC_Report__c.workflow-meta.xml
@@ -213,6 +213,7 @@
<fieldUpdates>
<fullName>UpdateStatus6</fullName>
<field>Status__c</field>
+ <literalValue>鐢宠涓�</literalValue>
<name>鏇存柊鐘舵�乢鐢宠涓�</name>
<notifyAssignee>false</notifyAssignee>
<operation>Literal</operation>
diff --git a/force-app/main/default/workflows/Quote.workflow-meta.xml b/force-app/main/default/workflows/Quote.workflow-meta.xml
index 51d3130..c20d018 100644
--- a/force-app/main/default/workflows/Quote.workflow-meta.xml
+++ b/force-app/main/default/workflows/Quote.workflow-meta.xml
@@ -84,7 +84,8 @@
<type>Alert</type>
</actions>
<active>true</active>
- <formula>Not(isNull(Queto_Confirm_Date__c))&& isNull(PRIORVALUE(Queto_Confirm_Date__c ))</formula>
+ <formula>Not(isNull(Queto_Confirm_Date__c))&&
+ isNull(PRIORVALUE(Queto_Confirm_Date__c ))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
</Workflow>
diff --git a/force-app/main/default/workflows/QuoteLineItem.workflow-meta.xml b/force-app/main/default/workflows/QuoteLineItem.workflow-meta.xml
index ca74806..20f364b 100644
--- a/force-app/main/default/workflows/QuoteLineItem.workflow-meta.xml
+++ b/force-app/main/default/workflows/QuoteLineItem.workflow-meta.xml
@@ -16,7 +16,7 @@
<name>set_quo_deliver_date</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/ReceivingNoteDetail__c.workflow-meta.xml b/force-app/main/default/workflows/ReceivingNoteDetail__c.workflow-meta.xml
index ffff52c..f35bbd7 100644
--- a/force-app/main/default/workflows/ReceivingNoteDetail__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/ReceivingNoteDetail__c.workflow-meta.xml
@@ -18,7 +18,7 @@
<name>Inspection_NG_Email</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>ReceivingNoteDetail__c.After_Inspection_time__c</field>
<operation>notEqual</operation>
diff --git a/force-app/main/default/workflows/ReceivingNoteSummary__c.workflow-meta.xml b/force-app/main/default/workflows/ReceivingNoteSummary__c.workflow-meta.xml
index 48fe71d..7ae2701 100644
--- a/force-app/main/default/workflows/ReceivingNoteSummary__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/ReceivingNoteSummary__c.workflow-meta.xml
@@ -14,6 +14,10 @@
<description>鏃犻厤濂楁彁閱掗偖浠�</description>
<protected>false</protected>
<recipients>
+ <recipient>_tianjiao_ning@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>jing_shao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
diff --git a/force-app/main/default/workflows/ReceivingNote__c.workflow-meta.xml b/force-app/main/default/workflows/ReceivingNote__c.workflow-meta.xml
index 57570da..9c84bf9 100644
--- a/force-app/main/default/workflows/ReceivingNote__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/ReceivingNote__c.workflow-meta.xml
@@ -76,6 +76,10 @@
<description>鍨嬪彿鎻愰啋閭欢</description>
<protected>false</protected>
<recipients>
+ <recipient>_tianjiao_ning@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>xuan_li@olympus.com.cn</recipient>
<type>user</type>
</recipients>
diff --git a/force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml b/force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml
index a5db456..1643b08 100644
--- a/force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml
@@ -21,16 +21,6 @@
<template>unfiled$public/Adjust_Queue_No</template>
</alerts>
<alerts>
- <fullName>Adjust_Queue_OK</fullName>
- <description>鎻掗槦鐢宠閫氳繃鎻愰啋</description>
- <protected>false</protected>
- <recipients>
- <type>owner</type>
- </recipients>
- <senderType>CurrentUser</senderType>
- <template>unfiled$public/Adjust_Queue_OK</template>
- </alerts>
- <alerts>
<fullName>Adjust_Queue_Rental_Start</fullName>
<description>鎻掗槦鐢宠鎵瑰噯鎻愰啋閭欢-澶囧搧</description>
<protected>false</protected>
@@ -86,6 +76,7 @@
<fieldUpdates>
<fullName>Inspection_result_NG_update</fullName>
<field>Inspection_result_NG__c</field>
+ <literalValue>鎶ヤ慨</literalValue>
<name>鍙戣揣鍓嶆鏌G</name>
<notifyAssignee>false</notifyAssignee>
<operation>Literal</operation>
@@ -147,7 +138,7 @@
<name>bp2_Inspect_Before_NG</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>From 鍊熷嚭澶囧搧閰嶅涓�瑙�</description>
<formula>ISCHANGED(Inspection_result_NG__c) && OR(TEXT(Inspection_result_NG__c) = '缁翠慨',TEXT(Inspection_result_NG__c) = '搴熷純')</formula>
<triggerType>onAllChanges</triggerType>
diff --git a/force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml b/force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml
index 38f5e70..a434007 100644
--- a/force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml
@@ -467,13 +467,13 @@
<field>applyUser__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Loaner_function/RentalApplyCantShipAll_HTML</template>
</alerts>
<alerts>
<fullName>RentalApplyOutStock</fullName>
- <ccEmails>hiroki_hotta@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>hiroki_hotta@olympus.com.cn</ccEmails>
<description>***鍑哄簱閫氱煡</description>
<protected>false</protected>
<recipients>
@@ -483,13 +483,13 @@
<field>applyUser__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Loaner_function/RentalApplyOutStock</template>
</alerts>
<alerts>
<fullName>RentalApplyWariateInfo</fullName>
- <ccEmails>hiroki_hotta@olympus.com.cn.invalid</ccEmails>
+ <ccEmails>hiroki_hotta@olympus.com.cn</ccEmails>
<description>***寮曞綋閫氱煡</description>
<protected>false</protected>
<recipients>
@@ -499,7 +499,7 @@
<field>applyUser__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Loaner_function/RentalApplyWariateInfo</template>
</alerts>
@@ -986,7 +986,7 @@
<fieldUpdates>
<fullName>Status_back</fullName>
<field>Status__c</field>
- <literalValue>濉啓瀹屾瘯</literalValue>
+ <literalValue>寮曞綋娓�</literalValue>
<name>鐘舵�佹洿鏂�</name>
<notifyAssignee>false</notifyAssignee>
<operation>Literal</operation>
@@ -996,7 +996,7 @@
<fieldUpdates>
<fullName>Status_update</fullName>
<field>Status__c</field>
- <literalValue>鍒犻櫎</literalValue>
+ <literalValue>鍑哄簱鎸囩ず娓�</literalValue>
<name>鐘舵�佹洿鏂�</name>
<notifyAssignee>false</notifyAssignee>
<operation>Literal</operation>
@@ -1189,48 +1189,51 @@
<field>Loaner_Storage_mail_address__c</field>
<formula>IF( NOT(ISBLANK(TEXT(Cross_Region_Assign__c))),
CASE(Cross_Region_Assign__c,
- "鍖椾含 澶囧搧涓績","OCMAssetBJ_Storage@olympus.com.cn.f",
- "涓婃捣 澶囧搧涓績","OCMAssetSH_Storage@olympus.com.cn.f",
- "骞垮窞 澶囧搧涓績","OCMAssetGZ_Storage@olympus.com.cn.f",
+ "鍖椾含 澶囧搧涓績","OCMAssetBJ_Storage@olympus.com.cn",
+ "涓婃捣 澶囧搧涓績","OCMAssetSH_Storage@olympus.com.cn",
+ "骞垮窞 澶囧搧涓績","OCMAssetGZ_Storage@olympus.com.cn",
""),
-IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮崡鎺ㄥ箍璇�","OCMAssetGZ_Storage@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧涓滃寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡崡鎺ㄥ箍璇�","OCMAssetGZ_Storage@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庝笢鎺ㄥ箍璇�","OCMAssetSH_Storage@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCMAssetBJ_Storage@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCMAssetSH_Storage@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCMAssetGZ_Storage@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="GI"),"OCMAssetBJ_Storage@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="SP"),"OCMAssetSH_Storage@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCMAssetGZ_Storage@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCMAssetSH_Storage@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCMAssetBJ_Storage@olympus.com.cn.f",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮崡鎺ㄥ箍璇�","OCMAssetGZ_Storage@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧涓滃寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡崡鎺ㄥ箍璇�","OCMAssetGZ_Storage@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庝笢鎺ㄥ箍璇�","OCMAssetSH_Storage@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮寳鎺ㄥ箍璇�","OCMAssetBJ_Storage@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCMAssetBJ_Storage@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCMAssetSH_Storage@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCMAssetGZ_Storage@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="GI"),"OCMAssetBJ_Storage@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="SP"),"OCMAssetSH_Storage@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCMAssetGZ_Storage@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCMAssetSH_Storage@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCMAssetBJ_Storage@olympus.com.cn",
CASE(Salesdept__c,
-"鍖荤枟鍗庡寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"鍗庡寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn.f",
-"鍖荤枟涓滃寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"涓滃寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn.f",
-"鍖荤枟瑗垮寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"瑗垮寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn.f",
-"鏈嶅姟鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"澶囧搧绠＄悊涓績","OCMAssetBJ_Storage@olympus.com.cn.f",
-"鍖荤枟鍗庡崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn.f",
-"鍗庡崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn.f",
-"鍗庡崡閿�鍞湰閮�","OCMAssetGZ_Storage@olympus.com.cn.f",
-"鍖荤枟瑗垮崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn.f",
-"瑗垮崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn.f",
-"瑗垮崡閿�鍞湰閮�","OCMAssetGZ_Storage@olympus.com.cn.f",
-"鍖荤枟鍗庝笢钀ヤ笟鏈儴","OCMAssetSH_Storage@olympus.com.cn.f",
-"鍗庝笢钀ヤ笟鏈儴","OCMAssetSH_Storage@olympus.com.cn.f",
-"鍗庝笢閿�鍞湰閮�","OCMAssetSH_Storage@olympus.com.cn.f",
-"鍖荤枟浜у搧鍩硅鏈儴","OCMAssetSH_Storage@olympus.com.cn.f",
-"娑堝寲路鍛煎惛鍐呴暅浜嬩笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"澶栫浜嬩笟鏈儴","OCMAssetSH_Storage@olympus.com.cn.f",
-"Solution鏈儴","OCMAssetSH_Storage@olympus.com.cn.f",
-"鎴樼暐鍒涙柊鏈儴","OCMAssetBJ_Storage@olympus.com.cn.f",
-"OCMAssetBJ_Storage@olympus.com.cn.f")
+"鍖荤枟鍗庡寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"鍗庡寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"鍗庡寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn",
+"鍖荤枟涓滃寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"涓滃寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"涓滃寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn",
+"鍖荤枟瑗垮寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"瑗垮寳钀ヤ笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"瑗垮寳閿�鍞湰閮�","OCMAssetBJ_Storage@olympus.com.cn",
+"鏈嶅姟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"澶囧搧绠＄悊涓績","OCMAssetBJ_Storage@olympus.com.cn",
+"鍖荤枟鍗庡崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn",
+"鍗庡崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn",
+"鍗庡崡閿�鍞湰閮�","OCMAssetGZ_Storage@olympus.com.cn",
+"鍖荤枟瑗垮崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn",
+"瑗垮崡钀ヤ笟鏈儴","OCMAssetGZ_Storage@olympus.com.cn",
+"瑗垮崡閿�鍞湰閮�","OCMAssetGZ_Storage@olympus.com.cn",
+"鍖荤枟鍗庝笢钀ヤ笟鏈儴","OCMAssetSH_Storage@olympus.com.cn",
+"鍗庝笢钀ヤ笟鏈儴","OCMAssetSH_Storage@olympus.com.cn",
+"鍗庝笢閿�鍞湰閮�","OCMAssetSH_Storage@olympus.com.cn",
+"鍖荤枟浜у搧鍩硅鏈儴","OCMAssetSH_Storage@olympus.com.cn",
+"娑堝寲路鍛煎惛鍐呴暅浜嬩笟鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"澶栫浜嬩笟鏈儴","OCMAssetSH_Storage@olympus.com.cn",
+"Solution鏈儴","OCMAssetSH_Storage@olympus.com.cn",
+"鎴樼暐鍒涙柊鏈儴","OCMAssetBJ_Storage@olympus.com.cn",
+"OCMAssetBJ_Storage@olympus.com.cn")
)))))))))))))))</formula>
<name>鏇存柊澶囧搧浠撳簱鐨勯偖绠卞湴鍧�</name>
<notifyAssignee>false</notifyAssignee>
@@ -1247,51 +1250,51 @@
<field>Loaner_centre_mail_address__c</field>
<formula>IF( NOT(ISBLANK(TEXT(Cross_Region_Assign__c))),
CASE(Cross_Region_Assign__c,
- "鍖椾含 澶囧搧涓績","OCM_Asset@olympus.com.cn.f",
- "涓婃捣 澶囧搧涓績","OCM_AssetSH@olympus.com.cn.f",
- "骞垮窞 澶囧搧涓績","OCM_AssetGZ@olympus.com.cn.f",
+ "鍖椾含 澶囧搧涓績","OCM_Asset@olympus.com.cn",
+ "涓婃捣 澶囧搧涓績","OCM_AssetSH@olympus.com.cn",
+ "骞垮窞 澶囧搧涓績","OCM_AssetGZ@olympus.com.cn",
""),
-IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮崡鎺ㄥ箍璇�","OCM_AssetGZ@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧涓滃寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡崡鎺ㄥ箍璇�","OCM_AssetGZ@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庝笢鎺ㄥ箍璇�","OCM_AssetSH@olympus.com.cn.f",
-IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCM_Asset@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCM_AssetSH@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCM_AssetGZ@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="GI"),"OCM_Asset@olympus.com.cn.f",
-IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="SP"),"OCM_AssetSH@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCM_AssetGZ@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="涓婃捣"),"ocm_assetsh@olympus.com.cn.f",
-IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="鍖椾含"),"ocm_asset@olympus.com.cn.f",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮崡鎺ㄥ箍璇�","OCM_AssetGZ@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧涓滃寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庡崡鎺ㄥ箍璇�","OCM_AssetGZ@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧鍗庝笢鎺ㄥ箍璇�","OCM_AssetSH@olympus.com.cn",
+IF(Owner:User.Category6__c ="鑳介噺浜у搧瑗垮寳鎺ㄥ箍璇�","OCM_Asset@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="鍖椾含"),"OCM_Asset@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="涓婃捣"),"OCM_AssetSH@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴",TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCM_AssetGZ@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="GI"),"OCM_Asset@olympus.com.cn",
+IF(AND(TEXT(Owner:User.Dept__c) ="MA鏈儴",TEXT(Product_category__c) ="SP"),"OCM_AssetSH@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="骞垮窞"),"OCM_AssetGZ@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="涓婃捣"),"ocm_assetsh@olympus.com.cn",
+IF(AND(OR(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠＄悊涓績"|| TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴"),TEXT(Owner:User.Branch__c) ="鍖椾含"),"ocm_asset@olympus.com.cn",
CASE(Salesdept__c,
-"鍖荤枟鍗庡寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"鍗庡寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"鍗庡寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn.f",
-"鍖荤枟涓滃寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"涓滃寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"涓滃寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn.f",
-"鍖荤枟瑗垮寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"瑗垮寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"瑗垮寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn.f",
-"鏈嶅姟鏈儴","OCM_Asset@olympus.com.cn.f",
-"澶囧搧绠＄悊涓績","OCM_Asset@olympus.com.cn.f",
-"鍖荤枟鍗庡崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn.f",
-"鍗庡崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn.f",
-"鍗庡崡閿�鍞湰閮�","OCM_AssetGZ@olympus.com.cn.f",
-"鍖荤枟瑗垮崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn.f",
-"瑗垮崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn.f",
-"瑗垮崡閿�鍞湰閮�","OCM_AssetGZ@olympus.com.cn.f",
-"鍖荤枟鍗庝笢钀ヤ笟鏈儴","OCM_AssetSH@olympus.com.cn.f",
-"鍗庝笢钀ヤ笟鏈儴","OCM_AssetSH@olympus.com.cn.f",
-"鍗庝笢閿�鍞湰閮�","OCM_AssetSH@olympus.com.cn.f",
-"鍖荤枟浜у搧鍩硅鏈儴","OCM_AssetSH@olympus.com.cn.f",
-"娑堝寲路鍛煎惛鍐呴暅浜嬩笟鏈儴","OCM_Asset@olympus.com.cn.f",
-"澶栫浜嬩笟鏈儴","OCM_AssetSH@olympus.com.cn.f",
-"Solution鏈儴","OCM_AssetSH@olympus.com.cn.f",
-"鎴樼暐鍒涙柊鏈儴","OCM_Asset@olympus.com.cn.f",
-"OCM_Asset@olympus.com.cn.f")
+"鍖荤枟鍗庡寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"鍗庡寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"鍗庡寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn",
+"鍖荤枟涓滃寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"涓滃寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"涓滃寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn",
+"鍖荤枟瑗垮寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"瑗垮寳钀ヤ笟鏈儴","OCM_Asset@olympus.com.cn",
+"瑗垮寳閿�鍞湰閮�","OCM_Asset@olympus.com.cn",
+"鏈嶅姟鏈儴","OCM_Asset@olympus.com.cn",
+"澶囧搧绠＄悊涓績","OCM_Asset@olympus.com.cn",
+"鍖荤枟鍗庡崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn",
+"鍗庡崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn",
+"鍗庡崡閿�鍞湰閮�","OCM_AssetGZ@olympus.com.cn",
+"鍖荤枟瑗垮崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn",
+"瑗垮崡钀ヤ笟鏈儴","OCM_AssetGZ@olympus.com.cn",
+"瑗垮崡閿�鍞湰閮�","OCM_AssetGZ@olympus.com.cn",
+"鍖荤枟鍗庝笢钀ヤ笟鏈儴","OCM_AssetSH@olympus.com.cn",
+"鍗庝笢钀ヤ笟鏈儴","OCM_AssetSH@olympus.com.cn",
+"鍗庝笢閿�鍞湰閮�","OCM_AssetSH@olympus.com.cn",
+"鍖荤枟浜у搧鍩硅鏈儴","OCM_AssetSH@olympus.com.cn",
+"娑堝寲路鍛煎惛鍐呴暅浜嬩笟鏈儴","OCM_Asset@olympus.com.cn",
+"澶栫浜嬩笟鏈儴","OCM_AssetSH@olympus.com.cn",
+"Solution鏈儴","OCM_AssetSH@olympus.com.cn",
+"鎴樼暐鍒涙柊鏈儴","OCM_Asset@olympus.com.cn",
+"OCM_Asset@olympus.com.cn")
)))))))))))))))</formula>
<name>鏇存柊澶囧搧涓績鐨勯偖绠卞湴鍧�</name>
<notifyAssignee>false</notifyAssignee>
@@ -1322,7 +1325,7 @@
<fieldUpdates>
<fullName>Update_ra_status_yindang</fullName>
<field>Status__c</field>
- <literalValue>宸叉壒鍑�</literalValue>
+ <literalValue>寮曞綋瀹屼簡</literalValue>
<name>鏇存柊澶囧搧鍊熷嚭鐢宠鐘舵�� 寮曞綋瀹屼簡</name>
<notifyAssignee>false</notifyAssignee>
<operation>Literal</operation>
@@ -1385,9 +1388,12 @@
<name>Repair_Del_Cancel_Mail</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>SendRepairCancelDeleteEmail__c</description>
- <formula>SendRepairCancelDeleteEmail__c && RA_Status__c <> '鑽夋涓�' && RA_Status__c <> '鐢宠涓�' && RA_Status__c <> '鍙栨秷'</formula>
+ <formula>SendRepairCancelDeleteEmail__c &&
+RA_Status__c <> '鑽夋涓�' &&
+RA_Status__c <> '鐢宠涓�' &&
+RA_Status__c <> '鍙栨秷'</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -1396,7 +1402,7 @@
<name>Return_TO_Set_Mail</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>褰掕繕鍙戦�佹湭瀹屼簡鏁�==0 and 锛堝鍝佺敵璇风姸鎬� = 鈥樺凡鍥炲瘎鈥� 鎴� 鈥樼敵璇疯�呭凡鏀惰揣鈥欙級and 涓嶅彂閫侀偖浠禙lag = false
OLD
@@ -1410,7 +1416,7 @@
<name>Return_TO_Set_Mail_Agency</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>鍔炰簨澶勯潪鍚屽煄锛屽彂缁欏姙浜嬪鍔╃悊</description>
<formula>LEN(Asset_return_Text__c) > 0 && Owner:User.OCM_man_province_Rental__c != TEXT(ToAgency__c) && LEFT(RecordTypeId, 15)!='01210000000RHIi' && LEFT(RecordTypeId, 15)!='01210000000RHIn'</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -1421,7 +1427,7 @@
<name>Delivered_Email</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>/*Sum_of_Deliveried__c + Sum_Before_Delivery_Check_NG__c = Sum_Of_Details__c */ /* (Shipment_requested_cnt__c + Pre_inspection_ng_num__c == Rental_Apply_Equipment_Set_Cnt__c)&&(Rental_Apply_Equipment_Set_Cnt__c!=0) && (Shipment_requested_cnt__c !=0)</description>
<formula>AND(LEN(Notice_of_Delivery_Text__c) > 0, ISCHANGED(Notice_of_Delivery_Hash__c), RA_Status__c != '瀹屼簡')</formula>
<triggerType>onAllChanges</triggerType>
@@ -1432,7 +1438,7 @@
<name>HP_received_sign_confirm_mail</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>绛惧瓧銇岃布銈夈倢銇熴倝鑷嫊銈汇儍銉堛仚銈嬨�傜⒑瑾嶃儭銉笺儷銈掑嚭銇欍��</description>
<formula>Not(isblank(HP_received_sign_text__c))&& ischanged(HP_received_sign_text__c) && HP_received_sign_NG__c = FALSE && AssetManageConfirm__c = FALSE</formula>
<triggerType>onAllChanges</triggerType>
@@ -1451,7 +1457,7 @@
<name>Clear_Sign_NG_Reason</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>HP_received_sign_text__c != null && ISCHANGED(HP_received_sign_text__c)&& HP_received_sign_NG__c =TRUE</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1461,11 +1467,11 @@
<name>set_Rental_Received_Day</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.AssetManageConfirm__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1485,17 +1491,17 @@
<name>RentalJump</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.Email_Jump__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
<fullName>澶囧搧鍥炴敹鎻愬墠7澶╂彁閱�</fullName>
- <active>false</active>
+ <active>true</active>
<booleanFilter>(1 AND 2 AND 8) AND ( (3 AND 5) OR (4 AND 6) OR 7 )</booleanFilter>
<criteriaItems>
<field>Rental_Apply__c.Bollow_Date__c</field>
@@ -1554,9 +1560,11 @@
<name>Asset_loaner_start_date</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>Asset_loaner_closed_day__c 澶囧搧棰勮鍥炴敹鏃� 銆佷粠鍏ユ棩鏈熺敾闈㈠～鍐�</description>
- <formula>(Asset_loaner_start_day__c <> Asset_loaner_start_date__c) || (Asset_loaner_closed_day__c<> Asset_loaner_closed_date__c)</formula>
+ <formula>(Asset_loaner_start_day__c <> Asset_loaner_start_date__c)
+ ||
+(Asset_loaner_closed_day__c<> Asset_loaner_closed_date__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1565,7 +1573,7 @@
<name>Set_cancel_after_loaner_arranged</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>Not(IsNew()) && RA_Status__c = '鍙栨秷' && (PRIORVALUE(RA_Status__c) = '宸插嚭搴撴寚绀�' || PRIORVALUE(RA_Status__c) = '宸蹭笅鏋�' || PRIORVALUE(RA_Status__c) = '鍑哄簱鍓嶅凡妫�娴�')</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1579,7 +1587,7 @@
<name>Set_request_cancel_time</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>Not(IsNew()) && RA_Status__c = '鍙栨秷'&& isCanceled_TF__c =false && (PRIORVALUE(RA_Status__c) = '宸叉壒鍑�' || PRIORVALUE(RA_Status__c) = '宸插垎閰�' || PRIORVALUE(RA_Status__c) = '宸插嚭搴撴寚绀�' || PRIORVALUE(RA_Status__c) = '宸蹭笅鏋�' || PRIORVALUE(RA_Status__c) = '鍑哄簱鍓嶅凡妫�娴�')</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1597,8 +1605,8 @@
<name>Update_WorkPlace_Apply</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
- <formula>TEXT(Status__c) = '濉啓瀹屾瘯'</formula>
+ <active>true</active>
+ <formula>TEXT(Status__c) = '濉啓瀹屾瘯' || TEXT(Status__c) = '鐢宠涓紙OPD鏈�氳繃锛�'</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -1607,7 +1615,7 @@
<name>Sign_ng</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>HP_received_sign_NG__c=TRUE</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1617,7 +1625,7 @@
<name>Reminder_Submit_LostEmail</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.Reminder_Submit_LostText__c</field>
<operation>notEqual</operation>
@@ -1630,7 +1638,7 @@
<name>UpdateJumpDateRental</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>鎻掗槦鏃跺�欑敓鎴愭彃闃熸棩鏈�</description>
<formula>IsJump_Rental__c == true</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
@@ -1656,7 +1664,7 @@
<name>Lost_Item_ActionEmail</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.Lost_Item_Email_Detail__c</field>
<operation>notEqual</operation>
@@ -1676,7 +1684,7 @@
</rules>
<rules>
<fullName>鑽夋涓渶瑕佹彁浜ょ殑鐢宠</fullName>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.Status__c</field>
<operation>equals</operation>
@@ -1712,7 +1720,7 @@
<name>Set_request_cancel_time</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Rental_Apply__c.isCanceled_TF_Set_Cnt__c</field>
<operation>greaterThan</operation>
@@ -1774,8 +1782,8 @@
<name>Follow_Inquiry_Stage_Copy</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
- <formula>(TEXT(demo_purpose2__c) = '璇曠敤锛堟湁璇环锛�' || TEXT(demo_purpose2__c) = '宸茶喘寰呰揣' ) && NOT(ISBLANK(Follow_UP_Opp__c)) && TEXT(Status__c) = '濉啓瀹屾瘯'</formula>
+ <active>true</active>
+ <formula>(TEXT(demo_purpose2__c) = '璇曠敤锛堟湁璇环锛�' || TEXT(demo_purpose2__c) = '宸茶喘寰呰揣' ) && NOT(ISBLANK(Follow_UP_Opp__c)) && (TEXT(Status__c) = '濉啓瀹屾瘯' || TEXT(Status__c) = '鐢宠涓紙OPD鏈�氳繃锛�')</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -1784,9 +1792,10 @@
<name>Update_loaner_dept_answer_time</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>PRIORVALUE(Select_Status__c) = '寰呭垎閰�' &&( Select_Status__c = '閮ㄥ垎鍒嗛厤' || Select_Status__c = '鍏ㄩ儴鍒嗛厤') && ISBLANK(Request_answer_time__c) && PRIORVALUE(Wei_Assigned_Cnt__c) > Wei_Assigned_Cnt__c</description>
- <formula>Yi_Assigned_Cnt_Sum__c > 0 && ISBLANK(Request_answer_time__c)</formula>
+ <formula>Yi_Assigned_Cnt_Sum__c > 0 &&
+ISBLANK(Request_answer_time__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
</Workflow>
diff --git a/force-app/main/default/workflows/RepairAgainAn__c.workflow-meta.xml b/force-app/main/default/workflows/RepairAgainAn__c.workflow-meta.xml
index f8175d0..0f65158 100644
--- a/force-app/main/default/workflows/RepairAgainAn__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/RepairAgainAn__c.workflow-meta.xml
@@ -35,6 +35,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>mingmeng_jian@olympus.com.cn</recipient>
<type>user</type>
</recipients>
diff --git a/force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml b/force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml
index 0bfc5d3..b6eefd2 100644
--- a/force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml
@@ -9,6 +9,10 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>shujuan_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -39,6 +43,10 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>shujuan_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -67,6 +75,10 @@
<recipients>
<field>RC_Mail_Address__c</field>
<type>email</type>
+ </recipients>
+ <recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>shujuan_liu@olympus.com.cn</recipient>
@@ -111,6 +123,10 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>shujuan_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -151,6 +167,10 @@
<recipients>
<field>RC_Mail_Address__c</field>
<type>email</type>
+ </recipients>
+ <recipients>
+ <recipient>haiqian_yu@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>shujuan_liu@olympus.com.cn</recipient>
@@ -601,7 +621,7 @@
<name>Failure_Source_Update</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair_Quotation__c.InspectionFailureCause__c</field>
<operation>notEqual</operation>
@@ -619,11 +639,11 @@
<name>QuotationStatusupdate</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair_Quotation__c.Quotation_agreement__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -637,13 +657,13 @@
<criteriaItems>
<field>Repair_Quotation__c.Decision_request__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
<fullName>鏈嶅姟鏈儴鐢宠鍑忎环鎬荤洃鎵瑰噯鎻愰啋</fullName>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</field>
<operation>notEqual</operation>
@@ -674,7 +694,16 @@
<type>Alert</type>
</actions>
<offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
- <timeLength>9</timeLength>
+ <timeLength>12</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>ActionEmailRepairCutZJ</name>
+ <type>Alert</type>
+ </actions>
+ <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
+ <timeLength>15</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
<workflowTimeTriggers>
@@ -701,22 +730,13 @@
<type>Alert</type>
</actions>
<offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
- <timeLength>15</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>ActionEmailRepairCutZJ</name>
- <type>Alert</type>
- </actions>
- <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
- <timeLength>12</timeLength>
+ <timeLength>9</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
</rules>
<rules>
<fullName>鏈嶅姟鏈儴鐢宠鍑忎环缁忕悊鎵瑰噯鎻愰啋</fullName>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair_Quotation__c.CutPriceStatus_Service__c</field>
<operation>equals</operation>
@@ -742,15 +762,6 @@
<type>Alert</type>
</actions>
<offsetFromField>Repair_Quotation__c.ServiceCutPriceApplyDate__c</offsetFromField>
- <timeLength>9</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>ActionEmailRepairCutJL</name>
- <type>Alert</type>
- </actions>
- <offsetFromField>Repair_Quotation__c.ServiceCutPriceApplyDate__c</offsetFromField>
<timeLength>3</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
@@ -781,10 +792,19 @@
<timeLength>15</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>ActionEmailRepairCutJL</name>
+ <type>Alert</type>
+ </actions>
+ <offsetFromField>Repair_Quotation__c.ServiceCutPriceApplyDate__c</offsetFromField>
+ <timeLength>9</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
</rules>
<rules>
<fullName>鏈嶅姟鏈儴鐢宠鍑忎环閮ㄩ暱鎵瑰噯鎻愰啋</fullName>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair_Quotation__c.CutPriceStatus_Service__c</field>
<operation>equals</operation>
@@ -810,15 +830,6 @@
<type>Alert</type>
</actions>
<offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateJL__c</offsetFromField>
- <timeLength>9</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
- <name>ActionEmailRepairCutBZ</name>
- <type>Alert</type>
- </actions>
- <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateJL__c</offsetFromField>
<timeLength>6</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
@@ -849,5 +860,14 @@
<timeLength>15</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>ActionEmailRepairCutBZ</name>
+ <type>Alert</type>
+ </actions>
+ <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateJL__c</offsetFromField>
+ <timeLength>9</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
</rules>
</Workflow>
diff --git a/force-app/main/default/workflows/Repair__c.workflow-meta.xml b/force-app/main/default/workflows/Repair__c.workflow-meta.xml
index 2cda781..ad6aa8b 100644
--- a/force-app/main/default/workflows/Repair__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Repair__c.workflow-meta.xml
@@ -12,7 +12,7 @@
<field>PAE_email__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/repair1</template>
</alerts>
@@ -28,7 +28,7 @@
<field>OCSM_Manager_Mail__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/repair2</template>
</alerts>
@@ -44,7 +44,7 @@
<field>OCSM_Manager_Mail__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/AE_Allowed1</template>
</alerts>
@@ -61,10 +61,14 @@
<type>email</type>
</recipients>
<recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/AE_NonAEUpd</template>
</alerts>
@@ -75,6 +79,10 @@
<recipients>
<recipient>CN_DOJ_OSH_RA</recipient>
<type>group</type>
+ </recipients>
+ <recipients>
+ <recipient>hiroki_hotta@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>it_prectech@olympus.com.cn</recipient>
@@ -88,12 +96,17 @@
<recipient>peiqiang_lin@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <recipients>
+ <recipient>yoichi_murata@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/AE_NonAllowed2</template>
</alerts>
<alerts>
<fullName>Cancel_Initiatioan</fullName>
+ <ccEmails>hiroki_hotta@olympus.com.cn</ccEmails>
<description>PAE_宸插彇娑堟垨鍒犻櫎寰匢nitiatioan鐨勪慨鐞�</description>
<protected>false</protected>
<recipients>
@@ -102,6 +115,14 @@
</recipients>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -118,6 +139,10 @@
</recipients>
<recipients>
<recipient>xizhi_ma@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>yuhao_zhao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -154,6 +179,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>liang1_zhu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>ling_sheng@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -186,6 +215,7 @@
</alerts>
<alerts>
<fullName>EtQ_Cancel</fullName>
+ <ccEmails>hiroki_hotta@olympus.com.cn</ccEmails>
<description>宸睧tQ Initiation鐨勫彉鎴愪负鍒犻櫎鎴栧彇娑�</description>
<protected>false</protected>
<recipients>
@@ -194,6 +224,14 @@
</recipients>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -212,7 +250,11 @@
<recipient>xizhi_ma@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <recipients>
+ <recipient>yuhao_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>repair/ETQCancel</template>
</alerts>
@@ -220,10 +262,19 @@
<fullName>Final_PAE_PAE1</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<description>PAE--Final鏃跺叾浠栧彉鎴怭AE/Unknown</description>
<protected>false</protected>
<recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -258,6 +309,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>wenzhe_li@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -279,6 +334,7 @@
<alerts>
<fullName>Need_Report_Repair1</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>shuting_wang@olympus.com.cn</ccEmails>
<description>OCSM瑕佹姤鍛婏紙EtQ宸茬‘璁わ級</description>
<protected>false</protected>
@@ -288,6 +344,10 @@
</recipients>
<recipients>
<recipient>bolun_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -306,13 +366,14 @@
<recipient>peiqiang_lin@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>DOJ/Need_Report_Repair1</template>
</alerts>
<alerts>
<fullName>Need_Report_Repair2</fullName>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>shuting_wang@olympus.com.cn</ccEmails>
<description>OCSM瑕佹姤鍛婏紝AWARE DATE杩�10澶╁悗锛屽皻鏈彂鎶ュ憡锛屾彁閱掗偖浠�</description>
<protected>false</protected>
@@ -322,6 +383,10 @@
</recipients>
<recipients>
<recipient>bolun_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -347,10 +412,15 @@
<fullName>PAE_Final_AE</fullName>
<ccEmails>ili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禼ode鍙樺寲鏇存柊</description>
<protected>false</protected>
<recipients>
<recipient>hui_zhao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -402,7 +472,7 @@
<recipient>URFGroupGZ_CD</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -414,7 +484,7 @@
<ccEmails>Danhong_Lin@olympus.com.cn</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙骞垮窞銆佹垚閮斤級鍏朵粬</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -432,7 +502,7 @@
<recipient>URFGroupGZ_CD</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -443,7 +513,7 @@
<ccEmails>jing_zhang@olympus.com.cn</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙骞垮窞锛夊叾浠�</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -462,7 +532,7 @@
<recipient>URFGroupSH_HZ</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -474,7 +544,7 @@
<ccEmails>shuijing.hu@olympus.com</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙涓婃捣銆佹澀宸烇級鍏朵粬</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -492,7 +562,7 @@
<recipient>URFGroupSH_HZ</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -504,7 +574,7 @@
<ccEmails>shuijing.hu@olympus.com</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙涓婃捣锛夊叾浠�</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -522,7 +592,7 @@
<recipient>URFGroupSY</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -533,7 +603,7 @@
<ccEmails>jing_zhang@olympus.com.cn</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙娌堥槼锛夊叾浠�</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -545,7 +615,7 @@
<recipient>URFGroup</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_Repair_EmailTemplate</template>
</alerts>
@@ -564,7 +634,7 @@
<recipient>URFGroupBJ_SY_XA</recipient>
<type>group</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate</template>
</alerts>
@@ -576,7 +646,7 @@
<ccEmails>shuijing.hu@olympus.com</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙鍏ㄥ浗锛�</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -587,7 +657,7 @@
<ccEmails>Zhixin_Hou@olympus.com.cn</ccEmails>
<description>闄愭RC淇悊杩旈�侀偖浠讹紙鍖椾含銆佹矆闃炽�佽タ瀹夛級鍏朵粬</description>
<protected>false</protected>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/RC_return_Repair_EmailTemplate_other</template>
</alerts>
@@ -612,6 +682,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>daisuke_goto@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -625,6 +699,10 @@
</recipients>
<recipients>
<recipient>jue_xu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>kazuyuki_tada@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -711,7 +789,15 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>liang1_zhu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>ling_sheng@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -823,6 +909,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>daisuke_goto@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>haijuan_wang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -832,6 +922,10 @@
</recipients>
<recipients>
<recipient>jue_xu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>kazuyuki_tada@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -1241,14 +1335,14 @@
<description>淇鍓嶏細Hospital__r.FSE_Main__r.Salesdepartment__c</description>
<field>FSE_owner_Salesdepartment__c</field>
<formula>CASE(Account__r.Parent.RecordTypeId,
-'012C600000003HN',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
-'012C600000003HK',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
-'012C600000003HM',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
-'012C600000003HO',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
-'012C600000003HR',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
-'012C600000003HL',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
-'012C600000003HP',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
-'012C600000003HQ',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
+'01210000000QemL',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
+'01210000000QezZ',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
+'01210000000QemQ',Hospital__r.FSE_GI_Main_Leader__r.Salesdepartment__c,
+'01210000000Qeze',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
+'01210000000Qezj',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
+'01210000000Qezt',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
+'01210000000Qezo',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
+'01210000000Qezy',Hospital__r.FSE_SP_Main_Leader__r.Salesdepartment__c,
''
)</formula>
<name>璁惧畾淇悊涓昏礋璐ｄ汉閿�鍞湰閮�</name>
@@ -1476,7 +1570,7 @@
<criteriaItems>
<field>Repair__c.ifDeadHurtChange__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1560,28 +1654,6 @@
<timeLength>10</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
- </rules>
- <rules>
- <fullName>FSE鐜板満淇悊瀹屾瘯鏉′欢</fullName>
- <actions>
- <name>On_site_repair_Input_time_incharge</name>
- <type>FieldUpdate</type>
- </actions>
- <active>false</active>
- <criteriaItems>
- <field>Repair__c.Repair_Ordered_Date__c</field>
- <operation>notEqual</operation>
- </criteriaItems>
- <criteriaItems>
- <field>Repair__c.Repair_Returned_To_HP_Date__c</field>
- <operation>equals</operation>
- </criteriaItems>
- <criteriaItems>
- <field>Repair__c.Billing_Amount__c</field>
- <operation>equals</operation>
- <value>CNY 0</value>
- </criteriaItems>
- <triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
<fullName>OCSM琛屾斂鎶ュ憡_宸叉姤鍛�</fullName>
@@ -1825,8 +1897,10 @@
<name>Repair_List_PriceText</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
- <formula>ISNEW()|| ISCHANGED(Repair_List_Price__c)|| ISCHANGED(Repair_Quotation_Price__c)</formula>
+ <active>true</active>
+ <formula>ISNEW()||
+ISCHANGED(Repair_List_Price__c)||
+ISCHANGED(Repair_Quotation_Price__c)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1835,11 +1909,11 @@
<name>Repair_order_Delete_requests</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair__c.Request_repair__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -1869,10 +1943,15 @@
<name>Update_address_ZipCode_Data</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<description>淇濇湁璁惧鏂板缓淇悊鍗曟椂锛屽姙璁惧涓婄殑鐩磋繑鏀惰揣鍦板潃甯﹀埌淇悊鍗曚笂锛屽苟淇濆瓨
淇濇湁璁惧涓婃墍鏈夌殑鏀惰揣鍦板潃鐩稿叧鐨勫瓧娈甸兘涓虹┖锛岄偅涔堟宸ヤ綔娴佷笉宸ヤ綔锛岄偅涔堜細鍘昏Е鍙戝櫒閲岄潰鏌ユ壘瀵瑰簲鐨勫姙浜嬪鐩磋繑鍦板潃锛屽苟璧嬪�煎埌鏂板缓鐨勪慨鐞嗕笂</description>
- <formula>ISBLANK( AWS_Data_Id__c ) && (OR(NOT( ISBLANK(Delivered_Product__r.address_Contacts__c )), NOT(ISBLANK(Delivered_Product__r.address_Telephone__c)), NOT(ISBLANK(Delivered_Product__r.address_Contacts_Name__c)), NOT(ISBLANK(Delivered_Product__r.address_City__c )), NOT(ISBLANK(Delivered_Product__r.Detailed_Address__c)), NOT(ISBLANK(Delivered_Product__r.address_ZipCode__c))))</formula>
+ <formula>ISBLANK( AWS_Data_Id__c ) && (OR(NOT( ISBLANK(Delivered_Product__r.address_Contacts__c )),
+NOT(ISBLANK(Delivered_Product__r.address_Telephone__c)),
+NOT(ISBLANK(Delivered_Product__r.address_Contacts_Name__c)),
+NOT(ISBLANK(Delivered_Product__r.address_City__c )),
+NOT(ISBLANK(Delivered_Product__r.Detailed_Address__c)),
+NOT(ISBLANK(Delivered_Product__r.address_ZipCode__c))))</formula>
<triggerType>onCreateOnly</triggerType>
</rules>
<rules>
@@ -1886,18 +1965,18 @@
<triggerType>onCreateOrTriggeringUpdate</triggerType>
<workflowTimeTriggers>
<actions>
- <name>X3dayspassedAlert</name>
- <type>Alert</type>
- </actions>
- <timeLength>3</timeLength>
- <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
- </workflowTimeTriggers>
- <workflowTimeTriggers>
- <actions>
<name>StatusCancel</name>
<type>FieldUpdate</type>
</actions>
<timeLength>7</timeLength>
+ <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+ </workflowTimeTriggers>
+ <workflowTimeTriggers>
+ <actions>
+ <name>X3dayspassedAlert</name>
+ <type>Alert</type>
+ </actions>
+ <timeLength>3</timeLength>
<workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
</workflowTimeTriggers>
</rules>
@@ -1907,7 +1986,7 @@
<name>SetRepairFirstEstimatedDate</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISBLANK( Repair_Firstestimated_Date__c )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1917,7 +1996,7 @@
<name>Repair_Final_completed_day</name>
<type>FieldUpdate</type>
</actions>
- <active>false</active>
+ <active>true</active>
<criteriaItems>
<field>Repair__c.Status__c</field>
<operation>contains</operation>
@@ -1932,7 +2011,7 @@
<name>X0_2_4_RC_RC</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>ISCHANGED(Repair_Ordered_Date__c)&&Remaining_Amount__c<=20000&&0<=Remaining_Amount__c</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -1942,7 +2021,7 @@
<name>Cancel_Return_Without_Repair_Notice</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>AND( ISCHANGED(Return_Without_Repair__c) , Return_Without_Repair__c = false)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -2055,7 +2134,7 @@
<criteriaItems>
<field>Repair__c.Invalid_check__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -2089,7 +2168,7 @@
<criteriaItems>
<field>Repair__c.Return_Without_Repair__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Return_Without_Repair_Reason__c</field>
@@ -2153,7 +2232,7 @@
<criteriaItems>
<field>Repair__c.DevApply__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2167,7 +2246,7 @@
<criteriaItems>
<field>Repair__c.Confirmed_Collect_money__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Collect_money_check1__c</field>
@@ -2189,7 +2268,7 @@
<criteriaItems>
<field>Repair__c.Confirmed_received_document__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2271,7 +2350,7 @@
<criteriaItems>
<field>Repair__c.Return_Without_Repair_IF__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Return_Without_Repair_Date__c</field>
@@ -2289,7 +2368,7 @@
<criteriaItems>
<field>Repair__c.Return_Without_Repair__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Return_Without_Repair_Request_Date__c</field>
@@ -2321,7 +2400,7 @@
<criteriaItems>
<field>Repair__c.Confirmed_Collect_money__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2339,7 +2418,7 @@
<criteriaItems>
<field>Repair__c.Confirmed_received_document__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -2353,7 +2432,7 @@
<criteriaItems>
<field>Repair__c.URF_Reapir__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Repair_Ordered_Date__c</field>
@@ -2380,7 +2459,7 @@
<criteriaItems>
<field>Repair__c.URF_Reapir__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Repair_Shipped_Date__c</field>
@@ -2421,7 +2500,7 @@
<criteriaItems>
<field>Repair__c.URF_Reapir__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Repair_Shipped_Date__c</field>
@@ -2458,7 +2537,7 @@
<criteriaItems>
<field>Repair__c.URF_Reapir__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Repair_Shipped_Date__c</field>
@@ -2494,7 +2573,7 @@
<criteriaItems>
<field>Repair__c.URF_Reapir__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Repair__c.Repair_Shipped_Date__c</field>
diff --git a/force-app/main/default/workflows/Report__c.workflow-meta.xml b/force-app/main/default/workflows/Report__c.workflow-meta.xml
index 265fd5b..ae150c3 100644
--- a/force-app/main/default/workflows/Report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Report__c.workflow-meta.xml
@@ -42,6 +42,10 @@
<recipient>manli_wu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
+ <recipients>
+ <recipient>yoshihiko_terabori@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<senderType>CurrentUser</senderType>
<template>Report/Competitor_report</template>
</alerts>
@@ -55,6 +59,14 @@
</recipients>
<recipients>
<recipient>weiliang_li@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>yoshihiko_terabori@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>yoshimichi_takahashi@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<senderType>CurrentUser</senderType>
@@ -86,6 +98,7 @@
<fullName>Final_PAE_Unknown</fullName>
<ccEmails>haijie_yin@olympus.com.cn</ccEmails>
<ccEmails>shinichi_aihara@olympus.com.cn</ccEmails>
+ <ccEmails>mengxin_zhou@olympus.com.cn</ccEmails>
<ccEmails>mingmeng_jian@olympus.com.cn</ccEmails>
<ccEmails>ningdan_song@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禤AE/Unknown</description>
@@ -99,6 +112,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>renren_zhao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -122,7 +139,7 @@
<recipient>xizhi_ma@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Update_ETQ</template>
</alerts>
@@ -130,6 +147,7 @@
<fullName>Final_PAE_Unknown_withETQ</fullName>
<ccEmails>haijie_yin@olympus.com.cn</ccEmails>
<ccEmails>shinichi_aihara@olympus.com.cn</ccEmails>
+ <ccEmails>mengxin_zhou@olympus.com.cn</ccEmails>
<ccEmails>mingmeng_jian@olympus.com.cn</ccEmails>
<ccEmails>ningdan_song@olympus.com.cn</ccEmails>
<description>PAE--Final鏃禤AE/Unknown withETQ</description>
@@ -143,6 +161,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>renren_zhao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -166,14 +188,16 @@
<recipient>xizhi_ma@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Update_ETQ</template>
</alerts>
<alerts>
<fullName>Intake_Judgement</fullName>
+ <ccEmails>xinhua_zhang@olympus.com.cn</ccEmails>
<ccEmails>lili_zhang@olympus.com.cn</ccEmails>
<ccEmails>peiqiang_lin@olympus.com.cn</ccEmails>
+ <ccEmails>yoichi_murata@olympus.com.cn</ccEmails>
<ccEmails>shuting_wang@olympus.com.cn</ccEmails>
<description>璇稩ntake鍒ゅ畾</description>
<protected>false</protected>
@@ -186,6 +210,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>chenlong_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>hengtao_huang@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -193,7 +221,7 @@
<recipient>lecheng_luo@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/VOC_Intake_Judgement</template>
</alerts>
@@ -201,6 +229,7 @@
<fullName>Intake_PAE_Unknown</fullName>
<ccEmails>shinichi_aihara@olympus.com.cn</ccEmails>
<ccEmails>haijie_yin@olympus.com.cn</ccEmails>
+ <ccEmails>mengxin_zhou@olympus.com.cn</ccEmails>
<ccEmails>mingmeng_jian@olympus.com.cn</ccEmails>
<ccEmails>ningdan_song@olympus.com.cn</ccEmails>
<description>PAE--Intake鏃禤AE/Unknown</description>
@@ -214,6 +243,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>jiao_liu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>renren_zhao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -237,7 +270,7 @@
<recipient>xizhi_ma@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Initiatioan_ETQ</template>
</alerts>
@@ -396,7 +429,7 @@
<field>PAE_email__c</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Report_AE</template>
</alerts>
@@ -428,7 +461,15 @@
<type>creator</type>
</recipients>
<recipients>
+ <recipient>dian_hu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>sheng_lu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>shinichi_iwano@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -470,6 +511,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>dian_hu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>sheng_lu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -484,7 +529,15 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>dian_hu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>sheng_lu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>shinichi_iwano@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -526,7 +579,15 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>dian_hu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>sheng_lu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>shinichi_iwano@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -568,7 +629,15 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>dian_hu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>sheng_lu@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>shinichi_iwano@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -636,6 +705,10 @@
<type>user</type>
</recipients>
<recipients>
+ <recipient>mengxin_zhou@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>mingmeng_jian@olympus.com.cn</recipient>
<type>user</type>
</recipients>
@@ -643,7 +716,7 @@
<recipient>ningdan_song@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Report_Update_ETQ</template>
</alerts>
@@ -1228,7 +1301,7 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>TEXT(Status__c) = "鍒ゅ畾瀹屾瘯" && RecordTypeId = "012C600000003KE"</formula>
+ <formula>TEXT(Status__c) = "鍒ゅ畾瀹屾瘯" && RecordTypeId = "01210000000Qeky"</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1242,7 +1315,7 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>TEXT(Status__c) = "鍥炵瓟瀹屾瘯" && RecordTypeId = "012C600000003KE"</formula>
+ <formula>TEXT(Status__c) = "鍥炵瓟瀹屾瘯" && RecordTypeId = "01210000000Qeky"</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -1280,7 +1353,7 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>TEXT(Status__c) = "濉啓瀹屾瘯" && RecordTypeId = "012C600000003KE"</formula>
+ <formula>TEXT(Status__c) = "濉啓瀹屾瘯" && RecordTypeId = "01210000000Qeky"</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
diff --git a/force-app/main/default/workflows/Request_tedner_doc__c.workflow-meta.xml b/force-app/main/default/workflows/Request_tedner_doc__c.workflow-meta.xml
index 61d3807..b711257 100644
--- a/force-app/main/default/workflows/Request_tedner_doc__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Request_tedner_doc__c.workflow-meta.xml
@@ -34,7 +34,7 @@
<name>Cancel_tender_request_doc</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>AND(ISCHANGED( Submit_check_flag__c ),Submit_check_flag__c=false)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -44,7 +44,7 @@
<name>Request_tender_doc_prepare</name>
<type>Alert</type>
</actions>
- <active>false</active>
+ <active>true</active>
<formula>AND(ISCHANGED( Submit_check_flag__c ),Submit_check_flag__c=true)</formula>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/SI_Attachment__c.workflow-meta.xml b/force-app/main/default/workflows/SI_Attachment__c.workflow-meta.xml
index 63ef757..7475dac 100644
--- a/force-app/main/default/workflows/SI_Attachment__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/SI_Attachment__c.workflow-meta.xml
@@ -9,6 +9,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>Opportunity_sub_owner__c</field>
<type>userLookup</type>
</recipients>
@@ -28,6 +32,10 @@
<ccEmails>si_yingye@olympus.com.cn</ccEmails>
<description>鏈�缁堟祴璇曟姤鍛婇偖浠跺彂閫�</description>
<protected>false</protected>
+ <recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<recipients>
<field>Oppor_Assistant__c</field>
<type>userLookup</type>
@@ -95,6 +103,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>Opportunity_sub_owner__c</field>
<type>userLookup</type>
</recipients>
@@ -123,6 +135,10 @@
</recipients>
<recipients>
<recipient>meng_zhang@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
<type>user</type>
</recipients>
<recipients>
@@ -212,6 +228,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>ziheng1_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<field>Opportunity_sub_owner__c</field>
<type>userLookup</type>
</recipients>
diff --git a/force-app/main/default/workflows/SLAReportInfo__c.workflow-meta.xml b/force-app/main/default/workflows/SLAReportInfo__c.workflow-meta.xml
index e368882..fb35e81 100644
--- a/force-app/main/default/workflows/SLAReportInfo__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/SLAReportInfo__c.workflow-meta.xml
@@ -20,12 +20,12 @@
<criteriaItems>
<field>SLAReportInfo__c.IsContractPeriod__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>SLAReportInfo__c.Event_Status__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/SMARM__c.workflow-meta.xml b/force-app/main/default/workflows/SMARM__c.workflow-meta.xml
index 9e4807c..dbdeb94 100644
--- a/force-app/main/default/workflows/SMARM__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/SMARM__c.workflow-meta.xml
@@ -36,7 +36,7 @@
<recipients>
<type>creator</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/SmarmEmailAlertToMe_VF</template>
</alerts>
diff --git a/force-app/main/default/workflows/Solution.workflow-meta.xml b/force-app/main/default/workflows/Solution.workflow-meta.xml
index 298d7af..72838d1 100644
--- a/force-app/main/default/workflows/Solution.workflow-meta.xml
+++ b/force-app/main/default/workflows/Solution.workflow-meta.xml
@@ -64,7 +64,7 @@
<criteriaItems>
<field>Solution.FAQ_disclosed_request__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/SolutionProjectRequirements__c.workflow-meta.xml b/force-app/main/default/workflows/SolutionProjectRequirements__c.workflow-meta.xml
index e9a7c49..ca520b2 100644
--- a/force-app/main/default/workflows/SolutionProjectRequirements__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/SolutionProjectRequirements__c.workflow-meta.xml
@@ -191,7 +191,7 @@
<name>solutionNewName</name>
<type>FieldUpdate</type>
</actions>
- <active>true</active>
+ <active>false</active>
<formula>true</formula>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/Statu_Achievements__c.workflow-meta.xml b/force-app/main/default/workflows/Statu_Achievements__c.workflow-meta.xml
index 513f2e2..d492a50 100644
--- a/force-app/main/default/workflows/Statu_Achievements__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Statu_Achievements__c.workflow-meta.xml
@@ -20,6 +20,10 @@
<recipient>qi_qiao@olympus.com.cn</recipient>
<type>user</type>
</recipients>
+ <recipients>
+ <recipient>xiaoqian_chen@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
<senderType>CurrentUser</senderType>
<template>NoteTheResidual/T1_DetailedList</template>
</alerts>
@@ -656,7 +660,20 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>OR( ISCHANGED(PaymentStatus__c), ISCHANGED(AssignmentStatus__c), ISCHANGED(Reason_not_collect_money__c), ISCHANGED(UnshippedAmount__c), ISCHANGED(Reason_not_ship__c), ISCHANGED(Follow_up_comment__c), ISCHANGED(DeliveryStatus__c), ISCHANGED(OverviewStatus__c), ISCHANGED(Manager_feedback__c), ISCHANGED(Payment_Scheduled_Date__c), ISCHANGED(Payment_All_Scheduled_Date__c), ISCHANGED(Shipping_Scheduled_Date__c), ISCHANGED(EndUser_contract_submit_day__c))</formula>
+ <formula>OR(
+ISCHANGED(PaymentStatus__c),
+ISCHANGED(AssignmentStatus__c),
+ISCHANGED(Reason_not_collect_money__c),
+ISCHANGED(UnshippedAmount__c),
+ISCHANGED(Reason_not_ship__c),
+ISCHANGED(Follow_up_comment__c),
+ISCHANGED(DeliveryStatus__c),
+ISCHANGED(OverviewStatus__c),
+ISCHANGED(Manager_feedback__c),
+ISCHANGED(Payment_Scheduled_Date__c),
+ISCHANGED(Payment_All_Scheduled_Date__c),
+ISCHANGED(Shipping_Scheduled_Date__c),
+ISCHANGED(EndUser_contract_submit_day__c))</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -867,12 +884,12 @@
<criteriaItems>
<field>Opportunity.ET_SP_Consumption__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>Statu_Achievements__c.ET_SP_Consumption__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<description>鏂板缓/鏇存柊娉ㄦ畫鏃讹紝鏍规嵁璇环鍊艰瀹�</description>
<triggerType>onAllChanges</triggerType>
@@ -887,12 +904,12 @@
<criteriaItems>
<field>Opportunity.ET_SP_Consumption__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>Statu_Achievements__c.ET_SP_Consumption__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<description>鏂板缓/鏇存柊娉ㄦ畫鏃讹紝鏍规嵁璇环鍊艰瀹�</description>
<triggerType>onAllChanges</triggerType>
diff --git a/force-app/main/default/workflows/SubAuthorized__c.workflow-meta.xml b/force-app/main/default/workflows/SubAuthorized__c.workflow-meta.xml
index cc4b762..51cafbd 100644
--- a/force-app/main/default/workflows/SubAuthorized__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/SubAuthorized__c.workflow-meta.xml
@@ -8,10 +8,14 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>SubAuthorized/SubAuthorizedApprovalDone</template>
</alerts>
@@ -21,6 +25,10 @@
<protected>false</protected>
<recipients>
<type>owner</type>
+ </recipients>
+ <recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
</recipients>
<recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
@@ -56,10 +64,14 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>SubAuthorized/SubAuthorizedEndTemplate</template>
</alerts>
@@ -71,6 +83,10 @@
<type>owner</type>
</recipients>
<recipients>
+ <recipient>chunxia_gao@olympus.com.cn</recipient>
+ <type>user</type>
+ </recipients>
+ <recipients>
<recipient>ling_zhu@olympus.com.cn</recipient>
<type>user</type>
</recipients>
diff --git a/force-app/main/default/workflows/Tender_information__c.workflow-meta.xml b/force-app/main/default/workflows/Tender_information__c.workflow-meta.xml
index 8c4fc04..7fc139b 100644
--- a/force-app/main/default/workflows/Tender_information__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Tender_information__c.workflow-meta.xml
@@ -45,7 +45,7 @@
<field>SP_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/TenderCloseTemplate</template>
</alerts>
@@ -64,7 +64,7 @@
<field>SP_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/Tender_notRespApproval</template>
</alerts>
@@ -87,7 +87,7 @@
<field>SP_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/Tender_notRespApproval</template>
</alerts>
@@ -110,7 +110,7 @@
<field>Zongjian_Sales__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/Tender_notRespApproval</template>
</alerts>
@@ -149,7 +149,7 @@
<field>SP_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>unfiled$public/Tender_TerminateReject</template>
</alerts>
@@ -168,7 +168,7 @@
<field>SP_assistant__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Prospect/Tender_notRespReject</template>
</alerts>
@@ -589,9 +589,12 @@
</fieldUpdates>
<fieldUpdates>
<fullName>updateTenderDate_c</fullName>
- <description>鏍规嵁 鎶曟爣寮�濮嬫椂闂� 銆佹姇鏍囨埅姝㈡椂闂� 銆佸叕鍛婅褰曟棩 椤哄簭 璧嬪��</description>
+ <description>鏍规嵁 鎶曟爣寮�濮嬫椂闂� 銆佹姇鏍囨埅姝㈡椂闂� 銆佸叕鍛婅褰曟棩 椤哄簭 璧嬪��
+//20231218 lt update add 椤圭洰闃舵
+IF( ISNULL(TenderBeginTime__c) , IF(ISNULL(TenderEndTime__c), IF(ISNULL(publicDate__c), null, publicDate__c) , DATEVALUE(TenderEndTime__c)) ,DATEVALUE(TenderBeginTime__c))</description>
<field>TenderDate__c</field>
- <formula>IF( ISNULL(TenderBeginTime__c) , IF(ISNULL(TenderEndTime__c), IF(ISNULL(publicDate__c), null, publicDate__c) , DATEVALUE(TenderEndTime__c)) ,DATEVALUE(TenderBeginTime__c))</formula>
+ <formula>IF( OR( TEXT( InfoType__c ) = '1锛氶鍛�' , TEXT( TerminateApprovalStatus__c ) = '鎵瑰噯') , null,
+IF( ISNULL(TenderBeginTime__c) , IF(ISNULL(TenderEndTime__c), IF(ISNULL(publicDate__c), null, publicDate__c) , DATEVALUE(TenderEndTime__c)) ,DATEVALUE(TenderBeginTime__c)))</formula>
<name>鏇存柊鎷涙爣鏃�</name>
<notifyAssignee>false</notifyAssignee>
<operation>Formula</operation>
@@ -798,8 +801,8 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>IF( NOT(ISNULL(TenderBeginTime__c)) , true, IF( NOT(ISNULL(TenderEndTime__c )), true, IF( NOT(ISNULL(publicDate__c)) , true, false) ) )</formula>
- <triggerType>onCreateOnly</triggerType>
+ <formula>true</formula>
+ <triggerType>onAllChanges</triggerType>
</rules>
<rules>
<fullName>鏇存柊鐩稿叧鎬х‘璁ゅ姪鐞�</fullName>
@@ -849,7 +852,7 @@
<type>FieldUpdate</type>
</actions>
<active>true</active>
- <formula>ISCHANGED(IsRelateProject__c) &&( ISBLANK(Text(PRIORVALUE(IsRelateProject__c))) || isblank(Text(IsRelateProject__c)) ) && ( $Profile.Id = '00eC600000004UD')</formula>
+ <formula>ISCHANGED(IsRelateProject__c) &&( ISBLANK(Text(PRIORVALUE(IsRelateProject__c))) || isblank(Text(IsRelateProject__c)) ) && ( $Profile.Id = '00e10000000s2fZ' || $Profile.Id = '00e10000000s3Jp' )</formula>
<triggerType>onAllChanges</triggerType>
</rules>
<rules>
@@ -903,6 +906,10 @@
<name>Tender_ResultDate_Clear</name>
<type>FieldUpdate</type>
</actions>
+ <actions>
+ <name>publicDate_Clear</name>
+ <type>FieldUpdate</type>
+ </actions>
<active>true</active>
<booleanFilter>(1 AND 2) OR (3 AND 4)</booleanFilter>
<criteriaItems>
diff --git a/force-app/main/default/workflows/User.workflow-meta.xml b/force-app/main/default/workflows/User.workflow-meta.xml
index c64dccc..6e2e9bc 100644
--- a/force-app/main/default/workflows/User.workflow-meta.xml
+++ b/force-app/main/default/workflows/User.workflow-meta.xml
@@ -20,7 +20,7 @@
<field>Email</field>
<type>email</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>Olympus_OCM/Process_Task_List_Model</template>
</alerts>
@@ -301,7 +301,7 @@
<criteriaItems>
<field>User.Send_Or_Not__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<criteriaItems>
<field>User.Unprocessed_Tack_Flag__c</field>
@@ -420,7 +420,7 @@
<criteriaItems>
<field>User.IsActive</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<criteriaItems>
<field>User.Stay_or_not__c</field>
diff --git a/force-app/main/default/workflows/Visit_Report__c.workflow-meta.xml b/force-app/main/default/workflows/Visit_Report__c.workflow-meta.xml
index 1747bba..c7392f7 100644
--- a/force-app/main/default/workflows/Visit_Report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Visit_Report__c.workflow-meta.xml
@@ -152,7 +152,7 @@
<criteriaItems>
<field>Visit_Report__c.Status__c</field>
<operation>equals</operation>
- <value>鐢宠涓�</value>
+ <value>鐢宠珛涓�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
@@ -166,7 +166,7 @@
<criteriaItems>
<field>Visit_Report__c.Status__c</field>
<operation>equals</operation>
- <value>鐢宠涓�</value>
+ <value>鐢宠珛涓�</value>
</criteriaItems>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
diff --git a/force-app/main/default/workflows/eSignForm__c.workflow-meta.xml b/force-app/main/default/workflows/eSignForm__c.workflow-meta.xml
index 56612f6..39bf7de 100644
--- a/force-app/main/default/workflows/eSignForm__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/eSignForm__c.workflow-meta.xml
@@ -53,7 +53,7 @@
<field>Sales_assistant_name_text__c</field>
<type>userLookup</type>
</recipients>
- <senderAddress>18523460502@163.com</senderAddress>
+ <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
<senderType>OrgWideEmailAddress</senderType>
<template>eSignFormFolder/PartOfTheDealerSignIn</template>
</alerts>
@@ -618,7 +618,7 @@
<criteriaItems>
<field>eSignForm__c.isSendHPEmail_del__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -640,7 +640,9 @@
</actions>
<active>false</active>
<description>鍙潬鎬уお浣庯紝宸茬鐢紝瀛楁鏇存柊鎸埌鍚勫鎵归�氳繃鏃剁偣璁剧疆</description>
- <formula>(skip_Distribution_Sign__c && HPDNSignUpStatus__c == '绛炬敹宸插畬鎴�') ||(skip_Hospital_Sign__c&& agencyDNSignUpStatus__c == '绛炬敹宸插畬鎴�') ||(Sales_Root_Formula__c=='璨╁２搴�' && HPDNSignUpStatus__c == '绛炬敹宸插畬鎴�' && agencyDNSignUpStatus__c == '绛炬敹宸插畬鎴�')</formula>
+ <formula>(skip_Distribution_Sign__c && HPDNSignUpStatus__c == '绛炬敹宸插畬鎴�')
+||(skip_Hospital_Sign__c&& agencyDNSignUpStatus__c == '绛炬敹宸插畬鎴�')
+||(Sales_Root_Formula__c=='璨╁２搴�' && HPDNSignUpStatus__c == '绛炬敹宸插畬鎴�' && agencyDNSignUpStatus__c == '绛炬敹宸插畬鎴�')</formula>
<triggerType>onCreateOrTriggeringUpdate</triggerType>
</rules>
<rules>
@@ -747,7 +749,7 @@
<criteriaItems>
<field>eSignForm__c.isSendEmail_del__c</field>
<operation>equals</operation>
- <value>False</value>
+ <value>鍋�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -771,7 +773,7 @@
<criteriaItems>
<field>eSignForm__c.HPAutoConfirm__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
@@ -785,7 +787,7 @@
<criteriaItems>
<field>eSignForm__c.agencyAutoConfirm__c</field>
<operation>equals</operation>
- <value>True</value>
+ <value>鐪�</value>
</criteriaItems>
<triggerType>onAllChanges</triggerType>
</rules>
diff --git a/manifest/packagewf.xml b/manifest/packagewf.xml
index fea179d..7bf4af4 100644
--- a/manifest/packagewf.xml
+++ b/manifest/packagewf.xml
@@ -2,7 +2,7 @@
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
<members>*</members>
- <name>Layout</name>
+ <name>WorkFlow</name>
</types>
<version>59.0</version>
</Package>
\ No newline at end of file
--
Gitblit v1.9.1