From 0e0dd1e20e7211f3c3c11d77a41090d998dfd06c Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期四, 18 一月 2024 16:32:25 +0800
Subject: [PATCH] bakcupprodwl

---
 force-app/main/default/email/unfiled$public/Adjust_Queue_No.email-meta.xml              |   11 +
 force-app/main/default/workflows/Opportunity.workflow-meta.xml                          |   29 ++--
 manifest/packagewfemailtemplate.xml                                                     |   11 +
 force-app/main/default/workflows/QIS_Report__c.workflow-meta.xml                        |   30 ++++
 force-app/main/default/workflows/Repair__c.workflow-meta.xml                            |   47 +++++-
 force-app/main/default/workflows/Monthly_Report__c.workflow-meta.xml                    |   28 ++++
 force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email            |   31 ++++
 force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email-meta.xml            |   11 +
 force-app/main/default/workflows/Maintenance_Contract__c.workflow-meta.xml              |   27 +++
 force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email                     |    1 
 /dev/null                                                                               |   15 --
 force-app/main/default/workflows/Rental_Apply__c.workflow-meta.xml                      |   19 ++
 force-app/main/default/workflows/Campaign.workflow-meta.xml                             |   10 
 force-app/main/default/workflows/Rental_Apply_Equipment_Set_Detail__c.workflow-meta.xml |   30 ++++
 force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email-meta.xml   |   29 ++++
 force-app/main/default/email/unfiled$public/Adjust_Queue_No.email                       |    1 
 force-app/main/default/workflows/AssetMaintainHeader__c.workflow-meta.xml               |   26 +++
 force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml                |    7 
 force-app/main/default/workflows/Repair_Quotation__c.workflow-meta.xml                  |   20 +-
 19 files changed, 328 insertions(+), 55 deletions(-)

diff --git a/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email b/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email
new file mode 100644
index 0000000..4961115
--- /dev/null
+++ b/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email
@@ -0,0 +1,31 @@
+鎮ㄥソ锛侊紒<BR>
+濡備笅澶囧搧鐢宠鎻掗槦锛岀儲璇锋偍鎵瑰噯锛佽阿璋紒
+<Table border="1">
+<tr>
+<th>鍨嬪彿</th>
+<th>涓�瑙堟槑缁哊o.</th>
+<th>鍊熷嚭澶囧搧涓�瑙堟槑缁嗙姸鎬�</th>
+<th>鎻掗槦鍘熷洜</th>
+</tr>
+<tr>
+<td>{!Rental_Apply_Equipment_Set_Detail__c.Fixture_Model_No__c}</td>
+<td><a href="{!Rental_Apply_Equipment_Set_Detail__c.Link}">{!Rental_Apply_Equipment_Set_Detail__c.Name}</a></td>
+<td>{!Rental_Apply_Equipment_Set_Detail__c.EquipmentSet_Detail_Status_Status__c}</td>
+<td>{!Rental_Apply_Equipment_Set_Detail__c.jumpReason__c}</td>
+</tr>
+<Table>
+<BR>
+鍊熷嚭鐢宠鑰咃細{!Rental_Apply__c.OwnerFullName}  <BR>
+浣跨敤鐩殑 锛歿!Rental_Apply__c.Demo_purpose1__c}/{!Rental_Apply__c.demo_purpose2__c} 
+ <BR>
+ <BR>
+銆愬鎴蜂俊鎭��  <BR>
+鍖婚櫌锛歿!Rental_Apply__c.Hospital__c} / {!Rental_Apply__c.OCM_segmentation__c}  <BR>
+瀛︿細锛歿!Rental_Apply__c.Campaign__c}<BR>
+
+銆愬�熷嚭鐩稿叧淇℃伅銆�  <BR>
+甯屾湜鍒拌揣鏃ワ細{!Rental_Apply__c.Request_shipping_day__c} <BR>
+甯屾湜鍊熺敤澶╂暟 锛歿!Rental_Apply__c.Hope_Lonaer_date_Num__c} <BR>
+鍊熺敤鐞嗙敱鎻忚堪 锛�<BR>
+{!Rental_Apply__c.Demo_purpose_text__c}
+<BR>
\ No newline at end of file
diff --git a/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email-meta.xml b/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email-meta.xml
new file mode 100644
index 0000000..1154001
--- /dev/null
+++ b/force-app/main/default/email/Loaner_function/Adjust_Queue_Window_Start.email-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <available>true</available>
+    <encodingKey>UTF-8</encodingKey>
+    <name>鎻掗槦鐢宠瀹℃壒鎻愰啋</name>
+    <style>none</style>
+    <subject>澶囧搧鍊熷嚭鐢宠-{!Rental_Apply__c.Name}   {!Rental_Apply__c.Demo_purpose1__c}/{!Rental_Apply__c.demo_purpose2__c}  -鐢宠鎻掗槦</subject>
+    <textOnly>鎮ㄥソ锛侊紒
+濡備笅澶囧搧鐢宠鎻掗槦锛岀儲璇锋偍鎵瑰噯锛佽阿璋紒
+
+鍨嬪彿  涓�瑙堟槑缁哊o.  鍊熷嚭澶囧搧涓�瑙堟槑缁嗙姸鎬�  鎻掗槦鍘熷洜
+{!Rental_Apply_Equipment_Set_Detail__c.Fixture_Model_No__c}  {!Rental_Apply_Equipment_Set_Detail__c.Name}  {!Rental_Apply_Equipment_Set_Detail__c.EquipmentSet_Detail_Status_Status__c}  {!Rental_Apply_Equipment_Set_Detail__c.jumpReason__c}
+
+
+鍊熷嚭鐢宠鑰咃細{!Rental_Apply__c.OwnerFullName}
+浣跨敤鐩殑 锛歿!Rental_Apply__c.Demo_purpose1__c}/{!Rental_Apply__c.demo_purpose2__c}
+
+銆愬鎴蜂俊鎭��
+鍖婚櫌锛歿!Rental_Apply__c.Hospital__c} / {!Rental_Apply__c.OCM_segmentation__c}
+瀛︿細锛歿!Rental_Apply__c.Campaign__c}
+銆愬�熷嚭鐩稿叧淇℃伅銆�
+甯屾湜鍒拌揣鏃ワ細{!Rental_Apply__c.Request_shipping_day__c}
+甯屾湜鍊熺敤澶╂暟 锛歿!Rental_Apply__c.Hope_Lonaer_date_Num__c}
+鍊熺敤鐞嗙敱鎻忚堪 锛�
+{!Rental_Apply__c.Demo_purpose_text__c}
+{!Rental_Apply__c.Email_Rental_Apply_Equipment_Set__c}</textOnly>
+    <type>custom</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email b/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email
new file mode 100644
index 0000000..1e33078
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email
@@ -0,0 +1 @@
+鎮ㄧ殑澶囧搧鐢宠鍗晎!Rental_Apply_Equipment_Set_Detail__c.Rental_Apply__c}涓�<a href="{!Rental_Apply_Equipment_Set_Detail__c.Link}">{!Rental_Apply_Equipment_Set_Detail__c.Name}</a>宸叉垚鍔熸挙鍥烇紝璇风‘璁わ紝璋㈣阿锛�
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email-meta.xml b/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email-meta.xml
new file mode 100644
index 0000000..e4ee254
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Adjust_Queue_Back.email-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <available>true</available>
+    <encodingKey>UTF-8</encodingKey>
+    <name>鎻掗槦鐢宠鎾ゅ洖鎻愰啋</name>
+    <style>none</style>
+    <subject>鎻掗槦鐢宠宸叉挙鍥烇紝璇风‘璁�</subject>
+    <textOnly>鎮ㄧ殑澶囧搧鐢宠鍗晎!Rental_Apply_Equipment_Set_Detail__c.Rental_Apply__c}涓瓄!Rental_Apply_Equipment_Set_Detail__c.Name}宸叉垚鍔熸挙鍥烇紝璇风‘璁わ紝璋㈣阿锛�</textOnly>
+    <type>custom</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email b/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email
new file mode 100644
index 0000000..e3a1e30
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email
@@ -0,0 +1 @@
+鎮ㄧ殑澶囧搧鐢宠鍗晎!Rental_Apply_Equipment_Set_Detail__c.Rental_Apply__c}涓�<a href="{!Rental_Apply_Equipment_Set_Detail__c.Link}">{!Rental_Apply_Equipment_Set_Detail__c.Name}</a>鎵瑰噯鏈�氳繃锛岃纭锛岃阿璋紒
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email-meta.xml b/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email-meta.xml
new file mode 100644
index 0000000..deef76e
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Adjust_Queue_No.email-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <available>true</available>
+    <encodingKey>UTF-8</encodingKey>
+    <name>鎻掗槦鐢宠鎷掔粷閫氱煡</name>
+    <style>none</style>
+    <subject>鎻掗槦鐢宠鏈壒鍑嗛�氳繃锛岃纭</subject>
+    <textOnly>鎮ㄧ殑澶囧搧鐢宠鍗晎!Rental_Apply_Equipment_Set_Detail__c.Rental_Apply__c}涓瓄!Rental_Apply_Equipment_Set_Detail__c.Name}鎵瑰噯鏈�氳繃锛岃纭锛岃阿璋紒</textOnly>
+    <type>custom</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/objects/Repair__c/fields/Rental_Apply_Equipment_Set_Detail__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Rental_Apply_Equipment_Set_Detail__c.field-meta.xml
deleted file mode 100644
index 56afe51..0000000
--- a/force-app/main/default/objects/Repair__c/fields/Rental_Apply_Equipment_Set_Detail__c.field-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
-    <fullName>Rental_Apply_Equipment_Set_Detail__c</fullName>
-    <deleteConstraint>SetNull</deleteConstraint>
-    <externalId>false</externalId>
-    <label>鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁�</label>
-    <referenceTo>Rental_Apply_Equipment_Set_Detail__c</referenceTo>
-    <relationshipLabel>淇悊</relationshipLabel>
-    <relationshipName>Rental_Apply_Equipment_Set_Detail</relationshipName>
-    <required>false</required>
-    <trackFeedHistory>false</trackFeedHistory>
-    <trackHistory>false</trackHistory>
-    <trackTrending>false</trackTrending>
-    <type>Lookup</type>
-</CustomField>
diff --git a/force-app/main/default/workflows/AssetMaintainHeader__c.workflow-meta.xml b/force-app/main/default/workflows/AssetMaintainHeader__c.workflow-meta.xml
index c7108f4..6fb63e6 100644
--- a/force-app/main/default/workflows/AssetMaintainHeader__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/AssetMaintainHeader__c.workflow-meta.xml
@@ -89,6 +89,14 @@
             <type>user</type>
         </recipients>
         <recipients>
+            <recipient>_runhao_shi@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
+            <recipient>xuan_li@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
             <recipient>ying_liu@olympus.com.cn</recipient>
             <type>user</type>
         </recipients>
@@ -129,6 +137,7 @@
     </alerts>
     <alerts>
         <fullName>AssetMaintainRejected_CC</fullName>
+        <ccEmails>sfdc_lvxueyan@olympus.com.cn</ccEmails>
         <description>02.鏁版嵁缁存姢宸查┏鍥濩C</description>
         <protected>false</protected>
         <recipients>
@@ -145,6 +154,14 @@
         </recipients>
         <recipients>
             <recipient>_haoran_chang@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
+            <recipient>_runhao_shi@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
+            <recipient>xuan_li@olympus.com.cn</recipient>
             <type>user</type>
         </recipients>
         <recipients>
@@ -184,6 +201,7 @@
     </alerts>
     <alerts>
         <fullName>AssetMaintainSubmitted_CC</fullName>
+        <ccEmails>sfdc_lvxueyan@olympus.com.cn</ccEmails>
         <description>01.鏁版嵁缁存姢鎻愪氦鐢宠CC</description>
         <protected>false</protected>
         <recipients>
@@ -203,6 +221,14 @@
             <type>user</type>
         </recipients>
         <recipients>
+            <recipient>_runhao_shi@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
+            <recipient>xuan_li@olympus.com.cn</recipient>
+            <type>user</type>
+        </recipients>
+        <recipients>
             <recipient>ying_liu@olympus.com.cn</recipient>
             <type>user</type>
         </recipients>
diff --git a/force-app/main/default/workflows/Campaign.workflow-meta.xml b/force-app/main/default/workflows/Campaign.workflow-meta.xml
index 347ea26..0766380 100644
--- a/force-app/main/default/workflows/Campaign.workflow-meta.xml
+++ b/force-app/main/default/workflows/Campaign.workflow-meta.xml
@@ -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>
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 638d338..8f04efe 100644
--- a/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/CancelPostponePlan__c.workflow-meta.xml
@@ -70,7 +70,7 @@
             <type>Alert</type>
         </actions>
         <active>true</active>
-        <booleanFilter>1 AND 2</booleanFilter>
+        <booleanFilter>1 AND 2 AND 3</booleanFilter>
         <criteriaItems>
             <field>CancelPostponePlan__c.Status__c</field>
             <operation>equals</operation>
@@ -81,6 +81,11 @@
             <operation>equals</operation>
             <value>鐪�</value>
         </criteriaItems>
+        <criteriaItems>
+            <field>CancelPostponePlan__c.cancelReasonCombobox__c</field>
+            <operation>notEqual</operation>
+            <value>鏃犲鍝�</value>
+        </criteriaItems>
         <description>opd鍙栨秷鎴愬姛涔嬪悗缁檕pd鎷呭綋鍙戦偖浠�</description>
         <triggerType>onCreateOrTriggeringUpdate</triggerType>
     </rules>
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 bf0e30a..b8444a5 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
@@ -2050,6 +2050,33 @@
         <triggerType>onAllChanges</triggerType>
     </rules>
     <rules>
+        <fullName>鑽夋涓�3澶╄鍫�7澶╁彇娑�</fullName>
+        <active>false</active>
+        <criteriaItems>
+            <field>Maintenance_Contract__c.Status__c</field>
+            <operation>equals</operation>
+            <value>鑽夋涓�</value>
+        </criteriaItems>
+        <triggerType>onCreateOrTriggeringUpdate</triggerType>
+        <workflowTimeTriggers>
+            <actions>
+                <name>X3dayspassed</name>
+                <type>Task</type>
+            </actions>
+            <offsetFromField>Maintenance_Contract__c.CreatedDate</offsetFromField>
+            <timeLength>3</timeLength>
+            <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+        </workflowTimeTriggers>
+        <workflowTimeTriggers>
+            <actions>
+                <name>Status_cancel</name>
+                <type>FieldUpdate</type>
+            </actions>
+            <timeLength>7</timeLength>
+            <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
+        </workflowTimeTriggers>
+    </rules>
+    <rules>
         <fullName>铏氭嫙缁翠慨鍚堝悓鏃ユ湡鏂囨湰鍖�</fullName>
         <actions>
             <name>endDateGuranteeToText</name>
diff --git a/force-app/main/default/workflows/Monthly_Report__c.workflow-meta.xml b/force-app/main/default/workflows/Monthly_Report__c.workflow-meta.xml
index 78c446c..c7738be 100644
--- a/force-app/main/default/workflows/Monthly_Report__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Monthly_Report__c.workflow-meta.xml
@@ -205,6 +205,34 @@
         <formula>ISCHANGED( Submit_check_flag__c )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
+    <rules>
+        <fullName>鍫卞憡鏇稿嵈涓�</fullName>
+        <actions>
+            <name>Submit_Flag_Off</name>
+            <type>FieldUpdate</type>
+        </actions>
+        <active>false</active>
+        <criteriaItems>
+            <field>Monthly_Report__c.Status__c</field>
+            <operation>equals</operation>
+            <value>鍗翠笅</value>
+        </criteriaItems>
+        <triggerType>onCreateOrTriggeringUpdate</triggerType>
+    </rules>
+    <rules>
+        <fullName>鍫卞憡鏇告彁鍑�</fullName>
+        <actions>
+            <name>Submit_Flag_On</name>
+            <type>FieldUpdate</type>
+        </actions>
+        <active>false</active>
+        <criteriaItems>
+            <field>Monthly_Report__c.Status__c</field>
+            <operation>equals</operation>
+            <value>鐢宠珛涓�</value>
+        </criteriaItems>
+        <triggerType>onCreateOrTriggeringUpdate</triggerType>
+    </rules>
     <tasks>
         <fullName>ActionTask01</fullName>
         <assignedToType>owner</assignedToType>
diff --git a/force-app/main/default/workflows/Opportunity.workflow-meta.xml b/force-app/main/default/workflows/Opportunity.workflow-meta.xml
index 59afca8..b3bbde3 100644
--- a/force-app/main/default/workflows/Opportunity.workflow-meta.xml
+++ b/force-app/main/default/workflows/Opportunity.workflow-meta.xml
@@ -249,7 +249,8 @@
             <field>Sales_window_text__c</field>
             <type>userLookup</type>
         </recipients>
-        <senderType>CurrentUser</senderType>
+        <senderAddress>ocm_te2ampj@olympus.com.cn</senderAddress>
+        <senderType>OrgWideEmailAddress</senderType>
         <template>Prospect/opp_alert_03_template</template>
     </alerts>
     <alerts>
@@ -2315,19 +2316,6 @@
                 <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>
@@ -2354,6 +2342,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>28</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
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 2eb0bcc..c0367c4 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
@@ -2934,6 +2934,21 @@
         </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>
@@ -3426,6 +3441,21 @@
         <triggerType>onCreateOrTriggeringUpdate</triggerType>
     </rules>
     <rules>
+        <fullName>delete 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>update_qis</name>
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 1643b08..ac8cc28 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
@@ -84,6 +84,36 @@
         <reevaluateOnChange>false</reevaluateOnChange>
     </fieldUpdates>
     <fieldUpdates>
+        <fullName>JumpStatus01</fullName>
+        <field>JumpStatus__c</field>
+        <literalValue>鑽夋涓�</literalValue>
+        <name>澶囧搧鍑哄�熸槑缁嗘彃闃熺姸鎬佽崏妗堜腑</name>
+        <notifyAssignee>false</notifyAssignee>
+        <operation>Literal</operation>
+        <protected>false</protected>
+        <reevaluateOnChange>false</reevaluateOnChange>
+    </fieldUpdates>
+    <fieldUpdates>
+        <fullName>JumpStatus02</fullName>
+        <field>JumpStatus__c</field>
+        <literalValue>鐢宠涓�</literalValue>
+        <name>澶囧搧鍑哄�熸槑缁嗘彃闃熺姸鎬佺敵璇蜂腑</name>
+        <notifyAssignee>false</notifyAssignee>
+        <operation>Literal</operation>
+        <protected>false</protected>
+        <reevaluateOnChange>false</reevaluateOnChange>
+    </fieldUpdates>
+    <fieldUpdates>
+        <fullName>JumpStatus03</fullName>
+        <field>JumpStatus__c</field>
+        <literalValue>宸叉壒鍑�</literalValue>
+        <name>澶囧搧鍑哄�熸槑缁嗘彃闃熺姸鎬佸凡鎵瑰噯</name>
+        <notifyAssignee>false</notifyAssignee>
+        <operation>Literal</operation>
+        <protected>false</protected>
+        <reevaluateOnChange>false</reevaluateOnChange>
+    </fieldUpdates>
+    <fieldUpdates>
         <fullName>Lost_Giveup_time</fullName>
         <field>Loaner_Giveup_Time__c</field>
         <formula>now()</formula>
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 a434007..f184caa 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
@@ -894,6 +894,25 @@
         <reevaluateOnChange>false</reevaluateOnChange>
     </fieldUpdates>
     <fieldUpdates>
+        <fullName>OPDApprovalStatus_update_fail</fullName>
+        <field>OPDApprovalStatus__c</field>
+        <name>OPD瀹℃壒閫氳繃鑷姩鎻愪氦瀹℃壒鐘舵�佹洿鏂� 绌�</name>
+        <notifyAssignee>false</notifyAssignee>
+        <operation>Literal</operation>
+        <protected>false</protected>
+        <reevaluateOnChange>false</reevaluateOnChange>
+    </fieldUpdates>
+    <fieldUpdates>
+        <fullName>OPDApprovalStatus_update_success</fullName>
+        <field>OPDApprovalStatus__c</field>
+        <literalValue>鎵瑰噯</literalValue>
+        <name>OPD瀹℃壒閫氳繃鑷姩鎻愪氦瀹℃壒鐘舵�佹洿鏂� 鎵瑰噯</name>
+        <notifyAssignee>false</notifyAssignee>
+        <operation>Literal</operation>
+        <protected>false</protected>
+        <reevaluateOnChange>false</reevaluateOnChange>
+    </fieldUpdates>
+    <fieldUpdates>
         <fullName>Onwer_job_category</fullName>
         <field>Onwer_job_category_text__c</field>
         <formula>Onwer_job_category__c</formula>
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 b6eefd2..52ef1a9 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
@@ -694,7 +694,7 @@
                 <type>Alert</type>
             </actions>
             <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
-            <timeLength>12</timeLength>
+            <timeLength>9</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
         <workflowTimeTriggers>
@@ -704,6 +704,15 @@
             </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>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
         <workflowTimeTriggers>
@@ -722,15 +731,6 @@
             </actions>
             <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
             <timeLength>3</timeLength>
-            <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
-        </workflowTimeTriggers>
-        <workflowTimeTriggers>
-            <actions>
-                <name>ActionEmailRepairCutZJ</name>
-                <type>Alert</type>
-            </actions>
-            <offsetFromField>Repair_Quotation__c.ServiceCutPriceSubmitDateBZ__c</offsetFromField>
-            <timeLength>9</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
     </rules>
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 ad6aa8b..4d68ac2 100644
--- a/force-app/main/default/workflows/Repair__c.workflow-meta.xml
+++ b/force-app/main/default/workflows/Repair__c.workflow-meta.xml
@@ -1656,6 +1656,33 @@
         </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.On_site_repair__c</field>
+            <operation>equals</operation>
+            <value>3. FSE鍔炰簨澶勪慨鐞�,4. FSE鐜板満淇悊</value>
+        </criteriaItems>
+        <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>
         <actions>
             <name>OCSMAdministrative</name>
@@ -1965,18 +1992,18 @@
         <triggerType>onCreateOrTriggeringUpdate</triggerType>
         <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>
+        <workflowTimeTriggers>
+            <actions>
+                <name>StatusCancel</name>
+                <type>FieldUpdate</type>
+            </actions>
+            <timeLength>7</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
     </rules>
@@ -2202,7 +2229,7 @@
                 <name>X2_01_14_30</name>
                 <type>Alert</type>
             </actions>
-            <timeLength>14</timeLength>
+            <timeLength>30</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
         <workflowTimeTriggers>
@@ -2210,7 +2237,7 @@
                 <name>X2_01_14_30</name>
                 <type>Alert</type>
             </actions>
-            <timeLength>30</timeLength>
+            <timeLength>14</timeLength>
             <workflowTimeTriggerUnit>Days</workflowTimeTriggerUnit>
         </workflowTimeTriggers>
     </rules>
diff --git a/manifest/packagewfemailtemplate.xml b/manifest/packagewfemailtemplate.xml
new file mode 100644
index 0000000..ff474b2
--- /dev/null
+++ b/manifest/packagewfemailtemplate.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types>
+        <members>unfiled$public/Adjust_Queue_Back</members>
+        <members>unfiled$public/Adjust_Queue_No</members>
+        <members>Loaner_function/Adjust_Queue_Window_Start</members>
+        <members>Loaner_function/Adjust_Queue_Window_Start</members>
+        <name>EmailTemplate</name>
+    </types>
+    <version>59.0</version>
+</Package>
\ No newline at end of file

--
Gitblit v1.9.1