AliOlySFDCSta.git

			@@ -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 不发送邮件Flag = 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>